Attachment 50563 Details for Bug 118281

[patch] ipod-sharp: iTunesDB 14 support (iTunes 5 compatibility)

ipod-sharp-0.5.5.patch (text/plain), 17.64 KB, created by Aaron Bockover on 2005-09-21 20:12:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Aaron Bockover

Created: 2005-09-21 20:12:40 UTC

Size: 17.64 KB

patch

obsolete

>diff -urN ./ChangeLog ../ipod-sharp-0.5.5/ChangeLog
>--- ./ChangeLog	2005-09-07 21:34:46.000000000 -0400
>+++ ../ipod-sharp-0.5.5/ChangeLog	2005-09-16 01:06:50.000000000 -0400
>@@ -1,3 +1,21 @@
>+2005-09-15  James Willcox  <snorp@snorp.net>
>+
>+	* configure.in: bump to 0.5.5
>+	* src/SongDatabase.cs: reassign the track ids on every save.
>+	Apparently if the ids are not sequential without gaps, the iPod
>+	will not show the songs after the gap.  Also, write out
>+	library index records.
>+	* src/Device.cs: enable write support on v14 databases.
>+
>+2005-09-08  Aaron Bockover  <aaron@aaronbock.net>
>+
>+	* configure.in: Require libipoddevice 0.3.3
>+	* src/SongDatabase.cs: Throw an unsupported exception if DB version is 
>+	greater than 14
>+	* src/Device.cs: support libipoddevice "device-model-string" property,
>+	bound as Device.ModelString, return false for Device.CanWrite if
>+	SongDatabase.Version is 14 or greater (we can't write that out yet)
>+
> 2005-09-07  Aaron Bockover  <aaron@aaronbock.net>
> 
> 	* configure.in: bump to 0.5.4, require libipoddevice 0.3.2
>diff -urN ./configure ../ipod-sharp-0.5.5/configure
>--- ./configure	2005-09-07 21:34:55.000000000 -0400
>+++ ../ipod-sharp-0.5.5/configure	2005-09-16 01:08:11.000000000 -0400
>@@ -1365,7 +1365,7 @@
> 
> MAJOR_VERSION=0
> MINOR_VERSION=5
>-MICRO_VERSION=4
>+MICRO_VERSION=5
> VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION
> 
> am__api_version="1.9"
>@@ -1938,12 +1938,12 @@
> 
> if test -n "$PKG_CONFIG"; then
>         if test -n "$PKG_CONFIG" && \
>-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"ipoddevice >= 0.3.2 gtk-sharp-2.0\"") >&5
>-  ($PKG_CONFIG --exists --print-errors "ipoddevice >= 0.3.2 gtk-sharp-2.0") 2>&5
>+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"ipoddevice >= 0.3.3 gtk-sharp-2.0\"") >&5
>+  ($PKG_CONFIG --exists --print-errors "ipoddevice >= 0.3.3 gtk-sharp-2.0") 2>&5
>   ac_status=$?
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
>   (exit $ac_status); }; then
>-  pkg_cv_IPODDEVICE_CFLAGS=`$PKG_CONFIG --cflags "ipoddevice >= 0.3.2 gtk-sharp-2.0" 2>/dev/null`
>+  pkg_cv_IPODDEVICE_CFLAGS=`$PKG_CONFIG --cflags "ipoddevice >= 0.3.3 gtk-sharp-2.0" 2>/dev/null`
> else
>   pkg_failed=yes
> fi
>@@ -1952,12 +1952,12 @@
> fi
> if test -n "$PKG_CONFIG"; then
>         if test -n "$PKG_CONFIG" && \
>-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"ipoddevice >= 0.3.2 gtk-sharp-2.0\"") >&5
>-  ($PKG_CONFIG --exists --print-errors "ipoddevice >= 0.3.2 gtk-sharp-2.0") 2>&5
>+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"ipoddevice >= 0.3.3 gtk-sharp-2.0\"") >&5
>+  ($PKG_CONFIG --exists --print-errors "ipoddevice >= 0.3.3 gtk-sharp-2.0") 2>&5
>   ac_status=$?
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
>   (exit $ac_status); }; then
>-  pkg_cv_IPODDEVICE_LIBS=`$PKG_CONFIG --libs "ipoddevice >= 0.3.2 gtk-sharp-2.0" 2>/dev/null`
>+  pkg_cv_IPODDEVICE_LIBS=`$PKG_CONFIG --libs "ipoddevice >= 0.3.3 gtk-sharp-2.0" 2>/dev/null`
> else
>   pkg_failed=yes
> fi
>@@ -1966,18 +1966,18 @@
> fi
> 
> if test $pkg_failed = yes; then
>-	IPODDEVICE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "ipoddevice >= 0.3.2 gtk-sharp-2.0"`
>+	IPODDEVICE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "ipoddevice >= 0.3.3 gtk-sharp-2.0"`
> 	# Put the nasty error message in config.log where it belongs
> 	echo "$IPODDEVICE_PKG_ERRORS" 1>&5
> 
>-	{ { echo "$as_me:$LINENO: error: Package requirements (ipoddevice >= 0.3.2 gtk-sharp-2.0) were not met.
>+	{ { echo "$as_me:$LINENO: error: Package requirements (ipoddevice >= 0.3.3 gtk-sharp-2.0) were not met.
> Consider adjusting the PKG_CONFIG_PATH environment variable if you
> installed software in a non-standard prefix.
> 
> Alternatively you may set the IPODDEVICE_CFLAGS and IPODDEVICE_LIBS environment variables
> to avoid the need to call pkg-config.  See the pkg-config man page for
> more details." >&5
>-echo "$as_me: error: Package requirements (ipoddevice >= 0.3.2 gtk-sharp-2.0) were not met.
>+echo "$as_me: error: Package requirements (ipoddevice >= 0.3.3 gtk-sharp-2.0) were not met.
> Consider adjusting the PKG_CONFIG_PATH environment variable if you
> installed software in a non-standard prefix.
> 
>diff -urN ./configure.in ../ipod-sharp-0.5.5/configure.in
>--- ./configure.in	2005-09-07 21:34:30.000000000 -0400
>+++ ../ipod-sharp-0.5.5/configure.in	2005-09-16 01:06:50.000000000 -0400
>@@ -3,7 +3,7 @@
> 
> MAJOR_VERSION=0
> MINOR_VERSION=5
>-MICRO_VERSION=4
>+MICRO_VERSION=5
> VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION
>                                                                                 
> AM_INIT_AUTOMAKE(ipod-sharp, $VERSION)
>@@ -18,7 +18,7 @@
> 
> AM_MAINTAINER_MODE
> 
>-PKG_CHECK_MODULES(IPODDEVICE, ipoddevice >= 0.3.2 gtk-sharp-2.0)
>+PKG_CHECK_MODULES(IPODDEVICE, ipoddevice >= 0.3.3 gtk-sharp-2.0)
> 
> dnl Mono	   
> AC_PATH_PROG(MONO, mono)
>diff -urN ./src/Device.cs ../ipod-sharp-0.5.5/src/Device.cs
>--- ./src/Device.cs	2005-09-08 02:15:13.000000000 -0400
>+++ ../ipod-sharp-0.5.5/src/Device.cs	2005-09-16 01:06:50.000000000 -0400
>@@ -55,6 +55,12 @@
>             }
>         }
> 
>+        public string ModelString {
>+            get {
>+                return (string)GetProperty ("device-model-string").Val;
>+            }
>+        }
>+
>         public DeviceGeneration Generation {
>             get {
>                 uint rawtype = (uint) GetProperty ("device-generation").Val;
>diff -urN ./src/DeviceModel.cs ../ipod-sharp-0.5.5/src/DeviceModel.cs
>--- ./src/DeviceModel.cs	2005-08-24 14:11:25.000000000 -0400
>+++ ../ipod-sharp-0.5.5/src/DeviceModel.cs	2005-09-19 01:02:30.000000000 -0400
>@@ -13,6 +13,8 @@
>         MiniPink,
>         MiniGreen,
>         MiniGold,
>-        Shuffle
>+        Shuffle,
>+        NanoWhite,
>+        NanoBlack
>     }
> }
>diff -urN ./src/SongDatabase.cs ../ipod-sharp-0.5.5/src/SongDatabase.cs
>--- ./src/SongDatabase.cs	2005-09-08 02:17:07.000000000 -0400
>+++ ../ipod-sharp-0.5.5/src/SongDatabase.cs	2005-09-20 20:11:35.000000000 -0400
>@@ -187,6 +187,15 @@
>             return true;
>         }
> 
>+        public void RemoveTrack (int id) {
>+            foreach (PlaylistItemRecord item in playlistItems) {
>+                if (item.TrackId == id) {
>+                    playlistItems.Remove (item);
>+                    break;
>+                }
>+            }
>+        }
>+
>         public void AddItem (PlaylistItemRecord rec) {
>             InsertItem (-1, rec);
>         }
>@@ -256,22 +265,50 @@
>             }
>         }
> 
>-        private void CreateLibraryIndices () {
>+        private DetailRecord CreateIndexRecord (TrackListRecord tracks, IndexType type) {
>+            DetailRecord record = new DetailRecord ();
>+            record.Type = DetailType.LibraryIndex;
>+            record.IndexType = type;
>+
>+            // blah, this is soooo sleaux
>+            
>+            ArrayList items = (ArrayList) playlistItems.Clone ();
>+            TrackSorter sorter = new TrackSorter (tracks, type);
>+            items.Sort (sorter);
>+
>+            ArrayList indices = new ArrayList ();
>+            foreach (PlaylistItemRecord item in items) {
>+                indices.Add (tracks.IndexOf (item.TrackId));
>+            }
>+
>+            record.LibraryIndices = (int[]) indices.ToArray (typeof (int));
>+            return record;
>+        }
>+
>+        private void CreateLibraryIndices (TrackListRecord tracks) {
>+
>+            ArrayList details = new ArrayList ();
>+            
>             // remove any existing library index records
>-            foreach (Record rec in (ArrayList) otherDetails.Clone ()) {
>+            foreach (Record rec in (ArrayList) otherDetails) {
>                 DetailRecord detail = rec as DetailRecord;
>-                if (detail != null && detail.Type == DetailType.LibraryIndex) {
>-                    otherDetails.Remove (rec);
>+                if (detail != null && detail.Type != DetailType.LibraryIndex) {
>+                    details.Add (rec);
>                 }
>             }
> 
>-            // TODO: actually create the new indices
>+            otherDetails = details;
>+            otherDetails.Add (CreateIndexRecord (tracks, IndexType.Song));
>+            otherDetails.Add (CreateIndexRecord (tracks, IndexType.Album));
>+            otherDetails.Add (CreateIndexRecord (tracks, IndexType.Artist));
>+            otherDetails.Add (CreateIndexRecord (tracks, IndexType.Genre));
>+            otherDetails.Add (CreateIndexRecord (tracks, IndexType.Composer));
>         }
>         
>         public override void Save (DatabaseRecord db, BinaryWriter writer) {
> 
>             if (isLibrary) {
>-                CreateLibraryIndices ();
>+                CreateLibraryIndices (db[DataSetIndex.Library].TrackList);
>             }
>             
>             MemoryStream stream = new MemoryStream ();
>@@ -308,6 +345,45 @@
>             writer.Write (new byte[PadLength]);
>             writer.Write (childData, 0, childDataLength);
>         }
>+
>+        private class TrackSorter : IComparer {
>+
>+            private TrackListRecord tracks;
>+            private IndexType type;
>+
>+            public TrackSorter (TrackListRecord tracks, IndexType type) {
>+                this.tracks = tracks;
>+                this.type = type;
>+            }
>+            
>+            public int Compare (object a, object b) {
>+                TrackRecord trackA = tracks.LookupTrack ((a as PlaylistItemRecord).TrackId);
>+                TrackRecord trackB = tracks.LookupTrack ((b as PlaylistItemRecord).TrackId);
>+
>+                if (trackA == null || trackB == null)
>+                    return 0;
>+                
>+                switch (type) {
>+                case IndexType.Song:
>+                    return String.Compare (trackA.GetDetail (DetailType.Title).Value,
>+                                           trackB.GetDetail (DetailType.Title).Value);
>+                case IndexType.Artist:
>+                    return String.Compare (trackA.GetDetail (DetailType.Artist).Value,
>+                                           trackB.GetDetail (DetailType.Artist).Value);
>+                case IndexType.Album:
>+                    return String.Compare (trackA.GetDetail (DetailType.Album).Value,
>+                                           trackB.GetDetail (DetailType.Album).Value);
>+                case IndexType.Genre:
>+                    return String.Compare (trackA.GetDetail (DetailType.Genre).Value,
>+                                           trackB.GetDetail (DetailType.Genre).Value);
>+                case IndexType.Composer:
>+                    return String.Compare (trackA.GetDetail (DetailType.Composer).Value,
>+                                           trackB.GetDetail (DetailType.Composer).Value);
>+                default:
>+                    return 0;
>+                }
>+            }
>+        }
>     }
>         
> 
>@@ -814,6 +890,24 @@
>         public IEnumerator GetEnumerator () {
>             return tracks.GetEnumerator ();
>         }
>+
>+        public TrackRecord LookupTrack (int id) {
>+            foreach (TrackRecord record in tracks) {
>+                if (record.Id == id)
>+                    return record;
>+            }
>+
>+            return null;
>+        }
>+
>+        public int IndexOf (int id) {
>+            for (int i = 0; i < tracks.Count; i++) {
>+                if ((tracks[i] as TrackRecord).Id == id)
>+                    return i;
>+            }
>+
>+            return -1;
>+        }
>         
>         public override void Read (DatabaseRecord db, BinaryReader reader) {
> 
>@@ -949,12 +1043,14 @@
> 
>     internal class DatabaseRecord : Record {
> 
>+        private const int SongIdStart = 1000;
>+
>         private int unknownOne = 1;
>         private int unknownTwo = 2;
>         
>         private ArrayList datasets = new ArrayList ();
> 
>-        public int Version = 13;
>+        public int Version = 14;
>         public long Id;
> 
>         public DataSetRecord this[DataSetIndex index] {
>@@ -993,7 +1089,7 @@
>             Id = BitConverter.ToInt64 (body, 12);
>             unknownTwo = BitConverter.ToInt32 (body, 20);
> 
>-            if (Version > 13)
>+            if (Version > 14)
>                 throw new DatabaseReadException ("Detected unsupported database version {0}", Version);
>             
>             datasets.Clear ();
>@@ -1009,7 +1105,29 @@
>                 this[DataSetIndex.PlaylistDuplicate].PlaylistList = this[DataSetIndex.Playlist].PlaylistList;
>         }
> 
>+        private void ReassignTrackIds () {
>+            Hashtable oldids = new Hashtable ();
>+
>+            int id = SongIdStart;
>+            foreach (TrackRecord track in this[DataSetIndex.Library].TrackList.Tracks) {
>+                oldids[track.Id] = id;
>+                track.Id = id++;
>+            }
>+
>+            foreach (PlaylistRecord pl in this[DataSetIndex.Playlist].PlaylistList.Playlists) {
>+                foreach (PlaylistItemRecord item in pl.Items) {
>+                    if (oldids[item.TrackId] == null)
>+                        continue;
>+                    
>+                    item.TrackId = (int) oldids[item.TrackId];
>+                }
>+            }
>+        }
>+
>         public override void Save (DatabaseRecord db, BinaryWriter writer) {
>+
>+            ReassignTrackIds ();
>+            
>             MemoryStream stream = new MemoryStream ();
>             BinaryWriter childWriter = new BinaryWriter (stream);
> 
>@@ -1294,11 +1412,11 @@
>                     writer.Write (buf);
>                     count += buf.Length;
> 
>-                    double percent = (double) count / (double) length;
>+                    /*double percent = (double) count / (double) length;
>                     if (percent >= lastPercent + PercentThreshold && SaveProgressChanged != null) {
>-                        SaveProgressChanged (this, song, (double) count / (double) length, completed, total);
>+                       SaveProgressChanged (this, song, (double) count / (double) length, completed, total);
>                         lastPercent = percent;
>-                    }
>+                    }*/
>                 } while (count < length);
>             } finally {
>                 if (reader != null)
>@@ -1313,29 +1431,38 @@
> 
>             CheckFreeSpace ();
> 
>-            if (SaveStarted != null)
>-                SaveStarted (this, new EventArgs ());
>+            EventHandler startedHandler = SaveStarted;
>+            if (startedHandler != null) {
>+                Console.WriteLine("Emitting SaveStarted");
>+                startedHandler (this, new EventArgs ());
>+            }
> 
>             // Back up the current song db
>-            if (File.Exists (SongDbPath))
>+            if (File.Exists (SongDbPath)) {
>+                Console.WriteLine("Backing up current db");
>                 File.Copy (SongDbPath, SongDbBackupPath, true);
>+            }
>             
>             try {
>                 // Save the songs db
>                 using (BinaryWriter writer = new BinaryWriter (new FileStream (SongDbPath, FileMode.Create))) {
>+                    Console.WriteLine("Saving Database");
>                     dbrec.Save (dbrec, writer);
>                 }
> 
>+                Console.WriteLine("Removing invalid songs");
>                 foreach (Song song in songsToRemove) {
>                     if (File.Exists (song.Filename))
>                         File.Delete (song.Filename);
>                 }
>                 
>+                Console.WriteLine("Creating base music path");
>                 if (!Directory.Exists (MusicBasePath))
>                     Directory.CreateDirectory (MusicBasePath);
>                 
>                 int completed = 0;
>                 
>+                Console.WriteLine("Copying new songs");
>                 foreach (Song song in songsToAdd) {
>                     string dest = GetFilesystemPath (song.Track.GetDetail (DetailType.Location).Value);
> 
>@@ -1345,32 +1472,39 @@
> 
>                 // Save the shuffle songs db (will only create if device is shuffle);
>                 try {
>+                    Console.WriteLine("Saving shuffle database");
>                     ShuffleSongDatabase.Save (device);
>                 } catch (Exception) {}
>                 
>+                Console.WriteLine("removing play counts");
>                 // The play count file is invalid now, so we'll remove it (even though the iPod would anyway)
>                 if (File.Exists (PlayCountsPath))
>                     File.Delete (PlayCountsPath);
> 
>             } catch (Exception e) {
>                 // rollback the song db
>+                Console.WriteLine("Rolling back database");
>                 if (File.Exists (SongDbBackupPath))
>                     File.Copy (SongDbBackupPath, SongDbPath, true);
>                 
>                 throw new DatabaseWriteException (e, "Failed to save database");
>             } finally {
>+                Console.WriteLine("Rescanning disk");
>                 try {
>                     device.RescanDisk();
>                 } catch(Exception) {}
>                 
>-                if (SaveEnded != null)
>-                    SaveEnded (this, new EventArgs ());
>+                EventHandler endedHandler = SaveEnded;
>+                if (endedHandler != null)
>+                    endedHandler (this, new EventArgs ());
>             }
>         }
> 
>         internal string GetFilesystemPath (string ipodPath) {
>             if (ipodPath == null)
>                 return null;
>+            else if (ipodPath == String.Empty)
>+                return String.Empty;
>             
>             return device.MountPoint + ipodPath.Replace (":", "/");
>         }
>@@ -1421,7 +1555,7 @@
> 
>                     // remove from the song db
>                     dbrec[DataSetIndex.Library].TrackList.Remove (song.Id);
>-                    dbrec[DataSetIndex.Playlist].Library.RemoveItem (song.Track.Id);
>+                    dbrec[DataSetIndex.Playlist].Library.RemoveTrack (song.Track.Id);
>                     
>                     // remove from the "normal" playlists
>                     foreach (Playlist list in playlists) {

Actions: View | Diff

Attachments on bug 118281: 50562 | 50563 | 50568 | 53898 | 53899