jackrabbit lib

[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 ef9da41..bf48012 100644 (file)
--- a/src/eu/alefzero/owncloud/syncadapter/FileSyncAdapter.java
+++ b/src/eu/alefzero/owncloud/syncadapter/FileSyncAdapter.java
@@ -21,6 +21,11 @@ package eu.alefzero.owncloud.syncadapter;
 import java.io.IOException;\r
 \r
 import org.apache.http.entity.StringEntity;\r
 import java.io.IOException;\r
 \r
 import org.apache.http.entity.StringEntity;\r

+import org.apache.jackrabbit.webdav.DavException;\r
+import org.apache.jackrabbit.webdav.MultiStatus;\r
+import org.apache.jackrabbit.webdav.client.methods.PropFindMethod;\r
+import org.apache.jackrabbit.webdav.property.DavProperty;\r
+import org.apache.jackrabbit.webdav.property.DavPropertyName;\r

 \r
 import android.accounts.Account;\r
 import android.accounts.AuthenticatorException;\r
 \r
 import android.accounts.Account;\r
 import android.accounts.AuthenticatorException;\r


@@ -34,10 +39,13 @@ import android.net.Uri;
 import android.os.Bundle;\r
 import android.os.RemoteException;\r
 import android.util.Log;\r
 import android.os.Bundle;\r
 import android.os.RemoteException;\r
 import android.util.Log;\r

+import eu.alefzero.owncloud.datamodel.FileDataStorageManager;\r
+import eu.alefzero.owncloud.datamodel.OCFile;\r

 import eu.alefzero.owncloud.db.ProviderMeta.ProviderTableMeta;\r
 import eu.alefzero.webdav.HttpPropFind;\r
 import eu.alefzero.webdav.TreeNode;\r
 import eu.alefzero.webdav.TreeNode.NodeProperty;\r
 import eu.alefzero.owncloud.db.ProviderMeta.ProviderTableMeta;\r
 import eu.alefzero.webdav.HttpPropFind;\r
 import eu.alefzero.webdav.TreeNode;\r
 import eu.alefzero.webdav.TreeNode.NodeProperty;\r

+import eu.alefzero.webdav.WebdavEntry;\r

 import eu.alefzero.webdav.WebdavUtils;\r
 \r
 /**\r
 import eu.alefzero.webdav.WebdavUtils;\r
 \r
 /**\r


@@ -52,7 +60,7 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
        public FileSyncAdapter(Context context, boolean autoInitialize) {\r
                super(context, autoInitialize);\r
        }\r
        public FileSyncAdapter(Context context, boolean autoInitialize) {\r
                super(context, autoInitialize);\r
        }\r

-\r
+       \r

        @Override\r
        public synchronized void onPerformSync(\r
                        Account account, \r
        @Override\r
        public synchronized void onPerformSync(\r
                        Account account, \r


@@ -61,82 +69,43 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
                        ContentProviderClient provider, \r
                        SyncResult syncResult) {\r
 \r
                        ContentProviderClient provider, \r
                        SyncResult syncResult) {\r
 \r

-               try {\r

                        this.setAccount(account);\r
                        this.setContentProvider(provider);\r
                        this.setAccount(account);\r
                        this.setContentProvider(provider);\r

+                       this.setStorageManager(new FileDataStorageManager(account, getContentProvider()));\r

 \r
 \r

-                       HttpPropFind query = this.getPropFindQuery();\r
-                       query.setEntity(new StringEntity(WebdavUtils.prepareXmlForPropFind()));\r
-                       TreeNode root = this.fireRequest(query);\r
-\r
-                       commitToDatabase(root, null);\r
-               } catch (OperationCanceledException e) {\r
-                       e.printStackTrace();\r
-               } catch (AuthenticatorException e) {\r
-                       syncResult.stats.numAuthExceptions++;\r
-                       e.printStackTrace();\r
-               } catch (IOException e) {\r
-                       syncResult.stats.numIoExceptions++;\r
-                       e.printStackTrace();\r
-               } catch (RemoteException e) {\r
-                       e.printStackTrace();\r
-               }\r
+                       fetchData(getUri().toString(), syncResult, 0);\r

        }\r
 \r
        }\r
 \r

-       private void commitToDatabase(TreeNode root, String parentId) throws RemoteException {\r
-               for (TreeNode n : root.getChildList()) {\r
-                       Log.d(TAG, n.toString());\r
-                       ContentValues cv = new ContentValues();\r
-                       cv.put(ProviderTableMeta.FILE_CONTENT_LENGTH, n.getProperty(NodeProperty.CONTENT_LENGTH));\r
-                       cv.put(ProviderTableMeta.FILE_MODIFIED, n.getProperty(NodeProperty.LAST_MODIFIED_DATE));\r
-                       cv.put(ProviderTableMeta.FILE_CONTENT_TYPE, n.getProperty(NodeProperty.RESOURCE_TYPE));\r
-                       cv.put(ProviderTableMeta.FILE_PARENT, parentId);\r
+  private void fetchData(String uri, SyncResult syncResult, long parentId) {\r
+    try {\r
+      PropFindMethod query = new PropFindMethod(uri);\r
+      getClient().executeMethod(query);\r
+      MultiStatus resp = null;\r
+      resp = query.getResponseBodyAsMultiStatus();\r
+      for (int i = (parentId==0?0:1); i < resp.getResponses().length; ++i) {\r
+        WebdavEntry we = new WebdavEntry(resp.getResponses()[i]);\r
+        OCFile file = new OCFile(we.path());\r
+        file.setCreationTimestamp(we.createTimestamp());\r
+        file.setFileLength(we.contentLength());\r
+        file.setMimetype(we.contentType());\r
+        file.setModificationTimestamp(we.modifiedTimesamp());\r
+        file.setParentId(parentId);\r
+        if (we.contentType().equals("DIR"))\r
+          fetchData(getUri().toString() + we.path(), syncResult, file.getFileId());\r
+      }\r

 \r
 \r

-                       String name = n.getProperty(NodeProperty.NAME),\r
-                                       path = n.getProperty(NodeProperty.PATH);\r
-                       Cursor c = this.getContentProvider().query(ProviderTableMeta.CONTENT_URI_FILE,\r
-                                       null,\r
-                                       ProviderTableMeta.FILE_NAME+"=? AND " + ProviderTableMeta.FILE_PATH + "=? AND " + ProviderTableMeta.FILE_ACCOUNT_OWNER + "=?",\r
-                                       new String[]{name, path, this.getAccount().name},\r
-                                       null);\r
-                       if (c.moveToFirst()) {\r
-                               this.getContentProvider().update(ProviderTableMeta.CONTENT_URI,\r
-                                               cv,\r
-                                               ProviderTableMeta._ID+"=?",\r
-                                                               new String[]{c.getString(c.getColumnIndex(ProviderTableMeta._ID))});\r
-                               Log.d(TAG, "ID of: "+name+":"+c.getString(c.getColumnIndex(ProviderTableMeta._ID)));\r
-                       } else {\r
-                               cv.put(ProviderTableMeta.FILE_NAME, n.getProperty(NodeProperty.NAME));\r
-                               cv.put(ProviderTableMeta.FILE_PATH, n.getProperty(NodeProperty.PATH));\r
-                               cv.put(ProviderTableMeta.FILE_ACCOUNT_OWNER, this.getAccount().name);\r
-                               Uri entry = this.getContentProvider().insert(ProviderTableMeta.CONTENT_URI_FILE, cv);\r
-                               Log.d(TAG, "Inserting new entry " + path + name);\r
-                               c = this.getContentProvider().query(entry, null, null, null, null);\r
-                               c.moveToFirst();\r
-                       }\r
-                       if (n.getProperty(NodeProperty.RESOURCE_TYPE).equals("DIR")) {\r
-                               commitToDatabase(n, c.getString(c.getColumnIndex(ProviderTableMeta._ID)));\r
-                       }\r
-               }\r
-               // clean removed files\r
-               String[] selection = new String[root.getChildList().size()+2];\r
-               selection[0] = this.getAccount().name;\r
-               selection[1] = parentId;\r
-               String qm = "";\r
-               for (int i = 2; i < selection.length-1; ++i) {\r
-                       qm += "?,";\r
-                       selection[i] = root.getChildList().get(i-2).getProperty(NodeProperty.NAME);\r
-               }\r
-               if (selection.length >= 3) {\r
-                       selection[selection.length-1] = root.getChildrenNames()[selection.length-3];\r
-                       qm += "?";\r
-               }\r
-               for (int i = 0; i < selection.length; ++i) {\r
-                       Log.d(TAG,selection[i]+"");\r
-               }\r
-               Log.d(TAG,"Removing files "+ parentId);\r
-               this.getContentProvider().delete(ProviderTableMeta.CONTENT_URI,\r
-                               ProviderTableMeta.FILE_ACCOUNT_OWNER+"=? AND " + ProviderTableMeta.FILE_PARENT + (parentId==null?" IS ":"=")+"? AND " + ProviderTableMeta.FILE_NAME + " NOT IN ("+qm+")",\r
-                               selection);\r
-       }\r
+    } catch (OperationCanceledException e) {\r
+      e.printStackTrace();\r
+    } catch (AuthenticatorException e) {\r
+      syncResult.stats.numAuthExceptions++;\r
+      e.printStackTrace();\r
+    } catch (IOException e) {\r
+      syncResult.stats.numIoExceptions++;\r
+      e.printStackTrace();\r
+    } catch (DavException e) {\r
+      syncResult.stats.numIoExceptions++;\r
+      e.printStackTrace();\r
+    }\r
+  }\r
+       \r

 }\r
 }\r