X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/b2dc291653d589178aa230ce6226106e442a8c11..8b24606331b944e962650d7d6f283c881b8a541c:/src/eu/alefzero/owncloud/syncadapter/FileSyncAdapter.java?ds=inline
diff --git a/src/eu/alefzero/owncloud/syncadapter/FileSyncAdapter.java b/src/eu/alefzero/owncloud/syncadapter/FileSyncAdapter.java
index bf00240e..ef7a3d5b 100644
--- a/src/eu/alefzero/owncloud/syncadapter/FileSyncAdapter.java
+++ b/src/eu/alefzero/owncloud/syncadapter/FileSyncAdapter.java
@@ -1,140 +1,269 @@
-/* ownCloud Android client application
- * Copyright (C) 2011 Bartek Przybylski
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-
-package eu.alefzero.owncloud.syncadapter;
-
-import java.io.IOException;
-
-import org.apache.http.entity.StringEntity;
-
-import android.accounts.Account;
-import android.accounts.AuthenticatorException;
-import android.accounts.OperationCanceledException;
-import android.content.ContentProviderClient;
-import android.content.ContentValues;
-import android.content.Context;
-import android.content.SyncResult;
-import android.database.Cursor;
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.RemoteException;
-import android.util.Log;
-import eu.alefzero.owncloud.db.ProviderMeta.ProviderTableMeta;
-import eu.alefzero.webdav.HttpPropFind;
-import eu.alefzero.webdav.TreeNode;
-import eu.alefzero.webdav.TreeNode.NodeProperty;
-import eu.alefzero.webdav.WebdavUtils;
-
-/**
- * SyncAdapter implementation for syncing sample SyncAdapter contacts to the
- * platform ContactOperations provider.
- */
-public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
- private static final String TAG = "FileSyncAdapter";
-
- public FileSyncAdapter(Context context, boolean autoInitialize) {
- super(context, autoInitialize);
- }
-
- @Override
- public synchronized void onPerformSync(
- Account account,
- Bundle extras,
- String authority,
- ContentProviderClient provider,
- SyncResult syncResult) {
-
- try {
- this.setAccount(account);
- this.setContentProvider(provider);
-
- HttpPropFind query = this.getPropFindQuery();
- query.setEntity(new StringEntity(WebdavUtils.prepareXmlForPropFind()));
- TreeNode root = this.fireRequest(query);
-
- commitToDatabase(root, null);
- } catch (OperationCanceledException e) {
- e.printStackTrace();
- } catch (AuthenticatorException e) {
- syncResult.stats.numAuthExceptions++;
- e.printStackTrace();
- } catch (IOException e) {
- syncResult.stats.numIoExceptions++;
- e.printStackTrace();
- } catch (RemoteException e) {
- e.printStackTrace();
- }
- }
-
- private void commitToDatabase(TreeNode root, String parentId) throws RemoteException {
- for (TreeNode n : root.getChildList()) {
- Log.d(TAG, n.toString());
- ContentValues cv = new ContentValues();
- cv.put(ProviderTableMeta.FILE_CONTENT_LENGTH, n.getProperty(NodeProperty.CONTENT_LENGTH));
- cv.put(ProviderTableMeta.FILE_MODIFIED, n.getProperty(NodeProperty.LAST_MODIFIED_DATE));
- cv.put(ProviderTableMeta.FILE_CONTENT_TYPE, n.getProperty(NodeProperty.RESOURCE_TYPE));
- cv.put(ProviderTableMeta.FILE_PARENT, parentId);
-
- String name = n.getProperty(NodeProperty.NAME),
- path = n.getProperty(NodeProperty.PATH);
- Cursor c = this.getContentProvider().query(ProviderTableMeta.CONTENT_URI_FILE,
- null,
- ProviderTableMeta.FILE_NAME+"=? AND " + ProviderTableMeta.FILE_PATH + "=? AND " + ProviderTableMeta.FILE_ACCOUNT_OWNER + "=?",
- new String[]{name, path, this.getAccount().name},
- null);
- if (c.moveToFirst()) {
- this.getContentProvider().update(ProviderTableMeta.CONTENT_URI,
- cv,
- ProviderTableMeta._ID+"=?",
- new String[]{c.getString(c.getColumnIndex(ProviderTableMeta._ID))});
- Log.d(TAG, "ID of: "+name+":"+c.getString(c.getColumnIndex(ProviderTableMeta._ID)));
- } else {
- cv.put(ProviderTableMeta.FILE_NAME, n.getProperty(NodeProperty.NAME));
- cv.put(ProviderTableMeta.FILE_PATH, n.getProperty(NodeProperty.PATH));
- cv.put(ProviderTableMeta.FILE_ACCOUNT_OWNER, this.getAccount().name);
- Uri entry = this.getContentProvider().insert(ProviderTableMeta.CONTENT_URI_FILE, cv);
- Log.d(TAG, "Inserting new entry " + path + name);
- c = this.getContentProvider().query(entry, null, null, null, null);
- c.moveToFirst();
- }
- if (n.getProperty(NodeProperty.RESOURCE_TYPE).equals("DIR")) {
- commitToDatabase(n, c.getString(c.getColumnIndex(ProviderTableMeta._ID)));
- }
- }
- // clean removed files
- String[] selection = new String[root.getChildList().size()+2];
- selection[0] = this.getAccount().name;
- selection[1] = parentId;
- String qm = "";
- for (int i = 2; i < selection.length-1; ++i) {
- qm += "?,";
- selection[i] = root.getChildList().get(i-2).getProperty(NodeProperty.NAME);
- }
- if (selection.length >= 3) {
- selection[selection.length-1] = root.getChildrenNames()[selection.length-3];
- qm += "?";
- }
- for (int i = 0; i < selection.length; ++i) {
- Log.d(TAG,selection[i]+"");
- }
- Log.d(TAG,"Removing files "+ parentId);
- this.getContentProvider().delete(ProviderTableMeta.CONTENT_URI,
- ProviderTableMeta.FILE_ACCOUNT_OWNER+"=? AND " + ProviderTableMeta.FILE_PARENT + (parentId==null?" IS ":"=")+"? AND " + ProviderTableMeta.FILE_NAME + " NOT IN ("+qm+")",
- selection);
- }
-}
+/* ownCloud Android client application
+ * Copyright (C) 2011 Bartek Przybylski
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ *
+ */
+
+package eu.alefzero.owncloud.syncadapter;
+
+import java.io.IOException;
+import java.io.ObjectInputStream.GetField;
+import java.util.List;
+import java.util.Vector;
+
+import org.apache.jackrabbit.webdav.DavException;
+import org.apache.jackrabbit.webdav.MultiStatus;
+import org.apache.jackrabbit.webdav.client.methods.PropFindMethod;
+
+import android.accounts.Account;
+import android.accounts.AuthenticatorException;
+import android.accounts.OperationCanceledException;
+import android.content.ContentProviderClient;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SyncResult;
+import android.os.Bundle;
+import android.util.Log;
+import eu.alefzero.owncloud.datamodel.FileDataStorageManager;
+import eu.alefzero.owncloud.datamodel.OCFile;
+import eu.alefzero.owncloud.files.services.FileDownloader;
+import eu.alefzero.webdav.WebdavEntry;
+
+/**
+ * SyncAdapter implementation for syncing sample SyncAdapter contacts to the
+ * platform ContactOperations provider.
+ *
+ * @author Bartek Przybylski
+ */
+public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
+
+ private final static String TAG = "FileSyncAdapter";
+
+ /* Commented code for ugly performance tests
+ private final static int MAX_DELAYS = 100;
+ private static long[] mResponseDelays = new long[MAX_DELAYS];
+ private static long[] mSaveDelays = new long[MAX_DELAYS];
+ private int mDelaysIndex = 0;
+ private int mDelaysCount = 0;
+ */
+
+ private long mCurrentSyncTime;
+
+ public FileSyncAdapter(Context context, boolean autoInitialize) {
+ super(context, autoInitialize);
+ }
+
+ @Override
+ public synchronized void onPerformSync(Account account, Bundle extras,
+ String authority, ContentProviderClient provider,
+ SyncResult syncResult) {
+
+ this.setAccount(account);
+ this.setContentProvider(provider);
+ this.setStorageManager(new FileDataStorageManager(account,
+ getContentProvider()));
+
+ /* Commented code for ugly performance tests
+ mDelaysIndex = 0;
+ mDelaysCount = 0;
+ */
+
+
+ Log.d(TAG, "syncing owncloud account " + account.name);
+
+ sendStickyBroadcast(true, null); // message to signal the start to the UI
+
+ PropFindMethod query;
+ try {
+ mCurrentSyncTime = System.currentTimeMillis();
+ query = new PropFindMethod(getUri().toString() + "/");
+ getClient().executeMethod(query);
+ MultiStatus resp = null;
+ resp = query.getResponseBodyAsMultiStatus();
+
+ if (resp.getResponses().length > 0) {
+ WebdavEntry we = new WebdavEntry(resp.getResponses()[0], getUri().getPath());
+ OCFile file = fillOCFile(we);
+ file.setParentId(0);
+ getStorageManager().saveFile(file);
+ fetchData(getUri().toString(), syncResult, file.getFileId(), account);
+ }
+ } catch (OperationCanceledException e) {
+ e.printStackTrace();
+ } catch (AuthenticatorException e) {
+ syncResult.stats.numAuthExceptions++;
+ e.printStackTrace();
+ } catch (IOException e) {
+ syncResult.stats.numIoExceptions++;
+ e.printStackTrace();
+ } catch (DavException e) {
+ syncResult.stats.numIoExceptions++;
+ e.printStackTrace();
+ } catch (Throwable t) {
+ // TODO update syncResult
+ Log.e(TAG, "problem while synchronizing owncloud account " + account.name, t);
+ t.printStackTrace();
+ }
+
+ /* Commented code for ugly performance tests
+ long sum = 0, mean = 0, max = 0, min = Long.MAX_VALUE;
+ for (int i=0; i updatedFiles = new Vector(resp.getResponses().length - 1);
+ for (int i = 1; i < resp.getResponses().length; ++i) {
+ WebdavEntry we = new WebdavEntry(resp.getResponses()[i], getUri().getPath());
+ OCFile file = fillOCFile(we);
+ file.setParentId(parentId);
+ if (getStorageManager().getFileByPath(file.getRemotePath()) != null &&
+ getStorageManager().getFileByPath(file.getRemotePath()).keepInSync() &&
+ file.getModificationTimestamp() > getStorageManager().getFileByPath(file.getRemotePath())
+ .getModificationTimestamp()) {
+ Intent intent = new Intent(this.getContext(), FileDownloader.class);
+ intent.putExtra(FileDownloader.EXTRA_ACCOUNT, getAccount());
+ intent.putExtra(FileDownloader.EXTRA_FILE_PATH, file.getURLDecodedRemotePath());
+ intent.putExtra(FileDownloader.EXTRA_REMOTE_PATH, file.getRemotePath());
+ intent.putExtra(FileDownloader.EXTRA_FILE_SIZE, file.getFileLength());
+ file.setKeepInSync(true);
+ getContext().startService(intent);
+ }
+ if (getStorageManager().getFileByPath(file.getRemotePath()) != null)
+ file.setKeepInSync(getStorageManager().getFileByPath(file.getRemotePath()).keepInSync());
+ //getStorageManager().saveFile(file);
+ updatedFiles.add(file);
+ if (parentId == 0)
+ parentId = file.getFileId();
+ }
+ /* Commented code for ugly performance tests
+ long saveDelay = System.currentTimeMillis();
+ */
+ getStorageManager().saveFiles(updatedFiles); // all "at once" ; trying to get a best performance in database update
+ /* Commented code for ugly performance tests
+ saveDelay = System.currentTimeMillis() - saveDelay;
+ Log.e(TAG, "syncing: SAVE TIME for " + uri + " contents, " + mSaveDelays[mDelaysIndex] + "ms");
+ */
+
+ // removal of obsolete files
+ Vector files = getStorageManager().getDirectoryContent(
+ getStorageManager().getFileById(parentId));
+ OCFile file;
+ for (int i=0; i < files.size(); ) {
+ file = files.get(i);
+ if (file.getLastSyncDate() != mCurrentSyncTime && file.getLastSyncDate() != 0) {
+ getStorageManager().removeFile(file);
+ files.remove(i);
+ } else {
+ i++;
+ }
+ }
+
+ // synchronized folder -> notice to UI
+ sendStickyBroadcast(true, getStorageManager().getFileById(parentId).getRemotePath());
+
+ // recursive fetch
+ for (OCFile newFile : files) {
+ if (newFile.getMimetype().equals("DIR")) {
+ fetchData(getUri().toString() + newFile.getRemotePath(), syncResult, newFile.getFileId(), account);
+ }
+ }
+
+ /* Commented code for ugly performance tests
+ mResponseDelays[mDelaysIndex] = responseDelay;
+ mSaveDelays[mDelaysIndex] = saveDelay;
+ mDelaysCount++;
+ mDelaysIndex++;
+ if (mDelaysIndex >= MAX_DELAYS)
+ mDelaysIndex = 0;
+ */
+
+
+
+ } catch (OperationCanceledException e) {
+ e.printStackTrace();
+ } catch (AuthenticatorException e) {
+ syncResult.stats.numAuthExceptions++;
+ e.printStackTrace();
+ } catch (IOException e) {
+ syncResult.stats.numIoExceptions++;
+ e.printStackTrace();
+ } catch (DavException e) {
+ syncResult.stats.numIoExceptions++;
+ e.printStackTrace();
+ } catch (Throwable t) {
+ // TODO update syncResult
+ Log.e(TAG, "problem while synchronizing owncloud account " + account.name, t);
+ t.printStackTrace();
+ }
+ }
+
+ private OCFile fillOCFile(WebdavEntry we) {
+ OCFile file = new OCFile(we.path());
+ file.setCreationTimestamp(we.createTimestamp());
+ file.setFileLength(we.contentLength());
+ file.setMimetype(we.contentType());
+ file.setModificationTimestamp(we.modifiedTimesamp());
+ file.setLastSyncDate(mCurrentSyncTime);
+ return file;
+ }
+
+
+ private void sendStickyBroadcast(boolean inProgress, String dirRemotePath) {
+ Intent i = new Intent(FileSyncService.SYNC_MESSAGE);
+ i.putExtra(FileSyncService.IN_PROGRESS, inProgress);
+ i.putExtra(FileSyncService.ACCOUNT_NAME, getAccount().name);
+ if (dirRemotePath != null) {
+ i.putExtra(FileSyncService.SYNC_FOLDER_REMOTE_PATH, dirRemotePath);
+ }
+ getContext().sendStickyBroadcast(i);
+ }
+
+}