Changeset 85

Timestamp:

12/23/07 00:02:28 (3 years ago)

Author:

chris

Message:

Completes #20: Saves the history file and clears submitted chunks
properly. These actions are now taking place after each chunk is
submitted.

Files:

• trunk/src/main/org/lastpod/ModelImpl.java (modified) (1 diff)
• trunk/src/main/org/lastpod/Scrobbler.java (modified) (5 diffs)
• trunk/src/test/org/lastpod/MockModel.java (modified) (1 diff)

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

@@ -158 +158 @@
-            scrobbler.setChunkProgress(userInterface);
-            scrobbler.setTracksToSubmit(activeRecentPlayed);
+            scrobbler.addInactiveToHistories(inactiveRecentPlayed);
-            scrobbler.handshake();
-            scrobbler.submitTracks();
-            scrobbler.addHistories(activeRecentPlayed, inactiveRecentPlayed);
-
-            /* Refresh track list. */

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

@@ -272 +272 @@
-                queryString += buildTrackQueryString(track, tracknum);
-
-                /* Unselect the submitted track. */
-                track.setActive(Boolean.FALSE);
-                tracknum++;
-            }
@@ -309 +307 @@
-                throw new RuntimeException("Unknown error submitting tracks");
-            }
+
+            /* The chunk is successfully written to last.fm. Makes sure the
+             * tracks are marked as inactive.  Writes the history file.
+             * This is done after each chunk because if the next chunk fails
+             * the history file should reflect where the failure occurred.
+             */
+            for (int j = 0; j < chunk.getChunkSize(); j++) {
+                TrackItem track = (TrackItem) chunk.getContent().get(j);
+                track.setActive(Boolean.FALSE);
+            }
+
+            addHistories(chunk.getContent());
-
-            /* Add 2 to progress.  1 because chunk progress starts at 1, whereas
@@ -381 +391 @@
-     * Creates the histories and writes them to a file.
-     * @param activeRecentPlayed  The list of active recently played tracks.
-
-
-
+
+
-        for (int i = 0; i < activeRecentPlayed.size(); i++) {
-            TrackItem track = (TrackItem) activeRecentPlayed.get(i);
@@ -389 +398 @@
-        }
-
+        History.getInstance(null).write();
+    }
+
+    /**
+     * Adds inactive recent played tracks to the histories file.  This is done
+     * so they will be preserved in the histories.
+     * @param inactiveRecentPlayed  The list of inactive recently played tracks.
+     */
+    public void addInactiveToHistories(List inactiveRecentPlayed) {
-        for (int i = 0; i < inactiveRecentPlayed.size(); i++) {
-            TrackItem track = (TrackItem) inactiveRecentPlayed.get(i);
@@ -396 +414 @@
-            }
-        }
-
-        History.getInstance(null).write();
-    }
-

trunk/src/test/org/lastpod/MockModel.java

@@ -213 +213 @@
-
-        Scrobbler scrobbler = new Scrobbler(null, null, null);
-
+
+
-        userInterface.setCompletionStatus(true);
-