| | 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.info 2009-07-10 11:20:05.000000000 -1200
-+++ gnupod-0.99.8/doc/gnupod.info.new 2020-08-19 16:15:37.130930267 -1200
-@@ -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.pl 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). This only works for iPods running Firmware 1.x
---- gnupod-0.99.8/doc/gnupod.texi 2009-07-10 11:20:05.000000000 -1200
-+++ gnupod-0.99.8/doc/gnupod.texi.new 2020-08-19 16:15:37.174932839 -1200
-@@ -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.pl to convert the iTunesDB to an GNUtunesDB)
-
- Use
- @example
--gnupod_INIT.pl -m /mnt/ipod --france
-+gnupod_INIT -m /mnt/ipod --france
- @end example
+Patched gnupod-0.99.8/man/gnupod_search.pl.1.gz
+--- gnupod-0.99.8/FAQ 2009-07-11 13:20:05.000000000 +1400
++++ gnupod-0.99.8/FAQ.new 2020-08-20 18:32:16.664545948 +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 '-')
- if you would like to enable the 'EU-Volume-Limit' (=decrease max. volume).
---- gnupod-0.99.8/tools/extractArtwork.pl 2009-07-10 11:20:05.000000000 -1200
-+++ gnupod-0.99.8/tools/extractArtwork.pl.new 2020-08-19 16:15:37.210934944 -1200
-@@ -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");
+-8. How to get parseable output from gnupod_search.pl
++8. How to get parseable output from gnupod_search
+ ----------------------------------------------------
- #print Data::Dumper::Dumper($AWDB);
+ gnupod_addsong.pl knows the '--view' switch.
---- 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 2020-08-19 16:15:37.278938919 -1200
-@@ -28,7 +28,7 @@
- use vars qw(%opts);
+ Example:
+-gnupod_search.pl --view=i -l "Cure" 2>/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 2009-07-11 13:20:05.000000000 +1400
++++ gnupod-0.99.8/src/gnupod_search.pl.new 2020-08-20 18:32:16.804550682 +1400
+@@ -38,7 +38,7 @@
--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 ;) )
- *********************************************************
+-print "gnupod_search.pl Version ###__VERSION__### (C) Adrian Ulrich\n";
++print "gnupod_search Version ###__VERSION__### (C) Adrian Ulrich\n";
-@@ -144,7 +144,7 @@
+ # WARNING: If you add new options wich don't do matching, change newfile()
+ #
+@@ -241,7 +241,7 @@
my($rtxt) = @_;
die << "EOF";
$rtxt
--Usage: gnupod_INIT.pl [-h] [-m directory]
-+Usage: gnupod_INIT [-h] [-m directory]
+-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
-@@ -165,7 +165,7 @@
+@@ -279,7 +279,7 @@
sub version {
die << "EOF";
--gnupod_INIT.pl (gnupod) ###__VERSION__###
-+gnupod_INIT (gnupod) ###__VERSION__###
- Copyright (C) Adrian Ulrich 2002-2004
+-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/src/gnupod_addsong.pl 2009-07-10 11:20:05.000000000 -1200
-+++ gnupod-0.99.8/src/gnupod_addsong.pl.new 2020-08-19 16:15:37.318941258 -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 2020-08-19 16:15:37.358943596 -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 2020-08-19 16:15:37.402946169 -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}});
---- gnupod-0.99.8/src/gnupod_check.pl 2009-07-10 11:20:05.000000000 -1200
-+++ gnupod-0.99.8/src/gnupod_check.pl.new 2020-08-19 16:15:37.490951313 -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");
-
- print "Pass 2: Checking Files on the iPod...\n";
- checkGNUtunes($con);
---- 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 2020-08-19 16:15:37.538954120 -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.".$$";
-
-- 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 2009-07-10 11:20:05.000000000 -1200
-+++ gnupod-0.99.8/src/ext/XMLhelper.pm.new 2020-08-19 16:15:37.570955991 -1200
-@@ -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) {
-Created gnupod-0.99.8/man/gnupod_convert_MIDI.pl.1.gz
---- gnupod-0.99.8/src/ext/FileMagic.pm 2009-07-10 11:20:05.000000000 -1200
-+++ gnupod-0.99.8/src/ext/FileMagic.pm.new 2020-08-19 16:15:38.827029421 -1200
-@@ -51,7 +51,7 @@
- # done!
- #
-
--my $NN_HEADERS = {'MThd' => { encoder=>'gnupod_convert_MIDI.pl', ftyp=>'MIDI'},
-+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' },
- 'MAC ' => { encoder=>'gnupod_convert_APE.pl', ftyp=>'APE' },
-Patched gnupod-0.99.8/man/gnupod_addsong.pl.1.gz
---- gnupod-0.99.8/README.about_m4a 2009-07-10 11:20:05.000000000 -1200
-+++ gnupod-0.99.8/README.about_m4a.new 2020-08-19 16:15:38.947036436 -1200
-@@ -27,9 +27,9 @@
-
- Example: faac -w --title mytitle file.wav
-
--Now you can add the file using gnupod_addsong.pl
-+Now you can add the file using gnupod_addsong
-
--# gnupod_addsong.pl file.m4a
-+# gnupod_addsong file.m4a
- # mktunes.pl
-
- :)
---- gnupod-0.99.8/README 2020-08-19 16:15:36.870915066 -1200
-+++ gnupod-0.99.8/README.new 2020-08-19 16:15:39.003039710 -1200
-@@ -30,7 +30,7 @@
- ----------------------------
-
- gnupod_INIT INIT a new iPod (create empty Database + Directories)
--gnupod_addsong.pl Add files
-+gnupod_addsong Add files
- gnupod_check.pl Check for 'zombie' files
- gnupod_otgsync.pl Handles On-The-Go Sync (not for humans)
- gnupod_search.pl Search ;)
---- gnupod-0.99.8/FAQ 2020-08-19 16:15:36.926918340 -1200
-+++ gnupod-0.99.8/FAQ.new 2020-08-19 16:15:39.055042751 -1200
-@@ -59,13 +59,13 @@
-
- 1 Mount the iPod (eg. /mnt/ipod)
- 2 run gnupod_INIT -m /mnt/ipod
-- 3 add songs using 'gnupod_addsong.pl -m /mnt/ipod *blabla.mp3
-+ 3 add songs using 'gnupod_addsong -m /mnt/ipod *blabla.mp3
- 4 build the iTunesDB using mktunes: 'mktunes.pl -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.pl
-+ 2 use gnupod_addsong
- 3 build the database with mktunes.pl
- 4 umount
-
-@@ -117,7 +117,7 @@
- - Apple AAC/ALAC files (.m4a)
- - PCM (.wav)
-
--gnupod_addsong.pl can read this 3 formats.
-+gnupod_addsong can read this 3 formats.
-
- GNUpod does (currently) *NOT* support:
-
-@@ -125,8 +125,8 @@
- - Apple MusicStore files (.m4p - DRM AAC) but it does support .m4a
-
- GnuPod >= 0.96 can convert FLAC and OGG files 'on the fly'.
--You'll have to call gnupod_addsong.pl with the
----decode switch. see 'man gnupod_addsong.pl' for more details
-+You'll have to call gnupod_addsong with the
-+--decode switch. see 'man gnupod_addsong' for more details
- (Or read the complete docs: 'info gnupod')
-
- DRM-Support isn't planned.
-@@ -137,9 +137,9 @@
- 7. How can i add files recursive?
- ---------------------------------
-
--gnupod_addsong.pl can read from stdin :)
-+gnupod_addsong can read from stdin :)
-
--$ find blabla/ | gnupod_addsong.pl -
-+$ find blabla/ | gnupod_addsong -
-
- (note the '-')
-
-@@ -147,7 +147,7 @@
- 8. How to get parseable output from gnupod_search.pl
- ----------------------------------------------------
-
--gnupod_addsong.pl knows the '--view' switch.
-+gnupod_addsong knows the '--view' switch.
+--- gnupod-0.99.8/CHANGES 2009-07-11 13:20:05.000000000 +1400
++++ gnupod-0.99.8/CHANGES.new 2020-08-20 18:32:16.928554876 +1400
+@@ -58,8 +58,8 @@
- Example:
- gnupod_search.pl --view=i -l "Cure" 2>/dev/null | tail +4
---- gnupod-0.99.8/CHANGES 2020-08-19 16:15:36.954919977 -1200
-+++ gnupod-0.99.8/CHANGES.new 2020-08-19 16:15:39.111046025 -1200
-@@ -60,7 +60,7 @@
+ 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
--- Added --podcast-files-limit switch to gnupod_addsong.pl
-+- Added --podcast-files-limit switch to gnupod_addsong
+-- 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
- - 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
+@@ -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.
-@@ -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
-@@ -184,13 +184,13 @@
- -------
+ - Added DESTDIR support (make DESTDIR=/tmp/bla install) and removed slackpkg target (obsoleted)
- - iPod-Video support
-- gnupod_addsong.pl can now read/add .mp4 files
-+ gnupod_addsong can now read/add .mp4 files
+@@ -344,7 +344,7 @@
- Converting .avi (RIFF) files on-the-fly works
- only IF your ffmpeg binary has AAC Support!
- (Adding preencoded files works witout ffmpeg)
+ - Rewritten ConverterCore.. shouldn't break anything...
-- Try: gnupod_addsong.pl --decode=video *.avi
-+ Try: gnupod_addsong --decode=video *.avi
+-- gnupod_search.pl can now RENAME/Edit tags.
++- gnupod_search can now RENAME/Edit tags.
+ use --rename="artist=New artist Name"
- - Fixes a playlist problem with iTunes5 (new 100 Mhods)
+ - 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')
-@@ -219,8 +219,8 @@
- Summary
- -------
+-- 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 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_addsong.pl 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...
- - Added basic support for podcast-rss and podcast-guid in tunes2pod.pl and mktunes.pl
-@@ -282,8 +282,8 @@
+-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)
- - Added support for multiple On-The-Go playlists.
+ gnuPod 0.26
+--- gnupod-0.99.8/AUTHORS 2009-07-11 13:20:05.000000000 +1400
++++ gnupod-0.99.8/AUTHORS.new 2020-08-20 18:32:16.980556634 +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 ;) )
--- 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 @@
- - You can now add MIDI files ;-) (with timidity)
+ And also many thanks to the many other people
+--- gnupod-0.99.8/README 2009-07-11 13:20:05.000000000 +1400
++++ gnupod-0.99.8/README.new 2020-08-20 18:32:17.016557852 +1400
+@@ -33,7 +33,7 @@
+ gnupod_addsong.pl Add files
+ gnupod_check.pl Check for 'zombie' files
+ gnupod_otgsync.pl Handles On-The-Go Sync (not for humans)
+-gnupod_search.pl Search ;)
++gnupod_search Search ;)
+ mktunes.pl Convert the GNUtunesDB.xml to a iTunesDB
+ tunes2pod.pl Convert the iTunesDB into a GNUtunesDB.xml
--- Added --set-songnum option for gnupod_addsong.pl
-+- Added --set-songnum option for gnupod_addsong
+--- gnupod-0.99.8/doc/gnupodrc.example 2009-07-11 13:20:05.000000000 +1400
++++ gnupod-0.99.8/doc/gnupodrc.example.new 2020-08-20 18:32:17.052559069 +1400
+@@ -52,7 +52,7 @@
+ ## Enforce iPod serial number:
+ # mktunes.fwguid = 000ba3100310abcf
- - Rewritten ConverterCore.. shouldn't break anything...
+-# *** gnupod_search.pl ***
++# *** gnupod_search ***
-@@ -364,18 +364,18 @@
- Summary
- -------
+ ## Always match only once
+ # gnupod_search.match-once = 1
+--- gnupod-0.99.8/doc/gnupod.info 2009-07-11 13:20:05.000000000 +1400
++++ gnupod-0.99.8/doc/gnupod.info.new 2020-08-20 18:32:17.100560693 +1400
+@@ -512,15 +512,15 @@
+ 4.4 Search 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 )
+-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.
- - GNUpod can now also convert OGG-Vorbis files
- (Use --decode=XXX, same as FLAC)
+ 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"
--- 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)
+- 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.
- - Many changes for the M4A parser, should work better now
-@@ -403,21 +403,21 @@
- (Needs JavaScript + DOM => Mozilla)
- ** SMARTPLAYLIST SYNTAX CHANGED **
+
+ File: gnupod.info, Node: Remove files, Next: Edit tags, Prev: Search files, Up: Using GNUpod
+@@ -528,9 +528,9 @@
+ 4.5 Remove files
+ ================
--- 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)
+-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_addsong.pl can read ALAC (Apples Loseless Audio Codec)
-+- gnupod_addsong can read ALAC (Apples Loseless Audio Codec)
- files (iTunes creates normal .m4a files)
+
+ File: gnupod.info, Node: Edit tags, Next: Creating playlists, Prev: Remove files, Up: Using GNUpod
+@@ -538,9 +538,9 @@
+ 4.6 Edit tags
+ =============
- - Polished Playcounts parser (no hardcoded offsets anymore)
+-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..)
- - 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 --artist="Alfred Neumann" --rename="artist=John Doe" --rename="rating=100"
++ gnupod_search --artist="Alfred Neumann" --rename="artist=John Doe" --rename="rating=100"
- - 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
+ 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
- - 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')
+- 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
--- 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
- such a file.
+ don't forget to run `mktunes.pl' afterwards.
-@@ -452,7 +452,7 @@
+--- gnupod-0.99.8/doc/gnupod.texi 2009-07-11 13:20:05.000000000 +1400
++++ gnupod-0.99.8/doc/gnupod.texi.new 2020-08-20 18:32:17.144562181 +1400
+@@ -529,33 +529,33 @@
+ @node Search files
+ @section Search files
- - I bought one myself
+-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.
--- 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?
+ 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
--- gnupod_addsong.pl understands ID3v2.2 tags
-+- gnupod_addsong understands ID3v2.2 tags
+-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.
- - You'll have to install Digest::MD5
+ @node Remove files
+ @section Remove files
-@@ -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)
+-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
-@@ -580,7 +580,7 @@
- * Added SPL-Write support
- * regex-matches are sorted by id
--gnupod_addsong.pl:
-+gnupod_addsong:
- * duplicate-checker displayed the
- wrong number of the dup, works again
+ @node Edit tags
+ @section Edit tags
-@@ -603,8 +603,8 @@
- * Playlist-Cleanup works now.. (another stupid bug.. :-/)
- * Added '--title' switch to usage
+-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..)
--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 ;) )
+ @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_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.pl/gnupod_addsong.pl or
-+ UTF8 version after running tunes2pod.pl/gnupod_addsong or
- gnupod_delete.pl
+ This example searches all files from 'Alfred Neumann', changes the artist into 'John Doe' and
+@@ -712,10 +712,10 @@
+ @end example
- UTF8 Support isn't testet very well, and gnuPod 0.28 maybe more
-@@ -700,7 +700,7 @@
- in the GNUtunesDB - file
- - mktunes.pl 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
-
+-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
--To add files, we use the script called gnupod_addsong.pl.
-+To add files, we use the script called gnupod_addsong.
-
+ don't forget to run @code{@w{mktunes.pl}} afterwards.
+--- gnupod-0.99.8/doc/gnupod.html 2009-07-11 13:20:05.000000000 +1400
++++ gnupod-0.99.8/doc/gnupod.html.new 2020-08-20 18:32:17.192563804 +1400
+@@ -722,15 +722,15 @@
+
+
- First, mount the iPod (eg. at /mnt/ipod) if it isn't mounted.
+-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.
--If you would like to add the file /tmp/foo.mp3, run gnupod_addsong.pl like this:
-- | | gnupod_addsong.pl -m /mnt/ipod /tmp/foo.mp3
-+If you would like to add the file /tmp/foo.mp3, run gnupod_addsong like this:
-+ | | gnupod_addsong -m /mnt/ipod /tmp/foo.mp3
- |
-
- You can also use wildcards:
-- | | gnupod_addsong.pl -m /mnt/ipod /mnt/mp3/seiken_densetsu2_ost/* /mnt/mp3/xenogears/ost?/*
-+ | | gnupod_addsong -m /mnt/ipod /mnt/mp3/seiken_densetsu2_ost/* /mnt/mp3/xenogears/ost?/*
+ 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"
|
--It isn't possible to add the same MP3 multiple times, gnupod_addsong.pl detects duplicates
-+It isn't possible to add the same MP3 multiple times, gnupod_addsong detects duplicates
- (Duplicate = same filesize/time and ID3Tag name). You can disable the duplicate-detection
- with the '--duplicate' switch.
-
-
--gnupod_addsong.pl understands MP3/WAV (RIFF) and M4A (Apple AAC - NO DRM!) files.
-+gnupod_addsong understands MP3/WAV (RIFF) and M4A (Apple AAC - NO DRM!) files.
+-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.
- It can also convert FLAC and OGG files on-the-fly:
-@@ -689,14 +689,14 @@
- Using this example, it would convert the two files into MP3 and add them to the iPod.
-
+
+@@ -751,9 +751,9 @@
+
+
-- | | gnupod_addsong.pl -m /mnt/ipod myfile.flac myfile.ogg --decode=mp3
-+ | | gnupod_addsong -m /mnt/ipod myfile.flac myfile.ogg --decode=mp3
+-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
|
- (Note: To use all features of --decode, you will have to install
- Audio::FLAC::Header, Ogg::Vorbis::Header::PurePerl, lame, flac, oggenc and faac)
-
-
--gnupod_addsong.pl tries to 'auto-detect' the encoding of the ID3 Tag.
-+gnupod_addsong tries to 'auto-detect' the encoding of the ID3 Tag.
- Sometimes this works (in most cases ;) ) sometimes it doesn't. If it doesn't work for you,
- feel free to send me an example-file: pab@blinkenligts.ch
-
-@@ -878,7 +878,7 @@
- Also check out http://blinkenlights.ch/gnupod/mkspl.html for a 'JavaScript SPL-Creator'
-
-
--You can also use the --playlist option of gnupod_addsong.pl. This will create and add the listed songs to the
-+You can also use the --playlist option of gnupod_addsong. This will create and add the listed songs to the
- named playlist.
-
-
-@@ -914,14 +914,14 @@
- Such a playlist will show up as a Podcast after running mktunes.pl
-
-
--gnupod_addsong.pl can also download podcasts and create such playlists itself:
-+gnupod_addsong can also download podcasts and create such playlists itself:
-
-
-- | | gnupod_addsong.pl -p "Heute Morgen" --playlist-is-podcast http://pod.drs.ch/heutemorgen_mpx.xml
-+ | | gnupod_addsong -p "Heute Morgen" --playlist-is-podcast http://pod.drs.ch/heutemorgen_mpx.xml
- |
+
+@@ -774,10 +774,10 @@
+
+
- Running this command will create a Playlist called 'Heute Morgen' (-p) and set podcast="1" (--playlist-is-podcast).
--gnupod_addsong.pl will then fetch the podcast from http://pod.drs.ch/heutemorgen_mpx.xml, download all (new) files
-+gnupod_addsong will then fetch the podcast from http://pod.drs.ch/heutemorgen_mpx.xml, download all (new) files
- and add them to the 'Heute Morgen' playlist!
+-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..)
-@@ -958,8 +958,8 @@
- | | model = nano_4g
+- | | 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"
|
--To specify a cover while adding files you'd use the --artwork switch of gnupod_addsong.pl. Example:
-- | | gnupod_addsong.pl --artwork cover.jpg *.mp3
-+To specify a cover while adding files you'd use the --artwork switch of gnupod_addsong. Example:
-+ | | gnupod_addsong --artwork cover.jpg *.mp3
+ 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:
-@@ -1047,14 +1047,14 @@
-
-
- If gnupod_check.pl found many errors (or you lost your GNUtunesDB.xml),
--you can 'rebuild' an GNUtunesDB using gnupod_addsong.pl
-+you can 'rebuild' an GNUtunesDB using gnupod_addsong
-
-
-- | | gnupod_addsong.pl --restore -m /mnt/ipod
-+ | | gnupod_addsong --restore -m /mnt/ipod
+-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
|
- First, it will create a clean, empty GNUtunesDB, it won't delete any songs on the iPod.
--Then, gnupod_addsong.pl --restore will re-create a GNUtunesDB including the Songs which are on the iPod
-+Then, gnupod_addsong --restore will re-create a GNUtunesDB including the Songs which are on the iPod
-
-
- I think nobody will ever have to do this.. but it maybe usefull to know that it's possible
-@@ -1218,7 +1218,7 @@
-
-
- Only mktunes.pl 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.
-+(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.info 2020-08-19 16:15:37.130930267 -1200
-+++ gnupod-0.99.8/doc/gnupod.info.new 2020-08-19 16:15:39.255054443 -1200
-@@ -469,23 +469,23 @@
- 4.3 Add files
- =============
-
--To add files, we use the script called `gnupod_addsong.pl'.
-+To add files, we use the script called `gnupod_addsong'.
-
- First, mount the iPod (eg. at /mnt/ipod) if it isn't mounted.
-
- If you would like to add the file /tmp/foo.mp3, run
--gnupod_addsong.pl like this:
-- gnupod_addsong.pl -m /mnt/ipod /tmp/foo.mp3
-+gnupod_addsong like this:
-+ gnupod_addsong -m /mnt/ipod /tmp/foo.mp3
-
- You can also use wildcards:
-- gnupod_addsong.pl -m /mnt/ipod /mnt/mp3/seiken_densetsu2_ost/* /mnt/mp3/xenogears/ost?/*
-+ gnupod_addsong -m /mnt/ipod /mnt/mp3/seiken_densetsu2_ost/* /mnt/mp3/xenogears/ost?/*
-
- It isn't possible to add the same MP3 multiple times,
--gnupod_addsong.pl detects duplicates (Duplicate = same filesize/time
-+gnupod_addsong detects duplicates (Duplicate = same filesize/time
- and ID3Tag name). You can disable the duplicate-detection with the
- '-duplicate' switch.
-
-- gnupod_addsong.pl understands MP3/WAV (RIFF) and M4A (Apple AAC - NO
-+ gnupod_addsong understands MP3/WAV (RIFF) and M4A (Apple AAC - NO
- DRM!) files.
+ don't forget to run mktunes.pl afterwards.
+Created gnupod-0.99.8/man/gnupod_convert_APE.pl.1.gz
+--- gnupod-0.99.8/src/ext/FileMagic.pm 2009-07-11 13:20:05.000000000 +1400
++++ gnupod-0.99.8/src/ext/FileMagic.pm.new 2020-08-20 18:32:18.856620078 +1400
+@@ -54,7 +54,7 @@
+ my $NN_HEADERS = {'MThd' => { encoder=>'gnupod_convert_MIDI.pl', ftyp=>'MIDI'},
+ 'fLaC' => { encoder=>'gnupod_convert_FLAC.pl', ftyp=>'FLAC'},
+ 'OggS' => { encoder=>'gnupod_convert_OGG.pl', ftyp=>'OGG' },
+- 'MAC ' => { encoder=>'gnupod_convert_APE.pl', ftyp=>'APE' },
++ 'MAC ' => { encoder=>'gnupod_convert_APE', ftyp=>'APE' },
+ 'RIFF' => { encoder=>'gnupod_convert_RIFF.pl', ftyp=>'RIFF', magic2=>'AVI '}};
- It can also convert FLAC and OGG files on-the-fly:
-@@ -493,13 +493,13 @@
- Using this example, it would convert the two files into MP3 and add
- them to the iPod.
-- gnupod_addsong.pl -m /mnt/ipod myfile.flac myfile.ogg --decode=mp3
-+ gnupod_addsong -m /mnt/ipod myfile.flac myfile.ogg --decode=mp3
+Patched gnupod-0.99.8/man/gnupod_check.pl.1.gz
+--- gnupod-0.99.8/src/gnupod_check.pl 2009-07-11 13:20:05.000000000 +1400
++++ gnupod-0.99.8/src/gnupod_check.pl.new 2020-08-20 18:32:18.980624272 +1400
+@@ -32,7 +32,7 @@
+ #Get maximal Pathlength from XMLHelper constant
+ my $xmlhelper_maxpathlen = GNUpod::XMLhelper::MAX_PATHLENGTH;
- (Note: To use all features of -decode, you will have to install
- Audio::FLAC::Header, Ogg::Vorbis::Header::PurePerl, lame, flac, oggenc
- and faac)
+-print "gnupod_check.pl Version ###__VERSION__### (C) Adrian Ulrich\n";
++print "gnupod_check Version ###__VERSION__### (C) Adrian Ulrich\n";
-- gnupod_addsong.pl tries to 'auto-detect' the encoding of the ID3 Tag.
-+ gnupod_addsong tries to 'auto-detect' the encoding of the ID3 Tag.
- Sometimes this works (in most cases ;) ) sometimes it doesn't. If it
- doesn't work for you, feel free to send me an example-file:
- pab@blinkenligts.ch
-@@ -617,7 +617,7 @@
- in the GNUpod tarball. Also check out
- http://blinkenlights.ch/gnupod/mkspl.html for a 'JavaScript SPL-Creator'
+ $opts{mount} = $ENV{IPOD_MOUNTPOINT};
+ #Don't add xml and itunes opts.. we *NEED* the mount opt to be set..
+@@ -121,7 +121,7 @@
+ my $rp = GNUpod::XMLhelper::realpath($opts{mount},$el->{file}->{path});
+ my $id = $el->{file}->{id};
+
+- my $HINT = "Run 'gnupod_check.pl --fixit' to wipe this zombie";
++ my $HINT = "Run 'gnupod_check --fixit' to wipe this zombie";
+
+ $TRACKER{SIZE}+=int($el->{file}->{filesize});
+ $TRACKER{TIME}+=int($el->{file}->{time});
+@@ -222,8 +222,8 @@
+ my($rtxt) = @_;
+ die << "EOF";
+ $rtxt
+-Usage: gnupod_check.pl [-h] [-m directory]
+-gnupod_check.pl checks for 'lost' files
++Usage: gnupod_check [-h] [-m directory]
++gnupod_check checks for 'lost' files
-- You can also use the -playlist option of gnupod_addsong.pl. This
-+ You can also use the -playlist option of gnupod_addsong. This
- will create and add the listed songs to the named playlist.
+ -h, --help display this help and exit
+ --version output version information and exit
+@@ -237,7 +237,7 @@
- Don't forget to run mktunes before umounting! (See 'Unplug the iPod')
-@@ -637,14 +637,14 @@
+ sub version {
+ die << "EOF";
+-gnupod_check.pl (gnupod) ###__VERSION__###
++gnupod_check (gnupod) ###__VERSION__###
+ Copyright (C) Adrian Ulrich 2002-2004
- Such a playlist will show up as a Podcast after running mktunes.pl
+ This is free software; see the source for copying conditions. There is NO
+--- gnupod-0.99.8/CHANGES 2020-08-20 18:32:16.928554876 +1400
++++ gnupod-0.99.8/CHANGES.new 2020-08-20 18:32:19.076627518 +1400
+@@ -258,14 +258,14 @@
+ -> Apple lowered the Max. Pathlength from 64 to
+ 55. GNUpod will now crop after 49 chars (who knows what
+ Apple will do next time?)
+- ..you can run 'gnupod_check.pl --fixit' to crop
++ ..you can run 'gnupod_check --fixit' to crop
+ songs you added with an older version.
+ -> Looks like Apple also broke the SmartPlaylists Liveupdate
+ Feature. I couldn't get it to work with iTunes and GNUpod. Good job guys!
+ Since GNUpod only supports 'liveupdate-smartplaylists', you can't
+ use any SPL's with GNUpod and iPod-Mini 1.4 . Downgrading to 1.3 helps.
-- gnupod_addsong.pl can also download podcasts and create such
-+ gnupod_addsong can also download podcasts and create such
- playlists itself:
+-- gnupod_check.pl has now a --fixit switch. It will try to
++- gnupod_check has now a --fixit switch. It will try to
+ fix the found errors itself
-- gnupod_addsong.pl -p "Heute Morgen" --playlist-is-podcast http://pod.drs.ch/heutemorgen_mpx.xml
-+ gnupod_addsong -p "Heute Morgen" --playlist-is-podcast http://pod.drs.ch/heutemorgen_mpx.xml
+ - Updated documentation: Tell how to extract a
+@@ -432,7 +432,7 @@
+ - Fixed some SmartPlaylist stuff and added support for last
+ playtime
- Running this command will create a Playlist called 'Heute Morgen'
- (`-p') and set `podcast="1"' (`--playlist-is-podcast').
--`gnupod_addsong.pl' will then fetch the podcast from
-+`gnupod_addsong' will then fetch the podcast from
- `http://pod.drs.ch/heutemorgen_mpx.xml', download all (new) files and
- add them to the 'Heute Morgen' playlist!
+-- Added gnupod_check.pl, it check's for 'lost' files
++- Added gnupod_check, it check's for 'lost' files
-@@ -671,8 +671,8 @@
- model = nano_4g
+ - I changed the 'build' system. Btw, you can now uninstall
+ GNUpod using 'make uninstall' .. but why? :)
+--- gnupod-0.99.8/README 2020-08-20 18:32:17.016557852 +1400
++++ gnupod-0.99.8/README.new 2020-08-20 18:32:19.124629141 +1400
+@@ -31,7 +31,7 @@
- To specify a cover while adding files you'd use the `--artwork'
--switch of `gnupod_addsong.pl'. Example:
-- gnupod_addsong.pl --artwork cover.jpg *.mp3
-+switch of `gnupod_addsong'. Example:
-+ gnupod_addsong --artwork cover.jpg *.mp3
+ gnupod_INIT.pl INIT a new iPod (create empty Database + Directories)
+ gnupod_addsong.pl Add files
+-gnupod_check.pl Check for 'zombie' files
++gnupod_check Check for 'zombie' files
+ gnupod_otgsync.pl Handles On-The-Go Sync (not for humans)
+ gnupod_search Search ;)
+ mktunes.pl Convert the GNUtunesDB.xml to a iTunesDB
+--- gnupod-0.99.8/doc/gnupod.info 2020-08-20 18:32:17.100560693 +1400
++++ gnupod-0.99.8/doc/gnupod.info.new 2020-08-20 18:32:19.184631171 +1400
+@@ -725,10 +725,10 @@
+ If your computer crashed while uploading/deleting songs, you may have
+ some 'zombie' files.
- Use `gnupod_search.pl' to change/add artwork for existing files.
- Example:
-@@ -730,12 +730,12 @@
+- In this case, you can use 'gnupod_check.pl' to search 'lost' files.
+-gnupod_check.pl will tell you what you could do to fix it.
++ In this case, you can use 'gnupod_check' to search 'lost' files.
++gnupod_check will tell you what you could do to fix it.
- If gnupod_check.pl found many errors (or you lost your
+- If gnupod_check.pl found many errors (or you lost your
++ If gnupod_check found many errors (or you lost your
GNUtunesDB.xml), you can 'rebuild' an GNUtunesDB using
--`gnupod_addsong.pl'
-+`gnupod_addsong'
-
-- gnupod_addsong.pl --restore -m /mnt/ipod
-+ gnupod_addsong --restore -m /mnt/ipod
-
- First, it will create a clean, empty GNUtunesDB, it won't delete any
--songs on the iPod. Then, `gnupod_addsong.pl --restore' will re-create
-+songs on the iPod. Then, `gnupod_addsong --restore' will re-create
- a GNUtunesDB including the Songs which are on the iPod
-
- I think nobody will ever have to do this.. but it maybe usefull to
-@@ -845,7 +845,7 @@
- and iTunes)
-
- Only mktunes.pl and tunes2pod.pl 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/gnupodrc.example 2009-07-10 11:20:05.000000000 -1200
-+++ gnupod-0.99.8/doc/gnupodrc.example.new 2020-08-19 16:15:39.343059588 -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/doc/gnupod.texi 2020-08-19 16:15:37.174932839 -1200
-+++ gnupod-0.99.8/doc/gnupod.texi.new 2020-08-19 16:15:39.375061459 -1200
-@@ -486,39 +486,39 @@
- @node Add files
- @section Add files
-
--To add files, we use the script called @code{@w{gnupod_addsong.pl}}.
-+To add files, we use the script called @code{@w{gnupod_addsong}}.
-
- First, mount the iPod (eg. at /mnt/ipod) if it isn't mounted.
-
--If you would like to add the file /tmp/foo.mp3, run gnupod_addsong.pl like this:
-+If you would like to add the file /tmp/foo.mp3, run gnupod_addsong like this:
- @example
--gnupod_addsong.pl -m /mnt/ipod /tmp/foo.mp3
-+gnupod_addsong -m /mnt/ipod /tmp/foo.mp3
- @end example
-
- You can also use wildcards:
- @example
--gnupod_addsong.pl -m /mnt/ipod /mnt/mp3/seiken_densetsu2_ost/* /mnt/mp3/xenogears/ost?/*
-+gnupod_addsong -m /mnt/ipod /mnt/mp3/seiken_densetsu2_ost/* /mnt/mp3/xenogears/ost?/*
- @end example
-
--It isn't possible to add the same MP3 multiple times, gnupod_addsong.pl detects duplicates
-+It isn't possible to add the same MP3 multiple times, gnupod_addsong detects duplicates
- (Duplicate = same filesize/time and ID3Tag name). You can disable the duplicate-detection
- with the '--duplicate' switch.
-
--gnupod_addsong.pl understands MP3/WAV (RIFF) and M4A (Apple AAC - NO DRM!) files.
-+gnupod_addsong understands MP3/WAV (RIFF) and M4A (Apple AAC - NO DRM!) files.
-
- It can also convert FLAC and OGG files on-the-fly:
-
- Using this example, it would convert the two files into MP3 and add them to the iPod.
-
- @example
--gnupod_addsong.pl -m /mnt/ipod myfile.flac myfile.ogg --decode=mp3
-+gnupod_addsong -m /mnt/ipod myfile.flac myfile.ogg --decode=mp3
- @end example
-
- (Note: To use all features of --decode, you will have to install
- Audio::FLAC::Header, Ogg::Vorbis::Header::PurePerl, lame, flac, oggenc and faac)
-
-
--gnupod_addsong.pl tries to 'auto-detect' the encoding of the ID3 Tag.
-+gnupod_addsong tries to 'auto-detect' the encoding of the ID3 Tag.
- Sometimes this works (in most cases ;) ) sometimes it doesn't. If it doesn't work for you,
- feel free to send me an example-file: pab@@blinkenligts.ch
-
-@@ -638,7 +638,7 @@
- For more examples have a look at @code{@w{doc/gnutunesdb.example}} included in the GNUpod tarball.
- Also check out http://blinkenlights.ch/gnupod/mkspl.html for a 'JavaScript SPL-Creator'
-
--You can also use the --playlist option of gnupod_addsong.pl. This will create and add the listed songs to the
-+You can also use the --playlist option of gnupod_addsong. This will create and add the listed songs to the
- named playlist.
-
- Don't forget to run mktunes before umounting! (See 'Unplug the iPod')
-@@ -651,14 +651,14 @@
- media type is set correctly. To add a single podcast do the following:
-
- @example
--gnupod_addsong.pl -p "Podcast Title" --playlist-is-podcast podcast.mp3
-+gnupod_addsong -p "Podcast Title" --playlist-is-podcast podcast.mp3
- @end example
- You can add multiple podcasts to the same title as well:
- @example
--gnupod_addsong.pl -p "Podcast Title" --playlist-is-podcast podcasts/*
-+gnupod_addsong -p "Podcast Title" --playlist-is-podcast podcasts/*
- @end example
- This also tells the iPod to skip this file when shuffling files. See
--gnupod_addsong.pl -h for more options.
-+gnupod_addsong -h for more options.
-
- If you want to change existing playlists to
- 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
-
--gnupod_addsong.pl can also download podcasts and create such playlists itself:
-+gnupod_addsong can also download podcasts and create such playlists itself:
-
- @example
--gnupod_addsong.pl -p "Heute Morgen" --playlist-is-podcast http://pod.drs.ch/heutemorgen_mpx.xml
-+gnupod_addsong -p "Heute Morgen" --playlist-is-podcast http://pod.drs.ch/heutemorgen_mpx.xml
- @end example
-
- Running this command will create a Playlist called 'Heute Morgen' (@code{@w{-p}}) and set @code{@w{podcast="1"}} (@code{@w{--playlist-is-podcast}}).
--@code{@w{gnupod_addsong.pl}} will then fetch the podcast from @code{@w{http://pod.drs.ch/heutemorgen_mpx.xml}}, download all (new) files
-+@code{@w{gnupod_addsong}} will then fetch the podcast from @code{@w{http://pod.drs.ch/heutemorgen_mpx.xml}}, download all (new) files
- and add them to the 'Heute Morgen' playlist!
-
- @node Adding cover artwork
-@@ -706,9 +706,9 @@
- @end example
-
-
--To specify a cover while adding files you'd use the @code{@w{--artwork}} switch of @code{@w{gnupod_addsong.pl}}. Example:
-+To specify a cover while adding files you'd use the @code{@w{--artwork}} switch of @code{@w{gnupod_addsong}}. Example:
- @example
--gnupod_addsong.pl --artwork cover.jpg *.mp3
-+gnupod_addsong --artwork cover.jpg *.mp3
- @end example
+ `gnupod_addsong.pl'
+--- gnupod-0.99.8/doc/gnupod.texi 2020-08-20 18:32:17.144562181 +1400
++++ gnupod-0.99.8/doc/gnupod.texi.new 2020-08-20 18:32:19.272634147 +1400
+@@ -761,11 +761,11 @@
+ If your computer crashed while uploading/deleting songs, you may
+ have some 'zombie' files.
-@@ -766,14 +766,14 @@
+-In this case, you can use 'gnupod_check.pl' to search 'lost' files.
+-gnupod_check.pl will tell you what you could do to fix it.
++In this case, you can use 'gnupod_check' to search 'lost' files.
++gnupod_check will tell you what you could do to fix it.
- If gnupod_check.pl found many errors (or you lost your GNUtunesDB.xml),
--you can 'rebuild' an GNUtunesDB using @code{gnupod_addsong.pl}
-+you can 'rebuild' an GNUtunesDB using @code{gnupod_addsong}
+-If gnupod_check.pl found many errors (or you lost your GNUtunesDB.xml),
++If gnupod_check found many errors (or you lost your GNUtunesDB.xml),
+ you can 'rebuild' an GNUtunesDB using @code{gnupod_addsong.pl}
@example
--gnupod_addsong.pl --restore -m /mnt/ipod
-+gnupod_addsong --restore -m /mnt/ipod
- @end example
-
- First, it will create a clean, empty GNUtunesDB, it won't delete any songs on the iPod.
--Then, @code{gnupod_addsong.pl --restore} will re-create a GNUtunesDB including the Songs which are on the iPod
-+Then, @code{gnupod_addsong --restore} will re-create a GNUtunesDB including the Songs which are on the iPod
-
- I think nobody will ever have to do this.. but it maybe usefull to know that it's possible
- (Note: Of course you'll lose your Playlists)
-@@ -870,7 +870,7 @@
- iPod and iTunes)
-
- Only mktunes.pl 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.
-+(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/src/gnupod_addsong.pl 2020-08-19 16:15:37.318941258 -1200
-+++ gnupod-0.99.8/src/gnupod_addsong.pl.new 2020-08-19 16:15:39.411063564 -1200
-@@ -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);
-
--print "gnupod_addsong.pl Version ###__VERSION__### (C) Adrian Ulrich\n";
-+print "gnupod_addsong Version ###__VERSION__### (C) Adrian Ulrich\n";
-
- $int_count = 3; #The user has to send INT (Ctrl+C) x times until we stop
-
-@@ -713,7 +713,7 @@
- #Sighandler
- sub handle_int {
- if($int_count) {
-- warn "RECEIVED SIGINT (CTRL+C): gnupod_addsong.pl is still working! hit CTRL+C again $int_count time(s) to quit.\n";
-+ warn "RECEIVED SIGINT (CTRL+C): gnupod_addsong is still working! hit CTRL+C again $int_count time(s) to quit.\n";
- $int_count--;
- }
- else {
-@@ -728,7 +728,7 @@
- my($rtxt) = @_;
- die << "EOF";
- $rtxt
--Usage: gnupod_addsong.pl [-h] [-m directory] File1 File2 ...
-+Usage: gnupod_addsong [-h] [-m directory] File1 File2 ...
+--- gnupod-0.99.8/doc/gnupod.html 2020-08-20 18:32:17.192563804 +1400
++++ gnupod-0.99.8/doc/gnupod.html.new 2020-08-20 18:32:19.392638205 +1400
+@@ -1042,11 +1042,11 @@
+ have some 'zombie' files.
+
- -h, --help display this help and exit
- --version output version information and exit
-@@ -775,7 +775,7 @@
+-In this case, you can use 'gnupod_check.pl' to search 'lost' files.
+-gnupod_check.pl will tell you what you could do to fix it.
++In this case, you can use 'gnupod_check' to search 'lost' files.
++gnupod_check will tell you what you could do to fix it.
+
- sub version {
- die << "EOF";
--gnupod_addsong.pl (gnupod) ###__VERSION__###
-+gnupod_addsong (gnupod) ###__VERSION__###
- Copyright (C) Adrian Ulrich 2002-2008
+-If gnupod_check.pl found many errors (or you lost your GNUtunesDB.xml),
++If gnupod_check found many errors (or you lost your GNUtunesDB.xml),
+ you can 'rebuild' an GNUtunesDB using gnupod_addsong.pl
+
- This is free software; see the source for copying conditions. There is NO
---- gnupod-0.99.8/src/gnupod_check.pl 2020-08-19 16:15:37.490951313 -1200
-+++ gnupod-0.99.8/src/gnupod_check.pl.new 2020-08-19 16:15:39.447065668 -1200
-@@ -85,7 +85,7 @@
- if($TRACKER{ERR} > 25) {
- print " -> I found MANY ($TRACKER{ERR}) errors. Maybe you should run\n";
- print " '$0 --fixit' to let me fix this errors. If it still doesn't help, run\n";
-- print " 'gnupod_addsong.pl --restore'. This would wipe all your Playlists\n";
-+ print " 'gnupod_addsong --restore'. This would wipe all your Playlists\n";
- print " but would cure your iPod for sure.\n";
- }
- }
---- gnupod-0.99.8/BUGS 2009-07-10 11:20:05.000000000 -1200
-+++ gnupod-0.99.8/BUGS.new 2020-08-19 16:15:39.495068475 -1200
-@@ -3,7 +3,7 @@
- * GNUpod doesn't like duplicate id's in the GNUtunesDB.xml ({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/gnupod_otgsync.pl 2009-07-11 13:20:05.000000000 +1400
++++ gnupod-0.99.8/src/gnupod_otgsync.pl.new 2020-08-20 18:32:20.112662554 +1400
+@@ -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
+--- 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 2020-08-20 18:32:20.304669047 +1400
+@@ -191,7 +191,7 @@
+ }
+
+ ##############################################################
+-# 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/ext/FooBar.pm 2009-07-11 13:20:05.000000000 +1400
++++ gnupod-0.99.8/src/ext/FooBar.pm.new 2020-08-20 18:32:20.392672023 +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 2020-08-20 18:32:20.580678381 +1400
+@@ -1012,7 +1012,7 @@
+
+
+
+-### Here are the READ sub's used by tunes2pod.pl
++### Here are the READ sub's used by tunes2pod
+
+ ###########################################
+ # Get a INT value
+--- gnupod-0.99.8/CHANGES 2020-08-20 18:32:19.076627518 +1400
++++ gnupod-0.99.8/CHANGES.new 2020-08-20 18:32:20.836687039 +1400
@@ -136,7 +136,7 @@
Summary
-------
@@ -1754,8 +1341,8 @@
MasterPlaylist)
@@ -222,7 +222,7 @@
- - gnupod_addsong can now fetch podcast-rss feeds!
- Example: 'gnupod_addsong http://www.tagesschau.de/export/podcast'
+ - 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
@@ -1793,8 +1380,8 @@
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 or
-+ UTF8 version after running tunes2pod/gnupod_addsong or
+- 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
@@ -1818,80 +1405,34 @@
(Thanks to Ciamac Moallemi for reporting and providing a patch)
- Support for songnum, songs, cdnum, cds and year
---- gnupod-0.99.8/doc/gnupod.html 2020-08-19 16:15:39.195050936 -1200
-+++ gnupod-0.99.8/doc/gnupod.html.new 2020-08-19 16:15:39.851089288 -1200
-@@ -600,7 +600,7 @@
- |
-
- 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)
-+(or if it finds an iTunesDB, it runs tunes2pod to convert the iTunesDB to an GNUtunesDB)
-
-
- Use
-@@ -1084,11 +1084,11 @@
-
- If you want to use an iPod with GNUpod and used something other than GNUpod (maybe iTunes)
- to perform the last update (adding songs, editing playists.. doing something..), you'll have to
-- use tunes2pod.pl to update the (outdated) GNUtunesDB.
-+ use tunes2pod to update the (outdated) GNUtunesDB.
-
-
- Mount the iPod and run
-- | | tunes2pod.pl -m /mnt/ipod
-+
-
- The iPod is now ready again for GNUpod.
-@@ -1096,7 +1096,7 @@
-
- You have to do this because GNUpod stores its information in the GNUtunesDB, but other programs access the
- iTunesDB directly. After you did something with eg. iTunes, the GNUtunesDB would be 'outdated' and you would
--lose any changes you made with iTunes. Running tunes2pod.pl will write a new GNUtunesDB which
-+lose any changes you made with iTunes. Running tunes2pod will write a new GNUtunesDB which
- reflects the content of the current iTunesDB.
-
-
-@@ -1113,7 +1113,7 @@
- </playlist>
- |
-
--..would look like this after using tunes2pod.pl
-+..would look like this after using tunes2pod
- | | ...
- <playist name="extended">
- <add id="1" />
-@@ -1211,13 +1211,13 @@
- the iTunesDB, but it's a simple XML file: easy to understand by humans and easy to edit by hand.
-
-
--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
- 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
- (gnupod_addsong for example) only have to deal with the XML file called GNUtunesDB.
-
+--- gnupod-0.99.8/README 2020-08-20 18:32:19.124629141 +1400
++++ gnupod-0.99.8/README.new 2020-08-20 18:32:20.936690420 +1400
+@@ -35,7 +35,7 @@
+ gnupod_otgsync.pl Handles On-The-Go Sync (not for humans)
+ gnupod_search 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
-@@ -1225,7 +1225,7 @@
- GNUtunesDB (by hand or using gnupod_something.pl) you'll have to run mktunes.pl.
-
+ You'll have to use mktunes.pl if you added/deleted/changed something
+ on the iPod.
+--- gnupod-0.99.8/doc/gnupodrc.example 2020-08-20 18:32:17.052559069 +1400
++++ gnupod-0.99.8/doc/gnupodrc.example.new 2020-08-20 18:32:21.016693126 +1400
+@@ -41,7 +41,7 @@
+ ## Uncomment this to skip 'on-the-go' sync
+ # otgsync.nosync = 1
--If 'you' changed the iTunesDB (using gtkPod/iTunes/Ehpod), run tunes2pod.pl *before*
-+If 'you' changed the iTunesDB (using gtkPod/iTunes/Ehpod), run tunes2pod *before*
- using any other GNUpod commands.
-
+-# *** tunes2pod.pl ***
++# *** tunes2pod ***
+ ## Uncomment to set '--force' switch to true (DANGEROUS)
+ # tunes2pod.force = 1
---- gnupod-0.99.8/doc/gnupod.info 2020-08-19 16:15:39.255054443 -1200
-+++ gnupod-0.99.8/doc/gnupod.info.new 2020-08-19 16:15:39.891091626 -1200
+--- gnupod-0.99.8/doc/gnupod.info 2020-08-20 18:32:19.184631171 +1400
++++ gnupod-0.99.8/doc/gnupod.info.new 2020-08-20 18:32:21.140697319 +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)
@@ -1939,7 +1480,7 @@
- Only mktunes.pl and tunes2pod.pl have to worry about the iTunesDB
+ Only mktunes.pl and tunes2pod have to worry about the iTunesDB
- format: all other tools (gnupod_addsong for example) only have to
+ format: all other tools (gnupod_addsong.pl for example) only have to
deal with the XML file called GNUtunesDB.
@@ -853,7 +853,7 @@
@@ -1951,23 +1492,12 @@
File: gnupod.info, Node: Get rid of '-m', Next: Known bugs and limitations, Prev: GNUtunesDB, Up: Problems
---- gnupod-0.99.8/doc/gnupodrc.example 2020-08-19 16:15:39.343059588 -1200
-+++ gnupod-0.99.8/doc/gnupodrc.example.new 2020-08-19 16:15:39.927093731 -1200
-@@ -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.texi 2020-08-19 16:15:39.375061459 -1200
-+++ gnupod-0.99.8/doc/gnupod.texi.new 2020-08-19 16:15:39.967096070 -1200
+--- gnupod-0.99.8/doc/gnupod.texi 2020-08-20 18:32:19.272634147 +1400
++++ gnupod-0.99.8/doc/gnupod.texi.new 2020-08-20 18:32:21.244700836 +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)
@@ -2016,7 +1546,7 @@
-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
- (gnupod_addsong for example) only have to deal with the XML file called GNUtunesDB.
+ (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}}.
@@ -2026,143 +1556,105 @@
using any other GNUpod commands.
---- gnupod-0.99.8/src/gnupod_INIT.pl 2020-08-19 16:15:37.278938919 -1200
-+++ gnupod-0.99.8/src/gnupod_INIT.pl.new 2020-08-19 16:15:40.003098174 -1200
-@@ -115,9 +115,9 @@
+--- gnupod-0.99.8/doc/gnupod.html 2020-08-20 18:32:19.392638205 +1400
++++ gnupod-0.99.8/doc/gnupod.html.new 2020-08-20 18:32:21.372705165 +1400
+@@ -600,7 +600,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 2020-08-19 16:15:40.059101448 -1200
-@@ -36,7 +36,7 @@
- $| = 1;
+ 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)
+
+ Use
+@@ -1084,11 +1084,11 @@
--print "tunes2pod.pl Version ###__VERSION__### (C) Adrian Ulrich\n";
-+print "tunes2pod Version ###__VERSION__### (C) Adrian Ulrich\n";
+ If you want to use an iPod with GNUpod and used something other than GNUpod (maybe iTunes)
+ to perform the last update (adding songs, editing playists.. doing something..), you'll have to
+- use tunes2pod.pl to update the (outdated) GNUtunesDB.
++ use tunes2pod to update the (outdated) GNUtunesDB.
+
- $opts{mount} = $ENV{IPOD_MOUNTPOINT};
+ Mount the iPod and run
+- | | tunes2pod.pl -m /mnt/ipod
++
-@@ -58,7 +58,7 @@
- #We disabled all autosyncing (_no_sync set to 1), so we do a test
- #ourself
- if(!$opts{force} && !(GNUpod::FooBar::ItunesDBNeedsSync($con))) {
-- print "I don't think that you have to run tunes2pod.pl\n";
-+ print "I don't think that you have to run tunes2pod\n";
- print "The GNUtunesDB looks up-to-date\n";
- print "\n";
- print "If you think i'm wrong, use '$0 --force'\n";
-@@ -354,7 +354,7 @@
- my($rtxt) = @_;
- die << "EOF";
- $rtxt
--Usage: tunes2pod.pl [-h] [-m directory]
-+Usage: tunes2pod [-h] [-m directory]
+ The iPod is now ready again for GNUpod.
+@@ -1096,7 +1096,7 @@
- -h, --help display this help and exit
- --version output version information and exit
-@@ -367,7 +367,7 @@
+ You have to do this because GNUpod stores its information in the GNUtunesDB, but other programs access the
+ iTunesDB directly. After you did something with eg. iTunes, the GNUtunesDB would be 'outdated' and you would
+-lose any changes you made with iTunes. Running tunes2pod.pl will write a new GNUtunesDB which
++lose any changes you made with iTunes. Running tunes2pod will write a new GNUtunesDB which
+ reflects the content of the current iTunesDB.
+
- sub version {
- die << "EOF";
--tunes2pod.pl (gnupod) ###__VERSION__###
-+tunes2pod (gnupod) ###__VERSION__###
- Copyright (C) Adrian Ulrich 2002-2007
+@@ -1113,7 +1113,7 @@
+ </playlist>
+ |
- This is free software; see the source for copying conditions. There is NO
---- 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 2020-08-19 16:15:40.163107529 -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
---- gnupod-0.99.8/src/ext/XMLhelper.pm 2020-08-19 16:15:37.570955991 -1200
-+++ gnupod-0.99.8/src/ext/XMLhelper.pm.new 2020-08-19 16:15:40.263113375 -1200
-@@ -191,7 +191,7 @@
- }
+-..would look like this after using tunes2pod.pl
++..would look like this after using tunes2pod
+ | | ...
+ <playist name="extended">
+ <add id="1" />
+@@ -1211,13 +1211,13 @@
+ the iTunesDB, but it's a simple XML file: easy to understand by humans and easy to edit by hand.
+
- ##############################################################
--# 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 @@
- }
+-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
+ iPod and iTunes)
+
- ##############################################################
--# 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/iTunesDB.pm 2009-07-10 11:20:05.000000000 -1200
-+++ gnupod-0.99.8/src/ext/iTunesDB.pm.new 2020-08-19 16:15:40.375119923 -1200
-@@ -1012,7 +1012,7 @@
+-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
+ (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.
+
+-If 'you' changed the iTunesDB (using gtkPod/iTunes/Ehpod), run tunes2pod.pl *before*
++If 'you' changed the iTunesDB (using gtkPod/iTunes/Ehpod), run tunes2pod *before*
+ using any other GNUpod commands.
+
--### Here are the READ sub's used by tunes2pod.pl
-+### Here are the READ sub's used by tunes2pod
+Created gnupod-0.99.8/man/gnupod_convert_FLAC.pl.1.gz
+--- gnupod-0.99.8/src/gnupod_convert_FLAC.pl 2009-07-11 13:20:05.000000000 +1400
++++ gnupod-0.99.8/src/gnupod_convert_FLAC.pl.new 2020-08-20 18:32:22.496743177 +1400
+@@ -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);
+ }
+--- gnupod-0.99.8/src/ext/FileMagic.pm 2020-08-20 18:32:18.856620078 +1400
++++ gnupod-0.99.8/src/ext/FileMagic.pm.new 2020-08-20 18:32:22.620747370 +1400
+@@ -52,7 +52,7 @@
+ #
- ###########################################
- # Get a INT value
---- 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 2020-08-19 16:15:40.491126705 -1200
-@@ -143,7 +143,7 @@
- sub StartItunesDBSync {
- my($con) = @_;
-
-- my $XBIN = "$con->{bindir}/tunes2pod.pl";
-+ my $XBIN = "$con->{bindir}/tunes2pod";
-
- if(-x $XBIN) {
- {
+ my $NN_HEADERS = {'MThd' => { encoder=>'gnupod_convert_MIDI.pl', 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.pl', ftyp=>'RIFF', magic2=>'AVI '}};
Patched gnupod-0.99.8/man/mktunes.pl.1.gz
---- gnupod-0.99.8/README.about_m4a 2020-08-19 16:15:38.947036436 -1200
-+++ gnupod-0.99.8/README.about_m4a.new 2020-08-19 16:15:40.707139333 -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/README 2020-08-19 16:15:39.707080869 -1200
-+++ gnupod-0.99.8/README.new 2020-08-19 16:15:40.759142373 -1200
-@@ -34,10 +34,10 @@
- gnupod_check.pl Check for 'zombie' files
- gnupod_otgsync.pl 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/README.developer 2020-08-19 16:15:39.743082974 -1200
-+++ gnupod-0.99.8/README.developer.new 2020-08-19 16:15:40.839147051 -1200
+--- gnupod-0.99.8/README.developer 2020-08-20 18:32:19.648646862 +1400
++++ gnupod-0.99.8/README.developer.new 2020-08-20 18:32:22.884756298 +1400
@@ -6,9 +6,9 @@
Minimal testing:
- > gnupod_INIT /mnt/empty
+ > gnupod_INIT.pl /mnt/empty
> gnupod_addsong
-> mktunes.pl
+> mktunes
@@ -2172,19 +1664,28 @@
> check if your ipod can read the result
Release checklist
---- gnupod-0.99.8/FAQ 2020-08-19 16:15:39.771084611 -1200
-+++ gnupod-0.99.8/FAQ.new 2020-08-19 16:15:40.927152195 -1200
+--- gnupod-0.99.8/BUGS 2009-07-11 13:20:05.000000000 +1400
++++ gnupod-0.99.8/BUGS.new 2020-08-20 18:32:22.932757922 +1400
+@@ -5,5 +5,5 @@
+ * GNUpod doen't like audible.com files (I'll have to look at this later...)
+ * gnupod_addsong.pl --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/FAQ 2020-08-20 18:32:19.740649974 +1400
++++ gnupod-0.99.8/FAQ.new 2020-08-20 18:32:22.976759410 +1400
@@ -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
+ 2 run gnupod_INIT.pl -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'
+ 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
+ 2 use gnupod_addsong.pl
- 3 build the database with mktunes.pl
+ 3 build the database with mktunes
4 umount
@@ -2217,14 +1718,150 @@
..or feel free to ask me questions about it:
---- gnupod-0.99.8/CHANGES 2020-08-19 16:15:39.807086715 -1200
-+++ gnupod-0.99.8/CHANGES.new 2020-08-19 16:15:41.007156873 -1200
+--- gnupod-0.99.8/src/gnupod_search.pl 2020-08-20 18:32:16.804550682 +1400
++++ gnupod-0.99.8/src/gnupod_search.pl.new 2020-08-20 18:32:23.020760898 +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/mktunes.pl 2009-07-11 13:20:05.000000000 +1400
++++ gnupod-0.99.8/src/mktunes.pl.new 2020-08-20 18:32:23.372772802 +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: 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
+@@ -159,7 +159,7 @@
+ # Displays current version
+ sub version {
+ die << "EOF";
+-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/gnupod_INIT.pl 2020-08-20 18:32:19.976657955 +1400
++++ gnupod-0.99.8/src/gnupod_INIT.pl.new 2020-08-20 18:32:23.528778077 +1400
+@@ -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
+
+--- gnupod-0.99.8/src/gnupod_otgsync.pl 2020-08-20 18:32:20.112662554 +1400
++++ gnupod-0.99.8/src/gnupod_otgsync.pl.new 2020-08-20 18:32:23.588780106 +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/ext/FooBar.pm 2020-08-20 18:32:20.392672023 +1400
++++ gnupod-0.99.8/src/ext/FooBar.pm.new 2020-08-20 18:32:23.636781730 +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 2020-08-20 18:32:23.736785111 +1400
+@@ -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 2009-07-11 13:20:05.000000000 +1400
++++ gnupod-0.99.8/src/gnupod_addsong.pl.new 2020-08-20 18:32:23.780786599 +1400
+@@ -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-0.99.8/README.about_m4a 2009-07-11 13:20:05.000000000 +1400
++++ gnupod-0.99.8/README.about_m4a.new 2020-08-20 18:32:23.836788493 +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/CHANGES 2020-08-20 18:32:20.836687039 +1400
++++ gnupod-0.99.8/CHANGES.new 2020-08-20 18:32:23.892790387 +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 to be passed on to mktunes.pl.
-+ NEW: Added "--fwguid" option to gnupod_INIT to be passed on to mktunes.
+- 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.
*** OLD STUFF ***
@@ -2249,8 +1886,8 @@
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'
+ - 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 and mktunes.pl
+- Added basic support for podcast-rss and podcast-guid in tunes2pod and mktunes
@@ -2274,7 +1911,7 @@
+ mktunes will drop old (= now invalid) ratings,
no autoconvert... sorry.. but does anyone care?
- - gnupod_addsong understands ID3v2.2 tags
+ - 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)
@@ -2328,117 +1965,57 @@
-- mktunes.pl no longer accepts when was
+- mktunes no longer accepts when was
not found.
- - gnupod_addsong handles long filenames now better
+ - gnupod_addsong.pl handles long filenames now better
- Timestamp should now be set correct
---- gnupod-0.99.8/doc/gnupod.html 2020-08-19 16:15:39.851089288 -1200
-+++ gnupod-0.99.8/doc/gnupod.html.new 2020-08-19 16:15:41.055159679 -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.
-
+--- gnupod-0.99.8/README 2020-08-20 18:32:20.936690420 +1400
++++ gnupod-0.99.8/README.new 2020-08-20 18:32:24.008794310 +1400
+@@ -34,10 +34,10 @@
+ gnupod_check Check for 'zombie' files
+ gnupod_otgsync.pl Handles On-The-Go Sync (not for humans)
+ gnupod_search 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
-- | | mktunes.pl -m /mnt/ipod --volume 40
-+ | | mktunes -m /mnt/ipod --volume 40
- |
+-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.
- 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
- |
+--- gnupod-0.99.8/doc/gnupodrc.example 2020-08-20 18:32:21.016693126 +1400
++++ gnupod-0.99.8/doc/gnupodrc.example.new 2020-08-20 18:32:24.048795663 +1400
+@@ -22,9 +22,9 @@
+ ## * nano_4g (the late 2008 nano)
+ # model = video
--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)
-
+-## 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
-
-@@ -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.
-
+@@ -32,7 +32,7 @@
-
-@@ -1213,16 +1213,16 @@
+ ##### NON GLOBAL OPTIONS ######
- 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)
-
+-# *** mktunes.pl ***
++# *** mktunes ***
+ ## Specify the iPods name
+ # mktunes.ipod-name = Wurstli
--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.
-
+@@ -46,7 +46,7 @@
+ # tunes2pod.force = 1
- 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.info 2020-08-19 16:15:39.891091626 -1200
-+++ gnupod-0.99.8/doc/gnupod.info.new 2020-08-19 16:15:41.099162251 -1200
+-# *** mktunes.pl ***
++# *** mktunes ***
+ ## Set --volume boost to +10 percent
+ # mktunes.volume = +10
+ ## Enforce iPod serial number:
+--- gnupod-0.99.8/doc/gnupod.info 2020-08-20 18:32:21.140697319 +1400
++++ gnupod-0.99.8/doc/gnupod.info.new 2020-08-20 18:32:24.120798098 +1400
@@ -338,8 +338,8 @@
Setup Firewire (or USB) as described in 'Using FireWire with
@@ -2466,11 +2043,11 @@
- 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
+ gnupod_addsong.pl 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
+ gnupod_search --artwork cover.jpg --album Katamari
- don't forget to run `mktunes.pl' afterwards.
+ don't forget to run `mktunes' afterwards.
@@ -2533,7 +2110,7 @@
- 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
+ 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
@@ -2543,40 +2120,8 @@
If 'you' changed the iTunesDB (using gtkPod/iTunes/Ehpod), run
`tunes2pod' *before* using any other GNUpod commands.
---- gnupod-0.99.8/doc/gnupodrc.example 2020-08-19 16:15:39.927093731 -1200
-+++ gnupod-0.99.8/doc/gnupodrc.example.new 2020-08-19 16:15:41.155165525 -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/doc/gnupod.texi 2020-08-19 16:15:39.967096070 -1200
-+++ gnupod-0.99.8/doc/gnupod.texi.new 2020-08-19 16:15:41.267172073 -1200
+--- gnupod-0.99.8/doc/gnupod.texi 2020-08-20 18:32:21.244700836 +1400
++++ gnupod-0.99.8/doc/gnupod.texi.new 2020-08-20 18:32:24.252802562 +1400
@@ -359,7 +359,7 @@
Note: These steps do not work on late 2007 iPods (such as Classic, Touch and 3th gen. Nano).
@@ -2602,10 +2147,10 @@
-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:
+ gnupod_addsong.pl can also download podcasts and create such playlists itself:
@@ -718,7 +718,7 @@
- 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.pl}} afterwards.
@@ -2672,7 +2217,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 for example) only have to deal with the XML file called GNUtunesDB.
+ (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}}.
@@ -2680,190 +2225,429 @@
If 'you' changed the iTunesDB (using gtkPod/iTunes/Ehpod), run @code{@w{tunes2pod}} *before*
using any other GNUpod commands.
---- gnupod-0.99.8/src/gnupod_INIT.pl 2020-08-19 16:15:40.003098174 -1200
-+++ gnupod-0.99.8/src/gnupod_INIT.pl.new 2020-08-19 16:15:41.319175114 -1200
-@@ -120,9 +120,9 @@
- $t2pfail = system("$con->{bindir}/tunes2pod", "--force", "-m", $opts{mount});
+--- gnupod-0.99.8/doc/gnupod.html 2020-08-20 18:32:21.372705165 +1400
++++ gnupod-0.99.8/doc/gnupod.html.new 2020-08-20 18:32:24.388807161 +1400
+@@ -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.pl can also download podcasts and create such playlists itself:
+@@ -967,7 +967,7 @@
+ gnupod_search --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.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 *before*
+Created gnupod-0.99.8/man/gnupod_convert_OGG.pl.1.gz
+--- gnupod-0.99.8/src/gnupod_convert_OGG.pl 2009-07-11 13:20:05.000000000 +1400
++++ gnupod-0.99.8/src/gnupod_convert_OGG.pl.new 2020-08-20 18:32:25.860856941 +1400
+@@ -48,8 +48,8 @@
}
- 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);
+ ## 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);
}
-@@ -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/ext/FileMagic.pm 2020-08-20 18:32:22.620747370 +1400
++++ gnupod-0.99.8/src/ext/FileMagic.pm.new 2020-08-20 18:32:25.964860458 +1400
+@@ -53,7 +53,7 @@
---- gnupod-0.99.8/src/gnupod_addsong.pl 2020-08-19 16:15:39.411063564 -1200
-+++ gnupod-0.99.8/src/gnupod_addsong.pl.new 2020-08-19 16:15:41.387179089 -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;
+ my $NN_HEADERS = {'MThd' => { encoder=>'gnupod_convert_MIDI.pl', 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.pl', ftyp=>'RIFF', magic2=>'AVI '}};
---- gnupod-0.99.8/src/mktunes.pl 2020-08-19 16:15:37.358943596 -1200
-+++ gnupod-0.99.8/src/mktunes.pl.new 2020-08-19 16:15:41.479184468 -1200
-@@ -37,7 +37,7 @@
- my %opts = ();
+Patched gnupod-0.99.8/man/gnupod_INIT.pl.1.gz
+--- gnupod-0.99.8/README.developer 2020-08-20 18:32:22.884756298 +1400
++++ gnupod-0.99.8/README.developer.new 2020-08-20 18:32:26.596881831 +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/FAQ 2020-08-20 18:32:22.976759410 +1400
++++ gnupod-0.99.8/FAQ.new 2020-08-20 18:32:26.640883319 +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/src/gnupod_search.pl 2020-08-20 18:32:23.020760898 +1400
++++ gnupod-0.99.8/src/gnupod_search.pl.new 2020-08-20 18:32:26.744886836 +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_check.pl 2020-08-20 18:32:18.980624272 +1400
++++ gnupod-0.99.8/src/gnupod_check.pl.new 2020-08-20 18:32:26.972894546 +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 "mktunes.pl ###__VERSION__### (C) Adrian Ulrich\n";
-+print "mktunes ###__VERSION__### (C) Adrian Ulrich\n";
+ print "Pass 2: Checking Files on the iPod...\n";
+ checkGNUtunes($con);
+--- gnupod-0.99.8/src/mktunes.pl 2020-08-20 18:32:23.372772802 +1400
++++ gnupod-0.99.8/src/mktunes.pl.new 2020-08-20 18:32:27.040896846 +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/gnupod_INIT.pl 2020-08-20 18:32:23.528778077 +1400
++++ gnupod-0.99.8/src/gnupod_INIT.pl.new 2020-08-20 18:32:27.100898875 +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};
- 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) = @_;
+ #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: mktunes.pl [-h] [-m directory] [-v VALUE]
-+Usage: mktunes [-h] [-m directory] [-v VALUE]
+-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
-@@ -159,7 +159,7 @@
- # Displays current version
+@@ -165,7 +165,7 @@
+
sub version {
die << "EOF";
--mktunes.pl (gnupod) ###__VERSION__###
-+mktunes (gnupod) ###__VERSION__###
- Copyright (C) Adrian Ulrich 2002-2007
+-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_otgsync.pl 2020-08-19 16:15:40.163107529 -1200
-+++ gnupod-0.99.8/src/gnupod_otgsync.pl.new 2020-08-19 16:15:41.567189613 -1200
-@@ -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 {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/ext/Mktunes.pm 2020-08-20 18:32:23.736785111 +1400
++++ gnupod-0.99.8/src/ext/Mktunes.pm.new 2020-08-20 18:32:27.208902528 +1400
+@@ -20,7 +20,7 @@
- push(@keeper, int($el->{file}->{id}));
---- gnupod-0.99.8/src/gnupod_search.pl 2020-08-19 16:15:37.402946169 -1200
-+++ gnupod-0.99.8/src/gnupod_search.pl.new 2020-08-19 16:15:41.643194056 -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
-
- 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/ext/Mktunes.pm 2020-08-19 16:15:37.538954120 -1200
-+++ gnupod-0.99.8/src/ext/Mktunes.pm.new 2020-08-19 16:15:41.683196395 -1200
-@@ -327,7 +327,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.".$$";
- 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";
+- 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 2020-08-20 18:32:23.780786599 +1400
++++ gnupod-0.99.8/src/gnupod_addsong.pl.new 2020-08-20 18:32:27.336906856 +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");
+ }
- 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/ext/FooBar.pm 2020-08-19 16:15:40.491126705 -1200
-+++ gnupod-0.99.8/src/ext/FooBar.pm.new 2020-08-19 16:15:41.719198499 -1200
-@@ -119,10 +119,10 @@
- }
+ # Check volume adjustment options for sanity
+--- gnupod-0.99.8/CHANGES 2020-08-20 18:32:23.892790387 +1400
++++ gnupod-0.99.8/CHANGES.new 2020-08-20 18:32:27.472911455 +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.
- #######################################################################
--# 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/BUGS 2020-08-19 16:15:39.495068475 -1200
-+++ gnupod-0.99.8/BUGS.new 2020-08-19 16:15:41.751200370 -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
-Created gnupod-0.99.8/man/gnupod_convert_RIFF.pl.1.gz
---- gnupod-0.99.8/CHANGES 2020-08-19 16:15:41.007156873 -1200
-+++ gnupod-0.99.8/CHANGES.new 2020-08-19 16:15:42.259230070 -1200
-@@ -141,7 +141,7 @@
- - Reduced MP3::Info false-positives: Empty files are
- no longer detected as .mp3 files
- - tools/fwpatch.pl: Support for video iPods added (yeah!)
--- gnupod_convert_RIFF.pl: Support for new ffmpeg builds (s/aac/libfaac/)
-+- gnupod_convert_RIFF: Support for new ffmpeg builds (s/aac/libfaac/)
- - Upgraded from GPLv2 to GPLv3
+ *** 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.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 ;) )
---- gnupod-0.99.8/src/ext/FileMagic.pm 2020-08-19 16:15:38.827029421 -1200
-+++ gnupod-0.99.8/src/ext/FileMagic.pm.new 2020-08-19 16:15:42.299232409 -1200
-@@ -55,7 +55,7 @@
- 'fLaC' => { encoder=>'gnupod_convert_FLAC.pl', ftyp=>'FLAC'},
- 'OggS' => { encoder=>'gnupod_convert_OGG.pl', ftyp=>'OGG' },
- 'MAC ' => { encoder=>'gnupod_convert_APE.pl', ftyp=>'APE' },
-- 'RIFF' => { encoder=>'gnupod_convert_RIFF.pl', ftyp=>'RIFF', magic2=>'AVI '}};
-+ 'RIFF' => { encoder=>'gnupod_convert_RIFF', ftyp=>'RIFF', magic2=>'AVI '}};
+-gnupod_INIT.pl
++gnupod_INIT
+ * Added '--france' switch (Limit volume to 100 db for
+ 1.x Firmware)
+--- gnupod-0.99.8/tools/extractArtwork.pl 2009-07-11 13:20:05.000000000 +1400
++++ gnupod-0.99.8/tools/extractArtwork.pl.new 2020-08-20 18:32:27.596915649 +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");
-Created gnupod-0.99.8/man/gnupod_convert_APE.pl.1.gz
---- gnupod-0.99.8/src/ext/FileMagic.pm 2020-08-19 16:15:42.299232409 -1200
-+++ gnupod-0.99.8/src/ext/FileMagic.pm.new 2020-08-19 16:15:42.807262109 -1200
-@@ -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' },
-- 'MAC ' => { encoder=>'gnupod_convert_APE.pl', ftyp=>'APE' },
-+ 'MAC ' => { encoder=>'gnupod_convert_APE', ftyp=>'APE' },
- 'RIFF' => { encoder=>'gnupod_convert_RIFF', ftyp=>'RIFF', magic2=>'AVI '}};
+ #print Data::Dumper::Dumper($AWDB);
+
+--- gnupod-0.99.8/README 2020-08-20 18:32:24.008794310 +1400
++++ gnupod-0.99.8/README.new 2020-08-20 18:32:27.720919842 +1400
+@@ -29,7 +29,7 @@
+ GNUpod commands (cheatsheet)
+ ----------------------------
+
+-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/doc/gnupod.info 2020-08-20 18:32:24.120798098 +1400
++++ gnupod-0.99.8/doc/gnupod.info.new 2020-08-20 18:32:27.888925524 +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)
+
+ 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.texi 2020-08-20 18:32:24.252802562 +1400
++++ gnupod-0.99.8/doc/gnupod.texi.new 2020-08-20 18:32:28.008929582 +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/doc/gnupod.html 2020-08-20 18:32:24.388807161 +1400
++++ gnupod-0.99.8/doc/gnupod.html.new 2020-08-20 18:32:28.072931746 +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).
+Created gnupod-0.99.8/man/gnupod_convert_MIDI.pl.1.gz
+--- gnupod-0.99.8/src/ext/FileMagic.pm 2020-08-20 18:32:25.964860458 +1400
++++ gnupod-0.99.8/src/ext/FileMagic.pm.new 2020-08-20 18:32:29.456978550 +1400
+@@ -51,7 +51,7 @@
+ # done!
+ #
+
+-my $NN_HEADERS = {'MThd' => { encoder=>'gnupod_convert_MIDI.pl', ftyp=>'MIDI'},
++my $NN_HEADERS = {'MThd' => { encoder=>'gnupod_convert_MIDI', ftyp=>'MIDI'},
+ 'fLaC' => { encoder=>'gnupod_convert_FLAC', ftyp=>'FLAC'},
+ 'OggS' => { encoder=>'gnupod_convert_OGG', ftyp=>'OGG' },
+ 'MAC ' => { encoder=>'gnupod_convert_APE', ftyp=>'APE' },
Patched gnupod-0.99.8/man/gnupod_otgsync.pl.1.gz
---- gnupod-0.99.8/README 2020-08-19 16:15:40.759142373 -1200
-+++ gnupod-0.99.8/README.new 2020-08-19 16:15:43.023274738 -1200
-@@ -32,7 +32,7 @@
- gnupod_INIT INIT a new iPod (create empty Database + Directories)
- gnupod_addsong Add files
- gnupod_check.pl 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 Convert the GNUtunesDB.xml to a iTunesDB
- tunes2pod Convert the iTunesDB into a GNUtunesDB.xml
---- gnupod-0.99.8/CHANGES 2020-08-19 16:15:42.259230070 -1200
-+++ gnupod-0.99.8/CHANGES.new 2020-08-19 16:15:43.063277076 -1200
+--- gnupod-0.99.8/src/gnupod_otgsync.pl 2020-08-20 18:32:23.588780106 +1400
++++ gnupod-0.99.8/src/gnupod_otgsync.pl.new 2020-08-20 18:32:29.732987884 +1400
+@@ -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
+--- gnupod-0.99.8/src/ext/FooBar.pm 2020-08-20 18:32:23.636781730 +1400
++++ gnupod-0.99.8/src/ext/FooBar.pm.new 2020-08-20 18:32:29.800990183 +1400
+@@ -164,11 +164,11 @@
+ }
+
+ ######################################################################
+-# 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/CHANGES 2020-08-20 18:32:27.472911455 +1400
++++ gnupod-0.99.8/CHANGES.new 2020-08-20 18:32:29.856992077 +1400
@@ -75,7 +75,7 @@
Fixing xescaped to always do byte matching and added some debug
output of dropped illegal characters.
@@ -2871,7 +2655,7 @@
-- 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.
+ - gnupod_addsong.pl: 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
@@ -2882,8 +2666,8 @@
* A new tool, don't use it yourself :)
It's only used internal.
---- gnupod-0.99.8/tools/otgtest.pl 2009-07-10 11:20:05.000000000 -1200
-+++ gnupod-0.99.8/tools/otgtest.pl.new 2020-08-19 16:15:43.111279882 -1200
+--- gnupod-0.99.8/tools/otgtest.pl 2009-07-11 13:20:05.000000000 +1400
++++ gnupod-0.99.8/tools/otgtest.pl.new 2020-08-20 18:32:29.904993700 +1400
@@ -15,7 +15,7 @@
####################################################
# Worker
@@ -2893,537 +2677,787 @@
$opts{_no_sync} = 1;
my $con = GNUpod::FooBar::connect(\%opts);
usage($con->{status}."\n") if $con->{status};
---- gnupod-0.99.8/src/gnupod_otgsync.pl 2020-08-19 16:15:41.567189613 -1200
-+++ gnupod-0.99.8/src/gnupod_otgsync.pl.new 2020-08-19 16:15:43.139281519 -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
---- gnupod-0.99.8/src/ext/FooBar.pm 2020-08-19 16:15:41.719198499 -1200
-+++ gnupod-0.99.8/src/ext/FooBar.pm.new 2020-08-19 16:15:43.183284092 -1200
-@@ -164,11 +164,11 @@
- }
-
- ######################################################################
--# 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) {
- {
-Created gnupod-0.99.8/man/gnupod_convert_FLAC.pl.1.gz
---- 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 2020-08-19 16:15:43.843322679 -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);
- }
---- gnupod-0.99.8/src/ext/FileMagic.pm 2020-08-19 16:15:42.807262109 -1200
-+++ gnupod-0.99.8/src/ext/FileMagic.pm.new 2020-08-19 16:15:43.875324550 -1200
-@@ -52,7 +52,7 @@
- #
-
- 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 '}};
-Patched gnupod-0.99.8/man/gnupod_search.pl.1.gz
---- gnupod-0.99.8/README 2020-08-19 16:15:43.023274738 -1200
-+++ gnupod-0.99.8/README.new 2020-08-19 16:15:43.999331800 -1200
-@@ -33,7 +33,7 @@
- gnupod_addsong Add files
- gnupod_check.pl Check for 'zombie' files
- gnupod_otgsync Handles On-The-Go Sync (not for humans)
--gnupod_search.pl Search ;)
-+gnupod_search Search ;)
+--- gnupod-0.99.8/README 2020-08-20 18:32:27.720919842 +1400
++++ gnupod-0.99.8/README.new 2020-08-20 18:32:29.948995188 +1400
+@@ -32,7 +32,7 @@
+ 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_otgsync Handles On-The-Go Sync (not for humans)
+ gnupod_search Search ;)
mktunes Convert the GNUtunesDB.xml to a iTunesDB
tunes2pod Convert the iTunesDB into a GNUtunesDB.xml
+Patched gnupod-0.99.8/man/gnupod_addsong.pl.1.gz
+--- gnupod-0.99.8/BUGS 2020-08-20 18:32:22.932757922 +1400
++++ gnupod-0.99.8/BUGS.new 2020-08-20 18:32:30.201003710 +1400
+@@ -3,7 +3,7 @@
+ * GNUpod doesn't like duplicate id's in the GNUtunesDB.xml (/dev/null | tail +4
-+gnupod_search --view=i -l "Cure" 2>/dev/null | tail +4
+ gnupod_search --view=i -l "Cure" 2>/dev/null | tail +4
+--- gnupod-0.99.8/src/gnupod_check.pl 2020-08-20 18:32:26.972894546 +1400
++++ gnupod-0.99.8/src/gnupod_check.pl.new 2020-08-20 18:32:30.425011285 +1400
+@@ -85,7 +85,7 @@
+ if($TRACKER{ERR} > 25) {
+ print " -> I found MANY ($TRACKER{ERR}) errors. Maybe you should run\n";
+ print " '$0 --fixit' to let me fix this errors. If it still doesn't help, run\n";
+- print " 'gnupod_addsong.pl --restore'. This would wipe all your Playlists\n";
++ print " 'gnupod_addsong --restore'. This would wipe all your Playlists\n";
+ print " but would cure your iPod for sure.\n";
+ }
+ }
+--- gnupod-0.99.8/src/gnupod_addsong.pl 2020-08-20 18:32:27.336906856 +1400
++++ gnupod-0.99.8/src/gnupod_addsong.pl.new 2020-08-20 18:32:30.585016696 +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);
- (Hmm.. output breaks if On-The-Go data get's synced..)
- FIXME.. maybe we should have an --out option?
---- gnupod-0.99.8/CHANGES 2020-08-19 16:15:43.063277076 -1200
-+++ gnupod-0.99.8/CHANGES.new 2020-08-19 16:15:44.079336477 -1200
-@@ -58,8 +58,8 @@
+-print "gnupod_addsong.pl Version ###__VERSION__### (C) Adrian Ulrich\n";
++print "gnupod_addsong Version ###__VERSION__### (C) Adrian Ulrich\n";
- I was planning to release GNUpod 1.0, but Heinrich Langos
+ $int_count = 3; #The user has to send INT (Ctrl+C) x times until we stop
+
+@@ -713,7 +713,7 @@
+ #Sighandler
+ sub handle_int {
+ if($int_count) {
+- warn "RECEIVED SIGINT (CTRL+C): gnupod_addsong.pl is still working! hit CTRL+C again $int_count time(s) to quit.\n";
++ warn "RECEIVED SIGINT (CTRL+C): gnupod_addsong is still working! hit CTRL+C again $int_count time(s) to quit.\n";
+ $int_count--;
+ }
+ else {
+@@ -728,7 +728,7 @@
+ my($rtxt) = @_;
+ die << "EOF";
+ $rtxt
+-Usage: gnupod_addsong.pl [-h] [-m directory] File1 File2 ...
++Usage: gnupod_addsong [-h] [-m directory] File1 File2 ...
+
+ -h, --help display this help and exit
+ --version output version information and exit
+@@ -775,7 +775,7 @@
+
+ sub version {
+ die << "EOF";
+-gnupod_addsong.pl (gnupod) ###__VERSION__###
++gnupod_addsong (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/README.about_m4a 2020-08-20 18:32:23.836788493 +1400
++++ gnupod-0.99.8/README.about_m4a.new 2020-08-20 18:32:30.717021160 +1400
+@@ -27,9 +27,9 @@
+
+ Example: faac -w --title mytitle file.wav
+
+-Now you can add the file using gnupod_addsong.pl
++Now you can add the file using gnupod_addsong
+
+-# gnupod_addsong.pl file.m4a
++# gnupod_addsong file.m4a
+ # mktunes
+
+ :)
+--- gnupod-0.99.8/CHANGES 2020-08-20 18:32:29.856992077 +1400
++++ gnupod-0.99.8/CHANGES.new 2020-08-20 18:32:30.845025489 +1400
+@@ -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
-+- Fix DBID width in gnupod_search output
-+- Added --bitrate switch to gnupod_search
- - Added --podcast-files-limit switch to gnupod_addsong
+ - 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
-@@ -209,7 +209,7 @@
- - QTFile.pm: rseek() now refuses to return more than 1024 kb. Fixes possible out-of-memory problems
- with broken files.
+ - 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
--- 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)
+@@ -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
+@@ -184,13 +184,13 @@
+ -------
-@@ -344,7 +344,7 @@
+ - 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)
+
+- Try: gnupod_addsong.pl --decode=video *.avi
++ Try: gnupod_addsong --decode=video *.avi
+
+ - Fixes a playlist problem with iTunes5 (new 100 Mhods)
+
+@@ -219,8 +219,8 @@
+ Summary
+ -------
+
+-- 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
+
+@@ -282,8 +282,8 @@
+
+ - Added support for multiple On-The-Go playlists.
+
+-- 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 @@
+
+ - You can now add MIDI files ;-) (with timidity)
+
+-- Added --set-songnum option for gnupod_addsong.pl
++- Added --set-songnum option for gnupod_addsong
- 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"
+@@ -364,18 +364,18 @@
+ Summary
+ -------
+
+-- 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 )
+
+ - GNUpod can now also convert OGG-Vorbis files
+ (Use --decode=XXX, same as FLAC)
+
+-- 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)
+
+ - Many changes for the M4A parser, should work better now
+@@ -403,21 +403,21 @@
+ (Needs JavaScript + DOM => Mozilla)
+ ** SMARTPLAYLIST SYNTAX CHANGED **
+
+-- 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)
+
+-- 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)
+
+ - Polished Playcounts parser (no hardcoded offsets anymore)
+
+ - added '--disable-v2' and '--disable-v1' to
+- gnupod_addsong.pl (Disable parsing of ID3TAG version X)
++ gnupod_addsong (Disable parsing of ID3TAG version X)
+
+ - 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...
+ such a file.
+@@ -452,7 +452,7 @@
--gnupod_search.pl:
-+gnupod_search:
- * -d doesn't delete all songs anymore.. hups..
+ - I bought one myself
+
+-- 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?
+
+-- gnupod_addsong.pl understands ID3v2.2 tags
++- gnupod_addsong understands ID3v2.2 tags
+
+ - You'll have to install Digest::MD5
+
+@@ -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)
+
+@@ -580,7 +580,7 @@
+ * Added SPL-Write support
+ * regex-matches are sorted by id
+
+-gnupod_addsong.pl:
++gnupod_addsong:
+ * duplicate-checker displayed the
+ wrong number of the dup, works again
+
+@@ -603,8 +603,8 @@
* 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.html 2020-08-19 16:15:41.055159679 -1200
-+++ gnupod-0.99.8/doc/gnupod.html.new 2020-08-19 16:15:44.131339517 -1200
-@@ -722,15 +722,15 @@
-
-
+-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 ;) )
--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.
-
+ 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
- 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"
- |
+ 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 gnupod_search.pl --help for more information.
-+Note: gnupod_search assumes RegExp input.
-+Please have a look at gnupod_search --help for more information.
-
+--- gnupod-0.99.8/README 2020-08-20 18:32:29.948995188 +1400
++++ gnupod-0.99.8/README.new 2020-08-20 18:32:30.949029006 +1400
+@@ -30,7 +30,7 @@
+ ----------------------------
-
-@@ -751,9 +751,9 @@
-
-
+ gnupod_INIT INIT a new iPod (create empty Database + Directories)
+-gnupod_addsong.pl Add files
++gnupod_addsong Add files
+ gnupod_check Check for 'zombie' files
+ gnupod_otgsync Handles On-The-Go Sync (not for humans)
+ gnupod_search Search ;)
+--- gnupod-0.99.8/doc/gnupodrc.example 2020-08-20 18:32:24.048795663 +1400
++++ gnupod-0.99.8/doc/gnupodrc.example.new 2020-08-20 18:32:31.029031711 +1400
+@@ -58,7 +58,7 @@
+ # gnupod_search.match-once = 1
--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 @@
-
-
+-# *** gnupod_addsong.pl ***
++# *** gnupod_addsong ***
--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..)
-
+ ## Disable ID3V2 Tag reading
+ # gnupod_addsong.disable-v2 = 1
+--- gnupod-0.99.8/doc/gnupod.info 2020-08-20 18:32:27.888925524 +1400
++++ gnupod-0.99.8/doc/gnupod.info.new 2020-08-20 18:32:31.081033470 +1400
+@@ -469,23 +469,23 @@
+ 4.3 Add files
+ =============
-- | | 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"
- |
+-To add files, we use the script called `gnupod_addsong.pl'.
++To add files, we use the script called `gnupod_addsong'.
- 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
- |
+ First, mount the iPod (eg. at /mnt/ipod) if it isn't mounted.
--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
- |
+ If you would like to add the file /tmp/foo.mp3, run
+-gnupod_addsong.pl like this:
+- gnupod_addsong.pl -m /mnt/ipod /tmp/foo.mp3
++gnupod_addsong like this:
++ gnupod_addsong -m /mnt/ipod /tmp/foo.mp3
- don't forget to run mktunes afterwards.
---- gnupod-0.99.8/doc/gnupod.info 2020-08-19 16:15:41.099162251 -1200
-+++ gnupod-0.99.8/doc/gnupod.info.new 2020-08-19 16:15:44.167341622 -1200
-@@ -512,15 +512,15 @@
- 4.4 Search files
- ================
+ You can also use wildcards:
+- gnupod_addsong.pl -m /mnt/ipod /mnt/mp3/seiken_densetsu2_ost/* /mnt/mp3/xenogears/ost?/*
++ gnupod_addsong -m /mnt/ipod /mnt/mp3/seiken_densetsu2_ost/* /mnt/mp3/xenogears/ost?/*
--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.
+ It isn't possible to add the same MP3 multiple times,
+-gnupod_addsong.pl detects duplicates (Duplicate = same filesize/time
++gnupod_addsong detects duplicates (Duplicate = same filesize/time
+ and ID3Tag name). You can disable the duplicate-detection with the
+ '-duplicate' switch.
- 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"
+- gnupod_addsong.pl understands MP3/WAV (RIFF) and M4A (Apple AAC - NO
++ gnupod_addsong understands MP3/WAV (RIFF) and M4A (Apple AAC - NO
+ DRM!) files.
-- 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.
+ It can also convert FLAC and OGG files on-the-fly:
+@@ -493,13 +493,13 @@
+ Using this example, it would convert the two files into MP3 and add
+ them to the iPod.
-
- File: gnupod.info, Node: Remove files, Next: Edit tags, Prev: Search files, Up: Using GNUpod
-@@ -528,9 +528,9 @@
- 4.5 Remove files
- ================
+- gnupod_addsong.pl -m /mnt/ipod myfile.flac myfile.ogg --decode=mp3
++ gnupod_addsong -m /mnt/ipod myfile.flac myfile.ogg --decode=mp3
--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
+ (Note: To use all features of -decode, you will have to install
+ Audio::FLAC::Header, Ogg::Vorbis::Header::PurePerl, lame, flac, oggenc
+ and faac)
-
- File: gnupod.info, Node: Edit tags, Next: Creating playlists, Prev: Remove files, Up: Using GNUpod
-@@ -538,9 +538,9 @@
- 4.6 Edit tags
- =============
+- gnupod_addsong.pl tries to 'auto-detect' the encoding of the ID3 Tag.
++ gnupod_addsong tries to 'auto-detect' the encoding of the ID3 Tag.
+ Sometimes this works (in most cases ;) ) sometimes it doesn't. If it
+ doesn't work for you, feel free to send me an example-file:
+ pab@blinkenligts.ch
+@@ -617,7 +617,7 @@
+ in the GNUpod tarball. Also check out
+ http://blinkenlights.ch/gnupod/mkspl.html for a 'JavaScript SPL-Creator'
--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..)
+- You can also use the -playlist option of gnupod_addsong.pl. This
++ You can also use the -playlist option of gnupod_addsong. This
+ will create and add the listed songs to the named playlist.
-- 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"
+ Don't forget to run mktunes before umounting! (See 'Unplug the iPod')
+@@ -637,14 +637,14 @@
- 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
+ Such a playlist will show up as a Podcast after running mktunes
-- Use `gnupod_search.pl' to change/add artwork for existing files.
-+ Use `gnupod_search' to change/add artwork for existing files.
+- gnupod_addsong.pl can also download podcasts and create such
++ gnupod_addsong can also download podcasts and create such
+ playlists itself:
+
+- gnupod_addsong.pl -p "Heute Morgen" --playlist-is-podcast http://pod.drs.ch/heutemorgen_mpx.xml
++ gnupod_addsong -p "Heute Morgen" --playlist-is-podcast http://pod.drs.ch/heutemorgen_mpx.xml
+
+ Running this command will create a Playlist called 'Heute Morgen'
+ (`-p') and set `podcast="1"' (`--playlist-is-podcast').
+-`gnupod_addsong.pl' will then fetch the podcast from
++`gnupod_addsong' will then fetch the podcast from
+ `http://pod.drs.ch/heutemorgen_mpx.xml', download all (new) files and
+ add them to the 'Heute Morgen' playlist!
+
+@@ -671,8 +671,8 @@
+ model = nano_4g
+
+ To specify a cover while adding files you'd use the `--artwork'
+-switch of `gnupod_addsong.pl'. Example:
+- gnupod_addsong.pl --artwork cover.jpg *.mp3
++switch of `gnupod_addsong'. Example:
++ gnupod_addsong --artwork cover.jpg *.mp3
+
+ 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
+@@ -730,12 +730,12 @@
- don't forget to run `mktunes' afterwards.
+ If gnupod_check found many errors (or you lost your
+ GNUtunesDB.xml), you can 'rebuild' an GNUtunesDB using
+-`gnupod_addsong.pl'
++`gnupod_addsong'
---- gnupod-0.99.8/doc/gnupodrc.example 2020-08-19 16:15:41.155165525 -1200
-+++ gnupod-0.99.8/doc/gnupodrc.example.new 2020-08-19 16:15:44.199343493 -1200
-@@ -52,7 +52,7 @@
- ## Enforce iPod serial number:
- # mktunes.fwguid = 000ba3100310abcf
+- gnupod_addsong.pl --restore -m /mnt/ipod
++ gnupod_addsong --restore -m /mnt/ipod
--# *** gnupod_search.pl ***
-+# *** gnupod_search ***
+ First, it will create a clean, empty GNUtunesDB, it won't delete any
+-songs on the iPod. Then, `gnupod_addsong.pl --restore' will re-create
++songs on the iPod. Then, `gnupod_addsong --restore' will re-create
+ a GNUtunesDB including the Songs which are on the iPod
- ## Always match only once
- # gnupod_search.match-once = 1
---- gnupod-0.99.8/doc/gnupod.texi 2020-08-19 16:15:41.267172073 -1200
-+++ gnupod-0.99.8/doc/gnupod.texi.new 2020-08-19 16:15:44.243346065 -1200
-@@ -529,33 +529,33 @@
- @node Search files
- @section Search files
+ I think nobody will ever have to do this.. but it maybe usefull to
+@@ -845,7 +845,7 @@
+ and iTunes)
--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.
+ 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.
- Maybe you would like to search for the artist called 'Schlummiguch'. In this case, run
+ It's important to keep the iTunesDB and GNUtunesDB 'in sync', so
+--- gnupod-0.99.8/doc/gnupod.texi 2020-08-20 18:32:28.008929582 +1400
++++ gnupod-0.99.8/doc/gnupod.texi.new 2020-08-20 18:32:31.137035364 +1400
+@@ -486,39 +486,39 @@
+ @node Add files
+ @section Add files
+
+-To add files, we use the script called @code{@w{gnupod_addsong.pl}}.
++To add files, we use the script called @code{@w{gnupod_addsong}}.
+
+ First, mount the iPod (eg. at /mnt/ipod) if it isn't mounted.
+
+-If you would like to add the file /tmp/foo.mp3, run gnupod_addsong.pl like this:
++If you would like to add the file /tmp/foo.mp3, run gnupod_addsong like this:
@example
--gnupod_search.pl -m /mnt/ipod -a "Schlummiguch"
-+gnupod_search -m /mnt/ipod -a "Schlummiguch"
+-gnupod_addsong.pl -m /mnt/ipod /tmp/foo.mp3
++gnupod_addsong -m /mnt/ipod /tmp/foo.mp3
@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.
+ You can also use wildcards:
+ @example
+-gnupod_addsong.pl -m /mnt/ipod /mnt/mp3/seiken_densetsu2_ost/* /mnt/mp3/xenogears/ost?/*
++gnupod_addsong -m /mnt/ipod /mnt/mp3/seiken_densetsu2_ost/* /mnt/mp3/xenogears/ost?/*
+ @end example
- @node Remove files
- @section Remove files
+-It isn't possible to add the same MP3 multiple times, gnupod_addsong.pl detects duplicates
++It isn't possible to add the same MP3 multiple times, gnupod_addsong detects duplicates
+ (Duplicate = same filesize/time and ID3Tag name). You can disable the duplicate-detection
+ with the '--duplicate' switch.
+
+-gnupod_addsong.pl understands MP3/WAV (RIFF) and M4A (Apple AAC - NO DRM!) files.
++gnupod_addsong understands MP3/WAV (RIFF) and M4A (Apple AAC - NO DRM!) files.
+
+ It can also convert FLAC and OGG files on-the-fly:
+
+ Using this example, it would convert the two files into MP3 and add them to the iPod.
--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
+-gnupod_addsong.pl -m /mnt/ipod myfile.flac myfile.ogg --decode=mp3
++gnupod_addsong -m /mnt/ipod myfile.flac myfile.ogg --decode=mp3
@end example
+ (Note: To use all features of --decode, you will have to install
+ Audio::FLAC::Header, Ogg::Vorbis::Header::PurePerl, lame, flac, oggenc and faac)
- @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..)
+-gnupod_addsong.pl tries to 'auto-detect' the encoding of the ID3 Tag.
++gnupod_addsong tries to 'auto-detect' the encoding of the ID3 Tag.
+ Sometimes this works (in most cases ;) ) sometimes it doesn't. If it doesn't work for you,
+ feel free to send me an example-file: pab@@blinkenligts.ch
+
+@@ -638,7 +638,7 @@
+ For more examples have a look at @code{@w{doc/gnutunesdb.example}} included in the GNUpod tarball.
+ Also check out http://blinkenlights.ch/gnupod/mkspl.html for a 'JavaScript SPL-Creator'
+
+-You can also use the --playlist option of gnupod_addsong.pl. This will create and add the listed songs to the
++You can also use the --playlist option of gnupod_addsong. This will create and add the listed songs to the
+ named playlist.
+
+ Don't forget to run mktunes before umounting! (See 'Unplug the iPod')
+@@ -651,14 +651,14 @@
+ media type is set correctly. To add a single podcast do the following:
@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"
+-gnupod_addsong.pl -p "Podcast Title" --playlist-is-podcast podcast.mp3
++gnupod_addsong -p "Podcast Title" --playlist-is-podcast podcast.mp3
+ @end example
+ You can add multiple podcasts to the same title as well:
+ @example
+-gnupod_addsong.pl -p "Podcast Title" --playlist-is-podcast podcasts/*
++gnupod_addsong -p "Podcast Title" --playlist-is-podcast podcasts/*
@end example
+ This also tells the iPod to skip this file when shuffling files. See
+-gnupod_addsong.pl -h for more options.
++gnupod_addsong -h for more options.
- This example searches all files from 'Alfred Neumann', changes the artist into 'John Doe' and
-@@ -712,10 +712,10 @@
+ If you want to change existing playlists to
+ 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
+
+-gnupod_addsong.pl can also download podcasts and create such playlists itself:
++gnupod_addsong can also download podcasts and create such playlists itself:
+
+ @example
+-gnupod_addsong.pl -p "Heute Morgen" --playlist-is-podcast http://pod.drs.ch/heutemorgen_mpx.xml
++gnupod_addsong -p "Heute Morgen" --playlist-is-podcast http://pod.drs.ch/heutemorgen_mpx.xml
@end example
+ Running this command will create a Playlist called 'Heute Morgen' (@code{@w{-p}}) and set @code{@w{podcast="1"}} (@code{@w{--playlist-is-podcast}}).
+-@code{@w{gnupod_addsong.pl}} will then fetch the podcast from @code{@w{http://pod.drs.ch/heutemorgen_mpx.xml}}, download all (new) files
++@code{@w{gnupod_addsong}} will then fetch the podcast from @code{@w{http://pod.drs.ch/heutemorgen_mpx.xml}}, download all (new) files
+ and add them to the 'Heute Morgen' playlist!
--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:
+ @node Adding cover artwork
+@@ -706,9 +706,9 @@
+ @end example
+
+
+-To specify a cover while adding files you'd use the @code{@w{--artwork}} switch of @code{@w{gnupod_addsong.pl}}. Example:
++To specify a cover while adding files you'd use the @code{@w{--artwork}} switch of @code{@w{gnupod_addsong}}. 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
+-gnupod_addsong.pl --artwork cover.jpg *.mp3
++gnupod_addsong --artwork cover.jpg *.mp3
@end example
- don't forget to run @code{@w{mktunes}} afterwards.
---- gnupod-0.99.8/src/gnupod_search.pl 2020-08-19 16:15:41.643194056 -1200
-+++ gnupod-0.99.8/src/gnupod_search.pl.new 2020-08-19 16:15:44.279348170 -1200
-@@ -38,7 +38,7 @@
+@@ -766,14 +766,14 @@
--print "gnupod_search.pl Version ###__VERSION__### (C) Adrian Ulrich\n";
-+print "gnupod_search Version ###__VERSION__### (C) Adrian Ulrich\n";
+ If gnupod_check found many errors (or you lost your GNUtunesDB.xml),
+-you can 'rebuild' an GNUtunesDB using @code{gnupod_addsong.pl}
++you can 'rebuild' an GNUtunesDB using @code{gnupod_addsong}
- # 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 ...
+ @example
+-gnupod_addsong.pl --restore -m /mnt/ipod
++gnupod_addsong --restore -m /mnt/ipod
+ @end example
- -h, --help display this help and exit
- --version output version information and exit
-@@ -279,7 +279,7 @@
+ First, it will create a clean, empty GNUtunesDB, it won't delete any songs on the iPod.
+-Then, @code{gnupod_addsong.pl --restore} will re-create a GNUtunesDB including the Songs which are on the iPod
++Then, @code{gnupod_addsong --restore} will re-create a GNUtunesDB including the Songs which are on the iPod
- sub version {
- die << "EOF";
--gnupod_search.pl (gnupod) ###__VERSION__###
-+gnupod_search (gnupod) ###__VERSION__###
- Copyright (C) Adrian Ulrich 2002-2008
+ I think nobody will ever have to do this.. but it maybe usefull to know that it's possible
+ (Note: Of course you'll lose your Playlists)
+@@ -870,7 +870,7 @@
+ iPod and iTunes)
- 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 2020-08-19 16:15:44.335351444 -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 ;) )
+ 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}}.
+--- gnupod-0.99.8/doc/gnupod.html 2020-08-20 18:32:28.072931746 +1400
++++ gnupod-0.99.8/doc/gnupod.html.new 2020-08-20 18:32:31.193037257 +1400
+@@ -661,26 +661,26 @@
+
+
- And also many thanks to the many other people
-Patched gnupod-0.99.8/man/gnupod_check.pl.1.gz
---- gnupod-0.99.8/README 2020-08-19 16:15:43.999331800 -1200
-+++ gnupod-0.99.8/README.new 2020-08-19 16:15:44.447357992 -1200
-@@ -31,7 +31,7 @@
+-To add files, we use the script called gnupod_addsong.pl.
++To add files, we use the script called gnupod_addsong.
+
- gnupod_INIT INIT a new iPod (create empty Database + Directories)
- gnupod_addsong Add files
--gnupod_check.pl Check for 'zombie' files
-+gnupod_check Check for 'zombie' files
- gnupod_otgsync Handles On-The-Go Sync (not for humans)
- gnupod_search Search ;)
- mktunes Convert the GNUtunesDB.xml to a iTunesDB
---- gnupod-0.99.8/CHANGES 2020-08-19 16:15:44.079336477 -1200
-+++ gnupod-0.99.8/CHANGES.new 2020-08-19 16:15:44.475359629 -1200
-@@ -258,14 +258,14 @@
- -> Apple lowered the Max. Pathlength from 64 to
- 55. GNUpod will now crop after 49 chars (who knows what
- Apple will do next time?)
-- ..you can run 'gnupod_check.pl --fixit' to crop
-+ ..you can run 'gnupod_check --fixit' to crop
- songs you added with an older version.
- -> Looks like Apple also broke the SmartPlaylists Liveupdate
- Feature. I couldn't get it to work with iTunes and GNUpod. Good job guys!
- Since GNUpod only supports 'liveupdate-smartplaylists', you can't
- use any SPL's with GNUpod and iPod-Mini 1.4 . Downgrading to 1.3 helps.
+ First, mount the iPod (eg. at /mnt/ipod) if it isn't mounted.
+
--- gnupod_check.pl has now a --fixit switch. It will try to
-+- gnupod_check has now a --fixit switch. It will try to
- fix the found errors itself
+-If you would like to add the file /tmp/foo.mp3, run gnupod_addsong.pl like this:
+- | | gnupod_addsong.pl -m /mnt/ipod /tmp/foo.mp3
++If you would like to add the file /tmp/foo.mp3, run gnupod_addsong like this:
++ | | gnupod_addsong -m /mnt/ipod /tmp/foo.mp3
+ |
- - Updated documentation: Tell how to extract a
-@@ -432,7 +432,7 @@
- - Fixed some SmartPlaylist stuff and added support for last
- playtime
+ You can also use wildcards:
+- | | gnupod_addsong.pl -m /mnt/ipod /mnt/mp3/seiken_densetsu2_ost/* /mnt/mp3/xenogears/ost?/*
++ | | gnupod_addsong -m /mnt/ipod /mnt/mp3/seiken_densetsu2_ost/* /mnt/mp3/xenogears/ost?/*
+ |
--- Added gnupod_check.pl, it check's for 'lost' files
-+- Added gnupod_check, it check's for 'lost' files
+-It isn't possible to add the same MP3 multiple times, gnupod_addsong.pl detects duplicates
++It isn't possible to add the same MP3 multiple times, gnupod_addsong detects duplicates
+ (Duplicate = same filesize/time and ID3Tag name). You can disable the duplicate-detection
+ with the '--duplicate' switch.
+
- - I changed the 'build' system. Btw, you can now uninstall
- GNUpod using 'make uninstall' .. but why? :)
---- gnupod-0.99.8/doc/gnupod.html 2020-08-19 16:15:44.131339517 -1200
-+++ gnupod-0.99.8/doc/gnupod.html.new 2020-08-19 16:15:44.527362669 -1200
-@@ -1042,11 +1042,11 @@
- have some 'zombie' files.
+-gnupod_addsong.pl understands MP3/WAV (RIFF) and M4A (Apple AAC - NO DRM!) files.
++gnupod_addsong understands MP3/WAV (RIFF) and M4A (Apple AAC - NO DRM!) files.
--In this case, you can use 'gnupod_check.pl' to search 'lost' files.
--gnupod_check.pl will tell you what you could do to fix it.
-+In this case, you can use 'gnupod_check' to search 'lost' files.
-+gnupod_check will tell you what you could do to fix it.
+ It can also convert FLAC and OGG files on-the-fly:
+@@ -689,14 +689,14 @@
+ Using this example, it would convert the two files into MP3 and add them to the iPod.
--If gnupod_check.pl found many errors (or you lost your GNUtunesDB.xml),
-+If gnupod_check found many errors (or you lost your GNUtunesDB.xml),
- you can 'rebuild' an GNUtunesDB using gnupod_addsong
+- | | gnupod_addsong.pl -m /mnt/ipod myfile.flac myfile.ogg --decode=mp3
++ | | gnupod_addsong -m /mnt/ipod myfile.flac myfile.ogg --decode=mp3
+ |
+
+ (Note: To use all features of --decode, you will have to install
+ Audio::FLAC::Header, Ogg::Vorbis::Header::PurePerl, lame, flac, oggenc and faac)
---- gnupod-0.99.8/doc/gnupod.info 2020-08-19 16:15:44.167341622 -1200
-+++ gnupod-0.99.8/doc/gnupod.info.new 2020-08-19 16:15:44.583365943 -1200
-@@ -725,10 +725,10 @@
- If your computer crashed while uploading/deleting songs, you may have
- some 'zombie' files.
+-gnupod_addsong.pl tries to 'auto-detect' the encoding of the ID3 Tag.
++gnupod_addsong tries to 'auto-detect' the encoding of the ID3 Tag.
+ Sometimes this works (in most cases ;) ) sometimes it doesn't. If it doesn't work for you,
+ feel free to send me an example-file: pab@blinkenligts.ch
+
+@@ -878,7 +878,7 @@
+ Also check out http://blinkenlights.ch/gnupod/mkspl.html for a 'JavaScript SPL-Creator'
+
-- In this case, you can use 'gnupod_check.pl' to search 'lost' files.
--gnupod_check.pl will tell you what you could do to fix it.
-+ In this case, you can use 'gnupod_check' to search 'lost' files.
-+gnupod_check will tell you what you could do to fix it.
+-You can also use the --playlist option of gnupod_addsong.pl. This will create and add the listed songs to the
++You can also use the --playlist option of gnupod_addsong. This will create and add the listed songs to the
+ named playlist.
+
-- If gnupod_check.pl found many errors (or you lost your
-+ If gnupod_check found many errors (or you lost your
- GNUtunesDB.xml), you can 'rebuild' an GNUtunesDB using
- `gnupod_addsong'
+@@ -914,14 +914,14 @@
+ Such a playlist will show up as a Podcast after running mktunes
+
---- gnupod-0.99.8/doc/gnupod.texi 2020-08-19 16:15:44.243346065 -1200
-+++ gnupod-0.99.8/doc/gnupod.texi.new 2020-08-19 16:15:44.631368750 -1200
-@@ -761,11 +761,11 @@
- If your computer crashed while uploading/deleting songs, you may
- have some 'zombie' files.
+-gnupod_addsong.pl can also download podcasts and create such playlists itself:
++gnupod_addsong can also download podcasts and create such playlists itself:
+
--In this case, you can use 'gnupod_check.pl' to search 'lost' files.
--gnupod_check.pl will tell you what you could do to fix it.
-+In this case, you can use 'gnupod_check' to search 'lost' files.
-+gnupod_check will tell you what you could do to fix it.
+- | | gnupod_addsong.pl -p "Heute Morgen" --playlist-is-podcast http://pod.drs.ch/heutemorgen_mpx.xml
++ | | gnupod_addsong -p "Heute Morgen" --playlist-is-podcast http://pod.drs.ch/heutemorgen_mpx.xml
+ |
+ Running this command will create a Playlist called 'Heute Morgen' (-p) and set podcast="1" (--playlist-is-podcast).
+-gnupod_addsong.pl will then fetch the podcast from http://pod.drs.ch/heutemorgen_mpx.xml, download all (new) files
++gnupod_addsong will then fetch the podcast from http://pod.drs.ch/heutemorgen_mpx.xml, download all (new) files
+ and add them to the 'Heute Morgen' playlist!
+
--If gnupod_check.pl found many errors (or you lost your GNUtunesDB.xml),
-+If gnupod_check found many errors (or you lost your GNUtunesDB.xml),
- you can 'rebuild' an GNUtunesDB using @code{gnupod_addsong}
+@@ -958,8 +958,8 @@
+
- @example
---- gnupod-0.99.8/src/gnupod_check.pl 2020-08-19 16:15:39.447065668 -1200
-+++ gnupod-0.99.8/src/gnupod_check.pl.new 2020-08-19 16:15:44.671371088 -1200
-@@ -32,7 +32,7 @@
- #Get maximal Pathlength from XMLHelper constant
- my $xmlhelper_maxpathlen = GNUpod::XMLhelper::MAX_PATHLENGTH;
+-To specify a cover while adding files you'd use the --artwork switch of gnupod_addsong.pl. Example:
+- | | gnupod_addsong.pl --artwork cover.jpg *.mp3
++To specify a cover while adding files you'd use the --artwork switch of gnupod_addsong. Example:
++ | | gnupod_addsong --artwork cover.jpg *.mp3
+ |
--print "gnupod_check.pl Version ###__VERSION__### (C) Adrian Ulrich\n";
-+print "gnupod_check Version ###__VERSION__### (C) Adrian Ulrich\n";
+ Use gnupod_search to change/add artwork for existing files. Example:
+@@ -1047,14 +1047,14 @@
+
- $opts{mount} = $ENV{IPOD_MOUNTPOINT};
- #Don't add xml and itunes opts.. we *NEED* the mount opt to be set..
-@@ -121,7 +121,7 @@
- my $rp = GNUpod::XMLhelper::realpath($opts{mount},$el->{file}->{path});
- my $id = $el->{file}->{id};
-
-- my $HINT = "Run 'gnupod_check.pl --fixit' to wipe this zombie";
-+ my $HINT = "Run 'gnupod_check --fixit' to wipe this zombie";
-
- $TRACKER{SIZE}+=int($el->{file}->{filesize});
- $TRACKER{TIME}+=int($el->{file}->{time});
-@@ -222,8 +222,8 @@
- my($rtxt) = @_;
- die << "EOF";
- $rtxt
--Usage: gnupod_check.pl [-h] [-m directory]
--gnupod_check.pl checks for 'lost' files
-+Usage: gnupod_check [-h] [-m directory]
-+gnupod_check checks for 'lost' files
+ If gnupod_check found many errors (or you lost your GNUtunesDB.xml),
+-you can 'rebuild' an GNUtunesDB using gnupod_addsong.pl
++you can 'rebuild' an GNUtunesDB using gnupod_addsong
+
- -h, --help display this help and exit
- --version output version information and exit
-@@ -237,7 +237,7 @@
+- | | gnupod_addsong.pl --restore -m /mnt/ipod
++ | | gnupod_addsong --restore -m /mnt/ipod
+ |
- sub version {
- die << "EOF";
--gnupod_check.pl (gnupod) ###__VERSION__###
-+gnupod_check (gnupod) ###__VERSION__###
- Copyright (C) Adrian Ulrich 2002-2004
+ First, it will create a clean, empty GNUtunesDB, it won't delete any songs on the iPod.
+-Then, gnupod_addsong.pl --restore will re-create a GNUtunesDB including the Songs which are on the iPod
++Then, gnupod_addsong --restore will re-create a GNUtunesDB including the Songs which are on the iPod
+
- This is free software; see the source for copying conditions. There is NO
-Created gnupod-0.99.8/man/gnupod_convert_OGG.pl.1.gz
---- 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 2020-08-19 16:15:45.351410845 -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);
- }
---- gnupod-0.99.8/src/ext/FileMagic.pm 2020-08-19 16:15:43.875324550 -1200
-+++ gnupod-0.99.8/src/ext/FileMagic.pm.new 2020-08-19 16:15:45.471417861 -1200
-@@ -53,7 +53,7 @@
+ I think nobody will ever have to do this.. but it maybe usefull to know that it's possible
+@@ -1218,7 +1218,7 @@
+
+
+ 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.
+
- my $NN_HEADERS = {'MThd' => { encoder=>'gnupod_convert_MIDI', ftyp=>'MIDI'},
+ It's important to keep the iTunesDB and GNUtunesDB 'in sync', so everytime you change the
+Created gnupod-0.99.8/man/gnupod_convert_RIFF.pl.1.gz
+--- gnupod-0.99.8/src/ext/FileMagic.pm 2020-08-20 18:32:29.456978550 +1400
++++ gnupod-0.99.8/src/ext/FileMagic.pm.new 2020-08-20 18:32:32.237072563 +1400
+@@ -55,7 +55,7 @@
'fLaC' => { encoder=>'gnupod_convert_FLAC', ftyp=>'FLAC'},
-- 'OggS' => { encoder=>'gnupod_convert_OGG.pl', ftyp=>'OGG' },
-+ 'OggS' => { encoder=>'gnupod_convert_OGG', 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 '}};
+- 'RIFF' => { encoder=>'gnupod_convert_RIFF.pl', ftyp=>'RIFF', magic2=>'AVI '}};
++ 'RIFF' => { encoder=>'gnupod_convert_RIFF', ftyp=>'RIFF', magic2=>'AVI '}};
+
+
+
+--- gnupod-0.99.8/CHANGES 2020-08-20 18:32:30.845025489 +1400
++++ gnupod-0.99.8/CHANGES.new 2020-08-20 18:32:32.337075945 +1400
+@@ -141,7 +141,7 @@
+ - Reduced MP3::Info false-positives: Empty files are
+ no longer detected as .mp3 files
+ - tools/fwpatch.pl: Support for video iPods added (yeah!)
+-- gnupod_convert_RIFF.pl: Support for new ffmpeg builds (s/aac/libfaac/)
++- gnupod_convert_RIFF: Support for new ffmpeg builds (s/aac/libfaac/)
+ - Upgraded from GPLv2 to GPLv3
+
quilt --quiltrc debian/quiltrc push -a
Applying patch 01-new-perl.patch
@@ -3498,8 +3532,8 @@
dh_installdirs -i
/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
@@ -3572,12 +3606,14 @@
dpkg-source --after-build .
dpkg-buildpackage: info: binary-only upload (no source included)
I: copying local configuration
+I: user script /srv/workspace/pbuilder/4092/tmp/hooks/B01_cleanup starting
+I: user script /srv/workspace/pbuilder/4092/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/15589 and its subdirectories
-I: Current time: Wed Aug 19 16:17:28 -12 2020
-I: pbuilder-time-stamp: 1597897048
+I: removing directory /srv/workspace/pbuilder/4092 and its subdirectories
+I: Current time: Thu Aug 20 18:33:27 +14 2020
+I: pbuilder-time-stamp: 1597898007
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|