Changeset 93

Timestamp:

01/03/08 00:49:25 (11 months ago)

Author:

chris

Message:

chages to get the parser work properly for shuffles. The issue solved
is the track ordering. The iTunesSD file is now used on shuffles (it
stores the order.)

Files:

• trunk/src/main/org/lastpod/ModelImpl.java (modified) (2 diffs)
• trunk/src/main/org/lastpod/action/DeletePlayCounts.java (modified) (2 diffs)
• trunk/src/main/org/lastpod/parser/ItunesDbParser.java (modified) (7 diffs)
• trunk/src/main/org/lastpod/parser/ItunesStatsParser.java (modified) (7 diffs)

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

@@ -24 +24 @@
-import org.lastpod.parser.TrackItemParser;
-
-import org.lastpod.util.ItunesStatsFilter;
-import org.lastpod.util.MiscUtilities;
-
-import java.io.File;
-
-import java.util.ArrayList;
@@ -101 +98 @@
-        History.getInstance(iTunesPath);
-
+        boolean isShuffle = ItunesStatsParser.isIpodShuffle(iTunesPath);
+
-        ItunesDbParser itunesDbParser =
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-            playCountsParser = new ItunesStatsParser(iTunesPath, parseMultiPlayTracks);
+        } else {
+            playCountsParser = new PlayCountsParser(iTunesPath, parseMultiPlayTracks);
-        }
-

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

@@ -22 +22 @@
-import org.lastpod.UI;
-
-util.ItunesStatsFilt
+parser.ItunesStatsPars
-
-import java.awt.event.ActionEvent;
@@ -91 +91 @@
-        playCountsFile = new File(iTunesPath + "Play Counts");
-
-
-
-
-
-
-
+
+
-            playCountsFile = new File(iTunesPath + "iTunesStats");
-            putValue(SHORT_DESCRIPTION, "Removes the iTunesStats file from the iPod shuffle.");

trunk/src/main/org/lastpod/parser/ItunesDbParser.java

