[Pkg-mono-svn-commits] rev 2527 - in ipod-sharp:
tags/0.5.16-1/debian/patches trunk/debian/patches
Sebastian Dröge
slomo-guest at costa.debian.org
Mon May 1 14:37:19 UTC 2006
Author: slomo-guest
Date: 2006-05-01 14:37:18 +0000 (Mon, 01 May 2006)
New Revision: 2527
Removed:
ipod-sharp/tags/0.5.16-1/debian/patches/01_rebuild-database-fix.diff
ipod-sharp/trunk/debian/patches/01_rebuild-database-fix.diff
Log:
* delete a obsolete patch
Deleted: ipod-sharp/tags/0.5.16-1/debian/patches/01_rebuild-database-fix.diff
===================================================================
--- ipod-sharp/tags/0.5.16-1/debian/patches/01_rebuild-database-fix.diff 2006-05-01 14:23:37 UTC (rev 2526)
+++ ipod-sharp/tags/0.5.16-1/debian/patches/01_rebuild-database-fix.diff 2006-05-01 14:37:18 UTC (rev 2527)
@@ -1,83 +0,0 @@
-Index: ChangeLog
-===================================================================
---- ChangeLog (revision 56832)
-+++ ChangeLog (working copy)
-@@ -1,3 +1,11 @@
-+2006-02-13 James Willcox <snorp at snorp.net>
-+
-+ * src/Song.cs: only create a new unique path in the Uri setter
-+ if the song isn't already on the device.
-+ * src/SongDatabase.cs: s/GetPodPath/GetUniquePodPath/ and
-+ add a GetPodPath, which just returns the ipodized path
-+ for a file.
-+
- 2006-02-13 Aaron Bockover <aaron at abock.org>
-
- 0.5.15 Released
-Index: src/SongDatabase.cs
-===================================================================
---- src/SongDatabase.cs (revision 56832)
-+++ src/SongDatabase.cs (working copy)
-@@ -1485,8 +1485,8 @@
- }
- }
-
-- private bool IsSongOnDevice(Song song) {
-- return song.FileName.StartsWith (MusicBasePath + Path.DirectorySeparatorChar + "F");
-+ internal bool IsSongOnDevice(string path) {
-+ return path.StartsWith (MusicBasePath + Path.DirectorySeparatorChar + "F");
- }
-
- private string FormatSpace (UInt64 bytes) {
-@@ -1506,7 +1506,7 @@
- }
-
- foreach (Song song in songsToAdd) {
-- if (!IsSongOnDevice (song)) {
-+ if (!IsSongOnDevice (song.FileName)) {
- required += (UInt64) song.Size;
- }
- }
-@@ -1620,7 +1620,7 @@
-
- // Copy songs to iPod; if song is already in the Music directory structure, do not copy
- foreach (Song song in songsToAdd) {
-- if (!IsSongOnDevice (song)) {
-+ if (!IsSongOnDevice (song.FileName)) {
- string dest = GetFilesystemPath (song.Track.GetDetail (DetailType.Location).Value);
- CopySong (song, dest, completed++, songsToAdd.Count);
- song.FileName = dest;
-@@ -1685,7 +1685,15 @@
- return device.MountPoint + ipodPath.Replace (":", "/");
- }
-
-- internal string GetPodPath (string path) {
-+ internal string GetPodPath (string path) {
-+ if (path == null || !path.StartsWith (device.MountPoint))
-+ return null;
-+
-+ string ret = path.Replace (device.MountPoint, "");
-+ return ret.Replace ("/", ":");
-+ }
-+
-+ internal string GetUniquePodPath (string path) {
- if (path == null)
- return null;
-
-Index: src/Song.cs
-===================================================================
---- src/Song.cs (revision 56832)
-+++ src/Song.cs (working copy)
-@@ -61,7 +61,11 @@
- throw new ArgumentException ("only file scheme is allowed");
-
- DetailRecord detail = record.GetDetail (DetailType.Location);
-- detail.Value = db.GetPodPath (value.LocalPath);
-+
-+ if (db.IsSongOnDevice (value.LocalPath))
-+ detail.Value = db.GetPodPath (value.LocalPath);
-+ else
-+ detail.Value = db.GetUniquePodPath (value.LocalPath);
-
- FileInfo info = new FileInfo (value.LocalPath);
- record.Size = (int) info.Length;
Deleted: ipod-sharp/trunk/debian/patches/01_rebuild-database-fix.diff
===================================================================
--- ipod-sharp/trunk/debian/patches/01_rebuild-database-fix.diff 2006-05-01 14:23:37 UTC (rev 2526)
+++ ipod-sharp/trunk/debian/patches/01_rebuild-database-fix.diff 2006-05-01 14:37:18 UTC (rev 2527)
@@ -1,83 +0,0 @@
-Index: ChangeLog
-===================================================================
---- ChangeLog (revision 56832)
-+++ ChangeLog (working copy)
-@@ -1,3 +1,11 @@
-+2006-02-13 James Willcox <snorp at snorp.net>
-+
-+ * src/Song.cs: only create a new unique path in the Uri setter
-+ if the song isn't already on the device.
-+ * src/SongDatabase.cs: s/GetPodPath/GetUniquePodPath/ and
-+ add a GetPodPath, which just returns the ipodized path
-+ for a file.
-+
- 2006-02-13 Aaron Bockover <aaron at abock.org>
-
- 0.5.15 Released
-Index: src/SongDatabase.cs
-===================================================================
---- src/SongDatabase.cs (revision 56832)
-+++ src/SongDatabase.cs (working copy)
-@@ -1485,8 +1485,8 @@
- }
- }
-
-- private bool IsSongOnDevice(Song song) {
-- return song.FileName.StartsWith (MusicBasePath + Path.DirectorySeparatorChar + "F");
-+ internal bool IsSongOnDevice(string path) {
-+ return path.StartsWith (MusicBasePath + Path.DirectorySeparatorChar + "F");
- }
-
- private string FormatSpace (UInt64 bytes) {
-@@ -1506,7 +1506,7 @@
- }
-
- foreach (Song song in songsToAdd) {
-- if (!IsSongOnDevice (song)) {
-+ if (!IsSongOnDevice (song.FileName)) {
- required += (UInt64) song.Size;
- }
- }
-@@ -1620,7 +1620,7 @@
-
- // Copy songs to iPod; if song is already in the Music directory structure, do not copy
- foreach (Song song in songsToAdd) {
-- if (!IsSongOnDevice (song)) {
-+ if (!IsSongOnDevice (song.FileName)) {
- string dest = GetFilesystemPath (song.Track.GetDetail (DetailType.Location).Value);
- CopySong (song, dest, completed++, songsToAdd.Count);
- song.FileName = dest;
-@@ -1685,7 +1685,15 @@
- return device.MountPoint + ipodPath.Replace (":", "/");
- }
-
-- internal string GetPodPath (string path) {
-+ internal string GetPodPath (string path) {
-+ if (path == null || !path.StartsWith (device.MountPoint))
-+ return null;
-+
-+ string ret = path.Replace (device.MountPoint, "");
-+ return ret.Replace ("/", ":");
-+ }
-+
-+ internal string GetUniquePodPath (string path) {
- if (path == null)
- return null;
-
-Index: src/Song.cs
-===================================================================
---- src/Song.cs (revision 56832)
-+++ src/Song.cs (working copy)
-@@ -61,7 +61,11 @@
- throw new ArgumentException ("only file scheme is allowed");
-
- DetailRecord detail = record.GetDetail (DetailType.Location);
-- detail.Value = db.GetPodPath (value.LocalPath);
-+
-+ if (db.IsSongOnDevice (value.LocalPath))
-+ detail.Value = db.GetPodPath (value.LocalPath);
-+ else
-+ detail.Value = db.GetUniquePodPath (value.LocalPath);
-
- FileInfo info = new FileInfo (value.LocalPath);
- record.Size = (int) info.Length;
More information about the Pkg-mono-svn-commits
mailing list