Avoid use of queues to delay recursion

[pub/Android/ownCloud.git] / src / eu / alefzero / owncloud / syncadapter / FileSyncAdapter.java

diff --git a/src/eu/alefzero/owncloud/syncadapter/FileSyncAdapter.java b/src/eu/alefzero/owncloud/syncadapter/FileSyncAdapter.java
index 85f9cbb..14237e4 100644 (file)
--- a/src/eu/alefzero/owncloud/syncadapter/FileSyncAdapter.java
+++ b/src/eu/alefzero/owncloud/syncadapter/FileSyncAdapter.java
@@ -19,7 +19,11 @@
 package eu.alefzero.owncloud.syncadapter;\r
 \r
 import java.io.IOException;\r
 package eu.alefzero.owncloud.syncadapter;\r
 \r
 import java.io.IOException;\r

-import java.net.URLDecoder;\r
+import java.util.ArrayList;\r
+import java.util.Iterator;\r
+import java.util.LinkedList;\r
+import java.util.List;\r
+import java.util.Queue;\r

 import java.util.Vector;\r
 \r
 import org.apache.jackrabbit.webdav.DavException;\r
 import java.util.Vector;\r
 \r
 import org.apache.jackrabbit.webdav.DavException;\r


@@ -35,6 +39,7 @@ import android.content.Intent;
 import android.content.SyncResult;\r
 import android.os.Bundle;\r
 import android.util.Log;\r
 import android.content.SyncResult;\r
 import android.os.Bundle;\r
 import android.util.Log;\r

+import android.webkit.MimeTypeMap;\r

 import eu.alefzero.owncloud.datamodel.FileDataStorageManager;\r
 import eu.alefzero.owncloud.datamodel.OCFile;\r
 import eu.alefzero.webdav.WebdavEntry;\r
 import eu.alefzero.owncloud.datamodel.FileDataStorageManager;\r
 import eu.alefzero.owncloud.datamodel.OCFile;\r
 import eu.alefzero.webdav.WebdavEntry;\r


@@ -64,13 +69,10 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
         this.setContentProvider(provider);\r
         this.setStorageManager(new FileDataStorageManager(account,\r
                 getContentProvider()));\r
         this.setContentProvider(provider);\r
         this.setStorageManager(new FileDataStorageManager(account,\r
                 getContentProvider()));\r

-\r
+        \r

         Log.d(TAG, "syncing owncloud account " + account.name);\r
 \r
         Log.d(TAG, "syncing owncloud account " + account.name);\r
 \r

-        Intent i = new Intent(FileSyncService.SYNC_MESSAGE);\r
-        i.putExtra(FileSyncService.IN_PROGRESS, true);\r
-        i.putExtra(FileSyncService.ACCOUNT_NAME, account.name);\r
-        getContext().sendStickyBroadcast(i);\r
+        sendStickyBroadcast(true, -1);  // message to signal the start to the UI\r

 \r
         PropFindMethod query;\r
         try {\r
 \r
         PropFindMethod query;\r
         try {\r


@@ -98,33 +100,67 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
         } catch (DavException e) {\r
             syncResult.stats.numIoExceptions++;\r
             e.printStackTrace();\r
         } catch (DavException e) {\r
             syncResult.stats.numIoExceptions++;\r
             e.printStackTrace();\r

+        } catch (RuntimeException r) {\r
+            //TODO count ; any type of exception should be treated, and the progress indicator finished;\r
+            //             reporting the user about bad synchronizations should be discussed\r
+            r.printStackTrace();\r
+            throw r;\r

         }\r
         }\r

