Changeset 104

Timestamp:

10/19/08 20:06:15 (2 years ago)

Author:

chris

Message:

r7962@ctilden-laptop: chris | 2008-10-19 20:04:57 -0700

r7958@ctilden-laptop: chris | 2008-10-19 19:26:36 -0700
version for working with cached submissions
r7959@ctilden-laptop: chris | 2008-10-19 19:29:05 -0700
merge of Maksim Liauchuk's patch from 7/6/2008
r7960@ctilden-laptop: chris | 2008-10-19 19:30:46 -0700
applied a code-format
r7961@ctilden-laptop: chris | 2008-10-19 19:43:58 -0700
fixes for minor javadoc errors

Files:

• trunk/src/main/org/lastpod/Model.java (modified) (1 diff)
• trunk/src/main/org/lastpod/ModelImpl.java (modified) (3 diffs)
• trunk/src/main/org/lastpod/Scrobbler.java (modified) (6 diffs)
• trunk/src/main/org/lastpod/action/SubmitTracks.java (modified) (1 diff)
• trunk/src/main/org/lastpod/util/XmlUtils.java (added)

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

@@ -44 +44 @@
-     * Submits the tracks to Last.fm
-     * @param userInterface  The application's user interface.
+     * @param online  submission type:
+     *                  true - online, false - offline (to Last.fm client cache)
-     * @return  A status message upon completion.
-     */
-
+, boolean online
-}

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

@@ -135 +135 @@
-     * Submits the tracks to Last.fm
-     * @param userInterface  The application's user interface.
+     * @param online  submission type:
+     *                  true - online, false - offline (to Last.fm client cache)
-     * @return  A status message upon completion.
-     */
-
+, boolean online
-        Logger logger = Logger.getLogger(LastPod.class.getPackage().getName());
-        Preferences fPrefs = Preferences.userRoot().node("ws/afterglo/audioPod");
@@ -167 +169 @@
-        String backupUrl = fPrefs.get("backupUrl", "");
-
+        String submitCachePath = fPrefs.get("submitCachePath", "");
+
-        try {
-
+
+
-
-            List activeRecentPlayed = onlyActiveTrackItems(recentlyPlayed);
@@ -176 +181 @@
-            scrobbler.setTracksToSubmit(activeRecentPlayed);
-            scrobbler.addInactiveToHistories(inactiveRecentPlayed);
-
-
+
+
+
+
+
+
+
-
-            /* Refresh track list. */

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

@@ -24 +24 @@
-import org.lastpod.util.IoUtils;
-import org.lastpod.util.MiscUtilities;
+import org.lastpod.util.XmlUtils;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
+
+import org.xml.sax.SAXException;
-
-import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
@@ -55 +64 @@
-import javax.security.auth.login.FailedLoginException;
-
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.TransformerException;
+
-/**
- * @author muti
@@ -69 +84 @@
-     */
-    private static final int MIN_TRACK_SECONDS = 30;
+
+    /**
+     * Last.fm client cache version.
+     */
+    private static final String CACHE_VERSION = "1.2";
+
+    /**
+     * Last.fm client product name.
+     */
+    private static final String PRODUCT_NAME = "Audioscrobbler";
-    private String username;
-    private String encryptedPassword;
@@ -76 +101 @@
-    private Integer submitPort;
-    private String submitUrl;
+    private String submitCachePath;
-
-    /**
@@ -94 +120 @@
-    private Logger logger;
-
-
+
+
-        this.username = username;
-        this.encryptedPassword = encryptedPassword;
-        this.backupUrl = backupUrl;
+        this.submitCachePath = submitCachePath;
-        logger = Logger.getLogger(getClass().getPackage().getName());
-    }
@@ -336 +364 @@
-    }
-
+    public void submitTracksToCache()
+            throws UnsupportedEncodingException, NoSuchAlgorithmException, MalformedURLException,
+                IOException, FailedLoginException, ParserConfigurationException, SAXException,
+                TransformerConfigurationException, TransformerException, Exception {
+        String statusMessage = "Submitting tracks to cache...";
+        chunkProgress.setSubmitStatusMessage(statusMessage);
+        logger.log(Level.INFO, statusMessage);
+
+        if (trackChunks.size() == 0) {
+            statusMessage = "No tracks to submit";
+            chunkProgress.setSubmitStatusMessage(statusMessage);
+            throw new RuntimeException(statusMessage);
+        }
+
+        File cacheFile = new File(submitCachePath);
+
+        if (cacheFile.createNewFile()) {
+            FileOutputStream fos = new FileOutputStream(cacheFile);
+            String cacheString = "";
+            cacheString += "<?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n";
+            cacheString += ("<submissions version=\"" + CACHE_VERSION + "\" product=\""
+            + PRODUCT_NAME + "\">\r\n");
+            cacheString += "</submissions>";
+            fos.write(cacheString.getBytes());
+            fos.close();
+        }
+
+        DocumentBuilderFactory docBuilderFactory = DocumentBuilderFactory.newInstance();
+        DocumentBuilder docBuilder = docBuilderFactory.newDocumentBuilder();
+        Document doc = docBuilder.parse(cacheFile);
+
+        NodeList submissions = doc.getElementsByTagName("submissions");
+
+        Chunk chunk = null;
+
+        for (int i = 0; i < trackChunks.size(); i++) {
+            pauseIfRequired();
+            chunk = (Chunk) trackChunks.get(i);
+
+            int tracknum = 0;
+
+            for (int j = 0; j < chunk.getChunkSize(); j++) {
+                TrackItem track = (TrackItem) chunk.getContent().get(j);
+
+                if (track.getLength() < MIN_TRACK_SECONDS) {
+                    continue;
+                }
+
+                Element item = doc.createElement("item");
+                XmlUtils.addChild(doc, item, "artist", track.getArtist());
+                XmlUtils.addChild(doc, item, "album", track.getAlbum());
+                XmlUtils.addChild(doc, item, "track", track.getTrack());
+                XmlUtils.addChild(doc, item, "duration", Long.toString(track.getLength()));
+                XmlUtils.addChild(doc, item, "timestamp", Long.toString(track.getLastplayed()));
+                XmlUtils.addChild(doc, item, "playcount", "0");
+                XmlUtils.addChild(doc, item, "source", "1");
+                XmlUtils.addChild(doc, item, "userActionFlags", "8");
+                XmlUtils.addChild(doc, item, "playerId", "foo");
+                submissions.item(0).appendChild(item);
+
+                tracknum++;
+            }
+
+            for (int j = 0; j < chunk.getChunkSize(); j++) {
+                TrackItem track = (TrackItem) chunk.getContent().get(j);
+                track.setActive(Boolean.FALSE);
+            }
+
+            addHistories(chunk.getContent());
+
+            chunkProgress.updateCurrentChunk(i + 2);
+        }
+
+        XmlUtils.xmlToFile(doc, submitCachePath);
+
+        chunkProgress.setSubmitStatusMessage("Done. You may now sync your iPod.");
+        logger.log(Level.INFO, "Tracks submitted");
+        logger.log(Level.INFO,
+            "You may now sync your iPod with your music management software "
+            + "or delete 'Play Counts' from the iTunes folder!");
+
+        chunkProgress.setCompletionStatus(true);
+    }
+
-    /**
-     * Last.fm will informs this client if it needs to pause.  This occurs when

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

@@ -139 +139 @@
-                        busyIconTimer.start();
-
-
+
+
-                    }
-