| | gnupod_INIT -m /mnt/ipod --france
+- | | mktunes.pl -m /mnt/ipod --volume 40
++ | | mktunes -m /mnt/ipod --volume 40
|
- if you would like to enable the 'EU-Volume-Limit' (=decrease max. volume).
---- gnupod-0.99.8/doc/gnupod.texi 2021-06-13 14:44:53.304338586 -1200
-+++ gnupod-0.99.8/doc/gnupod.texi.new 2021-06-13 14:44:53.632327759 -1200
-@@ -455,15 +455,15 @@
+ This would adjust the volume +40 percent. (You can also use '-100' to get
+ a silent iPod ;) )
+
- If the iPod is freshly formatted or you never used GNUpod before with this iPod, run
+-After mktunes.pl is done, you can umount the iPod and remove the sbp2 module
++After mktunes is done, you can umount the iPod and remove the sbp2 module
+ | | umount /mnt/ipod
+ rmmod sbp2
+ |
+
+-Added songs won't be visible on the iPod if you did not run mktunes.pl before umounting the iPod.
+-(If you forgot to run mktunes.pl before unpluging/umounting, simply mount the iPod again and run it)
++Added songs won't be visible on the iPod if you did not run mktunes before umounting the iPod.
++(If you forgot to run mktunes before unpluging/umounting, simply mount the iPod again and run it)
+
+
+
+@@ -1147,7 +1147,7 @@
+ non-apple software. GNUpod is able to create the required hash value if it knows the iPods serial number, this is a 16 chars long hex
+ value such as: 000ba3100310abcf and should be autodetected on GNU/Linux (via /proc/bus/usb/devices) and Solaris (via prtconf -v).
+ If GNUpod somehow fails to find the correct serial number of your iPod you'll have to specify the correct value using the --fwguid switch
+-of mktunes.pl.
++of mktunes.
+
+
+
+@@ -1213,16 +1213,16 @@
+
+ Everytime you run tunes2pod.pl, the iTunesDB will get parsed and converted into an
+ XML File (the GNUtunesDB).
+-mktunes.pl does the opposite: it parses the XML file and creates an iTunesDB (for the
++mktunes does the opposite: it parses the XML file and creates an iTunesDB (for the
+ iPod and iTunes)
+
+
+-Only mktunes.pl and tunes2pod.pl have to worry about the iTunesDB format: all other tools
++Only mktunes and tunes2pod.pl have to worry about the iTunesDB format: all other tools
+ (gnupod_addsong.pl for example) only have to deal with the XML file called GNUtunesDB.
+
+
+ It's important to keep the iTunesDB and GNUtunesDB 'in sync', so everytime you change the
+-GNUtunesDB (by hand or using gnupod_something.pl) you'll have to run mktunes.pl.
++GNUtunesDB (by hand or using gnupod_something.pl) you'll have to run mktunes.
+
+
+ If 'you' changed the iTunesDB (using gtkPod/iTunes/Ehpod), run tunes2pod.pl *before*
+--- gnupod-0.99.8/doc/gnupod.texi 2022-07-17 23:08:21.429954815 +1400
++++ gnupod-0.99.8/doc/gnupod.texi.new 2022-07-17 23:08:21.633954815 +1400
+@@ -359,7 +359,7 @@
+ Note: These steps do not work on late 2007 iPods (such as Classic, Touch and 3th gen. Nano).
+
+ Setup Firewire (or USB) as described in 'Using FireWire with GNU/Linux', load the modules and make sure that sbp2 detected your iPod.
+-Mount the iPod and run @code{@w{mktunes.pl}} to bring the device into a 'clean' state. Unmount the iPod after mktunes.pl finishes
++Mount the iPod and run @code{@w{mktunes}} to bring the device into a 'clean' state. Unmount the iPod after mktunes finishes
+ but do *not* unplug the iPod. Ready? Ok, we assume your iPod is @code{@w{/dev/sda}}:
+
+ First you need to get a new Firmware image.
+@@ -561,7 +561,7 @@
+ This example searches all files from 'Alfred Neumann', changes the artist into 'John Doe' and
+ sets the rating to 5 Stars (5*20=100)
+
+-Don't forget to run mktunes.pl!
++Don't forget to run mktunes!
+
+ You could also edit the GNUtunesDB.xml with a text editor :-)
+
+@@ -669,7 +669,7 @@
+
+ @end example
+
+-Such a playlist will show up as a Podcast after running mktunes.pl
++Such a playlist will show up as a Podcast after running mktunes
+
+ gnupod_addsong.pl can also download podcasts and create such playlists itself:
+
+@@ -718,7 +718,7 @@
+ gnupod_search.pl --artwork cover.jpg --album Katamari
+ @end example
+
+-don't forget to run @code{@w{mktunes.pl}} afterwards.
++don't forget to run @code{@w{mktunes}} afterwards.
+
+ Note: Artwork added by GNUpod may vanish after using iTunes: GNUpod does not inject the artwork into the id3-header of the file.
+ If iTunes finds such a file (while scanning / changing tags) the artwork may get dropped.
+@@ -727,32 +727,32 @@
+ @node Unplug the iPod
+ @section Unplug the iPod
+
+-Before umounting the iPod, you have to call @code{@w{mktunes.pl}} which will
++Before umounting the iPod, you have to call @code{@w{mktunes}} which will
+ parse the GNUtunesDB XML file and convert it into the iTunesDB format.
+
+ Simply run
@example
--gnupod_INIT.pl -m /mnt/ipod
-+gnupod_INIT -m /mnt/ipod
+-mktunes.pl -m /mnt/ipod
++mktunes -m /mnt/ipod
@end example
--gnupod_INIT.pl will create the default directory tree and creates an empty GNUtunesDB
-+gnupod_INIT will create the default directory tree and creates an empty GNUtunesDB
- (or if it finds an iTunesDB, it runs tunes2pod.pl to convert the iTunesDB to an GNUtunesDB)
+-Note: Since GNUpod 0.91, mktunes.pl has a '--volume' option which you can use to
++Note: Since GNUpod 0.91, mktunes has a '--volume' option which you can use to
+ boost the Volume.
- Use
@example
--gnupod_INIT.pl -m /mnt/ipod --france
-+gnupod_INIT -m /mnt/ipod --france
+-mktunes.pl -m /mnt/ipod --volume 40
++mktunes -m /mnt/ipod --volume 40
@end example
- if you would like to enable the 'EU-Volume-Limit' (=decrease max. volume).
---- gnupod-0.99.8/README 2021-06-13 14:44:53.312338321 -1200
-+++ gnupod-0.99.8/README.new 2021-06-13 14:44:53.640327496 -1200
-@@ -29,7 +29,7 @@
- GNUpod commands (cheatsheet)
- ----------------------------
+ This would adjust the volume +40 percent. (You can also use '-100' to get
+ a silent iPod ;) )
--gnupod_INIT.pl INIT a new iPod (create empty Database + Directories)
-+gnupod_INIT INIT a new iPod (create empty Database + Directories)
- gnupod_addsong.pl Add files
- gnupod_check Check for 'zombie' files
- gnupod_otgsync.pl Handles On-The-Go Sync (not for humans)
---- gnupod-0.99.8/FAQ 2009-07-10 11:20:05.000000000 -1200
-+++ gnupod-0.99.8/FAQ.new 2021-06-13 14:44:53.644327364 -1200
-@@ -58,7 +58,7 @@
- ./configure && make install
-
- 1 Mount the iPod (eg. /mnt/ipod)
-- 2 run gnupod_INIT.pl -m /mnt/ipod
-+ 2 run gnupod_INIT -m /mnt/ipod
- 3 add songs using 'gnupod_addsong.pl -m /mnt/ipod *blabla.mp3
- 4 build the iTunesDB using mktunes: 'mktunes.pl -m /mnt/ipod'
- 5 umount the iPod and enjoy!
---- gnupod-0.99.8/src/gnupod_check.pl 2021-06-13 14:44:53.320338058 -1200
-+++ gnupod-0.99.8/src/gnupod_check.pl.new 2021-06-13 14:44:53.652327100 -1200
-@@ -52,7 +52,7 @@
- usage($con->{status}."\n") if $con->{status};
-
- print "Pass 1: Checking Files in the GNUtunesDB.xml...\n";
-- GNUpod::XMLhelper::doxml($con->{xml}) or usage("Failed to parse $con->{xml}, did you run gnupod_INIT.pl?\n");
-+ GNUpod::XMLhelper::doxml($con->{xml}) or usage("Failed to parse $con->{xml}, did you run gnupod_INIT?\n");
+-After @code{@w{mktunes.pl}} is done, you can umount the iPod and remove the sbp2 module
++After @code{@w{mktunes}} is done, you can umount the iPod and remove the sbp2 module
+ @example
+ umount /mnt/ipod
+ rmmod sbp2
+ @end example
- print "Pass 2: Checking Files on the iPod...\n";
- checkGNUtunes($con);
---- gnupod-0.99.8/src/gnupod_INIT.pl 2009-07-10 11:20:05.000000000 -1200
-+++ gnupod-0.99.8/src/gnupod_INIT.pl.new 2021-06-13 14:44:53.660326835 -1200
-@@ -28,7 +28,7 @@
- use vars qw(%opts);
+-Added songs won't be visible on the iPod if you did not run mktunes.pl before umounting the iPod.
+-(If you forgot to run @code{@w{mktunes.pl}} before unpluging/umounting, simply mount the iPod again and run it)
++Added songs won't be visible on the iPod if you did not run mktunes before umounting the iPod.
++(If you forgot to run @code{@w{mktunes}} before unpluging/umounting, simply mount the iPod again and run it)
--print "gnupod_INIT.pl ###__VERSION__### (C) Adrian Ulrich\n";
-+print "gnupod_INIT ###__VERSION__### (C) Adrian Ulrich\n";
+ @node Recovering files
+@@ -832,7 +832,7 @@
+ non-apple software. GNUpod is able to create the required hash value if it knows the iPods serial number, this is a 16 chars long hex
+ value such as: @code{000ba3100310abcf} and should be autodetected on GNU/Linux (via @code{/proc/bus/usb/devices}) and Solaris (via @code{prtconf -v}).
+ If GNUpod somehow fails to find the correct serial number of your iPod you'll have to specify the correct value using the @code{--fwguid} switch
+-of @code{mktunes.pl}.
++of @code{mktunes}.
- $opts{mount} = $ENV{IPOD_MOUNTPOINT};
- #Don't add xml and itunes opts.. we *NEED* the mount opt to be set..
-@@ -64,7 +64,7 @@
+ @c ===========================================================================================
- btw: use 'gnupod_addsong -m $opts{mount} --restore'
- if you lost your songs on the iPod after using
-- gnupod_INIT.pl (..but this won't happen, because
-+ gnupod_INIT (..but this won't happen, because
- this tool has no bugs ;) )
- *********************************************************
+@@ -866,14 +866,14 @@
-@@ -144,7 +144,7 @@
- my($rtxt) = @_;
+ Everytime you run @code{@w{tunes2pod.pl}}, the iTunesDB will get parsed and converted into an
+ XML File (the GNUtunesDB).
+-@code{@w{mktunes.pl}} does the opposite: it parses the XML file and creates an iTunesDB (for the
++@code{@w{mktunes}} does the opposite: it parses the XML file and creates an iTunesDB (for the
+ iPod and iTunes)
+
+-Only mktunes.pl and tunes2pod.pl have to worry about the iTunesDB format: all other tools
++Only mktunes and tunes2pod.pl have to worry about the iTunesDB format: all other tools
+ (gnupod_addsong.pl for example) only have to deal with the XML file called GNUtunesDB.
+
+ It's important to keep the iTunesDB and GNUtunesDB 'in sync', so everytime you change the
+-GNUtunesDB (by hand or using gnupod_something.pl) you'll have to run @code{@w{mktunes.pl}}.
++GNUtunesDB (by hand or using gnupod_something.pl) you'll have to run @code{@w{mktunes}}.
+
+ If 'you' changed the iTunesDB (using gtkPod/iTunes/Ehpod), run @code{@w{tunes2pod.pl}} *before*
+ using any other GNUpod commands.
+--- gnupod-0.99.8/src/gnupod_otgsync.pl 2022-07-17 23:08:21.337954815 +1400
++++ gnupod-0.99.8/src/gnupod_otgsync.pl.new 2022-07-17 23:08:21.637954815 +1400
+@@ -129,9 +129,9 @@
+ sub newfile {
+ my($el) = @_;
+
+- #This has to be 'in-sync' with the mktunes.pl method
++ #This has to be 'in-sync' with the mktunes method
+ # (GNUtunesDB_id <-> iTunesDB_id)
+- # in mktunes.pl, every {file}->{id}));
+--- gnupod-0.99.8/src/mktunes.pl 2009-07-11 13:20:05.000000000 +1400
++++ gnupod-0.99.8/src/mktunes.pl.new 2022-07-17 23:08:21.641954815 +1400
+@@ -37,7 +37,7 @@
+ my %opts = ();
+
+
+-print "mktunes.pl ###__VERSION__### (C) Adrian Ulrich\n";
++print "mktunes ###__VERSION__### (C) Adrian Ulrich\n";
+
+ $opts{mount} = $ENV{IPOD_MOUNTPOINT};
+ GetOptions(\%opts, "version", "help|h", "ipod-name|n=s", "mount|m=s", "volume|v=i", "energy|e", "fwguid|g=s");
+@@ -140,7 +140,7 @@
+ my($rtxt) = @_;
die << "EOF";
$rtxt
--Usage: gnupod_INIT.pl [-h] [-m directory]
-+Usage: gnupod_INIT [-h] [-m directory]
+-Usage: mktunes.pl [-h] [-m directory] [-v VALUE]
++Usage: mktunes [-h] [-m directory] [-v VALUE]
-h, --help display this help and exit
--version output version information and exit
-@@ -165,7 +165,7 @@
-
+@@ -159,7 +159,7 @@
+ # Displays current version
sub version {
die << "EOF";
--gnupod_INIT.pl (gnupod) ###__VERSION__###
-+gnupod_INIT (gnupod) ###__VERSION__###
- Copyright (C) Adrian Ulrich 2002-2004
+-mktunes.pl (gnupod) ###__VERSION__###
++mktunes (gnupod) ###__VERSION__###
+ Copyright (C) Adrian Ulrich 2002-2007
This is free software; see the source for copying conditions. There is NO
---- gnupod-0.99.8/src/ext/XMLhelper.pm 2009-07-10 11:20:05.000000000 -1200
-+++ gnupod-0.99.8/src/ext/XMLhelper.pm.new 2021-06-13 14:44:53.668326572 -1200
-@@ -69,7 +69,7 @@
- my @aviable_targets = bsd_glob($xconn->{musicdir}."/*", $xconn->{autotest}?GLOB_NOCASE:GLOB_NOSORT);
+--- gnupod-0.99.8/src/ext/FooBar.pm 2022-07-17 23:08:21.341954815 +1400
++++ gnupod-0.99.8/src/ext/FooBar.pm.new 2022-07-17 23:08:21.645954815 +1400
+@@ -119,10 +119,10 @@
+ }
+
+ #######################################################################
+-# Call mktunes.pl
++# Call mktunes
+ sub StartAutoMkTunes {
+ my($con) = @_;
+- my $XBIN = "$con->{bindir}/mktunes.pl";
++ my $XBIN = "$con->{bindir}/mktunes";
+ if(-x $XBIN) {
+ {
+ local $ENV{IPOD_MOUNTPOINT} = $con->{mountpoint};
+--- gnupod-0.99.8/src/ext/Mktunes.pm 2009-07-11 13:20:05.000000000 +1400
++++ gnupod-0.99.8/src/ext/Mktunes.pm.new 2022-07-17 23:08:21.649954815 +1400
+@@ -327,7 +327,7 @@
+ }
- unless(int(@aviable_targets)) {
-- warn "No iPod folders found at $xconn->{mountpoint}, did you run gnupod_INIT.pl ?\n";
-+ warn "No iPod folders found at $xconn->{mountpoint}, did you run gnupod_INIT ?\n";
- return undef;
+ unless(GNUpod::XMLhelper::get_splpref($name)->{liveupdate}) {
+- warn "mktunes.pl: warning: (pl: $name) Liveupdate disabled. Please set liveupdate=\"1\" if you don't want an empty playlist\n";
++ warn "mktunes: warning: (pl: $name) Liveupdate disabled. Please set liveupdate=\"1\" if you don't want an empty playlist\n";
}
- if(length($current_extension) != 0) {
---- gnupod-0.99.8/src/ext/Mktunes.pm 2009-07-10 11:20:05.000000000 -1200
-+++ gnupod-0.99.8/src/ext/Mktunes.pm.new 2021-06-13 14:44:53.676326308 -1200
-@@ -20,7 +20,7 @@
- sub WriteItunesSD {
- my($self) = @_;
-- open(ITS, ">", $self->GetConnection->{itunessd}) or die "*** Unable to write the iTunesDB: $!, did you run gnupod_INIT.pl ?\n";
-+ open(ITS, ">", $self->GetConnection->{itunessd}) or die "*** Unable to write the iTunesDB: $!, did you run gnupod_INIT ?\n";
- binmode(ITS);
- print ITS GNUpod::iTunesDB::mk_itunes_sd_header({files=>$self->GetFileCount});
- foreach my $item (@{$self->GetFiles}) {
-@@ -43,7 +43,7 @@
- my $outfile = $self->GetConnection->{itunesdb};
- my $tmpfile = $outfile.".$$";
+ if(my $id = $item->{splcont}->{id}) { #We found an old id with disabled liveupdate, add it like a normal playlist:
+--- gnupod-0.99.8/src/gnupod_INIT.pl 2009-07-11 13:20:05.000000000 +1400
++++ gnupod-0.99.8/src/gnupod_INIT.pl.new 2022-07-17 23:08:21.653954815 +1400
+@@ -120,9 +120,9 @@
+ $t2pfail = system("$con->{bindir}/tunes2pod.pl", "--force", "-m", $opts{mount});
+ }
+ else {
+- #No iTunesDB, run mktunes.pl
+- print "No iTunesDB found, running mktunes.pl\n";
+- my @mktunescmd = ("$con->{bindir}/mktunes.pl", "-m" ,"$opts{mount}");
++ #No iTunesDB, run mktunes
++ print "No iTunesDB found, running mktunes\n";
++ my @mktunescmd = ("$con->{bindir}/mktunes", "-m" ,"$opts{mount}");
+ if ($opts{'fwguid'}) { push @mktunescmd, "-g", "$opts{fwguid}"; }
+ $t2pfail = system(@mktunescmd);
+ }
+@@ -150,12 +150,12 @@
+ --version output version information and exit
+ -m, --mount=directory iPod mountpoint, default is \$IPOD_MOUNTPOINT
+ -d, --disable-convert Don't try to convert an existing iTunesDB
+- -g, --fwguid=HEXVAL FirewireGuid / Serial of connected iPod (passed to mktunes.pl)
++ -g, --fwguid=HEXVAL FirewireGuid / Serial of connected iPod (passed to mktunes)
+ -f, --france Limit volume to 100dB (For French-Law/People)
+ Maximal-volume without this is ~104dB (VERY LOUD)
+ *WARNING* This works only for iPods running
+ Firmware 1.x (1st & 2nd generation)
+- You can also use mktunes.pl '--volume PERCENT'
++ You can also use mktunes '--volume PERCENT'
+ to adjust the volume (Works with Firmware 1.x AND 2.x)
+ --noask Do not wait for any user input
+
+--- gnupod-0.99.8/src/gnupod_search.pl 2009-07-11 13:20:05.000000000 +1400
++++ gnupod-0.99.8/src/gnupod_search.pl.new 2022-07-17 23:08:21.657954815 +1400
+@@ -264,7 +264,7 @@
+ u = UnixPath n = Songnum G = podcastguid R = podcastrss
+ d = dbid
+ --rename=KEY=VAL Change tags on found songs. Example: --rename="ARTIST=Foo Bar"
+- --artwork=FILE Set FILE as Cover for found files, do not forget to run mktunes.pl
++ --artwork=FILE Set FILE as Cover for found files, do not forget to run mktunes
+
+ Note: * Argument for title/artist/album/etc has to be UTF8 encoded, *not* latin1!
+ * Use '>3' to search all values above 3, use '<3' to search for values below 3
+--- gnupod-0.99.8/src/gnupod_addsong.pl 2009-07-11 13:20:05.000000000 +1400
++++ gnupod-0.99.8/src/gnupod_addsong.pl.new 2022-07-17 23:08:21.665954815 +1400
+@@ -206,11 +206,11 @@
+ #Use fixed addtime for autotests
+ $fh->{addtime} = int($connection->{autotest} ? 42 : time())+MACTIME;
-- open(ITUNES, ">", $tmpfile) or die "*** Unable to write the iTunesDB: $!, did you run gnupod_INIT.pl ?\n";
-+ open(ITUNES, ">", $tmpfile) or die "*** Unable to write the iTunesDB: $!, did you run gnupod_INIT ?\n";
- binmode(ITUNES);
- print ITUNES GNUpod::iTunesDB::mk_mhbd({});
- $mhbd_size = tell(ITUNES);
---- gnupod-0.99.8/src/gnupod_addsong.pl 2009-07-10 11:20:05.000000000 -1200
-+++ gnupod-0.99.8/src/gnupod_addsong.pl.new 2021-06-13 14:44:53.688325911 -1200
-@@ -119,7 +119,7 @@
- delete($opts{artwork});
- }
- }
-- GNUpod::XMLhelper::doxml($con->{xml}) or usage("Failed to parse $con->{xml}, did you run gnupod_INIT.pl?\n");
-+ GNUpod::XMLhelper::doxml($con->{xml}) or usage("Failed to parse $con->{xml}, did you run gnupod_INIT?\n");
- }
-
- # Check volume adjustment options for sanity
---- gnupod-0.99.8/src/mktunes.pl 2009-07-10 11:20:05.000000000 -1200
-+++ gnupod-0.99.8/src/mktunes.pl.new 2021-06-13 14:44:53.700325516 -1200
-@@ -66,7 +66,7 @@
- $mktunes = GNUpod::Mktunes->new(Connection=>$con, iPodName=>$opts{'ipod-name'}, Artwork=>$AWDB);
-
- print "> Parsing XML document...\n";
-- GNUpod::XMLhelper::doxml($con->{xml}) or usage("Could not read $con->{xml}, did you run gnupod_INIT.pl ?");
-+ GNUpod::XMLhelper::doxml($con->{xml}) or usage("Could not read $con->{xml}, did you run gnupod_INIT ?");
-
- print "\r> ".$mktunes->GetFileCount." files parsed, assembling iTunesDB...\n";
- $mktunes->WriteItunesDB;
---- gnupod-0.99.8/src/gnupod_search.pl 2009-07-10 11:20:05.000000000 -1200
-+++ gnupod-0.99.8/src/gnupod_search.pl.new 2021-06-13 14:44:53.768323271 -1200
-@@ -89,7 +89,7 @@
- }
-
- pview(undef,1);
-- GNUpod::XMLhelper::doxml($con->{xml}) or usage("Failed to parse $con->{xml}, did you run gnupod_INIT.pl?\n");
-+ GNUpod::XMLhelper::doxml($con->{xml}) or usage("Failed to parse $con->{xml}, did you run gnupod_INIT?\n");
- #XML::Parser finished, write new file if we deleted or renamed
- if($dirty) {
- GNUpod::XMLhelper::writexml($con,{automktunes=>$opts{automktunes}});
-Patched gnupod-0.99.8/man/tunes2pod.pl.1.gz
---- gnupod-0.99.8/README.developer 2021-06-13 14:44:53.576329608 -1200
-+++ gnupod-0.99.8/README.developer.new 2021-06-13 14:44:53.792322478 -1200
-@@ -7,7 +7,7 @@
- > gnupod_INIT /mnt/empty
+- #Ugly workaround to avoid a warning while running mktunes.pl:
++ #Ugly workaround to avoid a warning while running mktunes:
+ #All (?) int-values returned by wtf_is won't go above 0xffffffff
+ #Thats fine because almost everything inside an mhit can handle this.
+ #But bpm and srate are limited to 0xffff
+- # -> We fix this silently to avoid ugly warnings while running mktunes.pl
++ # -> We fix this silently to avoid ugly warnings while running mktunes
+ $fh->{bpm} = 0xFFFF if $fh->{bpm} > 0xFFFF;
+ $fh->{srate} = 0xFFFF if $fh->{srate} > 0xFFFF;
+
+--- gnupod-0.99.8/README.about_m4a 2009-07-11 13:20:05.000000000 +1400
++++ gnupod-0.99.8/README.about_m4a.new 2022-07-17 23:08:21.669954815 +1400
+@@ -30,6 +30,6 @@
+ Now you can add the file using gnupod_addsong.pl
+
+ # gnupod_addsong.pl file.m4a
+-# mktunes.pl
++# mktunes
+
+ :)
+--- gnupod-0.99.8/README.developer 2009-07-11 13:20:05.000000000 +1400
++++ gnupod-0.99.8/README.developer.new 2022-07-17 23:08:21.673954815 +1400
+@@ -6,9 +6,9 @@
+ Minimal testing:
+ > gnupod_INIT.pl /mnt/empty
> gnupod_addsong
- > mktunes.pl
--> tunes2pod.pl --force
-+> tunes2pod --force
- > mktunes.pl
+-> mktunes.pl
++> mktunes
+ > tunes2pod.pl --force
+-> mktunes.pl
++> mktunes
> check if your ipod can read the result
---- gnupod-0.99.8/CHANGES 2021-06-13 14:44:53.596328948 -1200
-+++ gnupod-0.99.8/CHANGES.new 2021-06-13 14:44:53.800322215 -1200
-@@ -136,7 +136,7 @@
- Summary
- -------
-
--- Fixed invalid warning about broken mhip header. (tunes2pod.pl)
-+- Fixed invalid warning about broken mhip header. (tunes2pod)
- - Less stricter Podcast-Playlist parsing
- - Reduced MP3::Info false-positives: Empty files are
- no longer detected as .mp3 files
-@@ -202,7 +202,7 @@
+ Release checklist
+--- gnupod-0.99.8/CHANGES 2022-07-17 23:08:21.549954815 +1400
++++ gnupod-0.99.8/CHANGES.new 2022-07-17 23:08:21.677954815 +1400
+@@ -46,7 +46,7 @@
+ NEW: Set addtime to a fixed value when doing autotests.
+ NEW: Added check for "autotest" file at the ipod mountpoint.
+ NEW: The connection hash was expanded by a "autotest" key.
+- NEW: Added "--fwguid" option to gnupod_INIT.pl to be passed on to mktunes.pl.
++ NEW: Added "--fwguid" option to gnupod_INIT.pl to be passed on to mktunes.
- - Workaround for broken files written by 'Anapod'
- Set 'tunes2pod.anapodworkaround=1' inside ~/.gnupodrc
-- to enable it. Enabling it slows down tunes2pod.pl
-+ to enable it. Enabling it slows down tunes2pod
- (because it deactivates the fast-skip of the (useless)
- MasterPlaylist)
+ *** OLD STUFF ***
+@@ -118,7 +118,7 @@
+ -------
+ - Added README_FIRMWARE.txt file
+ - Added compilation-patch, thanks to Ray Lortie
+-- Rewrote mktunes.pl to be faster and more readable :-)
++- Rewrote mktunes to be faster and more readable :-)
+ - Added support for 2007-iPods (iPod Classic, iPod Nano-2 and iPod Touch (?) )
+
+ Apple attempted to lockout non-iTunes software by implementing an obscure
+@@ -161,8 +161,8 @@
+ - Raised video-bitrate for on-the-fly converting
+ - Added configuration option 'automktunes'. Setting
+ 'automktunes = 1' inside ~/.gnupodrc eliminates the need
+- to call mktunes.pl after adding/deleting/renaming songs because GNUpod
+- will call mktunes.pl itself.
++ to call mktunes after adding/deleting/renaming songs because GNUpod
++ will call mktunes itself.
+ - Many internal changes / bugfixes to iTunesDB.pm like fixing an incorrect
+ written mhip size. Playlist parsing has also been rewritten and cleaned up.
+ - Bugfix: Do not detect PCM files as movies when using --decode
@@ -222,7 +222,7 @@
- gnupod_addsong.pl can now fetch podcast-rss feeds!
Example: 'gnupod_addsong.pl http://www.tagesschau.de/export/podcast'
-- Added basic support for podcast-rss and podcast-guid in tunes2pod.pl and mktunes.pl
-+- Added basic support for podcast-rss and podcast-guid in tunes2pod and mktunes.pl
++- Added basic support for podcast-rss and podcast-guid in tunes2pod.pl and mktunes
- Fixed small bug in FileMagic.pm: UTF16-Tags didn't work.
Thanks to Chris Abajian for reporting this issue.
-@@ -469,7 +469,7 @@
- iPods
+@@ -292,7 +292,7 @@
+ - Added support for m4a 'gnre' tags
- - GNUpod checks if the iTunesDB did change and
-- runs tunes2pod.pl if it has to run it
-+ runs tunes2pod if it has to run it
+ - Fixed some iPod-Shuffle issues
+- * mktunes.pl removes the iTunesShuffle leftover
++ * mktunes removes the iTunesShuffle leftover
+
+ - Remove TARGET-File if File::Copy() failed for any reason
+ => Better handling of 'disk full' but still not perfect
+@@ -473,7 +473,7 @@
- Changed rating-schema to match SPL-Rating
-> Rating 5 is now 100 (newrating=oldrating*20)
-@@ -530,7 +530,7 @@
- --------
- iTunesDB.pm and co:
- * Can read and write Playlist-Elements without child
-- tunes2pod.pl couldn't read files written by
-+ tunes2pod couldn't read files written by
- (newer) MusicMatch releases.. this should fix the issue :)
- * Don't parse MasterPlaylists, do a seek()
- -> Speeds up parsing
-@@ -572,7 +572,7 @@
- FileMagic.pm
- * Fixed (?) ID3v2 reading
+- mktunes.pl will drop old (= now invalid) ratings,
++ mktunes will drop old (= now invalid) ratings,
+ no autoconvert... sorry.. but does anyone care?
--tunes2pod.pl:
-+tunes2pod:
+ - gnupod_addsong.pl understands ID3v2.2 tags
+@@ -557,7 +557,7 @@
+ a 'feature' of iTunes)
+ * Added 'eq syntax check', you can use (since 0.90)
+ 'eq="#!#NUMBER#!#' to specify the EQ-Setting per song.
+- mktunes.pl will now check if this syntax is correct.
++ mktunes will now check if this syntax is correct.
+ (You'll see a warning if it failed)
+ * Fixed get_string() to handle null-size strings correct
+ * Changed some internal things (using hrefs.. etc)
+@@ -576,7 +576,7 @@
* Added paranoia checks (stricter parsing)
* Added SPL-Read code (BETA!)
-@@ -657,7 +657,7 @@
- Use an UNICODE Texteditor to edit the GNUtunesDB..
- (Like 'yudit' or the gnome2 texteditor)
- Your old latin1 GNUtunesDB will get converted to an
-- UTF8 version after running tunes2pod.pl/gnupod_addsong.pl or
-+ UTF8 version after running tunes2pod/gnupod_addsong.pl or
- gnupod_delete.pl
+-mktunes.pl
++mktunes
+ * Added SPL-Write support
+ * regex-matches are sorted by id
- UTF8 Support isn't testet very well, and gnuPod 0.28 maybe more
-@@ -668,8 +668,8 @@
+@@ -611,13 +611,13 @@
+ * Added '--france' switch (Limit volume to 100 db for
+ 1.x Firmware)
+-mktunes.pl
++mktunes
+ * New Playlist-Code.. MUCH faster now
+ (Wow.. again? no.. the code of 0.90 was
+ VERY slow with many files (~3000) and more
+ than ~15 big playlists)
+ * Added '--volume' switch: Adjust the volume on the iPod!
+- Use something like 'mktunes.pl --volume 70' to boost
++ Use something like 'mktunes --volume 70' to boost
+ the volume by 70% (same as volume="70" in the GNUtunesDB)
- gnuPod 0.28
--- Rewritten Playlistcode for tunes2pod.pl
--- tunes2pod.pl doesn't kill your empty GNUtunesDB anymore
-+- Rewritten Playlistcode for tunes2pod
-+- tunes2pod doesn't kill your empty GNUtunesDB anymore
+ XMLhelper.pm
+@@ -671,9 +671,9 @@
+ - Rewritten Playlistcode for tunes2pod.pl
+ - tunes2pod.pl doesn't kill your empty GNUtunesDB anymore
if it can't find the iTunesDB
- - mktunes.pl uses now binmode(), maybe this helps
+-- mktunes.pl uses now binmode(), maybe this helps
++- mktunes uses now binmode(), maybe this helps
RedHat 8 ? .. (and win32 ;) )
-@@ -735,7 +735,7 @@
-
-
- gnuPod 0.21
--- Fixed stupid tunes2pod.pl bug with big iTunesDBs
-+- Fixed stupid tunes2pod bug with big iTunesDBs
- (Thanks to Ciamac Moallemi for reporting and providing a patch)
- - Support for songnum, songs, cdnum, cds and year
+-- mktunes.pl is now *much* faster!!
++- mktunes is now *much* faster!!
+ - the GNUtunesDB written by gnupod_delete.pl looks
+ nicer now :) (id= is now always the first element..)
+
+@@ -698,7 +698,7 @@
+ written by MusicMatch
+ - Playlists are now sorted on the iPod as they are found
+ in the GNUtunesDB - file
+-- mktunes.pl no longer accepts when was
++- mktunes no longer accepts when was
+ not found.
+ - gnupod_addsong.pl handles long filenames now better
+ - Timestamp should now be set correct
+--- gnupod-0.99.8/README 2022-07-17 23:08:21.445954815 +1400
++++ gnupod-0.99.8/README.new 2022-07-17 23:08:21.681954815 +1400
+@@ -34,10 +34,10 @@
+ gnupod_check Check for 'zombie' files
+ gnupod_otgsync Handles On-The-Go Sync (not for humans)
+ gnupod_search.pl Search ;)
+-mktunes.pl Convert the GNUtunesDB.xml to a iTunesDB
++mktunes Convert the GNUtunesDB.xml to a iTunesDB
+ tunes2pod.pl Convert the iTunesDB into a GNUtunesDB.xml
---- gnupod-0.99.8/doc/gnupod.info 2021-06-13 14:44:53.612328420 -1200
-+++ gnupod-0.99.8/doc/gnupod.info.new 2021-06-13 14:44:53.808321951 -1200
+-You'll have to use mktunes.pl if you added/deleted/changed something
++You'll have to use mktunes if you added/deleted/changed something
+ on the iPod.
+
+
+Patched gnupod-0.99.8/man/tunes2pod.pl.1.gz
+--- gnupod-0.99.8/FAQ 2022-07-17 23:08:21.613954815 +1400
++++ gnupod-0.99.8/FAQ.new 2022-07-17 23:08:21.693954815 +1400
+@@ -190,7 +190,7 @@
+ But the iTunesDB-format isn't so complicated if you know how to
+ write the specific parts and how you'll have to assemble
+ them.
+-Just have a look at iTunesDB.pm and tunes2pod.pl+mktunes
++Just have a look at iTunesDB.pm and tunes2pod+mktunes
+
+ ..or feel free to ask me questions about it:
+
+--- gnupod-0.99.8/doc/gnupod.info 2022-07-17 23:08:21.617954815 +1400
++++ gnupod-0.99.8/doc/gnupod.info.new 2022-07-17 23:08:21.697954815 +1400
@@ -437,7 +437,7 @@
- gnupod_INIT -m /mnt/ipod
+ gnupod_INIT.pl -m /mnt/ipod
- gnupod_INIT will create the default directory tree and creates an
+ gnupod_INIT.pl will create the default directory tree and creates an
-empty GNUtunesDB (or if it finds an iTunesDB, it runs tunes2pod.pl to
+empty GNUtunesDB (or if it finds an iTunesDB, it runs tunes2pod to
convert the iTunesDB to an GNUtunesDB)
@@ -1241,17 +1774,17 @@
- Everytime you run `tunes2pod.pl', the iTunesDB will get parsed and
+ Everytime you run `tunes2pod', the iTunesDB will get parsed and
- converted into an XML File (the GNUtunesDB). `mktunes.pl' does the
+ converted into an XML File (the GNUtunesDB). `mktunes' does the
opposite: it parses the XML file and creates an iTunesDB (for the iPod
and iTunes)
-- Only mktunes.pl and tunes2pod.pl have to worry about the iTunesDB
-+ Only mktunes.pl and tunes2pod have to worry about the iTunesDB
+- Only mktunes and tunes2pod.pl have to worry about the iTunesDB
++ Only mktunes and tunes2pod have to worry about the iTunesDB
format: all other tools (gnupod_addsong.pl for example) only have to
deal with the XML file called GNUtunesDB.
@@ -853,7 +853,7 @@
- gnupod_something.pl) you'll have to run `mktunes.pl'.
+ gnupod_something.pl) you'll have to run `mktunes'.
If 'you' changed the iTunesDB (using gtkPod/iTunes/Ehpod), run
-`tunes2pod.pl' *before* using any other GNUpod commands.
@@ -1259,12 +1792,23 @@
File: gnupod.info, Node: Get rid of '-m', Next: Known bugs and limitations, Prev: GNUtunesDB, Up: Problems
---- gnupod-0.99.8/doc/gnupod.html 2021-06-13 14:44:53.620328156 -1200
-+++ gnupod-0.99.8/doc/gnupod.html.new 2021-06-13 14:44:53.824321422 -1200
+--- gnupod-0.99.8/doc/gnupodrc.example 2022-07-17 23:08:21.625954815 +1400
++++ gnupod-0.99.8/doc/gnupodrc.example.new 2022-07-17 23:08:21.701954815 +1400
+@@ -41,7 +41,7 @@
+ ## Uncomment this to skip 'on-the-go' sync
+ # otgsync.nosync = 1
+
+-# *** tunes2pod.pl ***
++# *** tunes2pod ***
+ ## Uncomment to set '--force' switch to true (DANGEROUS)
+ # tunes2pod.force = 1
+
+--- gnupod-0.99.8/doc/gnupod.html 2022-07-17 23:08:21.629954815 +1400
++++ gnupod-0.99.8/doc/gnupod.html.new 2022-07-17 23:08:21.705954815 +1400
@@ -600,7 +600,7 @@
|
- gnupod_INIT will create the default directory tree and creates an empty GNUtunesDB
+ gnupod_INIT.pl will create the default directory tree and creates an empty GNUtunesDB
-(or if it finds an iTunesDB, it runs tunes2pod.pl to convert the iTunesDB to an GNUtunesDB)
+(or if it finds an iTunesDB, it runs tunes2pod to convert the iTunesDB to an GNUtunesDB)
@@ -1309,17 +1853,17 @@
-Everytime you run tunes2pod.pl, the iTunesDB will get parsed and converted into an
+Everytime you run tunes2pod, the iTunesDB will get parsed and converted into an
XML File (the GNUtunesDB).
- mktunes.pl does the opposite: it parses the XML file and creates an iTunesDB (for the
+ mktunes does the opposite: it parses the XML file and creates an iTunesDB (for the
iPod and iTunes)
--Only mktunes.pl and tunes2pod.pl have to worry about the iTunesDB format: all other tools
-+Only mktunes.pl and tunes2pod have to worry about the iTunesDB format: all other tools
+-Only mktunes and tunes2pod.pl have to worry about the iTunesDB format: all other tools
++Only mktunes and tunes2pod have to worry about the iTunesDB format: all other tools
(gnupod_addsong.pl for example) only have to deal with the XML file called GNUtunesDB.
@@ -1225,7 +1225,7 @@
- GNUtunesDB (by hand or using gnupod_something.pl) you'll have to run mktunes.pl.
+ GNUtunesDB (by hand or using gnupod_something.pl) you'll have to run mktunes.
-If 'you' changed the iTunesDB (using gtkPod/iTunes/Ehpod), run tunes2pod.pl *before*
@@ -1327,12 +1871,12 @@
using any other GNUpod commands.
---- gnupod-0.99.8/doc/gnupod.texi 2021-06-13 14:44:53.632327759 -1200
-+++ gnupod-0.99.8/doc/gnupod.texi.new 2021-06-13 14:44:53.832321159 -1200
+--- gnupod-0.99.8/doc/gnupod.texi 2022-07-17 23:08:21.633954815 +1400
++++ gnupod-0.99.8/doc/gnupod.texi.new 2022-07-17 23:08:21.709954815 +1400
@@ -459,7 +459,7 @@
@end example
- gnupod_INIT will create the default directory tree and creates an empty GNUtunesDB
+ gnupod_INIT.pl will create the default directory tree and creates an empty GNUtunesDB
-(or if it finds an iTunesDB, it runs tunes2pod.pl to convert the iTunesDB to an GNUtunesDB)
+(or if it finds an iTunesDB, it runs tunes2pod to convert the iTunesDB to an GNUtunesDB)
@@ -1376,71 +1920,76 @@
-Everytime you run @code{@w{tunes2pod.pl}}, the iTunesDB will get parsed and converted into an
+Everytime you run @code{@w{tunes2pod}}, the iTunesDB will get parsed and converted into an
XML File (the GNUtunesDB).
- @code{@w{mktunes.pl}} does the opposite: it parses the XML file and creates an iTunesDB (for the
+ @code{@w{mktunes}} does the opposite: it parses the XML file and creates an iTunesDB (for the
iPod and iTunes)
--Only mktunes.pl and tunes2pod.pl have to worry about the iTunesDB format: all other tools
-+Only mktunes.pl and tunes2pod have to worry about the iTunesDB format: all other tools
+-Only mktunes and tunes2pod.pl have to worry about the iTunesDB format: all other tools
++Only mktunes and tunes2pod have to worry about the iTunesDB format: all other tools
(gnupod_addsong.pl for example) only have to deal with the XML file called GNUtunesDB.
It's important to keep the iTunesDB and GNUtunesDB 'in sync', so everytime you change the
- GNUtunesDB (by hand or using gnupod_something.pl) you'll have to run @code{@w{mktunes.pl}}.
+ GNUtunesDB (by hand or using gnupod_something.pl) you'll have to run @code{@w{mktunes}}.
-If 'you' changed the iTunesDB (using gtkPod/iTunes/Ehpod), run @code{@w{tunes2pod.pl}} *before*
+If 'you' changed the iTunesDB (using gtkPod/iTunes/Ehpod), run @code{@w{tunes2pod}} *before*
using any other GNUpod commands.
---- gnupod-0.99.8/doc/gnupodrc.example 2009-07-10 11:20:05.000000000 -1200
-+++ gnupod-0.99.8/doc/gnupodrc.example.new 2021-06-13 14:44:53.840320895 -1200
-@@ -41,7 +41,7 @@
- ## Uncomment this to skip 'on-the-go' sync
- # otgsync.nosync = 1
+--- gnupod-0.99.8/src/gnupod_otgsync.pl 2022-07-17 23:08:21.637954815 +1400
++++ gnupod-0.99.8/src/gnupod_otgsync.pl.new 2022-07-17 23:08:21.713954815 +1400
+@@ -63,7 +63,7 @@
+ usage($con->{status}."\n") if $con->{status};
+
+ if(GNUpod::FooBar::ItunesDBNeedsSync($con)) {
+- die "gnupod_otgsync: Bug detected! You need to run tunes2pod.pl -> Sync broken!\n";
++ die "gnupod_otgsync: Bug detected! You need to run tunes2pod -> Sync broken!\n";
+ }
+
+ ##Check if GNUtunesDB <-> iTunesDB is really in-sync
+--- gnupod-0.99.8/src/ext/FooBar.pm 2022-07-17 23:08:21.645954815 +1400
++++ gnupod-0.99.8/src/ext/FooBar.pm.new 2022-07-17 23:08:21.717954815 +1400
+@@ -143,7 +143,7 @@
+ sub StartItunesDBSync {
+ my($con) = @_;
+
+- my $XBIN = "$con->{bindir}/tunes2pod.pl";
++ my $XBIN = "$con->{bindir}/tunes2pod";
+
+ if(-x $XBIN) {
+ {
+--- gnupod-0.99.8/src/ext/iTunesDB.pm 2009-07-11 13:20:05.000000000 +1400
++++ gnupod-0.99.8/src/ext/iTunesDB.pm.new 2022-07-17 23:08:21.725954815 +1400
+@@ -1012,7 +1012,7 @@
--# *** tunes2pod.pl ***
-+# *** tunes2pod ***
- ## Uncomment to set '--force' switch to true (DANGEROUS)
- # tunes2pod.force = 1
---- gnupod-0.99.8/README 2021-06-13 14:44:53.640327496 -1200
-+++ gnupod-0.99.8/README.new 2021-06-13 14:44:53.848320630 -1200
-@@ -35,7 +35,7 @@
- gnupod_otgsync.pl Handles On-The-Go Sync (not for humans)
- gnupod_search.pl Search ;)
- mktunes.pl Convert the GNUtunesDB.xml to a iTunesDB
--tunes2pod.pl Convert the iTunesDB into a GNUtunesDB.xml
-+tunes2pod Convert the iTunesDB into a GNUtunesDB.xml
- You'll have to use mktunes.pl if you added/deleted/changed something
- on the iPod.
---- gnupod-0.99.8/FAQ 2021-06-13 14:44:53.644327364 -1200
-+++ gnupod-0.99.8/FAQ.new 2021-06-13 14:44:53.856320366 -1200
-@@ -190,7 +190,7 @@
- But the iTunesDB-format isn't so complicated if you know how to
- write the specific parts and how you'll have to assemble
- them.
--Just have a look at iTunesDB.pm and tunes2pod.pl+mktunes.pl
-+Just have a look at iTunesDB.pm and tunes2pod+mktunes.pl
+-### Here are the READ sub's used by tunes2pod.pl
++### Here are the READ sub's used by tunes2pod
- ..or feel free to ask me questions about it:
-
---- gnupod-0.99.8/src/gnupod_INIT.pl 2021-06-13 14:44:53.660326835 -1200
-+++ gnupod-0.99.8/src/gnupod_INIT.pl.new 2021-06-13 14:44:53.864320103 -1200
-@@ -115,9 +115,9 @@
+ ###########################################
+ # Get a INT value
+--- gnupod-0.99.8/src/ext/XMLhelper.pm 2009-07-11 13:20:05.000000000 +1400
++++ gnupod-0.99.8/src/ext/XMLhelper.pm.new 2022-07-17 23:08:21.729954815 +1400
+@@ -191,7 +191,7 @@
+ }
- my $t2pfail = 0;
- if(-e $con->{itunesdb} && !$opts{'disable-convert'}) {
-- #We have an iTunesDB, call tunes2pod.pl
-- print "Found *existing* iTunesDB, running tunes2pod.pl\n";
-- $t2pfail = system("$con->{bindir}/tunes2pod.pl", "--force", "-m", $opts{mount});
-+ #We have an iTunesDB, call tunes2pod
-+ print "Found *existing* iTunesDB, running tunes2pod\n";
-+ $t2pfail = system("$con->{bindir}/tunes2pod", "--force", "-m", $opts{mount});
- }
- else {
- #No iTunesDB, run mktunes.pl
---- gnupod-0.99.8/src/tunes2pod.pl 2009-07-10 11:20:05.000000000 -1200
-+++ gnupod-0.99.8/src/tunes2pod.pl.new 2021-06-13 14:44:53.872319838 -1200
+ ##############################################################
+-# Add a playlist to output (Called by eventer or tunes2pod.pl)
++# Add a playlist to output (Called by eventer or tunes2pod)
+ # This thing doesn't create xml-encoded output!
+ sub addpl {
+ my($name, $opt) = @_;
+@@ -210,7 +210,7 @@
+ }
+
+ ##############################################################
+-# Add a SmartPlaylist to output (Called by eventer or tunes2pod.pl)
++# Add a SmartPlaylist to output (Called by eventer or tunes2pod)
+ # Like addpl(), 'output' isn't xml-encoded
+ sub addspl {
+ my($name, $opt) = @_;
+--- gnupod-0.99.8/src/tunes2pod.pl 2009-07-11 13:20:05.000000000 +1400
++++ gnupod-0.99.8/src/tunes2pod.pl.new 2022-07-17 23:08:21.733954815 +1400
@@ -36,7 +36,7 @@
$| = 1;
@@ -1477,318 +2026,787 @@
Copyright (C) Adrian Ulrich 2002-2007
This is free software; see the source for copying conditions. There is NO
---- gnupod-0.99.8/src/ext/iTunesDB.pm 2009-07-10 11:20:05.000000000 -1200
-+++ gnupod-0.99.8/src/ext/iTunesDB.pm.new 2021-06-13 14:44:53.880319574 -1200
-@@ -1012,7 +1012,7 @@
+--- gnupod-0.99.8/src/gnupod_INIT.pl 2022-07-17 23:08:21.653954815 +1400
++++ gnupod-0.99.8/src/gnupod_INIT.pl.new 2022-07-17 23:08:21.737954815 +1400
+@@ -115,9 +115,9 @@
+ my $t2pfail = 0;
+ if(-e $con->{itunesdb} && !$opts{'disable-convert'}) {
+- #We have an iTunesDB, call tunes2pod.pl
+- print "Found *existing* iTunesDB, running tunes2pod.pl\n";
+- $t2pfail = system("$con->{bindir}/tunes2pod.pl", "--force", "-m", $opts{mount});
++ #We have an iTunesDB, call tunes2pod
++ print "Found *existing* iTunesDB, running tunes2pod\n";
++ $t2pfail = system("$con->{bindir}/tunes2pod", "--force", "-m", $opts{mount});
+ }
+ else {
+ #No iTunesDB, run mktunes
+--- gnupod-0.99.8/README.developer 2022-07-17 23:08:21.673954815 +1400
++++ gnupod-0.99.8/README.developer.new 2022-07-17 23:08:21.741954815 +1400
+@@ -7,7 +7,7 @@
+ > gnupod_INIT.pl /mnt/empty
+ > gnupod_addsong
+ > mktunes
+-> tunes2pod.pl --force
++> tunes2pod --force
+ > mktunes
+ > check if your ipod can read the result
+--- gnupod-0.99.8/CHANGES 2022-07-17 23:08:21.677954815 +1400
++++ gnupod-0.99.8/CHANGES.new 2022-07-17 23:08:21.745954815 +1400
+@@ -136,7 +136,7 @@
+ Summary
+ -------
--### Here are the READ sub's used by tunes2pod.pl
-+### Here are the READ sub's used by tunes2pod
+-- Fixed invalid warning about broken mhip header. (tunes2pod.pl)
++- Fixed invalid warning about broken mhip header. (tunes2pod)
+ - Less stricter Podcast-Playlist parsing
+ - Reduced MP3::Info false-positives: Empty files are
+ no longer detected as .mp3 files
+@@ -202,7 +202,7 @@
- ###########################################
- # Get a INT value
---- gnupod-0.99.8/src/ext/XMLhelper.pm 2021-06-13 14:44:53.668326572 -1200
-+++ gnupod-0.99.8/src/ext/XMLhelper.pm.new 2021-06-13 14:44:53.888319310 -1200
-@@ -191,7 +191,7 @@
- }
+ - Workaround for broken files written by 'Anapod'
+ Set 'tunes2pod.anapodworkaround=1' inside ~/.gnupodrc
+- to enable it. Enabling it slows down tunes2pod.pl
++ to enable it. Enabling it slows down tunes2pod
+ (because it deactivates the fast-skip of the (useless)
+ MasterPlaylist)
- ##############################################################
--# Add a playlist to output (Called by eventer or tunes2pod.pl)
-+# Add a playlist to output (Called by eventer or tunes2pod)
- # This thing doesn't create xml-encoded output!
- sub addpl {
- my($name, $opt) = @_;
-@@ -210,7 +210,7 @@
- }
+@@ -222,7 +222,7 @@
+ - gnupod_addsong.pl can now fetch podcast-rss feeds!
+ Example: 'gnupod_addsong.pl http://www.tagesschau.de/export/podcast'
- ##############################################################
--# Add a SmartPlaylist to output (Called by eventer or tunes2pod.pl)
-+# Add a SmartPlaylist to output (Called by eventer or tunes2pod)
- # Like addpl(), 'output' isn't xml-encoded
- sub addspl {
- my($name, $opt) = @_;
---- gnupod-0.99.8/src/ext/FooBar.pm 2009-07-10 11:20:05.000000000 -1200
-+++ gnupod-0.99.8/src/ext/FooBar.pm.new 2021-06-13 14:44:53.896319046 -1200
-@@ -143,7 +143,7 @@
- sub StartItunesDBSync {
- my($con) = @_;
-
-- my $XBIN = "$con->{bindir}/tunes2pod.pl";
-+ my $XBIN = "$con->{bindir}/tunes2pod";
-
- if(-x $XBIN) {
- {
---- gnupod-0.99.8/src/gnupod_otgsync.pl 2009-07-10 11:20:05.000000000 -1200
-+++ gnupod-0.99.8/src/gnupod_otgsync.pl.new 2021-06-13 14:44:53.900318914 -1200
-@@ -63,7 +63,7 @@
- usage($con->{status}."\n") if $con->{status};
-
- if(GNUpod::FooBar::ItunesDBNeedsSync($con)) {
-- die "gnupod_otgsync.pl: Bug detected! You need to run tunes2pod.pl -> Sync broken!\n";
-+ die "gnupod_otgsync.pl: Bug detected! You need to run tunes2pod -> Sync broken!\n";
- }
-
- ##Check if GNUtunesDB <-> iTunesDB is really in-sync
+-- Added basic support for podcast-rss and podcast-guid in tunes2pod.pl and mktunes
++- Added basic support for podcast-rss and podcast-guid in tunes2pod and mktunes
+
+ - Fixed small bug in FileMagic.pm: UTF16-Tags didn't work.
+ Thanks to Chris Abajian for reporting this issue.
+@@ -469,7 +469,7 @@
+ iPods
+
+ - GNUpod checks if the iTunesDB did change and
+- runs tunes2pod.pl if it has to run it
++ runs tunes2pod if it has to run it
+
+ - Changed rating-schema to match SPL-Rating
+ -> Rating 5 is now 100 (newrating=oldrating*20)
+@@ -530,7 +530,7 @@
+ --------
+ iTunesDB.pm and co:
+ * Can read and write Playlist-Elements without child
+- tunes2pod.pl couldn't read files written by
++ tunes2pod couldn't read files written by
+ (newer) MusicMatch releases.. this should fix the issue :)
+ * Don't parse MasterPlaylists, do a seek()
+ -> Speeds up parsing
+@@ -572,7 +572,7 @@
+ FileMagic.pm
+ * Fixed (?) ID3v2 reading
+
+-tunes2pod.pl:
++tunes2pod:
+ * Added paranoia checks (stricter parsing)
+ * Added SPL-Read code (BETA!)
+
+@@ -657,7 +657,7 @@
+ Use an UNICODE Texteditor to edit the GNUtunesDB..
+ (Like 'yudit' or the gnome2 texteditor)
+ Your old latin1 GNUtunesDB will get converted to an
+- UTF8 version after running tunes2pod.pl/gnupod_addsong.pl or
++ UTF8 version after running tunes2pod/gnupod_addsong.pl or
+ gnupod_delete.pl
+
+ UTF8 Support isn't testet very well, and gnuPod 0.28 maybe more
+@@ -668,8 +668,8 @@
+
+
+ gnuPod 0.28
+-- Rewritten Playlistcode for tunes2pod.pl
+-- tunes2pod.pl doesn't kill your empty GNUtunesDB anymore
++- Rewritten Playlistcode for tunes2pod
++- tunes2pod doesn't kill your empty GNUtunesDB anymore
+ if it can't find the iTunesDB
+ - mktunes uses now binmode(), maybe this helps
+ RedHat 8 ? .. (and win32 ;) )
+@@ -735,7 +735,7 @@
+
+
+ gnuPod 0.21
+-- Fixed stupid tunes2pod.pl bug with big iTunesDBs
++- Fixed stupid tunes2pod bug with big iTunesDBs
+ (Thanks to Ciamac Moallemi for reporting and providing a patch)
+ - Support for songnum, songs, cdnum, cds and year
+
+--- gnupod-0.99.8/README 2022-07-17 23:08:21.681954815 +1400
++++ gnupod-0.99.8/README.new 2022-07-17 23:08:21.749954815 +1400
+@@ -35,7 +35,7 @@
+ gnupod_otgsync Handles On-The-Go Sync (not for humans)
+ gnupod_search.pl Search ;)
+ mktunes Convert the GNUtunesDB.xml to a iTunesDB
+-tunes2pod.pl Convert the iTunesDB into a GNUtunesDB.xml
++tunes2pod Convert the iTunesDB into a GNUtunesDB.xml
+
+ You'll have to use mktunes if you added/deleted/changed something
+ on the iPod.
Created gnupod-0.99.8/man/gnupod_convert_APE.pl.1.gz
---- gnupod-0.99.8/src/ext/FileMagic.pm 2021-06-13 14:44:53.544330664 -1200
-+++ gnupod-0.99.8/src/ext/FileMagic.pm.new 2021-06-13 14:44:54.000315614 -1200
+--- gnupod-0.99.8/src/ext/FileMagic.pm 2022-07-17 23:08:21.597954815 +1400
++++ gnupod-0.99.8/src/ext/FileMagic.pm.new 2022-07-17 23:08:21.801954815 +1400
@@ -54,7 +54,7 @@
my $NN_HEADERS = {'MThd' => { encoder=>'gnupod_convert_MIDI', ftyp=>'MIDI'},
- 'fLaC' => { encoder=>'gnupod_convert_FLAC.pl', ftyp=>'FLAC'},
- 'OggS' => { encoder=>'gnupod_convert_OGG.pl', ftyp=>'OGG' },
+ 'fLaC' => { encoder=>'gnupod_convert_FLAC', ftyp=>'FLAC'},
+ 'OggS' => { encoder=>'gnupod_convert_OGG', ftyp=>'OGG' },
- 'MAC ' => { encoder=>'gnupod_convert_APE.pl', ftyp=>'APE' },
+ 'MAC ' => { encoder=>'gnupod_convert_APE', ftyp=>'APE' },
'RIFF' => { encoder=>'gnupod_convert_RIFF', ftyp=>'RIFF', magic2=>'AVI '}};
-Patched gnupod-0.99.8/man/gnupod_addsong.pl.1.gz
---- gnupod-0.99.8/CHANGES 2021-06-13 14:44:53.800322215 -1200
-+++ gnupod-0.99.8/CHANGES.new 2021-06-13 14:44:54.068313369 -1200
-@@ -60,7 +60,7 @@
- flooded me with patches, many thanks to him:
- - Fix DBID width in gnupod_search.pl output
- - Added --bitrate switch to gnupod_search.pl
--- Added --podcast-files-limit switch to gnupod_addsong.pl
-+- Added --podcast-files-limit switch to gnupod_addsong
- - Added Podcast-Date patch (GNUpod now depends on Date::Parse)
- - Added --unique switch to extractArtwork.pl
- - Added xescaped() patch. GNUpod will now store
-@@ -77,7 +77,7 @@
- - FileMagic.pm: Remove trailing zeros from MP3 tags that come in utf16 or utf8.
- - gnupod_otgsync.pl: Marking files as played even when only the
- skipcount or bookmark is > 0.
--- gnupod_addsong.pl: Added other sources for artist tag data from podcasts.
-+- gnupod_addsong: Added other sources for artist tag data from podcasts.
- Added "--podcast-artwork" option to download and add artwork to podcasts.
- Added "--podcast-cache-dir" option allow caching of podcast media files.
- Fixed podcast XML parser handlers to merge CDATA that comes in chunks.
-@@ -93,7 +93,7 @@
- - Use udevinfo to find the iPods Firewire-GUID (as /proc/bus/usb/devices is depricated)
- - Support for iPhone: Edit ~/.gnupodrc and add 'model = iphone'
- - Some documentation 'fixes', thanks a lot to Toby Cabot
--- gnupod_addsong.pl: replace wget with curl
-+- gnupod_addsong: replace wget with curl
- - Use binmode() more often to help Win32
+Patched gnupod-0.99.8/man/gnupod_INIT.pl.1.gz
+--- gnupod-0.99.8/FAQ 2022-07-17 23:08:21.693954815 +1400
++++ gnupod-0.99.8/FAQ.new 2022-07-17 23:08:21.809954815 +1400
+@@ -58,7 +58,7 @@
+ ./configure && make install
+
+ 1 Mount the iPod (eg. /mnt/ipod)
+- 2 run gnupod_INIT.pl -m /mnt/ipod
++ 2 run gnupod_INIT -m /mnt/ipod
+ 3 add songs using 'gnupod_addsong.pl -m /mnt/ipod *blabla.mp3
+ 4 build the iTunesDB using mktunes: 'mktunes -m /mnt/ipod'
+ 5 umount the iPod and enjoy!
+--- gnupod-0.99.8/doc/gnupod.info 2022-07-17 23:08:21.697954815 +1400
++++ gnupod-0.99.8/doc/gnupod.info.new 2022-07-17 23:08:21.817954815 +1400
+@@ -434,14 +434,14 @@
+
+ If the iPod is freshly formatted or you never used GNUpod before
+ with this iPod, run
+- gnupod_INIT.pl -m /mnt/ipod
++ gnupod_INIT -m /mnt/ipod
+- gnupod_INIT.pl will create the default directory tree and creates an
++ gnupod_INIT will create the default directory tree and creates an
+ empty GNUtunesDB (or if it finds an iTunesDB, it runs tunes2pod to
+ convert the iTunesDB to an GNUtunesDB)
-@@ -155,9 +155,9 @@
+ Use
+- gnupod_INIT.pl -m /mnt/ipod --france
++ gnupod_INIT -m /mnt/ipod --france
+
+ if you would like to enable the 'EU-Volume-Limit' (=decrease max.
+ volume). This only works for iPods running Firmware 1.x
+--- gnupod-0.99.8/doc/gnupod.html 2022-07-17 23:08:21.705954815 +1400
++++ gnupod-0.99.8/doc/gnupod.html.new 2022-07-17 23:08:21.821954815 +1400
+@@ -596,15 +596,15 @@
+
+
+ If the iPod is freshly formatted or you never used GNUpod before with this iPod, run
+- | | gnupod_INIT.pl -m /mnt/ipod
++ | | gnupod_INIT -m /mnt/ipod
+ |
+
+-gnupod_INIT.pl will create the default directory tree and creates an empty GNUtunesDB
++gnupod_INIT will create the default directory tree and creates an empty GNUtunesDB
+ (or if it finds an iTunesDB, it runs tunes2pod to convert the iTunesDB to an GNUtunesDB)
+
+
+ Use
+- | | gnupod_INIT.pl -m /mnt/ipod --france
++ | | gnupod_INIT -m /mnt/ipod --france
+ |
+
+ if you would like to enable the 'EU-Volume-Limit' (=decrease max. volume).
+--- gnupod-0.99.8/doc/gnupod.texi 2022-07-17 23:08:21.709954815 +1400
++++ gnupod-0.99.8/doc/gnupod.texi.new 2022-07-17 23:08:21.825954815 +1400
+@@ -455,15 +455,15 @@
+
+ If the iPod is freshly formatted or you never used GNUpod before with this iPod, run
+ @example
+-gnupod_INIT.pl -m /mnt/ipod
++gnupod_INIT -m /mnt/ipod
+ @end example
+
+-gnupod_INIT.pl will create the default directory tree and creates an empty GNUtunesDB
++gnupod_INIT will create the default directory tree and creates an empty GNUtunesDB
+ (or if it finds an iTunesDB, it runs tunes2pod to convert the iTunesDB to an GNUtunesDB)
+
+ Use
+ @example
+-gnupod_INIT.pl -m /mnt/ipod --france
++gnupod_INIT -m /mnt/ipod --france
+ @end example
+
+ if you would like to enable the 'EU-Volume-Limit' (=decrease max. volume).
+--- gnupod-0.99.8/src/gnupod_check.pl 2022-07-17 23:08:21.433954815 +1400
++++ gnupod-0.99.8/src/gnupod_check.pl.new 2022-07-17 23:08:21.829954815 +1400
+@@ -52,7 +52,7 @@
+ usage($con->{status}."\n") if $con->{status};
+
+ print "Pass 1: Checking Files in the GNUtunesDB.xml...\n";
+- GNUpod::XMLhelper::doxml($con->{xml}) or usage("Failed to parse $con->{xml}, did you run gnupod_INIT.pl?\n");
++ GNUpod::XMLhelper::doxml($con->{xml}) or usage("Failed to parse $con->{xml}, did you run gnupod_INIT?\n");
+
+ print "Pass 2: Checking Files on the iPod...\n";
+ checkGNUtunes($con);
+--- gnupod-0.99.8/src/mktunes.pl 2022-07-17 23:08:21.641954815 +1400
++++ gnupod-0.99.8/src/mktunes.pl.new 2022-07-17 23:08:21.837954815 +1400
+@@ -66,7 +66,7 @@
+ $mktunes = GNUpod::Mktunes->new(Connection=>$con, iPodName=>$opts{'ipod-name'}, Artwork=>$AWDB);
+
+ print "> Parsing XML document...\n";
+- GNUpod::XMLhelper::doxml($con->{xml}) or usage("Could not read $con->{xml}, did you run gnupod_INIT.pl ?");
++ GNUpod::XMLhelper::doxml($con->{xml}) or usage("Could not read $con->{xml}, did you run gnupod_INIT ?");
+
+ print "\r> ".$mktunes->GetFileCount." files parsed, assembling iTunesDB...\n";
+ $mktunes->WriteItunesDB;
+--- gnupod-0.99.8/src/ext/Mktunes.pm 2022-07-17 23:08:21.649954815 +1400
++++ gnupod-0.99.8/src/ext/Mktunes.pm.new 2022-07-17 23:08:21.841954815 +1400
+@@ -20,7 +20,7 @@
+
+ sub WriteItunesSD {
+ my($self) = @_;
+- open(ITS, ">", $self->GetConnection->{itunessd}) or die "*** Unable to write the iTunesDB: $!, did you run gnupod_INIT.pl ?\n";
++ open(ITS, ">", $self->GetConnection->{itunessd}) or die "*** Unable to write the iTunesDB: $!, did you run gnupod_INIT ?\n";
+ binmode(ITS);
+ print ITS GNUpod::iTunesDB::mk_itunes_sd_header({files=>$self->GetFileCount});
+ foreach my $item (@{$self->GetFiles}) {
+@@ -43,7 +43,7 @@
+ my $outfile = $self->GetConnection->{itunesdb};
+ my $tmpfile = $outfile.".$$";
+
+- open(ITUNES, ">", $tmpfile) or die "*** Unable to write the iTunesDB: $!, did you run gnupod_INIT.pl ?\n";
++ open(ITUNES, ">", $tmpfile) or die "*** Unable to write the iTunesDB: $!, did you run gnupod_INIT ?\n";
+ binmode(ITUNES);
+ print ITUNES GNUpod::iTunesDB::mk_mhbd({});
+ $mhbd_size = tell(ITUNES);
+--- gnupod-0.99.8/src/ext/XMLhelper.pm 2022-07-17 23:08:21.729954815 +1400
++++ gnupod-0.99.8/src/ext/XMLhelper.pm.new 2022-07-17 23:08:21.845954815 +1400
+@@ -69,7 +69,7 @@
+ my @aviable_targets = bsd_glob($xconn->{musicdir}."/*", $xconn->{autotest}?GLOB_NOCASE:GLOB_NOSORT);
+
+ unless(int(@aviable_targets)) {
+- warn "No iPod folders found at $xconn->{mountpoint}, did you run gnupod_INIT.pl ?\n";
++ warn "No iPod folders found at $xconn->{mountpoint}, did you run gnupod_INIT ?\n";
+ return undef;
+ }
+ if(length($current_extension) != 0) {
+--- gnupod-0.99.8/src/gnupod_INIT.pl 2022-07-17 23:08:21.737954815 +1400
++++ gnupod-0.99.8/src/gnupod_INIT.pl.new 2022-07-17 23:08:21.849954815 +1400
+@@ -28,7 +28,7 @@
+ use vars qw(%opts);
+
+
+-print "gnupod_INIT.pl ###__VERSION__### (C) Adrian Ulrich\n";
++print "gnupod_INIT ###__VERSION__### (C) Adrian Ulrich\n";
+
+ $opts{mount} = $ENV{IPOD_MOUNTPOINT};
+ #Don't add xml and itunes opts.. we *NEED* the mount opt to be set..
+@@ -64,7 +64,7 @@
+
+ btw: use 'gnupod_addsong -m $opts{mount} --restore'
+ if you lost your songs on the iPod after using
+- gnupod_INIT.pl (..but this won't happen, because
++ gnupod_INIT (..but this won't happen, because
+ this tool has no bugs ;) )
+ *********************************************************
+
+@@ -144,7 +144,7 @@
+ my($rtxt) = @_;
+ die << "EOF";
+ $rtxt
+-Usage: gnupod_INIT.pl [-h] [-m directory]
++Usage: gnupod_INIT [-h] [-m directory]
+
+ -h, --help display this help and exit
+ --version output version information and exit
+@@ -165,7 +165,7 @@
+
+ sub version {
+ die << "EOF";
+-gnupod_INIT.pl (gnupod) ###__VERSION__###
++gnupod_INIT (gnupod) ###__VERSION__###
+ Copyright (C) Adrian Ulrich 2002-2004
+
+ This is free software; see the source for copying conditions. There is NO
+--- gnupod-0.99.8/src/gnupod_search.pl 2022-07-17 23:08:21.657954815 +1400
++++ gnupod-0.99.8/src/gnupod_search.pl.new 2022-07-17 23:08:21.853954815 +1400
+@@ -89,7 +89,7 @@
+ }
+
+ pview(undef,1);
+- GNUpod::XMLhelper::doxml($con->{xml}) or usage("Failed to parse $con->{xml}, did you run gnupod_INIT.pl?\n");
++ GNUpod::XMLhelper::doxml($con->{xml}) or usage("Failed to parse $con->{xml}, did you run gnupod_INIT?\n");
+ #XML::Parser finished, write new file if we deleted or renamed
+ if($dirty) {
+ GNUpod::XMLhelper::writexml($con,{automktunes=>$opts{automktunes}});
+--- gnupod-0.99.8/src/gnupod_addsong.pl 2022-07-17 23:08:21.665954815 +1400
++++ gnupod-0.99.8/src/gnupod_addsong.pl.new 2022-07-17 23:08:21.857954815 +1400
+@@ -119,7 +119,7 @@
+ delete($opts{artwork});
+ }
+ }
+- GNUpod::XMLhelper::doxml($con->{xml}) or usage("Failed to parse $con->{xml}, did you run gnupod_INIT.pl?\n");
++ GNUpod::XMLhelper::doxml($con->{xml}) or usage("Failed to parse $con->{xml}, did you run gnupod_INIT?\n");
+ }
+
+ # Check volume adjustment options for sanity
+--- gnupod-0.99.8/tools/extractArtwork.pl 2009-07-11 13:20:05.000000000 +1400
++++ gnupod-0.99.8/tools/extractArtwork.pl.new 2022-07-17 23:08:21.861954815 +1400
+@@ -22,7 +22,7 @@
+ my $AWDB = GNUpod::ArtworkDB->new(Connection=>$connection, DropUnseen=>0);
+
+ $AWDB->LoadArtworkDb;
+-GNUpod::XMLhelper::doxml($connection->{xml}) or usage("Failed to parse $connection->{xml}, did you run gnupod_INIT.pl?\n");
++GNUpod::XMLhelper::doxml($connection->{xml}) or usage("Failed to parse $connection->{xml}, did you run gnupod_INIT?\n");
+
+ #print Data::Dumper::Dumper($AWDB);
+
+--- gnupod-0.99.8/README.developer 2022-07-17 23:08:21.741954815 +1400
++++ gnupod-0.99.8/README.developer.new 2022-07-17 23:08:21.865954815 +1400
+@@ -4,7 +4,7 @@
+ These aren't the droids you're looking for. Move along! :-)
+
+ Minimal testing:
+-> gnupod_INIT.pl /mnt/empty
++> gnupod_INIT /mnt/empty
+ > gnupod_addsong
+ > mktunes
+ > tunes2pod --force
+--- gnupod-0.99.8/CHANGES 2022-07-17 23:08:21.745954815 +1400
++++ gnupod-0.99.8/CHANGES.new 2022-07-17 23:08:21.869954815 +1400
+@@ -46,7 +46,7 @@
+ NEW: Set addtime to a fixed value when doing autotests.
+ NEW: Added check for "autotest" file at the ipod mountpoint.
+ NEW: The connection hash was expanded by a "autotest" key.
+- NEW: Added "--fwguid" option to gnupod_INIT.pl to be passed on to mktunes.
++ NEW: Added "--fwguid" option to gnupod_INIT to be passed on to mktunes.
+
+
+ *** OLD STUFF ***
+@@ -154,7 +154,7 @@
+ - Added support for Podcast-Playlists.
- Filter out bad chars from '--rename' command.
- Added RVA2 (Normalize) patch by Peter Liljenberg
- - gnupod_INIT: Added --noask option
--- gnupod_addsong.pl: --playlist can now be used multiple times
--- gnupod_addsong.pl: added --playlist-is-podcast command
--- gnupod_addsong.pl: Added workaround for glibc/linux/perl bug/problem (realloc() error)
-+- gnupod_addsong: --playlist can now be used multiple times
-+- gnupod_addsong: added --playlist-is-podcast command
-+- gnupod_addsong: Added workaround for glibc/linux/perl bug/problem (realloc() error)
- - Raised video-bitrate for on-the-fly converting
- - Added configuration option 'automktunes'. Setting
- 'automktunes = 1' inside ~/.gnupodrc eliminates the need
-@@ -184,13 +184,13 @@
- -------
+-- gnupod_INIT.pl: Added --noask option
++- gnupod_INIT: Added --noask option
+ - gnupod_addsong.pl: --playlist can now be used multiple times
+ - gnupod_addsong.pl: added --playlist-is-podcast command
+ - gnupod_addsong.pl: Added workaround for glibc/linux/perl bug/problem (realloc() error)
+@@ -607,7 +607,7 @@
+ * Can read from STDIN again (use 'gnupod_addsong.pl -')
+ (I forgot this feature ;) )
- - iPod-Video support
-- gnupod_addsong.pl can now read/add .mp4 files
-+ gnupod_addsong can now read/add .mp4 files
+-gnupod_INIT.pl
++gnupod_INIT
+ * Added '--france' switch (Limit volume to 100 db for
+ 1.x Firmware)
- Converting .avi (RIFF) files on-the-fly works
- only IF your ffmpeg binary has AAC Support!
- (Adding preencoded files works witout ffmpeg)
+--- gnupod-0.99.8/README 2022-07-17 23:08:21.749954815 +1400
++++ gnupod-0.99.8/README.new 2022-07-17 23:08:21.877954815 +1400
+@@ -29,7 +29,7 @@
+ GNUpod commands (cheatsheet)
+ ----------------------------
-- Try: gnupod_addsong.pl --decode=video *.avi
-+ Try: gnupod_addsong --decode=video *.avi
+-gnupod_INIT.pl INIT a new iPod (create empty Database + Directories)
++gnupod_INIT INIT a new iPod (create empty Database + Directories)
+ gnupod_addsong.pl Add files
+ gnupod_check Check for 'zombie' files
+ gnupod_otgsync Handles On-The-Go Sync (not for humans)
+Patched gnupod-0.99.8/man/gnupod_search.pl.1.gz
+--- gnupod-0.99.8/AUTHORS 2009-07-11 13:20:05.000000000 +1400
++++ gnupod-0.99.8/AUTHORS.new 2022-07-17 23:08:21.885954815 +1400
+@@ -10,7 +10,7 @@
+ Contributed to the 'old' GNUpod (< 0.9)
+ - gnupod_list.pl
+ - gnupod_renumber.pl
+- - gnupod_search.pl (Most important tool ;) )
++ - gnupod_search (Most important tool ;) )
- - Fixes a playlist problem with iTunes5 (new 100 Mhods)
-@@ -219,8 +219,8 @@
- Summary
- -------
+ And also many thanks to the many other people
+--- gnupod-0.99.8/FAQ 2022-07-17 23:08:21.809954815 +1400
++++ gnupod-0.99.8/FAQ.new 2022-07-17 23:08:21.893954815 +1400
+@@ -8,7 +8,7 @@
+ 5 : Does GNUpod support feature $foobar ?
+ 6 : Can i add File-Format $foobar ?
+ 7 : How can i add files recursive?
+-8 : How to get parseable output from gnupod_search.pl?
++8 : How to get parseable output from gnupod_search?
+ 9 : Some Artists/Albums, etc. shows up multiple times
+ on the iPod Browser!
+ 10 : Why?
+@@ -144,13 +144,13 @@
+ (note the '-')
--- gnupod_addsong.pl can now fetch podcast-rss feeds!
-- Example: 'gnupod_addsong.pl http://www.tagesschau.de/export/podcast'
-+- gnupod_addsong can now fetch podcast-rss feeds!
-+ Example: 'gnupod_addsong http://www.tagesschau.de/export/podcast'
- - Added basic support for podcast-rss and podcast-guid in tunes2pod and mktunes.pl
+-8. How to get parseable output from gnupod_search.pl
++8. How to get parseable output from gnupod_search
+ ----------------------------------------------------
-@@ -282,8 +282,8 @@
+ gnupod_addsong.pl knows the '--view' switch.
- - Added support for multiple On-The-Go playlists.
+ Example:
+-gnupod_search.pl --view=i -l "Cure" 2>/dev/null | tail +4
++gnupod_search --view=i -l "Cure" 2>/dev/null | tail +4
--- gnupod_addsong.pl can now reenocde aac and mp3 'on-the-fly'
-- Usage: gnupod_addsong.pl --reencode 6 *.mp3
-+- gnupod_addsong can now reenocde aac and mp3 'on-the-fly'
-+ Usage: gnupod_addsong --reencode 6 *.mp3
- This would reenocde everything with 'lame -V 6'
- Use this if you don't have much space left (iPod Shuffle?!)
- Note: The Reencode option also changes the quality of
-@@ -340,7 +340,7 @@
+ (Hmm.. output breaks if On-The-Go data get's synced..)
+ FIXME.. maybe we should have an --out option?
+--- gnupod-0.99.8/doc/gnupod.info 2022-07-17 23:08:21.817954815 +1400
++++ gnupod-0.99.8/doc/gnupod.info.new 2022-07-17 23:08:21.897954815 +1400
+@@ -512,15 +512,15 @@
+ 4.4 Search files
+ ================
- - You can now add MIDI files ;-) (with timidity)
+-GNUpod includes a tool called `gnupod_search.pl' that helps you search
++GNUpod includes a tool called `gnupod_search' that helps you search
+ for files.
--- Added --set-songnum option for gnupod_addsong.pl
-+- Added --set-songnum option for gnupod_addsong
+ Maybe you would like to search for the artist called 'Schlummiguch'.
+ In this case, run
+- gnupod_search.pl -m /mnt/ipod -a "Schlummiguch"
++ gnupod_search -m /mnt/ipod -a "Schlummiguch"
- - Rewritten ConverterCore.. shouldn't break anything...
+- Note: gnupod_search.pl assumes RegExp input. Please have a look at
+-`gnupod_search.pl --help' for more information.
++ Note: gnupod_search assumes RegExp input. Please have a look at
++`gnupod_search --help' for more information.
-@@ -364,18 +364,18 @@
- Summary
- -------
+
+ File: gnupod.info, Node: Remove files, Next: Edit tags, Prev: Search files, Up: Using GNUpod
+@@ -528,9 +528,9 @@
+ 4.5 Remove files
+ ================
--- Changed --decode switch from gnupod_addsong.pl
-+- Changed --decode switch from gnupod_addsong
- You can now select the output format of --decode
- -> pcm(old default) / MP3 (using lame) / AAC (using FAAC)
-- Example: # gnupod_addsong.pl --decode=mp3 *.flac
-+ Example: # gnupod_addsong --decode=mp3 *.flac
- (Idea and original patch from )
+-Removing files is done using `gnupod_search.pl -d'. To Remove all
++Removing files is done using `gnupod_search -d'. To Remove all
+ files from the artist 'Schlummiguch', run
+- gnupod_search.pl -m /mnt/ipod -a "Schlummiguch" -d
++ gnupod_search -m /mnt/ipod -a "Schlummiguch" -d
- - GNUpod can now also convert OGG-Vorbis files
- (Use --decode=XXX, same as FLAC)
+
+ File: gnupod.info, Node: Edit tags, Next: Creating playlists, Prev: Remove files, Up: Using GNUpod
+@@ -538,9 +538,9 @@
+ 4.6 Edit tags
+ =============
--- Added --playlist=STRING switch to gnupod_addsong.pl
-+- Added --playlist=STRING switch to gnupod_addsong
- This creates the playlist 'STRING' and adds all songs
-- passed to gnupod_addsong.pl to this playlist.
-+ passed to gnupod_addsong to this playlist.
- (Thanks to Bob Cotton)
+-You can use `gnupod_search.pl' to edit tags (like artist, album, etc..)
++You can use `gnupod_search' to edit tags (like artist, album, etc..)
- - Many changes for the M4A parser, should work better now
-@@ -403,21 +403,21 @@
- (Needs JavaScript + DOM => Mozilla)
- ** SMARTPLAYLIST SYNTAX CHANGED **
+- gnupod_search.pl --artist="Alfred Neumann" --rename="artist=John Doe" --rename="rating=100"
++ gnupod_search --artist="Alfred Neumann" --rename="artist=John Doe" --rename="rating=100"
--- gnupod_addsong.pl can now add FLAC files.
-+- gnupod_addsong can now add FLAC files.
- 'flac' needs to be in your $PATH and it's disabled
-- per default. (Enable it using gnupod_addsong.pl --decode
-+ per default. (Enable it using gnupod_addsong --decode
- or set 'gnupod_addsong.decode=1' in your config)
+ This example searches all files from 'Alfred Neumann', changes the
+ artist into 'John Doe' and sets the rating to 5 Stars (5*20=100)
+@@ -674,10 +674,10 @@
+ switch of `gnupod_addsong.pl'. Example:
+ gnupod_addsong.pl --artwork cover.jpg *.mp3
--- gnupod_addsong.pl can read ALAC (Apples Loseless Audio Codec)
-+- gnupod_addsong can read ALAC (Apples Loseless Audio Codec)
- files (iTunes creates normal .m4a files)
+- Use `gnupod_search.pl' to change/add artwork for existing files.
++ Use `gnupod_search' to change/add artwork for existing files.
+ Example:
+ # Set cover.jpg as artwork for all songs that match album =~ /Katamari/i
+- gnupod_search.pl --artwork cover.jpg --album Katamari
++ gnupod_search --artwork cover.jpg --album Katamari
- - Polished Playcounts parser (no hardcoded offsets anymore)
+ don't forget to run `mktunes' afterwards.
- - added '--disable-v2' and '--disable-v1' to
-- gnupod_addsong.pl (Disable parsing of ID3TAG version X)
-+ gnupod_addsong (Disable parsing of ID3TAG version X)
+--- gnupod-0.99.8/doc/gnupodrc.example 2022-07-17 23:08:21.701954815 +1400
++++ gnupod-0.99.8/doc/gnupodrc.example.new 2022-07-17 23:08:21.901954815 +1400
+@@ -52,7 +52,7 @@
+ ## Enforce iPod serial number:
+ # mktunes.fwguid = 000ba3100310abcf
- - Fixed small bug with .m4a files and added more fields.
-- gnupod_addsong.pl can now read M4A/AAC files from www.allofmp3.com
-+ gnupod_addsong can now read M4A/AAC files from www.allofmp3.com
+-# *** gnupod_search.pl ***
++# *** gnupod_search ***
+
+ ## Always match only once
+ # gnupod_search.match-once = 1
+--- gnupod-0.99.8/doc/gnupod.html 2022-07-17 23:08:21.821954815 +1400
++++ gnupod-0.99.8/doc/gnupod.html.new 2022-07-17 23:08:21.905954815 +1400
+@@ -722,15 +722,15 @@
+
+
+
+-GNUpod includes a tool called gnupod_search.pl that helps you search for files.
++GNUpod includes a tool called gnupod_search that helps you search for files.
+
+
+ Maybe you would like to search for the artist called 'Schlummiguch'. In this case, run
+- | | gnupod_search.pl -m /mnt/ipod -a "Schlummiguch"
++ | | gnupod_search -m /mnt/ipod -a "Schlummiguch"
+ |
+
+-Note: gnupod_search.pl assumes RegExp input.
+-Please have a look at gnupod_search.pl --help for more information.
++Note: gnupod_search assumes RegExp input.
++Please have a look at gnupod_search --help for more information.
+
+
+
+@@ -751,9 +751,9 @@
+
+
+
+-Removing files is done using gnupod_search.pl -d.
++Removing files is done using gnupod_search -d.
+ To Remove all files from the artist 'Schlummiguch', run
+- | | gnupod_search.pl -m /mnt/ipod -a "Schlummiguch" -d
++ | | gnupod_search -m /mnt/ipod -a "Schlummiguch" -d
+ |
+
+
+@@ -774,10 +774,10 @@
+
+
+
+-You can use gnupod_search.pl to edit tags (like artist, album, etc..)
++You can use gnupod_search to edit tags (like artist, album, etc..)
+
+
+- | | gnupod_search.pl --artist="Alfred Neumann" --rename="artist=John Doe" --rename="rating=100"
++ | | gnupod_search --artist="Alfred Neumann" --rename="artist=John Doe" --rename="rating=100"
+ |
+
+ This example searches all files from 'Alfred Neumann', changes the artist into 'John Doe' and
+@@ -962,9 +962,9 @@
+ | | gnupod_addsong.pl --artwork cover.jpg *.mp3
+ |
+
+-Use gnupod_search.pl to change/add artwork for existing files. Example:
++Use gnupod_search to change/add artwork for existing files. Example:
+ | | # Set cover.jpg as artwork for all songs that match album =~ /Katamari/i
+-gnupod_search.pl --artwork cover.jpg --album Katamari
++gnupod_search --artwork cover.jpg --album Katamari
+ |
+
+ don't forget to run mktunes afterwards.
+--- gnupod-0.99.8/doc/gnupod.texi 2022-07-17 23:08:21.825954815 +1400
++++ gnupod-0.99.8/doc/gnupod.texi.new 2022-07-17 23:08:21.909954815 +1400
+@@ -529,33 +529,33 @@
+ @node Search files
+ @section Search files
+
+-GNUpod includes a tool called @code{@w{gnupod_search.pl}} that helps you search for files.
++GNUpod includes a tool called @code{@w{gnupod_search}} that helps you search for files.
+
+ Maybe you would like to search for the artist called 'Schlummiguch'. In this case, run
+ @example
+-gnupod_search.pl -m /mnt/ipod -a "Schlummiguch"
++gnupod_search -m /mnt/ipod -a "Schlummiguch"
+ @end example
+
+-Note: gnupod_search.pl assumes RegExp input.
+-Please have a look at @code{@w{gnupod_search.pl --help}} for more information.
++Note: gnupod_search assumes RegExp input.
++Please have a look at @code{@w{gnupod_search --help}} for more information.
+
+ @node Remove files
+ @section Remove files
+
+-Removing files is done using @code{@w{gnupod_search.pl -d}}.
++Removing files is done using @code{@w{gnupod_search -d}}.
+ To Remove all files from the artist 'Schlummiguch', run
+ @example
+-gnupod_search.pl -m /mnt/ipod -a "Schlummiguch" -d
++gnupod_search -m /mnt/ipod -a "Schlummiguch" -d
+ @end example
+
+
+ @node Edit tags
+ @section Edit tags
+
+-You can use @code{@w{gnupod_search.pl}} to edit tags (like artist, album, etc..)
++You can use @code{@w{gnupod_search}} to edit tags (like artist, album, etc..)
+
+ @example
+-gnupod_search.pl --artist="Alfred Neumann" --rename="artist=John Doe" --rename="rating=100"
++gnupod_search --artist="Alfred Neumann" --rename="artist=John Doe" --rename="rating=100"
+ @end example
+
+ This example searches all files from 'Alfred Neumann', changes the artist into 'John Doe' and
+@@ -712,10 +712,10 @@
+ @end example
+
+
+-Use @code{@w{gnupod_search.pl}} to change/add artwork for existing files. Example:
++Use @code{@w{gnupod_search}} to change/add artwork for existing files. Example:
+ @example
+ # Set cover.jpg as artwork for all songs that match album =~ /Katamari/i
+-gnupod_search.pl --artwork cover.jpg --album Katamari
++gnupod_search --artwork cover.jpg --album Katamari
+ @end example
+
+ don't forget to run @code{@w{mktunes}} afterwards.
+--- gnupod-0.99.8/src/gnupod_search.pl 2022-07-17 23:08:21.853954815 +1400
++++ gnupod-0.99.8/src/gnupod_search.pl.new 2022-07-17 23:08:21.913954815 +1400
+@@ -38,7 +38,7 @@
+
+
+
+-print "gnupod_search.pl Version ###__VERSION__### (C) Adrian Ulrich\n";
++print "gnupod_search Version ###__VERSION__### (C) Adrian Ulrich\n";
+
+ # WARNING: If you add new options wich don't do matching, change newfile()
+ #
+@@ -241,7 +241,7 @@
+ my($rtxt) = @_;
+ die << "EOF";
+ $rtxt
+-Usage: gnupod_search.pl [-h] [-m directory] File1 File2 ...
++Usage: gnupod_search [-h] [-m directory] File1 File2 ...
+
+ -h, --help display this help and exit
+ --version output version information and exit
+@@ -279,7 +279,7 @@
+
+ sub version {
+ die << "EOF";
+-gnupod_search.pl (gnupod) ###__VERSION__###
++gnupod_search (gnupod) ###__VERSION__###
+ Copyright (C) Adrian Ulrich 2002-2008
+
+ This is free software; see the source for copying conditions. There is NO
+--- gnupod-0.99.8/CHANGES 2022-07-17 23:08:21.869954815 +1400
++++ gnupod-0.99.8/CHANGES.new 2022-07-17 23:08:21.921954815 +1400
+@@ -58,8 +58,8 @@
+
+ I was planning to release GNUpod 1.0, but Heinrich Langos
+ flooded me with patches, many thanks to him:
+-- Fix DBID width in gnupod_search.pl output
+-- Added --bitrate switch to gnupod_search.pl
++- Fix DBID width in gnupod_search output
++- Added --bitrate switch to gnupod_search
+ - Added --podcast-files-limit switch to gnupod_addsong.pl
+ - Added Podcast-Date patch (GNUpod now depends on Date::Parse)
+ - Added --unique switch to extractArtwork.pl
+@@ -209,7 +209,7 @@
+ - QTFile.pm: rseek() now refuses to return more than 1024 kb. Fixes possible out-of-memory problems
+ with broken files.
+
+-- Fixed an obscure gnupod_search.pl bug causing some weird search results.
++- Fixed an obscure gnupod_search bug causing some weird search results.
+
+ - Added DESTDIR support (make DESTDIR=/tmp/bla install) and removed slackpkg target (obsoleted)
+@@ -344,7 +344,7 @@
+
+ - Rewritten ConverterCore.. shouldn't break anything...
+
+-- gnupod_search.pl can now RENAME/Edit tags.
++- gnupod_search can now RENAME/Edit tags.
+ use --rename="artist=New artist Name"
+
+ - You can now sort playlists:
+@@ -422,8 +422,8 @@
- added tools/m4a-info.pl: Use this tool to read Title/Artist tags
from .m4a files (not installed by 'make install')
-@@ -425,7 +425,7 @@
- - You can modify the output of gnupod_search.pl using --view
- (See 'gnupod_search.pl --help')
--- gnupod_addsong.pl checks for wrong extensions
-+- gnupod_addsong checks for wrong extensions
+-- You can modify the output of gnupod_search.pl using --view
+- (See 'gnupod_search.pl --help')
++- You can modify the output of gnupod_search using --view
++ (See 'gnupod_search --help')
+
+ - gnupod_addsong.pl checks for wrong extensions
(like a mp3-file called 'test.wav'). The iPod wouldn't play
- such a file.
+@@ -598,7 +598,7 @@
+ I hope i didn't break anything.. but...
-@@ -452,7 +452,7 @@
- - I bought one myself
+-gnupod_search.pl:
++gnupod_search:
+ * -d doesn't delete all songs anymore.. hups..
+ * Playlist-Cleanup works now.. (another stupid bug.. :-/)
+ * Added '--title' switch to usage
+@@ -682,7 +682,7 @@
+ - Fixed 'creating playlists' sample in documentation.
+ - Firmware 1.1.0 can read FAT32, updatet documentation.
+ - gnupod_delete.pl doesn't kill regex playlists anymore (ouch)
+-- gnupod_search.pl supports -g(enre)
++- gnupod_search supports -g(enre)
+ (Thanks to Johan Ruttenberg)
--- gnupod_addsong.pl understands .m4a files
-+- gnupod_addsong understands .m4a files
- (= AAC Files written by iTunes)
- I don't know if it works with DRM files (.m4p?)
- I don't have any DRM files and i'm not interested
-@@ -476,7 +476,7 @@
- mktunes.pl will drop old (= now invalid) ratings,
- no autoconvert... sorry.. but does anyone care?
+ gnuPod 0.26
+--- gnupod-0.99.8/README 2022-07-17 23:08:21.877954815 +1400
++++ gnupod-0.99.8/README.new 2022-07-17 23:08:21.925954815 +1400
+@@ -33,7 +33,7 @@
+ gnupod_addsong.pl Add files
+ gnupod_check Check for 'zombie' files
+ gnupod_otgsync Handles On-The-Go Sync (not for humans)
+-gnupod_search.pl Search ;)
++gnupod_search Search ;)
+ mktunes Convert the GNUtunesDB.xml to a iTunesDB
+ tunes2pod Convert the iTunesDB into a GNUtunesDB.xml
--- gnupod_addsong.pl understands ID3v2.2 tags
-+- gnupod_addsong understands ID3v2.2 tags
+Patched gnupod-0.99.8/man/gnupod_addsong.pl.1.gz
+--- gnupod-0.99.8/BUGS 2022-07-17 23:08:21.609954815 +1400
++++ gnupod-0.99.8/BUGS.new 2022-07-17 23:08:21.937954815 +1400
+@@ -3,7 +3,7 @@
+ * GNUpod doesn't like duplicate id's in the GNUtunesDB.xml (/dev/null | tail +4
+--- gnupod-0.99.8/doc/gnupod.info 2022-07-17 23:08:21.897954815 +1400
++++ gnupod-0.99.8/doc/gnupod.info.new 2022-07-17 23:08:21.945954815 +1400
@@ -469,23 +469,23 @@
4.3 Add files
=============
@@ -1846,7 +2864,7 @@
Don't forget to run mktunes before umounting! (See 'Unplug the iPod')
@@ -637,14 +637,14 @@
- Such a playlist will show up as a Podcast after running mktunes.pl
+ Such a playlist will show up as a Podcast after running mktunes
- gnupod_addsong.pl can also download podcasts and create such
+ gnupod_addsong can also download podcasts and create such
@@ -1871,7 +2889,7 @@
+switch of `gnupod_addsong'. Example:
+ gnupod_addsong --artwork cover.jpg *.mp3
- Use `gnupod_search.pl' to change/add artwork for existing files.
+ Use `gnupod_search' to change/add artwork for existing files.
Example:
@@ -730,12 +730,12 @@
@@ -1892,14 +2910,25 @@
@@ -845,7 +845,7 @@
and iTunes)
- Only mktunes.pl and tunes2pod have to worry about the iTunesDB
+ Only mktunes and tunes2pod have to worry about the iTunesDB
-format: all other tools (gnupod_addsong.pl for example) only have to
+format: all other tools (gnupod_addsong for example) only have to
deal with the XML file called GNUtunesDB.
It's important to keep the iTunesDB and GNUtunesDB 'in sync', so
---- gnupod-0.99.8/doc/gnupod.html 2021-06-13 14:44:53.824321422 -1200
-+++ gnupod-0.99.8/doc/gnupod.html.new 2021-06-13 14:44:54.100312313 -1200
+--- gnupod-0.99.8/doc/gnupodrc.example 2022-07-17 23:08:21.901954815 +1400
++++ gnupod-0.99.8/doc/gnupodrc.example.new 2022-07-17 23:08:21.949954815 +1400
+@@ -58,7 +58,7 @@
+ # gnupod_search.match-once = 1
+
+
+-# *** gnupod_addsong.pl ***
++# *** gnupod_addsong ***
+
+ ## Disable ID3V2 Tag reading
+ # gnupod_addsong.disable-v2 = 1
+--- gnupod-0.99.8/doc/gnupod.html 2022-07-17 23:08:21.905954815 +1400
++++ gnupod-0.99.8/doc/gnupod.html.new 2022-07-17 23:08:21.953954815 +1400
@@ -661,26 +661,26 @@
@@ -1960,7 +2989,7 @@
@@ -914,14 +914,14 @@
- Such a playlist will show up as a Podcast after running mktunes.pl
+ Such a playlist will show up as a Podcast after running mktunes
-gnupod_addsong.pl can also download podcasts and create such playlists itself:
@@ -1987,7 +3016,7 @@
+ | | gnupod_addsong --artwork cover.jpg *.mp3
|
- Use gnupod_search.pl to change/add artwork for existing files. Example:
+ Use gnupod_search to change/add artwork for existing files. Example:
@@ -1047,14 +1047,14 @@
@@ -2009,14 +3038,14 @@
@@ -1218,7 +1218,7 @@
- Only mktunes.pl and tunes2pod have to worry about the iTunesDB format: all other tools
+ Only mktunes and tunes2pod have to worry about the iTunesDB format: all other tools
-(gnupod_addsong.pl for example) only have to deal with the XML file called GNUtunesDB.
+(gnupod_addsong for example) only have to deal with the XML file called GNUtunesDB.
It's important to keep the iTunesDB and GNUtunesDB 'in sync', so everytime you change the
---- gnupod-0.99.8/doc/gnupod.texi 2021-06-13 14:44:53.832321159 -1200
-+++ gnupod-0.99.8/doc/gnupod.texi.new 2021-06-13 14:44:54.108312049 -1200
+--- gnupod-0.99.8/doc/gnupod.texi 2022-07-17 23:08:21.909954815 +1400
++++ gnupod-0.99.8/doc/gnupod.texi.new 2022-07-17 23:08:21.957954815 +1400
@@ -486,39 +486,39 @@
@node Add files
@section Add files
@@ -2094,7 +3123,7 @@
podcast playlists you just need to set the podcast flag to '1':
@@ -671,14 +671,14 @@
- Such a playlist will show up as a Podcast after running mktunes.pl
+ Such a playlist will show up as a Podcast after running mktunes
-gnupod_addsong.pl can also download podcasts and create such playlists itself:
+gnupod_addsong can also download podcasts and create such playlists itself:
@@ -2143,106 +3172,14 @@
@@ -870,7 +870,7 @@
iPod and iTunes)
- Only mktunes.pl and tunes2pod have to worry about the iTunesDB format: all other tools
+ Only mktunes and tunes2pod have to worry about the iTunesDB format: all other tools
-(gnupod_addsong.pl for example) only have to deal with the XML file called GNUtunesDB.
+(gnupod_addsong for example) only have to deal with the XML file called GNUtunesDB.
It's important to keep the iTunesDB and GNUtunesDB 'in sync', so everytime you change the
- GNUtunesDB (by hand or using gnupod_something.pl) you'll have to run @code{@w{mktunes.pl}}.
---- gnupod-0.99.8/doc/gnupodrc.example 2021-06-13 14:44:53.840320895 -1200
-+++ gnupod-0.99.8/doc/gnupodrc.example.new 2021-06-13 14:44:54.116311785 -1200
-@@ -58,7 +58,7 @@
- # gnupod_search.match-once = 1
-
-
--# *** gnupod_addsong.pl ***
-+# *** gnupod_addsong ***
-
- ## Disable ID3V2 Tag reading
- # gnupod_addsong.disable-v2 = 1
---- gnupod-0.99.8/BUGS 2009-07-10 11:20:05.000000000 -1200
-+++ gnupod-0.99.8/BUGS.new 2021-06-13 14:44:54.124311521 -1200
-@@ -3,7 +3,7 @@
- * GNUpod doesn't like duplicate id's in the GNUtunesDB.xml (/dev/null | tail +4
---- gnupod-0.99.8/src/gnupod_check.pl 2021-06-13 14:44:53.652327100 -1200
-+++ gnupod-0.99.8/src/gnupod_check.pl.new 2021-06-13 14:44:54.144310860 -1200
+ GNUtunesDB (by hand or using gnupod_something.pl) you'll have to run @code{@w{mktunes}}.
+--- gnupod-0.99.8/src/gnupod_check.pl 2022-07-17 23:08:21.829954815 +1400
++++ gnupod-0.99.8/src/gnupod_check.pl.new 2022-07-17 23:08:21.961954815 +1400
@@ -85,7 +85,7 @@
if($TRACKER{ERR} > 25) {
print " -> I found MANY ($TRACKER{ERR}) errors. Maybe you should run\n";
@@ -2252,8 +3189,8 @@
print " but would cure your iPod for sure.\n";
}
}
---- gnupod-0.99.8/src/gnupod_addsong.pl 2021-06-13 14:44:53.688325911 -1200
-+++ gnupod-0.99.8/src/gnupod_addsong.pl.new 2021-06-13 14:44:54.148310729 -1200
+--- gnupod-0.99.8/src/gnupod_addsong.pl 2022-07-17 23:08:21.857954815 +1400
++++ gnupod-0.99.8/src/gnupod_addsong.pl.new 2022-07-17 23:08:21.969954815 +1400
@@ -37,7 +37,7 @@
use constant MACTIME => GNUpod::FooBar::MACTIME;
use vars qw(%opts %dupdb_normal %dupdb_lazy %dupdb_podcast $int_count %podcast_infos %podcast_channel_infos %per_file_info);
@@ -2290,1134 +3227,261 @@
Copyright (C) Adrian Ulrich 2002-2008
This is free software; see the source for copying conditions. There is NO
-Patched gnupod-0.99.8/man/gnupod_otgsync.pl.1.gz
---- gnupod-0.99.8/CHANGES 2021-06-13 14:44:54.068313369 -1200
-+++ gnupod-0.99.8/CHANGES.new 2021-06-13 14:44:54.168310068 -1200
-@@ -75,7 +75,7 @@
- Fixing xescaped to always do byte matching and added some debug
- output of dropped illegal characters.
- - FileMagic.pm: Remove trailing zeros from MP3 tags that come in utf16 or utf8.
--- gnupod_otgsync.pl: Marking files as played even when only the
-+- gnupod_otgsync: Marking files as played even when only the
- skipcount or bookmark is > 0.
- - gnupod_addsong: Added other sources for artist tag data from podcasts.
- Added "--podcast-artwork" option to download and add artwork to podcasts.
-@@ -510,7 +510,7 @@
- QTfile.pm
- * A dirty QuickTime parser
-
--gnupod_otgsync.pl
-+gnupod_otgsync
- * A new tool, don't use it yourself :)
- It's only used internal.
+--- gnupod-0.99.8/README.about_m4a 2022-07-17 23:08:21.669954815 +1400
++++ gnupod-0.99.8/README.about_m4a.new 2022-07-17 23:08:21.973954815 +1400
+@@ -27,9 +27,9 @@
+
+ Example: faac -w --title mytitle file.wav
---- gnupod-0.99.8/tools/otgtest.pl 2009-07-10 11:20:05.000000000 -1200
-+++ gnupod-0.99.8/tools/otgtest.pl.new 2021-06-13 14:44:54.176309804 -1200
-@@ -15,7 +15,7 @@
- ####################################################
- # Worker
- sub go {
-- #Disable auto-run of tunes2pod or gnupod_otgsync.pl
-+ #Disable auto-run of tunes2pod or gnupod_otgsync
- $opts{_no_sync} = 1;
- my $con = GNUpod::FooBar::connect(\%opts);
- usage($con->{status}."\n") if $con->{status};
---- gnupod-0.99.8/README 2021-06-13 14:44:54.128311389 -1200
-+++ gnupod-0.99.8/README.new 2021-06-13 14:44:54.184309541 -1200
-@@ -32,7 +32,7 @@
- gnupod_INIT INIT a new iPod (create empty Database + Directories)
- gnupod_addsong Add files
- gnupod_check Check for 'zombie' files
--gnupod_otgsync.pl Handles On-The-Go Sync (not for humans)
-+gnupod_otgsync Handles On-The-Go Sync (not for humans)
- gnupod_search.pl Search ;)
- mktunes.pl Convert the GNUtunesDB.xml to a iTunesDB
- tunes2pod Convert the iTunesDB into a GNUtunesDB.xml
---- gnupod-0.99.8/src/ext/FooBar.pm 2021-06-13 14:44:53.896319046 -1200
-+++ gnupod-0.99.8/src/ext/FooBar.pm.new 2021-06-13 14:44:54.192309276 -1200
-@@ -164,11 +164,11 @@
- }
+-Now you can add the file using gnupod_addsong.pl
++Now you can add the file using gnupod_addsong
- ######################################################################
--# Call gnupod_otgsync.pl
-+# Call gnupod_otgsync
- sub StartOnTheGoSync {
- my($con) = @_;
-
-- my $XBIN = "$con->{bindir}/gnupod_otgsync.pl";
-+ my $XBIN = "$con->{bindir}/gnupod_otgsync";
-
- if(-x $XBIN) {
- {
---- gnupod-0.99.8/src/gnupod_otgsync.pl 2021-06-13 14:44:53.900318914 -1200
-+++ gnupod-0.99.8/src/gnupod_otgsync.pl.new 2021-06-13 14:44:54.204308880 -1200
-@@ -63,7 +63,7 @@
- usage($con->{status}."\n") if $con->{status};
-
- if(GNUpod::FooBar::ItunesDBNeedsSync($con)) {
-- die "gnupod_otgsync.pl: Bug detected! You need to run tunes2pod -> Sync broken!\n";
-+ die "gnupod_otgsync: Bug detected! You need to run tunes2pod -> Sync broken!\n";
- }
-
- ##Check if GNUtunesDB <-> iTunesDB is really in-sync
-Patched gnupod-0.99.8/man/mktunes.pl.1.gz
---- gnupod-0.99.8/README.developer 2021-06-13 14:44:53.792322478 -1200
-+++ gnupod-0.99.8/README.developer.new 2021-06-13 14:44:54.224308220 -1200
-@@ -6,9 +6,9 @@
- Minimal testing:
- > gnupod_INIT /mnt/empty
- > gnupod_addsong
--> mktunes.pl
-+> mktunes
- > tunes2pod --force
--> mktunes.pl
-+> mktunes
- > check if your ipod can read the result
+-# gnupod_addsong.pl file.m4a
++# gnupod_addsong file.m4a
+ # mktunes
- Release checklist
---- gnupod-0.99.8/CHANGES 2021-06-13 14:44:54.168310068 -1200
-+++ gnupod-0.99.8/CHANGES.new 2021-06-13 14:44:54.228308088 -1200
-@@ -46,7 +46,7 @@
- NEW: Set addtime to a fixed value when doing autotests.
- NEW: Added check for "autotest" file at the ipod mountpoint.
- NEW: The connection hash was expanded by a "autotest" key.
-- NEW: Added "--fwguid" option to gnupod_INIT to be passed on to mktunes.pl.
-+ NEW: Added "--fwguid" option to gnupod_INIT to be passed on to mktunes.
+ :)
+--- gnupod-0.99.8/CHANGES 2022-07-17 23:08:21.921954815 +1400
++++ gnupod-0.99.8/CHANGES.new 2022-07-17 23:08:21.977954815 +1400
+@@ -60,7 +60,7 @@
+ flooded me with patches, many thanks to him:
+ - Fix DBID width in gnupod_search output
+ - Added --bitrate switch to gnupod_search
+-- Added --podcast-files-limit switch to gnupod_addsong.pl
++- Added --podcast-files-limit switch to gnupod_addsong
+ - Added Podcast-Date patch (GNUpod now depends on Date::Parse)
+ - Added --unique switch to extractArtwork.pl
+ - Added xescaped() patch. GNUpod will now store
+@@ -77,7 +77,7 @@
+ - FileMagic.pm: Remove trailing zeros from MP3 tags that come in utf16 or utf8.
+ - gnupod_otgsync: Marking files as played even when only the
+ skipcount or bookmark is > 0.
+-- gnupod_addsong.pl: Added other sources for artist tag data from podcasts.
++- gnupod_addsong: Added other sources for artist tag data from podcasts.
+ Added "--podcast-artwork" option to download and add artwork to podcasts.
+ Added "--podcast-cache-dir" option allow caching of podcast media files.
+ Fixed podcast XML parser handlers to merge CDATA that comes in chunks.
+@@ -93,7 +93,7 @@
+ - Use udevinfo to find the iPods Firewire-GUID (as /proc/bus/usb/devices is depricated)
+ - Support for iPhone: Edit ~/.gnupodrc and add 'model = iphone'
+ - Some documentation 'fixes', thanks a lot to Toby Cabot
+-- gnupod_addsong.pl: replace wget with curl
++- gnupod_addsong: replace wget with curl
+ - Use binmode() more often to help Win32
- *** OLD STUFF ***
-@@ -118,7 +118,7 @@
- -------
- - Added README_FIRMWARE.txt file
- - Added compilation-patch, thanks to Ray Lortie
--- Rewrote mktunes.pl to be faster and more readable :-)
-+- Rewrote mktunes to be faster and more readable :-)
- - Added support for 2007-iPods (iPod Classic, iPod Nano-2 and iPod Touch (?) )
-
- Apple attempted to lockout non-iTunes software by implementing an obscure
-@@ -161,8 +161,8 @@
+@@ -155,9 +155,9 @@
+ - Filter out bad chars from '--rename' command.
+ - Added RVA2 (Normalize) patch by Peter Liljenberg
+ - gnupod_INIT: Added --noask option
+-- gnupod_addsong.pl: --playlist can now be used multiple times
+-- gnupod_addsong.pl: added --playlist-is-podcast command
+-- gnupod_addsong.pl: Added workaround for glibc/linux/perl bug/problem (realloc() error)
++- gnupod_addsong: --playlist can now be used multiple times
++- gnupod_addsong: added --playlist-is-podcast command
++- gnupod_addsong: Added workaround for glibc/linux/perl bug/problem (realloc() error)
- Raised video-bitrate for on-the-fly converting
- Added configuration option 'automktunes'. Setting
'automktunes = 1' inside ~/.gnupodrc eliminates the need
-- to call mktunes.pl after adding/deleting/renaming songs because GNUpod
-- will call mktunes.pl itself.
-+ to call mktunes after adding/deleting/renaming songs because GNUpod
-+ will call mktunes itself.
- - Many internal changes / bugfixes to iTunesDB.pm like fixing an incorrect
- written mhip size. Playlist parsing has also been rewritten and cleaned up.
- - Bugfix: Do not detect PCM files as movies when using --decode
-@@ -222,7 +222,7 @@
- - gnupod_addsong can now fetch podcast-rss feeds!
- Example: 'gnupod_addsong http://www.tagesschau.de/export/podcast'
-
--- Added basic support for podcast-rss and podcast-guid in tunes2pod and mktunes.pl
-+- Added basic support for podcast-rss and podcast-guid in tunes2pod and mktunes
-
- - Fixed small bug in FileMagic.pm: UTF16-Tags didn't work.
- Thanks to Chris Abajian for reporting this issue.
-@@ -292,7 +292,7 @@
- - Added support for m4a 'gnre' tags
-
- - Fixed some iPod-Shuffle issues
-- * mktunes.pl removes the iTunesShuffle leftover
-+ * mktunes removes the iTunesShuffle leftover
-
- - Remove TARGET-File if File::Copy() failed for any reason
- => Better handling of 'disk full' but still not perfect
-@@ -473,7 +473,7 @@
-
- - Changed rating-schema to match SPL-Rating
- -> Rating 5 is now 100 (newrating=oldrating*20)
-- mktunes.pl will drop old (= now invalid) ratings,
-+ mktunes will drop old (= now invalid) ratings,
- no autoconvert... sorry.. but does anyone care?
-
- - gnupod_addsong understands ID3v2.2 tags
-@@ -557,7 +557,7 @@
- a 'feature' of iTunes)
- * Added 'eq syntax check', you can use (since 0.90)
- 'eq="#!#NUMBER#!#' to specify the EQ-Setting per song.
-- mktunes.pl will now check if this syntax is correct.
-+ mktunes will now check if this syntax is correct.
- (You'll see a warning if it failed)
- * Fixed get_string() to handle null-size strings correct
- * Changed some internal things (using hrefs.. etc)
-@@ -576,7 +576,7 @@
- * Added paranoia checks (stricter parsing)
- * Added SPL-Read code (BETA!)
-
--mktunes.pl
-+mktunes
- * Added SPL-Write support
- * regex-matches are sorted by id
-
-@@ -611,13 +611,13 @@
- * Added '--france' switch (Limit volume to 100 db for
- 1.x Firmware)
-
--mktunes.pl
-+mktunes
- * New Playlist-Code.. MUCH faster now
- (Wow.. again? no.. the code of 0.90 was
- VERY slow with many files (~3000) and more
- than ~15 big playlists)
- * Added '--volume' switch: Adjust the volume on the iPod!
-- Use something like 'mktunes.pl --volume 70' to boost
-+ Use something like 'mktunes --volume 70' to boost
- the volume by 70% (same as volume="70" in the GNUtunesDB)
-
- XMLhelper.pm
-@@ -671,9 +671,9 @@
- - Rewritten Playlistcode for tunes2pod
- - tunes2pod doesn't kill your empty GNUtunesDB anymore
- if it can't find the iTunesDB
--- mktunes.pl uses now binmode(), maybe this helps
-+- mktunes uses now binmode(), maybe this helps
- RedHat 8 ? .. (and win32 ;) )
--- mktunes.pl is now *much* faster!!
-+- mktunes is now *much* faster!!
- - the GNUtunesDB written by gnupod_delete.pl looks
- nicer now :) (id= is now always the first element..)
-
-@@ -698,7 +698,7 @@
- written by MusicMatch
- - Playlists are now sorted on the iPod as they are found
- in the GNUtunesDB - file
--- mktunes.pl no longer accepts when was
-+- mktunes no longer accepts when was
- not found.
- - gnupod_addsong handles long filenames now better
- - Timestamp should now be set correct
---- gnupod-0.99.8/README.about_m4a 2021-06-13 14:44:54.084312841 -1200
-+++ gnupod-0.99.8/README.about_m4a.new 2021-06-13 14:44:54.236307824 -1200
-@@ -30,6 +30,6 @@
- Now you can add the file using gnupod_addsong
-
- # gnupod_addsong file.m4a
--# mktunes.pl
-+# mktunes
-
- :)
---- gnupod-0.99.8/doc/gnupod.info 2021-06-13 14:44:54.092312577 -1200
-+++ gnupod-0.99.8/doc/gnupod.info.new 2021-06-13 14:44:54.244307560 -1200
-@@ -338,8 +338,8 @@
-
- Setup Firewire (or USB) as described in 'Using FireWire with
- GNU/Linux', load the modules and make sure that sbp2 detected your iPod.
--Mount the iPod and run `mktunes.pl' to bring the device into a 'clean'
--state. Unmount the iPod after mktunes.pl finishes but do *not* unplug
-+Mount the iPod and run `mktunes' to bring the device into a 'clean'
-+state. Unmount the iPod after mktunes finishes but do *not* unplug
- the iPod. Ready? Ok, we assume your iPod is `/dev/sda':
-
- First you need to get a new Firmware image. Checkout the latest
-@@ -545,7 +545,7 @@
- This example searches all files from 'Alfred Neumann', changes the
- artist into 'John Doe' and sets the rating to 5 Stars (5*20=100)
-
-- Don't forget to run mktunes.pl!
-+ Don't forget to run mktunes!
-
- You could also edit the GNUtunesDB.xml with a text editor :-)
-
-@@ -635,7 +635,7 @@
-
-
-
-- Such a playlist will show up as a Podcast after running mktunes.pl
-+ Such a playlist will show up as a Podcast after running mktunes
-
- gnupod_addsong can also download podcasts and create such
- playlists itself:
-@@ -679,7 +679,7 @@
- # Set cover.jpg as artwork for all songs that match album =~ /Katamari/i
- gnupod_search.pl --artwork cover.jpg --album Katamari
-
-- don't forget to run `mktunes.pl' afterwards.
-+ don't forget to run `mktunes' afterwards.
-
- Note: Artwork added by GNUpod may vanish after using iTunes: GNUpod
- does not inject the artwork into the id3-header of the file. If iTunes
-@@ -692,28 +692,28 @@
- 4.10 Unplug the iPod
- ====================
-
--Before umounting the iPod, you have to call `mktunes.pl' which will
-+Before umounting the iPod, you have to call `mktunes' which will
- parse the GNUtunesDB XML file and convert it into the iTunesDB format.
-
- Simply run
-- mktunes.pl -m /mnt/ipod
-+ mktunes -m /mnt/ipod
-
-- Note: Since GNUpod 0.91, mktunes.pl has a '-volume' option which you
-+ Note: Since GNUpod 0.91, mktunes has a '-volume' option which you
- can use to boost the Volume.
-
-- mktunes.pl -m /mnt/ipod --volume 40
-+ mktunes -m /mnt/ipod --volume 40
-
- This would adjust the volume +40 percent. (You can also use '-100'
- to get a silent iPod ;) )
-
-- After `mktunes.pl' is done, you can umount the iPod and remove the
-+ After `mktunes' is done, you can umount the iPod and remove the
- sbp2 module
- umount /mnt/ipod
- rmmod sbp2
-
- Added songs won't be visible on the iPod if you did not run
--mktunes.pl before umounting the iPod. (If you forgot to run
--`mktunes.pl' before unpluging/umounting, simply mount the iPod again
-+mktunes before umounting the iPod. (If you forgot to run
-+`mktunes' before unpluging/umounting, simply mount the iPod again
- and run it)
-
-
-@@ -803,7 +803,7 @@
- should be autodetected on GNU/Linux (via `/proc/bus/usb/devices') and
- Solaris (via `prtconf -v'). If GNUpod somehow fails to find the
- correct serial number of your iPod you'll have to specify the correct
--value using the `--fwguid' switch of `mktunes.pl'.
-+value using the `--fwguid' switch of `mktunes'.
-
-
- File: gnupod.info, Node: Problems, Next: GNU Free Documentation License, Prev: Using GNUpod, Up: Top
-@@ -840,17 +840,17 @@
- understand by humans and easy to edit by hand.
-
- Everytime you run `tunes2pod', the iTunesDB will get parsed and
--converted into an XML File (the GNUtunesDB). `mktunes.pl' does the
-+converted into an XML File (the GNUtunesDB). `mktunes' does the
- opposite: it parses the XML file and creates an iTunesDB (for the iPod
- and iTunes)
-
-- Only mktunes.pl and tunes2pod have to worry about the iTunesDB
-+ Only mktunes and tunes2pod have to worry about the iTunesDB
- format: all other tools (gnupod_addsong for example) only have to
- deal with the XML file called GNUtunesDB.
-
- It's important to keep the iTunesDB and GNUtunesDB 'in sync', so
- everytime you change the GNUtunesDB (by hand or using
--gnupod_something.pl) you'll have to run `mktunes.pl'.
-+gnupod_something.pl) you'll have to run `mktunes'.
-
- If 'you' changed the iTunesDB (using gtkPod/iTunes/Ehpod), run
- `tunes2pod' *before* using any other GNUpod commands.
---- gnupod-0.99.8/doc/gnupod.html 2021-06-13 14:44:54.100312313 -1200
-+++ gnupod-0.99.8/doc/gnupod.html.new 2021-06-13 14:44:54.256307164 -1200
-@@ -475,7 +475,7 @@
-
-
- Setup Firewire (or USB) as described in 'Using FireWire with GNU/Linux', load the modules and make sure that sbp2 detected your iPod.
--Mount the iPod and run mktunes.pl to bring the device into a 'clean' state. Unmount the iPod after mktunes.pl finishes
-+Mount the iPod and run mktunes to bring the device into a 'clean' state. Unmount the iPod after mktunes finishes
- but do *not* unplug the iPod. Ready? Ok, we assume your iPod is /dev/sda:
-
-
-@@ -784,7 +784,7 @@
- sets the rating to 5 Stars (5*20=100)
-
-
--Don't forget to run mktunes.pl!
-+Don't forget to run mktunes!
-
-
- You could also edit the GNUtunesDB.xml with a text editor :-)
-@@ -911,7 +911,7 @@
- </playlist>
- |
-
--Such a playlist will show up as a Podcast after running mktunes.pl
-+Such a playlist will show up as a Podcast after running mktunes
-
-
- gnupod_addsong can also download podcasts and create such playlists itself:
-@@ -967,7 +967,7 @@
- gnupod_search.pl --artwork cover.jpg --album Katamari
- |
-
--don't forget to run mktunes.pl afterwards.
-+don't forget to run mktunes afterwards.
-
-
- Note: Artwork added by GNUpod may vanish after using iTunes: GNUpod does not inject the artwork into the id3-header of the file.
-@@ -992,32 +992,32 @@
-
-
-
--Before umounting the iPod, you have to call mktunes.pl which will
-+Before umounting the iPod, you have to call mktunes which will
- parse the GNUtunesDB XML file and convert it into the iTunesDB format.
-
-
- Simply run
-- | | mktunes.pl -m /mnt/ipod
-+
-
--Note: Since GNUpod 0.91, mktunes.pl has a '--volume' option which you can use to
-+Note: Since GNUpod 0.91, mktunes has a '--volume' option which you can use to
- boost the Volume.
-
-
-- | | mktunes.pl -m /mnt/ipod --volume 40
-+ | | mktunes -m /mnt/ipod --volume 40
- |
-
- This would adjust the volume +40 percent. (You can also use '-100' to get
- a silent iPod ;) )
-
-
--After mktunes.pl is done, you can umount the iPod and remove the sbp2 module
-+After mktunes is done, you can umount the iPod and remove the sbp2 module
- | | umount /mnt/ipod
- rmmod sbp2
- |
-
--Added songs won't be visible on the iPod if you did not run mktunes.pl before umounting the iPod.
--(If you forgot to run mktunes.pl before unpluging/umounting, simply mount the iPod again and run it)
-+Added songs won't be visible on the iPod if you did not run mktunes before umounting the iPod.
-+(If you forgot to run mktunes before unpluging/umounting, simply mount the iPod again and run it)
-
-
-
-@@ -1147,7 +1147,7 @@
- non-apple software. GNUpod is able to create the required hash value if it knows the iPods serial number, this is a 16 chars long hex
- value such as: 000ba3100310abcf and should be autodetected on GNU/Linux (via /proc/bus/usb/devices) and Solaris (via prtconf -v).
- If GNUpod somehow fails to find the correct serial number of your iPod you'll have to specify the correct value using the --fwguid switch
--of mktunes.pl.
-+of mktunes.
-
-
-
-@@ -1213,16 +1213,16 @@
-
- Everytime you run tunes2pod, the iTunesDB will get parsed and converted into an
- XML File (the GNUtunesDB).
--mktunes.pl does the opposite: it parses the XML file and creates an iTunesDB (for the
-+mktunes does the opposite: it parses the XML file and creates an iTunesDB (for the
- iPod and iTunes)
-
-
--Only mktunes.pl and tunes2pod have to worry about the iTunesDB format: all other tools
-+Only mktunes and tunes2pod have to worry about the iTunesDB format: all other tools
- (gnupod_addsong for example) only have to deal with the XML file called GNUtunesDB.
-
-
- It's important to keep the iTunesDB and GNUtunesDB 'in sync', so everytime you change the
--GNUtunesDB (by hand or using gnupod_something.pl) you'll have to run mktunes.pl.
-+GNUtunesDB (by hand or using gnupod_something.pl) you'll have to run mktunes.
-
-
- If 'you' changed the iTunesDB (using gtkPod/iTunes/Ehpod), run tunes2pod *before*
---- gnupod-0.99.8/doc/gnupod.texi 2021-06-13 14:44:54.108312049 -1200
-+++ gnupod-0.99.8/doc/gnupod.texi.new 2021-06-13 14:44:54.264306900 -1200
-@@ -359,7 +359,7 @@
- Note: These steps do not work on late 2007 iPods (such as Classic, Touch and 3th gen. Nano).
-
- Setup Firewire (or USB) as described in 'Using FireWire with GNU/Linux', load the modules and make sure that sbp2 detected your iPod.
--Mount the iPod and run @code{@w{mktunes.pl}} to bring the device into a 'clean' state. Unmount the iPod after mktunes.pl finishes
-+Mount the iPod and run @code{@w{mktunes}} to bring the device into a 'clean' state. Unmount the iPod after mktunes finishes
- but do *not* unplug the iPod. Ready? Ok, we assume your iPod is @code{@w{/dev/sda}}:
-
- First you need to get a new Firmware image.
-@@ -561,7 +561,7 @@
- This example searches all files from 'Alfred Neumann', changes the artist into 'John Doe' and
- sets the rating to 5 Stars (5*20=100)
-
--Don't forget to run mktunes.pl!
-+Don't forget to run mktunes!
-
- You could also edit the GNUtunesDB.xml with a text editor :-)
-
-@@ -669,7 +669,7 @@
-
- @end example
-
--Such a playlist will show up as a Podcast after running mktunes.pl
-+Such a playlist will show up as a Podcast after running mktunes
-
- gnupod_addsong can also download podcasts and create such playlists itself:
-
-@@ -718,7 +718,7 @@
- gnupod_search.pl --artwork cover.jpg --album Katamari
- @end example
-
--don't forget to run @code{@w{mktunes.pl}} afterwards.
-+don't forget to run @code{@w{mktunes}} afterwards.
-
- Note: Artwork added by GNUpod may vanish after using iTunes: GNUpod does not inject the artwork into the id3-header of the file.
- If iTunes finds such a file (while scanning / changing tags) the artwork may get dropped.
-@@ -727,32 +727,32 @@
- @node Unplug the iPod
- @section Unplug the iPod
-
--Before umounting the iPod, you have to call @code{@w{mktunes.pl}} which will
-+Before umounting the iPod, you have to call @code{@w{mktunes}} which will
- parse the GNUtunesDB XML file and convert it into the iTunesDB format.
-
- Simply run
- @example
--mktunes.pl -m /mnt/ipod
-+mktunes -m /mnt/ipod
- @end example
-
--Note: Since GNUpod 0.91, mktunes.pl has a '--volume' option which you can use to
-+Note: Since GNUpod 0.91, mktunes has a '--volume' option which you can use to
- boost the Volume.
-
- @example
--mktunes.pl -m /mnt/ipod --volume 40
-+mktunes -m /mnt/ipod --volume 40
- @end example
-
- This would adjust the volume +40 percent. (You can also use '-100' to get
- a silent iPod ;) )
-
--After @code{@w{mktunes.pl}} is done, you can umount the iPod and remove the sbp2 module
-+After @code{@w{mktunes}} is done, you can umount the iPod and remove the sbp2 module
- @example
- umount /mnt/ipod
- rmmod sbp2
- @end example
-
--Added songs won't be visible on the iPod if you did not run mktunes.pl before umounting the iPod.
--(If you forgot to run @code{@w{mktunes.pl}} before unpluging/umounting, simply mount the iPod again and run it)
-+Added songs won't be visible on the iPod if you did not run mktunes before umounting the iPod.
-+(If you forgot to run @code{@w{mktunes}} before unpluging/umounting, simply mount the iPod again and run it)
-
-
- @node Recovering files
-@@ -832,7 +832,7 @@
- non-apple software. GNUpod is able to create the required hash value if it knows the iPods serial number, this is a 16 chars long hex
- value such as: @code{000ba3100310abcf} and should be autodetected on GNU/Linux (via @code{/proc/bus/usb/devices}) and Solaris (via @code{prtconf -v}).
- If GNUpod somehow fails to find the correct serial number of your iPod you'll have to specify the correct value using the @code{--fwguid} switch
--of @code{mktunes.pl}.
-+of @code{mktunes}.
-
- @c ===========================================================================================
-
-@@ -866,14 +866,14 @@
-
- Everytime you run @code{@w{tunes2pod}}, the iTunesDB will get parsed and converted into an
- XML File (the GNUtunesDB).
--@code{@w{mktunes.pl}} does the opposite: it parses the XML file and creates an iTunesDB (for the
-+@code{@w{mktunes}} does the opposite: it parses the XML file and creates an iTunesDB (for the
- iPod and iTunes)
-
--Only mktunes.pl and tunes2pod have to worry about the iTunesDB format: all other tools
-+Only mktunes and tunes2pod have to worry about the iTunesDB format: all other tools
- (gnupod_addsong for example) only have to deal with the XML file called GNUtunesDB.
-
- It's important to keep the iTunesDB and GNUtunesDB 'in sync', so everytime you change the
--GNUtunesDB (by hand or using gnupod_something.pl) you'll have to run @code{@w{mktunes.pl}}.
-+GNUtunesDB (by hand or using gnupod_something.pl) you'll have to run @code{@w{mktunes}}.
-
- If 'you' changed the iTunesDB (using gtkPod/iTunes/Ehpod), run @code{@w{tunes2pod}} *before*
- using any other GNUpod commands.
---- gnupod-0.99.8/doc/gnupodrc.example 2021-06-13 14:44:54.116311785 -1200
-+++ gnupod-0.99.8/doc/gnupodrc.example.new 2021-06-13 14:44:54.276306504 -1200
-@@ -22,9 +22,9 @@
- ## * nano_4g (the late 2008 nano)
- # model = video
-
--## Let GNUpod call mktunes.pl itself.
-+## Let GNUpod call mktunes itself.
- ## This may cause a slow-down when dealing with
--## large databases on slow CPUs because mktunes.pl
-+## large databases on slow CPUs because mktunes
- ## may take some time to complete
- # automktunes = 1
-
-@@ -32,7 +32,7 @@
-
- ##### NON GLOBAL OPTIONS ######
-
--# *** mktunes.pl ***
-+# *** mktunes ***
- ## Specify the iPods name
- # mktunes.ipod-name = Wurstli
-
-@@ -46,7 +46,7 @@
- # tunes2pod.force = 1
-
-
--# *** mktunes.pl ***
-+# *** mktunes ***
- ## Set --volume boost to +10 percent
- # mktunes.volume = +10
- ## Enforce iPod serial number:
---- gnupod-0.99.8/BUGS 2021-06-13 14:44:54.124311521 -1200
-+++ gnupod-0.99.8/BUGS.new 2021-06-13 14:44:54.280306372 -1200
-@@ -5,5 +5,5 @@
- * GNUpod doen't like audible.com files (I'll have to look at this later...)
- * gnupod_addsong --restore doesn't remove the '\d+_' prefix from
- files without tags
--* mktunes.pl -v 0 doesn't overwrite config value
-+* mktunes -v 0 doesn't overwrite config value
- See -> TODO
---- gnupod-0.99.8/README 2021-06-13 14:44:54.184309541 -1200
-+++ gnupod-0.99.8/README.new 2021-06-13 14:44:54.288306108 -1200
-@@ -34,10 +34,10 @@
- gnupod_check Check for 'zombie' files
- gnupod_otgsync Handles On-The-Go Sync (not for humans)
- gnupod_search.pl Search ;)
--mktunes.pl Convert the GNUtunesDB.xml to a iTunesDB
-+mktunes Convert the GNUtunesDB.xml to a iTunesDB
- tunes2pod Convert the iTunesDB into a GNUtunesDB.xml
-
--You'll have to use mktunes.pl if you added/deleted/changed something
-+You'll have to use mktunes if you added/deleted/changed something
- on the iPod.
-
-
---- gnupod-0.99.8/FAQ 2021-06-13 14:44:54.136311125 -1200
-+++ gnupod-0.99.8/FAQ.new 2021-06-13 14:44:54.296305844 -1200
-@@ -60,13 +60,13 @@
- 1 Mount the iPod (eg. /mnt/ipod)
- 2 run gnupod_INIT -m /mnt/ipod
- 3 add songs using 'gnupod_addsong -m /mnt/ipod *blabla.mp3
-- 4 build the iTunesDB using mktunes: 'mktunes.pl -m /mnt/ipod'
-+ 4 build the iTunesDB using mktunes: 'mktunes -m /mnt/ipod'
- 5 umount the iPod and enjoy!
-
- If you add more songs, repeat step 1-5 (without step 2!) :
- 1 Mount the iPod
- 2 use gnupod_addsong
-- 3 build the database with mktunes.pl
-+ 3 build the database with mktunes
- 4 umount
-
- Please read the README file and the info page
-@@ -83,7 +83,7 @@
-
- But there are some GNUpod 'forks'
-
--- GTKpod http://gtkpod.sf.net ('Inspired' by mktunes.pl / iTunesDB.pm)
-+- GTKpod http://gtkpod.sf.net ('Inspired' by mktunes / iTunesDB.pm)
- - Rhythmbox http://www.rhythmbox.org/ (Uses GTKpod code)
+@@ -184,13 +184,13 @@
+ -------
- (..and some companies created commercial iPod apps.. and i'm sure
-@@ -166,7 +166,7 @@
- To fix it:
- - Open the GNUtunesDB.xml (/mnt/ipod/iPod_Control/.gnupod/)
- - Search the faulty entries, fix them and save
--- Run mktunes.pl to update the iPod.
-+- Run mktunes to update the iPod.
+ - iPod-Video support
+- gnupod_addsong.pl can now read/add .mp4 files
++ gnupod_addsong can now read/add .mp4 files
+ Converting .avi (RIFF) files on-the-fly works
+ only IF your ffmpeg binary has AAC Support!
+ (Adding preencoded files works witout ffmpeg)
- 10. Why?
-@@ -190,7 +190,7 @@
- But the iTunesDB-format isn't so complicated if you know how to
- write the specific parts and how you'll have to assemble
- them.
--Just have a look at iTunesDB.pm and tunes2pod+mktunes.pl
-+Just have a look at iTunesDB.pm and tunes2pod+mktunes
+- Try: gnupod_addsong.pl --decode=video *.avi
++ Try: gnupod_addsong --decode=video *.avi
- ..or feel free to ask me questions about it:
-
---- gnupod-0.99.8/src/gnupod_INIT.pl 2021-06-13 14:44:53.864320103 -1200
-+++ gnupod-0.99.8/src/gnupod_INIT.pl.new 2021-06-13 14:44:54.304305579 -1200
-@@ -120,9 +120,9 @@
- $t2pfail = system("$con->{bindir}/tunes2pod", "--force", "-m", $opts{mount});
- }
- else {
-- #No iTunesDB, run mktunes.pl
-- print "No iTunesDB found, running mktunes.pl\n";
-- my @mktunescmd = ("$con->{bindir}/mktunes.pl", "-m" ,"$opts{mount}");
-+ #No iTunesDB, run mktunes
-+ print "No iTunesDB found, running mktunes\n";
-+ my @mktunescmd = ("$con->{bindir}/mktunes", "-m" ,"$opts{mount}");
- if ($opts{'fwguid'}) { push @mktunescmd, "-g", "$opts{fwguid}"; }
- $t2pfail = system(@mktunescmd);
- }
-@@ -150,12 +150,12 @@
- --version output version information and exit
- -m, --mount=directory iPod mountpoint, default is \$IPOD_MOUNTPOINT
- -d, --disable-convert Don't try to convert an existing iTunesDB
-- -g, --fwguid=HEXVAL FirewireGuid / Serial of connected iPod (passed to mktunes.pl)
-+ -g, --fwguid=HEXVAL FirewireGuid / Serial of connected iPod (passed to mktunes)
- -f, --france Limit volume to 100dB (For French-Law/People)
- Maximal-volume without this is ~104dB (VERY LOUD)
- *WARNING* This works only for iPods running
- Firmware 1.x (1st & 2nd generation)
-- You can also use mktunes.pl '--volume PERCENT'
-+ You can also use mktunes '--volume PERCENT'
- to adjust the volume (Works with Firmware 1.x AND 2.x)
- --noask Do not wait for any user input
+ - Fixes a playlist problem with iTunes5 (new 100 Mhods)
---- gnupod-0.99.8/src/ext/FooBar.pm 2021-06-13 14:44:54.192309276 -1200
-+++ gnupod-0.99.8/src/ext/FooBar.pm.new 2021-06-13 14:44:54.308305448 -1200
-@@ -119,10 +119,10 @@
- }
+@@ -219,8 +219,8 @@
+ Summary
+ -------
- #######################################################################
--# Call mktunes.pl
-+# Call mktunes
- sub StartAutoMkTunes {
- my($con) = @_;
-- my $XBIN = "$con->{bindir}/mktunes.pl";
-+ my $XBIN = "$con->{bindir}/mktunes";
- if(-x $XBIN) {
- {
- local $ENV{IPOD_MOUNTPOINT} = $con->{mountpoint};
---- gnupod-0.99.8/src/ext/Mktunes.pm 2021-06-13 14:44:53.676326308 -1200
-+++ gnupod-0.99.8/src/ext/Mktunes.pm.new 2021-06-13 14:44:54.320305052 -1200
-@@ -327,7 +327,7 @@
- }
-
- unless(GNUpod::XMLhelper::get_splpref($name)->{liveupdate}) {
-- warn "mktunes.pl: warning: (pl: $name) Liveupdate disabled. Please set liveupdate=\"1\" if you don't want an empty playlist\n";
-+ warn "mktunes: warning: (pl: $name) Liveupdate disabled. Please set liveupdate=\"1\" if you don't want an empty playlist\n";
- }
-
- if(my $id = $item->{splcont}->{id}) { #We found an old id with disabled liveupdate, add it like a normal playlist:
---- gnupod-0.99.8/src/gnupod_addsong.pl 2021-06-13 14:44:54.148310729 -1200
-+++ gnupod-0.99.8/src/gnupod_addsong.pl.new 2021-06-13 14:44:54.328304787 -1200
-@@ -206,11 +206,11 @@
- #Use fixed addtime for autotests
- $fh->{addtime} = int($connection->{autotest} ? 42 : time())+MACTIME;
-
-- #Ugly workaround to avoid a warning while running mktunes.pl:
-+ #Ugly workaround to avoid a warning while running mktunes:
- #All (?) int-values returned by wtf_is won't go above 0xffffffff
- #Thats fine because almost everything inside an mhit can handle this.
- #But bpm and srate are limited to 0xffff
-- # -> We fix this silently to avoid ugly warnings while running mktunes.pl
-+ # -> We fix this silently to avoid ugly warnings while running mktunes
- $fh->{bpm} = 0xFFFF if $fh->{bpm} > 0xFFFF;
- $fh->{srate} = 0xFFFF if $fh->{srate} > 0xFFFF;
+-- gnupod_addsong.pl can now fetch podcast-rss feeds!
+- Example: 'gnupod_addsong.pl http://www.tagesschau.de/export/podcast'
++- gnupod_addsong can now fetch podcast-rss feeds!
++ Example: 'gnupod_addsong http://www.tagesschau.de/export/podcast'
---- gnupod-0.99.8/src/gnupod_otgsync.pl 2021-06-13 14:44:54.204308880 -1200
-+++ gnupod-0.99.8/src/gnupod_otgsync.pl.new 2021-06-13 14:44:54.332304655 -1200
-@@ -129,9 +129,9 @@
- sub newfile {
- my($el) = @_;
+ - Added basic support for podcast-rss and podcast-guid in tunes2pod and mktunes
-- #This has to be 'in-sync' with the mktunes.pl method
-+ #This has to be 'in-sync' with the mktunes method
- # (GNUtunesDB_id <-> iTunesDB_id)
-- # in mktunes.pl, every {file}->{id}));
---- gnupod-0.99.8/src/mktunes.pl 2021-06-13 14:44:53.700325516 -1200
-+++ gnupod-0.99.8/src/mktunes.pl.new 2021-06-13 14:44:54.340304392 -1200
-@@ -37,7 +37,7 @@
- my %opts = ();
+@@ -282,8 +282,8 @@
+ - Added support for multiple On-The-Go playlists.
--print "mktunes.pl ###__VERSION__### (C) Adrian Ulrich\n";
-+print "mktunes ###__VERSION__### (C) Adrian Ulrich\n";
+-- gnupod_addsong.pl can now reenocde aac and mp3 'on-the-fly'
+- Usage: gnupod_addsong.pl --reencode 6 *.mp3
++- gnupod_addsong can now reenocde aac and mp3 'on-the-fly'
++ Usage: gnupod_addsong --reencode 6 *.mp3
+ This would reenocde everything with 'lame -V 6'
+ Use this if you don't have much space left (iPod Shuffle?!)
+ Note: The Reencode option also changes the quality of
+@@ -340,7 +340,7 @@
- $opts{mount} = $ENV{IPOD_MOUNTPOINT};
- GetOptions(\%opts, "version", "help|h", "ipod-name|n=s", "mount|m=s", "volume|v=i", "energy|e", "fwguid|g=s");
-@@ -140,7 +140,7 @@
- my($rtxt) = @_;
- die << "EOF";
- $rtxt
--Usage: mktunes.pl [-h] [-m directory] [-v VALUE]
-+Usage: mktunes [-h] [-m directory] [-v VALUE]
+ - You can now add MIDI files ;-) (with timidity)
- -h, --help display this help and exit
- --version output version information and exit
-@@ -159,7 +159,7 @@
- # Displays current version
- sub version {
- die << "EOF";
--mktunes.pl (gnupod) ###__VERSION__###
-+mktunes (gnupod) ###__VERSION__###
- Copyright (C) Adrian Ulrich 2002-2007
+-- Added --set-songnum option for gnupod_addsong.pl
++- Added --set-songnum option for gnupod_addsong
- This is free software; see the source for copying conditions. There is NO
---- gnupod-0.99.8/src/gnupod_search.pl 2021-06-13 14:44:53.768323271 -1200
-+++ gnupod-0.99.8/src/gnupod_search.pl.new 2021-06-13 14:44:54.348304128 -1200
-@@ -264,7 +264,7 @@
- u = UnixPath n = Songnum G = podcastguid R = podcastrss
- d = dbid
- --rename=KEY=VAL Change tags on found songs. Example: --rename="ARTIST=Foo Bar"
-- --artwork=FILE Set FILE as Cover for found files, do not forget to run mktunes.pl
-+ --artwork=FILE Set FILE as Cover for found files, do not forget to run mktunes
+ - Rewritten ConverterCore.. shouldn't break anything...
- Note: * Argument for title/artist/album/etc has to be UTF8 encoded, *not* latin1!
- * Use '>3' to search all values above 3, use '<3' to search for values below 3
-Created gnupod-0.99.8/man/gnupod_convert_FLAC.pl.1.gz
---- gnupod-0.99.8/src/ext/FileMagic.pm 2021-06-13 14:44:54.000315614 -1200
-+++ gnupod-0.99.8/src/ext/FileMagic.pm.new 2021-06-13 14:44:54.440301091 -1200
-@@ -52,7 +52,7 @@
- #
+@@ -364,18 +364,18 @@
+ Summary
+ -------
- my $NN_HEADERS = {'MThd' => { encoder=>'gnupod_convert_MIDI', ftyp=>'MIDI'},
-- 'fLaC' => { encoder=>'gnupod_convert_FLAC.pl', ftyp=>'FLAC'},
-+ 'fLaC' => { encoder=>'gnupod_convert_FLAC', ftyp=>'FLAC'},
- 'OggS' => { encoder=>'gnupod_convert_OGG.pl', ftyp=>'OGG' },
- 'MAC ' => { encoder=>'gnupod_convert_APE', ftyp=>'APE' },
- 'RIFF' => { encoder=>'gnupod_convert_RIFF', ftyp=>'RIFF', magic2=>'AVI '}};
---- gnupod-0.99.8/src/gnupod_convert_FLAC.pl 2009-07-10 11:20:05.000000000 -1200
-+++ gnupod-0.99.8/src/gnupod_convert_FLAC.pl.new 2021-06-13 14:44:54.444300959 -1200
-@@ -46,8 +46,8 @@
- }
- ## 3. = no errors without Audio::FLAC! :)
- if($@ || ref($ftag) ne "HASH") {
-- warn "gnupod_convert_FLAC.pl: Could not read FLAC-Metadata from $file\n";
-- warn "gnupod_convert_FLAC.pl: Maybe Audio::FLAC is not installed?\n";
-+ warn "gnupod_convert_FLAC: Could not read FLAC-Metadata from $file\n";
-+ warn "gnupod_convert_FLAC: Maybe Audio::FLAC is not installed?\n";
- warn "Error: $@\n";
- exit(1);
- }
-Created gnupod-0.99.8/man/gnupod_convert_OGG.pl.1.gz
---- gnupod-0.99.8/src/ext/FileMagic.pm 2021-06-13 14:44:54.440301091 -1200
-+++ gnupod-0.99.8/src/ext/FileMagic.pm.new 2021-06-13 14:44:54.540297790 -1200
-@@ -53,7 +53,7 @@
+-- Changed --decode switch from gnupod_addsong.pl
++- Changed --decode switch from gnupod_addsong
+ You can now select the output format of --decode
+ -> pcm(old default) / MP3 (using lame) / AAC (using FAAC)
+- Example: # gnupod_addsong.pl --decode=mp3 *.flac
++ Example: # gnupod_addsong --decode=mp3 *.flac
+ (Idea and original patch from )
- my $NN_HEADERS = {'MThd' => { encoder=>'gnupod_convert_MIDI', ftyp=>'MIDI'},
- 'fLaC' => { encoder=>'gnupod_convert_FLAC', ftyp=>'FLAC'},
-- 'OggS' => { encoder=>'gnupod_convert_OGG.pl', ftyp=>'OGG' },
-+ 'OggS' => { encoder=>'gnupod_convert_OGG', ftyp=>'OGG' },
- 'MAC ' => { encoder=>'gnupod_convert_APE', ftyp=>'APE' },
- 'RIFF' => { encoder=>'gnupod_convert_RIFF', ftyp=>'RIFF', magic2=>'AVI '}};
+ - GNUpod can now also convert OGG-Vorbis files
+ (Use --decode=XXX, same as FLAC)
---- gnupod-0.99.8/src/gnupod_convert_OGG.pl 2009-07-10 11:20:05.000000000 -1200
-+++ gnupod-0.99.8/src/gnupod_convert_OGG.pl.new 2021-06-13 14:44:54.544297658 -1200
-@@ -48,8 +48,8 @@
- }
- ## 3. = no errors
- if($@) {
-- warn "gnupod_convert_OGG.pl: Could not read OGG-Metadata from $file (".ref($ftag).")\n";
-- warn "gnupod_convert_OGG.pl: Maybe $ogg_pmod is not installed?\n";
-+ warn "gnupod_convert_OGG: Could not read OGG-Metadata from $file (".ref($ftag).")\n";
-+ warn "gnupod_convert_OGG: Maybe $ogg_pmod is not installed?\n";
- warn "Error: *$@*\n";
- exit(1);
- }
-Patched gnupod-0.99.8/man/gnupod_search.pl.1.gz
---- gnupod-0.99.8/CHANGES 2021-06-13 14:44:54.228308088 -1200
-+++ gnupod-0.99.8/CHANGES.new 2021-06-13 14:44:54.564296998 -1200
-@@ -58,8 +58,8 @@
+-- Added --playlist=STRING switch to gnupod_addsong.pl
++- Added --playlist=STRING switch to gnupod_addsong
+ This creates the playlist 'STRING' and adds all songs
+- passed to gnupod_addsong.pl to this playlist.
++ passed to gnupod_addsong to this playlist.
+ (Thanks to Bob Cotton)
- I was planning to release GNUpod 1.0, but Heinrich Langos
- flooded me with patches, many thanks to him:
--- Fix DBID width in gnupod_search.pl output
--- Added --bitrate switch to gnupod_search.pl
-+- Fix DBID width in gnupod_search output
-+- Added --bitrate switch to gnupod_search
- - Added --podcast-files-limit switch to gnupod_addsong
- - Added Podcast-Date patch (GNUpod now depends on Date::Parse)
- - Added --unique switch to extractArtwork.pl
-@@ -209,7 +209,7 @@
- - QTFile.pm: rseek() now refuses to return more than 1024 kb. Fixes possible out-of-memory problems
- with broken files.
+ - Many changes for the M4A parser, should work better now
+@@ -403,21 +403,21 @@
+ (Needs JavaScript + DOM => Mozilla)
+ ** SMARTPLAYLIST SYNTAX CHANGED **
--- Fixed an obscure gnupod_search.pl bug causing some weird search results.
-+- Fixed an obscure gnupod_search bug causing some weird search results.
+-- gnupod_addsong.pl can now add FLAC files.
++- gnupod_addsong can now add FLAC files.
+ 'flac' needs to be in your $PATH and it's disabled
+- per default. (Enable it using gnupod_addsong.pl --decode
++ per default. (Enable it using gnupod_addsong --decode
+ or set 'gnupod_addsong.decode=1' in your config)
- - Added DESTDIR support (make DESTDIR=/tmp/bla install) and removed slackpkg target (obsoleted)
+-- gnupod_addsong.pl can read ALAC (Apples Loseless Audio Codec)
++- gnupod_addsong can read ALAC (Apples Loseless Audio Codec)
+ files (iTunes creates normal .m4a files)
-@@ -344,7 +344,7 @@
+ - Polished Playcounts parser (no hardcoded offsets anymore)
- - Rewritten ConverterCore.. shouldn't break anything...
+ - added '--disable-v2' and '--disable-v1' to
+- gnupod_addsong.pl (Disable parsing of ID3TAG version X)
++ gnupod_addsong (Disable parsing of ID3TAG version X)
--- gnupod_search.pl can now RENAME/Edit tags.
-+- gnupod_search can now RENAME/Edit tags.
- use --rename="artist=New artist Name"
+ - Fixed small bug with .m4a files and added more fields.
+- gnupod_addsong.pl can now read M4A/AAC files from www.allofmp3.com
++ gnupod_addsong can now read M4A/AAC files from www.allofmp3.com
- - You can now sort playlists:
-@@ -422,8 +422,8 @@
- added tools/m4a-info.pl: Use this tool to read Title/Artist tags
from .m4a files (not installed by 'make install')
+@@ -425,7 +425,7 @@
+ - You can modify the output of gnupod_search using --view
+ (See 'gnupod_search --help')
--- You can modify the output of gnupod_search.pl using --view
-- (See 'gnupod_search.pl --help')
-+- You can modify the output of gnupod_search using --view
-+ (See 'gnupod_search --help')
-
- - gnupod_addsong checks for wrong extensions
+-- gnupod_addsong.pl checks for wrong extensions
++- gnupod_addsong checks for wrong extensions
(like a mp3-file called 'test.wav'). The iPod wouldn't play
-@@ -598,7 +598,7 @@
- I hope i didn't break anything.. but...
-
-
--gnupod_search.pl:
-+gnupod_search:
- * -d doesn't delete all songs anymore.. hups..
- * Playlist-Cleanup works now.. (another stupid bug.. :-/)
- * Added '--title' switch to usage
-@@ -682,7 +682,7 @@
- - Fixed 'creating playlists' sample in documentation.
- - Firmware 1.1.0 can read FAT32, updatet documentation.
- - gnupod_delete.pl doesn't kill regex playlists anymore (ouch)
--- gnupod_search.pl supports -g(enre)
-+- gnupod_search supports -g(enre)
- (Thanks to Johan Ruttenberg)
-
- gnuPod 0.26
---- gnupod-0.99.8/doc/gnupod.info 2021-06-13 14:44:54.244307560 -1200
-+++ gnupod-0.99.8/doc/gnupod.info.new 2021-06-13 14:44:54.572296734 -1200
-@@ -512,15 +512,15 @@
- 4.4 Search files
- ================
-
--GNUpod includes a tool called `gnupod_search.pl' that helps you search
-+GNUpod includes a tool called `gnupod_search' that helps you search
- for files.
-
- Maybe you would like to search for the artist called 'Schlummiguch'.
- In this case, run
-- gnupod_search.pl -m /mnt/ipod -a "Schlummiguch"
-+ gnupod_search -m /mnt/ipod -a "Schlummiguch"
-
-- Note: gnupod_search.pl assumes RegExp input. Please have a look at
--`gnupod_search.pl --help' for more information.
-+ Note: gnupod_search assumes RegExp input. Please have a look at
-+`gnupod_search --help' for more information.
-
-
- File: gnupod.info, Node: Remove files, Next: Edit tags, Prev: Search files, Up: Using GNUpod
-@@ -528,9 +528,9 @@
- 4.5 Remove files
- ================
-
--Removing files is done using `gnupod_search.pl -d'. To Remove all
-+Removing files is done using `gnupod_search -d'. To Remove all
- files from the artist 'Schlummiguch', run
-- gnupod_search.pl -m /mnt/ipod -a "Schlummiguch" -d
-+ gnupod_search -m /mnt/ipod -a "Schlummiguch" -d
-
-
- File: gnupod.info, Node: Edit tags, Next: Creating playlists, Prev: Remove files, Up: Using GNUpod
-@@ -538,9 +538,9 @@
- 4.6 Edit tags
- =============
-
--You can use `gnupod_search.pl' to edit tags (like artist, album, etc..)
-+You can use `gnupod_search' to edit tags (like artist, album, etc..)
-
-- gnupod_search.pl --artist="Alfred Neumann" --rename="artist=John Doe" --rename="rating=100"
-+ gnupod_search --artist="Alfred Neumann" --rename="artist=John Doe" --rename="rating=100"
-
- This example searches all files from 'Alfred Neumann', changes the
- artist into 'John Doe' and sets the rating to 5 Stars (5*20=100)
-@@ -674,10 +674,10 @@
- switch of `gnupod_addsong'. Example:
- gnupod_addsong --artwork cover.jpg *.mp3
-
-- Use `gnupod_search.pl' to change/add artwork for existing files.
-+ Use `gnupod_search' to change/add artwork for existing files.
- Example:
- # Set cover.jpg as artwork for all songs that match album =~ /Katamari/i
-- gnupod_search.pl --artwork cover.jpg --album Katamari
-+ gnupod_search --artwork cover.jpg --album Katamari
-
- don't forget to run `mktunes' afterwards.
-
---- gnupod-0.99.8/doc/gnupod.html 2021-06-13 14:44:54.256307164 -1200
-+++ gnupod-0.99.8/doc/gnupod.html.new 2021-06-13 14:44:54.584296338 -1200
-@@ -722,15 +722,15 @@
-
-
-
--GNUpod includes a tool called gnupod_search.pl that helps you search for files.
-+GNUpod includes a tool called gnupod_search that helps you search for files.
-
-
- Maybe you would like to search for the artist called 'Schlummiguch'. In this case, run
-- | | gnupod_search.pl -m /mnt/ipod -a "Schlummiguch"
-+ | | gnupod_search -m /mnt/ipod -a "Schlummiguch"
- |
-
--Note: gnupod_search.pl assumes RegExp input.
--Please have a look at gnupod_search.pl --help for more information.
-+Note: gnupod_search assumes RegExp input.
-+Please have a look at gnupod_search --help for more information.
-
-
-
-@@ -751,9 +751,9 @@
-
-
-
--Removing files is done using gnupod_search.pl -d.
-+Removing files is done using gnupod_search -d.
- To Remove all files from the artist 'Schlummiguch', run
-- | | gnupod_search.pl -m /mnt/ipod -a "Schlummiguch" -d
-+ | | gnupod_search -m /mnt/ipod -a "Schlummiguch" -d
- |
-
-
-@@ -774,10 +774,10 @@
-
-
-
--You can use gnupod_search.pl to edit tags (like artist, album, etc..)
-+You can use gnupod_search to edit tags (like artist, album, etc..)
-
-
-- | | gnupod_search.pl --artist="Alfred Neumann" --rename="artist=John Doe" --rename="rating=100"
-+ | | gnupod_search --artist="Alfred Neumann" --rename="artist=John Doe" --rename="rating=100"
- |
-
- This example searches all files from 'Alfred Neumann', changes the artist into 'John Doe' and
-@@ -962,9 +962,9 @@
- | | gnupod_addsong --artwork cover.jpg *.mp3
- |
-
--Use gnupod_search.pl to change/add artwork for existing files. Example:
-+Use gnupod_search to change/add artwork for existing files. Example:
- | | # Set cover.jpg as artwork for all songs that match album =~ /Katamari/i
--gnupod_search.pl --artwork cover.jpg --album Katamari
-+gnupod_search --artwork cover.jpg --album Katamari
- |
-
- don't forget to run mktunes afterwards.
---- gnupod-0.99.8/doc/gnupod.texi 2021-06-13 14:44:54.264306900 -1200
-+++ gnupod-0.99.8/doc/gnupod.texi.new 2021-06-13 14:44:54.592296073 -1200
-@@ -529,33 +529,33 @@
- @node Search files
- @section Search files
-
--GNUpod includes a tool called @code{@w{gnupod_search.pl}} that helps you search for files.
-+GNUpod includes a tool called @code{@w{gnupod_search}} that helps you search for files.
+ such a file.
- Maybe you would like to search for the artist called 'Schlummiguch'. In this case, run
- @example
--gnupod_search.pl -m /mnt/ipod -a "Schlummiguch"
-+gnupod_search -m /mnt/ipod -a "Schlummiguch"
- @end example
+@@ -452,7 +452,7 @@
--Note: gnupod_search.pl assumes RegExp input.
--Please have a look at @code{@w{gnupod_search.pl --help}} for more information.
-+Note: gnupod_search assumes RegExp input.
-+Please have a look at @code{@w{gnupod_search --help}} for more information.
+ - I bought one myself
- @node Remove files
- @section Remove files
+-- gnupod_addsong.pl understands .m4a files
++- gnupod_addsong understands .m4a files
+ (= AAC Files written by iTunes)
+ I don't know if it works with DRM files (.m4p?)
+ I don't have any DRM files and i'm not interested
+@@ -476,7 +476,7 @@
+ mktunes will drop old (= now invalid) ratings,
+ no autoconvert... sorry.. but does anyone care?
--Removing files is done using @code{@w{gnupod_search.pl -d}}.
-+Removing files is done using @code{@w{gnupod_search -d}}.
- To Remove all files from the artist 'Schlummiguch', run
- @example
--gnupod_search.pl -m /mnt/ipod -a "Schlummiguch" -d
-+gnupod_search -m /mnt/ipod -a "Schlummiguch" -d
- @end example
+-- gnupod_addsong.pl understands ID3v2.2 tags
++- gnupod_addsong understands ID3v2.2 tags
+ - You'll have to install Digest::MD5
- @node Edit tags
- @section Edit tags
+@@ -521,7 +521,7 @@
+ Summary:
+ --------
+ - Reading MusicMatch files should work (again)
+-- gnupod_addsong.pl can add WAVE files
++- gnupod_addsong can add WAVE files
+ - Parsing large iTunesDB files should be faster
+ (-> we skip the MainPlayList)
--You can use @code{@w{gnupod_search.pl}} to edit tags (like artist, album, etc..)
-+You can use @code{@w{gnupod_search}} to edit tags (like artist, album, etc..)
+@@ -580,7 +580,7 @@
+ * Added SPL-Write support
+ * regex-matches are sorted by id
- @example
--gnupod_search.pl --artist="Alfred Neumann" --rename="artist=John Doe" --rename="rating=100"
-+gnupod_search --artist="Alfred Neumann" --rename="artist=John Doe" --rename="rating=100"
- @end example
+-gnupod_addsong.pl:
++gnupod_addsong:
+ * duplicate-checker displayed the
+ wrong number of the dup, works again
- This example searches all files from 'Alfred Neumann', changes the artist into 'John Doe' and
-@@ -712,10 +712,10 @@
- @end example
+@@ -603,8 +603,8 @@
+ * Playlist-Cleanup works now.. (another stupid bug.. :-/)
+ * Added '--title' switch to usage
+-gnupod_addsong.pl:
+- * Can read from STDIN again (use 'gnupod_addsong.pl -')
++gnupod_addsong:
++ * Can read from STDIN again (use 'gnupod_addsong -')
+ (I forgot this feature ;) )
--Use @code{@w{gnupod_search.pl}} to change/add artwork for existing files. Example:
-+Use @code{@w{gnupod_search}} to change/add artwork for existing files. Example:
- @example
- # Set cover.jpg as artwork for all songs that match album =~ /Katamari/i
--gnupod_search.pl --artwork cover.jpg --album Katamari
-+gnupod_search --artwork cover.jpg --album Katamari
- @end example
+ gnupod_INIT
+@@ -657,7 +657,7 @@
+ Use an UNICODE Texteditor to edit the GNUtunesDB..
+ (Like 'yudit' or the gnome2 texteditor)
+ Your old latin1 GNUtunesDB will get converted to an
+- UTF8 version after running tunes2pod/gnupod_addsong.pl or
++ UTF8 version after running tunes2pod/gnupod_addsong or
+ gnupod_delete.pl
- don't forget to run @code{@w{mktunes}} afterwards.
---- gnupod-0.99.8/doc/gnupodrc.example 2021-06-13 14:44:54.276306504 -1200
-+++ gnupod-0.99.8/doc/gnupodrc.example.new 2021-06-13 14:44:54.600295810 -1200
-@@ -52,7 +52,7 @@
- ## Enforce iPod serial number:
- # mktunes.fwguid = 000ba3100310abcf
+ UTF8 Support isn't testet very well, and gnuPod 0.28 maybe more
+@@ -700,7 +700,7 @@
+ in the GNUtunesDB - file
+ - mktunes no longer accepts when was
+ not found.
+-- gnupod_addsong.pl handles long filenames now better
++- gnupod_addsong handles long filenames now better
+ - Timestamp should now be set correct
+ (utime(undef,undef.. didn't work on every OS..)
+ - new playist keywords. You can now use /dev/null | tail +4
-+gnupod_search --view=i -l "Cure" 2>/dev/null | tail +4
-
- (Hmm.. output breaks if On-The-Go data get's synced..)
- FIXME.. maybe we should have an --out option?
---- gnupod-0.99.8/src/gnupod_search.pl 2021-06-13 14:44:54.348304128 -1200
-+++ gnupod-0.99.8/src/gnupod_search.pl.new 2021-06-13 14:44:54.624295017 -1200
-@@ -38,7 +38,7 @@
-
-
-
--print "gnupod_search.pl Version ###__VERSION__### (C) Adrian Ulrich\n";
-+print "gnupod_search Version ###__VERSION__### (C) Adrian Ulrich\n";
-
- # WARNING: If you add new options wich don't do matching, change newfile()
- #
-@@ -241,7 +241,7 @@
- my($rtxt) = @_;
- die << "EOF";
- $rtxt
--Usage: gnupod_search.pl [-h] [-m directory] File1 File2 ...
-+Usage: gnupod_search [-h] [-m directory] File1 File2 ...
-
- -h, --help display this help and exit
- --version output version information and exit
-@@ -279,7 +279,7 @@
-
- sub version {
- die << "EOF";
--gnupod_search.pl (gnupod) ###__VERSION__###
-+gnupod_search (gnupod) ###__VERSION__###
- Copyright (C) Adrian Ulrich 2002-2008
-
- This is free software; see the source for copying conditions. There is NO
---- gnupod-0.99.8/AUTHORS 2009-07-10 11:20:05.000000000 -1200
-+++ gnupod-0.99.8/AUTHORS.new 2021-06-13 14:44:54.632294754 -1200
-@@ -10,7 +10,7 @@
- Contributed to the 'old' GNUpod (< 0.9)
- - gnupod_list.pl
- - gnupod_renumber.pl
-- - gnupod_search.pl (Most important tool ;) )
-+ - gnupod_search (Most important tool ;) )
-
-
- And also many thanks to the many other people
+ gnupod_search Search ;)
quilt --quiltrc debian/quiltrc push -a
Applying patch 01-new-perl.patch
patching file gnupod-0.99.8/src/ext/FileMagic.pm
@@ -3492,8 +3556,8 @@
dh_installdirs: warning: Compatibility levels before 10 are deprecated (level 9 in use)
/usr/bin/make -C gnupod-0.99.8 install DESTDIR=/build/gnupod-tools-0.99.8/debian/gnupod-tools
make[1]: Entering directory '/build/gnupod-tools-0.99.8/gnupod-0.99.8'
-/bin/bash ./mkinstalldirs /build/gnupod-tools-0.99.8/debian/gnupod-tools/usr/bin
-/bin/bash ./mkinstalldirs /build/gnupod-tools-0.99.8/debian/gnupod-tools/usr/share/man/man1
+/bin/sh ./mkinstalldirs /build/gnupod-tools-0.99.8/debian/gnupod-tools/usr/bin
+/bin/sh ./mkinstalldirs /build/gnupod-tools-0.99.8/debian/gnupod-tools/usr/share/man/man1
/usr/bin/perl tools/gnupod_install.pl INSTALL "/usr/bin/perl" "/usr/bin" "/usr/share/info" "/usr/share/man" "/build/gnupod-tools-0.99.8/debian/gnupod-tools"
Installing GNUpod 0.99.8 using gnupod_install 0.25
> src/gnupod_addsong.pl --> /build/gnupod-tools-0.99.8/debian/gnupod-tools/usr/bin/gnupod_addsong.pl
@@ -3571,12 +3635,15 @@
dpkg-genchanges: info: binary-only upload (no source code included)
dpkg-source --after-build .
dpkg-buildpackage: info: binary-only upload (no source included)
+I: copying local configuration
+I: user script /srv/workspace/pbuilder/9947/tmp/hooks/B01_cleanup starting
+I: user script /srv/workspace/pbuilder/9947/tmp/hooks/B01_cleanup finished
I: unmounting dev/ptmx filesystem
I: unmounting dev/pts filesystem
I: unmounting dev/shm filesystem
I: unmounting proc filesystem
I: unmounting sys filesystem
I: cleaning the build env
-I: removing directory /srv/workspace/pbuilder/7411 and its subdirectories
-I: Current time: Sun Jun 13 14:45:02 -12 2021
-I: pbuilder-time-stamp: 1623638702
+I: removing directory /srv/workspace/pbuilder/9947 and its subdirectories
+I: Current time: Sun Jul 17 23:08:25 +14 2022
+I: pbuilder-time-stamp: 1658048905
|
|
|
|
|
|
|
|
|