-        i.putExtra(FileSyncService.IN_PROGRESS, false);\r
-        getContext().sendStickyBroadcast(i);\r
+        sendStickyBroadcast(false, -1);        \r

     }\r
 \r
     private void fetchData(String uri, SyncResult syncResult, long parentId) {\r
         try {\r
     }\r
 \r
     private void fetchData(String uri, SyncResult syncResult, long parentId) {\r
         try {\r

+            Log.v(TAG, "syncing: fetching " + uri);\r
+            \r
+            boolean logmore = (uri.contains("many-files"));\r
+\r
+            // remote request \r
+            if (logmore) Log.v(TAG, "syncing: fetching many-files, TO REQUEST");\r

             PropFindMethod query = new PropFindMethod(uri);\r
             getClient().executeMethod(query);\r
             MultiStatus resp = null;\r
             PropFindMethod query = new PropFindMethod(uri);\r
             getClient().executeMethod(query);\r
             MultiStatus resp = null;\r

+            \r
+            if (logmore) Log.v(TAG, "syncing: fetching many-files, TO PREPARE THE RESPONSE");\r

             resp = query.getResponseBodyAsMultiStatus();\r
             resp = query.getResponseBodyAsMultiStatus();\r

+            \r
+            // insertion of updated files\r
+            if (logmore) Log.v(TAG, "syncing: fetching many-files, TO PARSE REPONSES");\r

             for (int i = 1; i < resp.getResponses().length; ++i) {\r
             for (int i = 1; i < resp.getResponses().length; ++i) {\r

+                if (logmore) Log.v(TAG, "syncing: fetching many-files, PARSING REPONSE " + i + "-esima");\r

                 WebdavEntry we = new WebdavEntry(resp.getResponses()[i], getUri().getPath());\r
                 OCFile file = fillOCFile(we);\r
                 file.setParentId(parentId);\r
                 getStorageManager().saveFile(file);\r
                 if (parentId == 0)\r
                     parentId = file.getFileId();\r
                 WebdavEntry we = new WebdavEntry(resp.getResponses()[i], getUri().getPath());\r
                 OCFile file = fillOCFile(we);\r
                 file.setParentId(parentId);\r
                 getStorageManager().saveFile(file);\r
                 if (parentId == 0)\r
                     parentId = file.getFileId();\r

-                if (we.contentType().equals("DIR"))\r
-                    fetchData(getUri().toString() + we.path(), syncResult, file.getFileId());\r

             }\r
             }\r

+            \r
+            // removal of old files\r
+            // TODO - getDirectoryContent is crashing the app by lack of memory when a lot of files are in the same directory!!!!\r
+            //        tested with the path /\r
+            if (logmore) Log.v(TAG, "syncing: fetching many-files, RETRIEVING VECTOR OF FILES");\r

             Vector<OCFile> files = getStorageManager().getDirectoryContent(\r
                     getStorageManager().getFileById(parentId));\r
             for (OCFile file : files) {\r
                 if (file.getLastSyncDate() != mCurrentSyncTime && file.getLastSyncDate() != 0)\r
                     getStorageManager().removeFile(file);\r
             }\r
             Vector<OCFile> files = getStorageManager().getDirectoryContent(\r
                     getStorageManager().getFileById(parentId));\r
             for (OCFile file : files) {\r
                 if (file.getLastSyncDate() != mCurrentSyncTime && file.getLastSyncDate() != 0)\r
                     getStorageManager().removeFile(file);\r
             }\r

+            \r
+            // synched folder -> notice to IU\r
+            if (logmore) Log.v(TAG, "syncing: fetching many-files, NOTIFYING THE UI");\r
+            sendStickyBroadcast(true, parentId);\r
+\r
+            // recursive fetch\r
+            if (logmore) Log.v(TAG, "syncing: fetching many-files, TRYING TO RECURSE");\r
+            files = getStorageManager().getDirectoryContent(getStorageManager().getFileById(parentId));\r
+            for (OCFile file : files) {\r
+                if (file.getMimetype().equals("DIR")) {\r
+                    fetchData(getUri().toString() + file.getRemotePath(), syncResult, file.getFileId());\r
+                }\r
+            }\r
+\r
+\r

         } catch (OperationCanceledException e) {\r
             e.printStackTrace();\r
         } catch (AuthenticatorException e) {\r
         } catch (OperationCanceledException e) {\r
             e.printStackTrace();\r
         } catch (AuthenticatorException e) {\r


@@ -140,7 +176,7 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
     }\r
 \r
     private OCFile fillOCFile(WebdavEntry we) {\r
     }\r
 \r
     private OCFile fillOCFile(WebdavEntry we) {\r

-        OCFile file = new OCFile(URLDecoder.decode(we.path()));\r
+        OCFile file = new OCFile(we.path());\r

         file.setCreationTimestamp(we.createTimestamp());\r
         file.setFileLength(we.contentLength());\r
         file.setMimetype(we.contentType());\r
         file.setCreationTimestamp(we.createTimestamp());\r
         file.setFileLength(we.contentLength());\r
         file.setMimetype(we.contentType());\r


@@ -148,5 +184,16 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
         file.setLastSyncDate(mCurrentSyncTime);\r
         return file;\r
     }\r
         file.setLastSyncDate(mCurrentSyncTime);\r
         return file;\r
     }\r

+    \r
+    \r
+    private void sendStickyBroadcast(boolean inProgress, long OCDirId) {\r
+        Intent i = new Intent(FileSyncService.SYNC_MESSAGE);\r
+        i.putExtra(FileSyncService.IN_PROGRESS, inProgress);\r
+        i.putExtra(FileSyncService.ACCOUNT_NAME, getAccount().name);\r
+        if (OCDirId > 0) {\r
+            i.putExtra(FileSyncService.SYNC_FOLDER, OCDirId);\r
+        }\r
+        getContext().sendStickyBroadcast(i);\r
+    }\r

 \r
 }\r
 \r
 }\r