Changeset 89

Timestamp:

12/29/07 10:28:00 (11 months ago)

Author:

chris

Message:

Completes #56:
Added new parser for the iPod shuffle
Added logic to determine if the iPod being used is a shuffle

or a non-shuffle. If a shuffle is detected then the parser
is automatically switched out and the "Delete Playcounts"
action is modified to delete the proper file.

Files:

• trunk/src/main/org/lastpod/ModelImpl.java (modified) (2 diffs)
• trunk/src/main/org/lastpod/UI.java (modified) (1 diff)
• trunk/src/main/org/lastpod/action/DeletePlayCounts.java (modified) (4 diffs)
• trunk/src/main/org/lastpod/parser/ItunesStatsParser.java (added)
• trunk/src/main/org/lastpod/util/ItunesStatsFilter.java (added)
• trunk/src/test/iTunesStats (added)
• trunk/src/test/org/lastpod/parser/ItunesStatsParserTest.java (added)

trunk/src/main/org/lastpod/ModelImpl.java

@@ -20 +20 @@
-
-import org.lastpod.parser.ItunesDbParser;
+import org.lastpod.parser.ItunesStatsParser;
-import org.lastpod.parser.PlayCountsParser;
-
+
+
+
-import org.lastpod.util.MiscUtilities;
+
+import java.io.File;
-
-import java.util.ArrayList;
@@ -95 +100 @@
-        ItunesDbParser itunesDbParser =
-            new ItunesDbParser(iTunesPath, parseVariousArtists, splitVariousArtistStrings);
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-        DbReader reader = new DbReader(itunesDbParser, playCountsParser);
-

trunk/src/main/org/lastpod/UI.java

@@ -113 +113 @@
-     */
-    public UI(Model model) {
-8
+9
-
-        submitStatus = new JLabel();

trunk/src/main/org/lastpod/action/DeletePlayCounts.java

@@ -21 +21 @@
-import org.lastpod.Model;
-import org.lastpod.UI;
+
+import org.lastpod.util.ItunesStatsFilter;
-
-import java.awt.event.ActionEvent;
@@ -54 +56 @@
-
-    /**
+     * Stores the file location of the "Play Counts" or "iTunesStats" file.
+     * (For non-shuffle iPods there is a "Play Counts" file, for shuffle
+     * iPods the "iTunesStats" file is used.)
+     */
+    private File playCountsFile;
+
+    /**
-     * Constructs this action.
-     * @param userInterface  The application's user interface.
@@ -69 +78 @@
-        putValue(SHORT_DESCRIPTION, desc);
-        putValue(MNEMONIC_KEY, new Integer(mnemonic));
+
+        /* Setup Playcounts file; based on either iPod shuffle or non-shuffle.
+         */
+        Preferences fPrefs = Preferences.userRoot().node("ws/afterglo/audioPod");
+        String iTunesPath = fPrefs.get("iTunes Path", "default");
+
+        if (!iTunesPath.endsWith(File.separator)) {
+            iTunesPath += File.separator;
+        }
+
+        /* Defaults the file for non-shuffle iPods. */
+        playCountsFile = new File(iTunesPath + "Play Counts");
+
+        /* Checks for the "iTunesStats" file.  If it exists, switch to the iPod
+         * shuffle file. */
+        File file = new File(iTunesPath);
+        File[] itunesStatsFiles = file.listFiles(new ItunesStatsFilter());
+
+        if ((itunesStatsFiles != null) && (itunesStatsFiles.length != 0)) {
+            playCountsFile = new File(iTunesPath + "iTunesStats");
+            putValue(SHORT_DESCRIPTION, "Removes the iTunesStats file from the iPod shuffle.");
+        }
-    }
-
@@ -98 +129 @@
-        }
-
-File 
+
-
-        boolean succuss = false;