@@ -29 +29 @@
-import java.io.InputStream;
-
+import java.math.BigInteger;
+
-import java.util.ArrayList;
+import java.util.HashMap;
-import java.util.List;
+import java.util.Map;
-
-/**
@@ -45 +49 @@
-
-    /**
+     * The location of the iTunesSD file.
+     */
+    private String iTunesSdFile;
+
+    /**
-     * Stores a boolean value that will be passed into <code>TrackItem</code>.
-     */
@@ -53 +62 @@
-     */
-    String[] variousArtistsStrings;
+
+    /**
+     * Stores <code>true</code> if this iTunesDB is for an iPod shuffle.
+     */
+    boolean isShuffle = false;
-
-    /**
@@ -70 +84 @@
-     * @param variousArtistsStrings  A String array containing the various artist
-     * strings that should be parsed.
+     * @param isShuffle  <code>true</code> if this iTunesDB is for an iPod shuffle.
-     */
-    public ItunesDbParser(String iTunesPath, boolean parseVariousArtists,
-
+, boolean isShuffle
-        if (!iTunesPath.endsWith(File.separator)) {
-            iTunesPath += File.separator;
@@ -78 +93 @@
-
-        this.iTunesFile = iTunesPath + "iTunesDB";
+        this.iTunesSdFile = iTunesPath + "iTunesSD";
-        this.parseVariousArtists = parseVariousArtists;
-        this.variousArtistsStrings = variousArtistsStrings;
+        this.isShuffle = isShuffle;
-    }
-
@@ -95 +112 @@
-            itunesBufferedIn = new BufferedInputStream(itunesFileIn, 65535);
-
-
+
+
+
+
+
+
+
-        } catch (IOException e) {
-            throw new RuntimeException("Error reading iTunes Database");
@@ -240 +263 @@
-
-    /**
+     * Reads the iTunesSD file and uses the ordering in this file to reorder
+     * the track list.
+     * @param trackList  The track list from the iTunesDB
+     * @return  A new <code>java.util.List</code> that is ordered per the
+     * iTunesSD order.
+     * @throws IOException  Thrown if I/O errors occur.
+     */
+    private List readItunesSdAndReorderList(List trackList)
+            throws IOException {
+        InputStream itunesSdFileIn = null;
+        InputStream itunesSdBufferedIn = null;
+
+        try {
+            itunesSdFileIn = new FileInputStream(iTunesSdFile);
+            itunesSdBufferedIn = new BufferedInputStream(itunesSdFileIn, 65535);
+
+            /* Converts the trackList into a Map. */
+            Map trackMap = new HashMap();
+            TrackItem track = null;
+
+            for (int i = 0; i < trackList.size(); i++) {
+                track = (TrackItem) trackList.get(i);
+                trackMap.put(track.getLocation(), track);
+            }
+
+            List orderedTrackList = new ArrayList();
+
+            byte[] threeBytes = new byte[3];
+
+            itunesSdBufferedIn.read(threeBytes);
+
+            int numentries = (new BigInteger(threeBytes)).intValue();
+
+            IoUtils.skipFully(itunesSdBufferedIn, 15); //skip rest of header
+            assert (numentries == trackList.size());
+
+            for (int i = 0; i < (numentries - 1); i++) {
+                itunesSdBufferedIn.mark(1048576); //save beginning of entry location
+
+                itunesSdBufferedIn.read(threeBytes);
+
+                int entrylen = (new BigInteger(threeBytes)).intValue();
+
+                IoUtils.skipFully(itunesSdBufferedIn, 30);
+
+                byte[] data = new byte[522];
+                itunesSdBufferedIn.read(data);
+
+                /* Filename should have : characters instead of / characters. */
+                String filename = new String(data, "UTF-16LE").replace('/', ':').trim();
+
+                orderedTrackList.add(trackMap.get(filename));
+
+                itunesSdBufferedIn.reset();
+                IoUtils.skipFully(itunesSdBufferedIn, entrylen);
+            }
+
+            return orderedTrackList;
+        } finally {
+            IoUtils.cleanup(itunesSdFileIn, null);
+            IoUtils.cleanup(itunesSdBufferedIn, null);
+        }
+    }
+
+    /**
-     * Does nothing for this implementation.
-     * @param trackList  Does nothing for this implementation.

trunk/src/main/org/lastpod/parser/ItunesStatsParser.java

@@ -22 +22 @@
-
-import org.lastpod.util.IoUtils;
+import org.lastpod.util.ItunesStatsFilter;
-
-import java.io.BufferedInputStream;
@@ -113 +114 @@
-            playCountsBufferedIn = new BufferedInputStream(playCountsFileIn, 65535);
-
-
+
+
+
-        } catch (IOException e) {
-            String errorMsg =
@@ -145 +148 @@
-        IoUtils.skipFully(itunesStatsistream, 3); //skip rest of header
-
-        Calendar calendar = Calendar.getInstance();
-
-        for (int i = 0; i < (numentries - 1); i++) {
-            itunesStatsistream.mark(1048576); //save beginning of entry location
@@ -164 +165 @@
-                TrackItem temptrack = (TrackItem) trackList.get(i);
-                temptrack.setPlaycount(playcount);
-                calendar.add(Calendar.SECOND, -(int) temptrack.getLength());
-                temptrack.setLastplayed(calendar.getTimeInMillis() / 1000);
-
-                recentPlays.add(trackList.get(i));
-
@@ -173 +171 @@
-
-                    for (long j = 0; j < numberToManufacture; j++) {
-, calendar
+
-                        recentPlays.add(temptrack);
-                    }
@@ -193 +191 @@
-     * @return  A manufactured <code>TrackItem</code>.
-     */
-, Calendar calendar
+
-        TrackItem manufacturedTrack = new TrackItem(temptrack);
-        calendar.add(Calendar.SECOND, -(int) manufacturedTrack.getLength());
-        manufacturedTrack.setLastplayed(calendar.getTimeInMillis() / 1000);
-
-        manufacturedTrack.setPlaycount(1);
-        temptrack.setPlaycount(1);
@@ -203 +198 @@
-        return manufacturedTrack;
-    }
+
+    /**
+     * Manufactures the last played times for all the track items.
+     * @param trackItems  The list of track items to modify.
+     * @return  The modified list of track items.
+     */
+    private List manufactureLastPlayed(List trackItems) {
+        Calendar calendar = Calendar.getInstance();
+        TrackItem temptrack = null;
+
+        for (int i = trackItems.size() - 1; i >= 0; i--) {
+            temptrack = (TrackItem) trackItems.get(i);
+            calendar.add(Calendar.SECOND, -(int) temptrack.getLength());
+            temptrack.setLastplayed(calendar.getTimeInMillis() / 1000);
+        }
+
+        return trackItems;
+    }
+
+    /**
+     * Utility function to determine if the iTunesPath is that of an iPod shuffle.
+     * @param iTunesPath  The path to the iTunes_Control directory.
+     * @return  <code>true</code> if the iPod is a Shuffle.
+     */
+    public static boolean isIpodShuffle(String iTunesPath) {
+        /* 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());
+
+        return (itunesStatsFiles != null) && (itunesStatsFiles.length != 0);
+    }
-}