implemented status check before music list sync

Author: Jude Love

.idea/misc.xml

@@ -17,8 +17,17 @@
 import org.rootio.handset.BuildConfig;
 import org.rootio.handset.R;
 import org.rootio.tools.cloud.Cloud;
+import org.rootio.tools.persistence.DBAgent;
 import org.rootio.tools.utils.Utils;
 
+import java.io.IOException;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
 /**
  * @author Jude Mukundane, M-ITI/IST-UL
  */
@@ -27,7 +36,7 @@ public class MusicListHandler implements SynchronizationHandler {
     private Context parent;
     private Cloud cloud;
     private int offset, limit = 100;
-    private long maxDateadded;
+    private String maxDateadded;
 
     MusicListHandler(Context parent, Cloud cloud) {
         this.parent = parent;
@@ -45,9 +54,8 @@ public JSONObject getSynchronizationData() {
     public void processJSONResponse(JSONObject synchronizationResponse) {
         // do nothing with the response
         try {
-            if(synchronizationResponse.getBoolean("status"))
-            {
-                this.logMaxDateAdded(this.maxDateadded);
+            if (synchronizationResponse.getBoolean("status")) {
+                this.logMaxDateAdded(synchronizationResponse.getString("date"));
             }
         } catch (JSONException e) {
             e.printStackTrace();
@@ -56,32 +64,84 @@ public void processJSONResponse(JSONObject synchronizationResponse) {
 
     @Override
     public String getSynchronizationURL() {
-        return String.format("%s://%s:%s/%s/%s/music?api_key=%s&version=%s_%s", this.cloud.getServerScheme(), this.cloud.getServerAddress(), this.cloud.getHTTPPort(), "api/station", this.cloud.getStationId(), this.cloud.getServerKey(), BuildConfig.VERSION_NAME, BuildConfig.VERSION_CODE);
-  }
+        try {
+            if (isSyncDue()) {
+                return String.format("%s://%s:%s/%s/%s/music?api_key=%s&version=%s_%s", this.cloud.getServerScheme(), this.cloud.getServerAddress(), this.cloud.getHTTPPort(), "api/station", this.cloud.getStationId(), this.cloud.getServerKey(), BuildConfig.VERSION_NAME, BuildConfig.VERSION_CODE);
+            } else {
+                return null;
+            }
+        } catch (JSONException e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    private boolean isSyncDue() throws JSONException {
+        List<Integer> result = getMediaStatus();
+        if (result == null) {
+            return false; //something wrong, needs looking into
+        }
+        String response = Utils.doPostHTTP(getPreSynchronizationURL(), "");
+        JSONObject status = new JSONObject(response);
+
+        //if the number of songs, albums or artists is different from what is on the server
+        //and the sync date is different from what is on the server, a sync is in order
+        boolean syncDue = !(status.getJSONObject("songs").getLong("count") == (long) result.get(0) && status.getJSONObject("songs").getString("max_date").equals(getMaxDateAdded())
+                && status.getJSONObject("albums").getLong("count") == (long) result.get(1) && status.getJSONObject("albums").getString("max_date").equals(getMaxDateAdded())
+                && status.getJSONObject("artists").getLong("count") == (long) result.get(2) && status.getJSONObject("artists").getString("max_date").equals(getMaxDateAdded()));
+        Logger.getLogger("RootIO").log(Level.INFO, "Media Sync Due: " + syncDue + " ( " + status + " ) and " + result.get(0) + ", " + getMaxDateAdded());
+        return syncDue;
+    }
+
+    private String getPreSynchronizationURL() {
+        return String.format("%s://%s:%s/%s/%s/music_status?api_key=%s&version=%s_%s", this.cloud.getServerScheme(), this.cloud.getServerAddress(), this.cloud.getHTTPPort(), "api/station", this.cloud.getStationId(), this.cloud.getServerKey(), BuildConfig.VERSION_NAME, BuildConfig.VERSION_CODE);
+    }
 
-    private long getMaxDateAdded()
-    {
-        return (long)Utils.getPreference("media_max_date_added", long.class, this.parent);
+    private String getMaxDateAdded() {
+        String maxDate = (String) Utils.getPreference("media_max_date_added", String.class, this.parent);
+        return maxDate != null && maxDate.contains(".") ? maxDate.substring(0, maxDate.indexOf(".")) : maxDate;
     }
 
-    private void logMaxDateAdded(long maxDate) {
+    private void logMaxDateAdded(String maxDate) {
         ContentValues values = new ContentValues();
         values.put("media_max_date_added", maxDate);
         Utils.savePreferences(values, this.parent);
     }
 
+    private List<Integer> getMediaStatus() {
+        List<Integer> result = new ArrayList<>();
+        Cursor cur;
+        try {
+            ContentResolver cr = this.parent.getContentResolver();
+            Uri uri = MediaStore.Audio.Media.EXTERNAL_CONTENT_URI;
+            String[] selection = new String[]{"count (distinct " + MediaStore.Audio.Media.TITLE + ")", "count (distinct " + MediaStore.Audio.Media.ALBUM + ")", "count (distinct " + MediaStore.Audio.Media.ARTIST + ")"};
+            //uncomment last bit to turn on paging in case of very many records, but in this case sort by date_added asc
+            String sortOrder = MediaStore.Audio.Media.TITLE + " ASC"; // limit   " + String.valueOf(limit) + " offset "+String.valueOf(offset);
+            cur = cr.query(uri, selection, null, new String[]{}, sortOrder);
+            cur.moveToFirst();
+            result.add(cur.getInt(0));
+            result.add(cur.getInt(1));
+            result.add(cur.getInt(2));
+            return result;
+        }
+        catch (Exception ex)
+        {
+            return null;
+        }
+
+    }
+
     private JSONObject getSongList() {
         JSONObject music = new JSONObject();
         String artist, album;
         Cursor cur = null;
         try {
-            this.maxDateadded = this.getMaxDateAdded();
             ContentResolver cr = this.parent.getContentResolver();
             Uri uri = MediaStore.Audio.Media.EXTERNAL_CONTENT_URI;
-            String selection = MediaStore.Audio.Media.IS_MUSIC + "!= 0 and date_added > ?";
+            String selection = MediaStore.Audio.Media.IS_MUSIC + "!= 0 and date_added ";
             //uncomment last bit to turn on paging in case of very many records, but in this case sort by date_added asc
             String sortOrder = MediaStore.Audio.Media.TITLE + " ASC"; // limit   " + String.valueOf(limit) + " offset "+String.valueOf(offset);
-            cur = cr.query(uri, null, selection, new String[]{String.valueOf(this.maxDateadded)}, sortOrder);
+            cur = cr.query(uri, null, selection, new String[]{}, sortOrder);
             offset += limit;
             int count;
 
@@ -91,7 +151,7 @@ private JSONObject getSongList() {
 
 
                 if (count > 0) {
-                    if(count < limit) // we have reached the end of all records!
+                    if (count < limit) // we have reached the end of all records!
                     {
                         offset = 0;
                     }
@@ -104,10 +164,7 @@ private JSONObject getSongList() {
                         long dateAdded = cur.getLong(cur.getColumnIndex(MediaStore.Audio.Media.DATE_ADDED));
                         song.put("date_added", dateAdded);
                         song.put("date_modified", cur.getString(cur.getColumnIndex(MediaStore.Audio.Media.DATE_MODIFIED)));
-                        if(dateAdded > maxDateadded)
-                        {
-                            maxDateadded = dateAdded;
-                        }
+
 
                         artist = cur.getString(cur.getColumnIndex(MediaStore.Audio.Media.ARTIST)) == null ? "unknown" : cur.getString(cur.getColumnIndex(MediaStore.Audio.Media.ARTIST));
                         artist = artist.replace("\u2019", "'").replace("\u2018", "'");

app/src/main/java/org/rootio/services/synchronization/MusicListHandler.java

@@ -193,6 +193,10 @@ private int getFrequency() {
     public void synchronize(final SynchronizationHandler handler, Integer id) {
         try {
             String synchronizationUrl = handler.getSynchronizationURL();
+            if(synchronizationUrl == null)
+            {
+                return;
+            }
             HashMap<String, Object> response = Utils.doDetailedPostHTTP(synchronizationUrl, handler.getSynchronizationData().toString());
             JSONObject responseJSON;
             responseJSON = new JSONObject((String) response.get("response"));