package eu.alefzero.owncloud.syncadapter;\r
\r
import java.io.IOException;\r
-import java.io.ObjectInputStream.GetField;\r
+import java.util.List;\r
import java.util.Vector;\r
\r
import org.apache.jackrabbit.webdav.DavException;\r
import eu.alefzero.owncloud.datamodel.OCFile;\r
import eu.alefzero.owncloud.files.services.FileDownloader;\r
import eu.alefzero.webdav.WebdavEntry;\r
+import eu.alefzero.webdav.WebdavUtils;\r
\r
/**\r
* SyncAdapter implementation for syncing sample SyncAdapter contacts to the\r
\r
private final static String TAG = "FileSyncAdapter"; \r
\r
+ /* Commented code for ugly performance tests\r
+ private final static int MAX_DELAYS = 100;\r
+ private static long[] mResponseDelays = new long[MAX_DELAYS]; \r
+ private static long[] mSaveDelays = new long[MAX_DELAYS];\r
+ private int mDelaysIndex = 0;\r
+ private int mDelaysCount = 0;\r
+ */\r
+ \r
private long mCurrentSyncTime;\r
+ private boolean mCancellation;\r
+ private Account mAccount;\r
\r
public FileSyncAdapter(Context context, boolean autoInitialize) {\r
super(context, autoInitialize);\r
String authority, ContentProviderClient provider,\r
SyncResult syncResult) {\r
\r
- this.setAccount(account);\r
+ mCancellation = false;\r
+ mAccount = account;\r
+ \r
+ this.setAccount(mAccount);\r
this.setContentProvider(provider);\r
- this.setStorageManager(new FileDataStorageManager(account,\r
+ this.setStorageManager(new FileDataStorageManager(mAccount,\r
getContentProvider()));\r
\r
- Log.d(TAG, "syncing owncloud account " + account.name);\r
+ /* Commented code for ugly performance tests\r
+ mDelaysIndex = 0;\r
+ mDelaysCount = 0;\r
+ */\r
+ \r
+ \r
+ Log.d(TAG, "syncing owncloud account " + mAccount.name);\r
\r
sendStickyBroadcast(true, null); // message to signal the start to the UI\r
\r
OCFile file = fillOCFile(we);\r
file.setParentId(0);\r
getStorageManager().saveFile(file);\r
- fetchData(getUri().toString(), syncResult, file.getFileId(), account);\r
+ if (!mCancellation) {\r
+ fetchData(getUri().toString(), syncResult, file.getFileId());\r
+ }\r
}\r
} catch (OperationCanceledException e) {\r
e.printStackTrace();\r
Log.e(TAG, "problem while synchronizing owncloud account " + account.name, t);\r
t.printStackTrace();\r
}\r
+ \r
+ /* Commented code for ugly performance tests\r
+ long sum = 0, mean = 0, max = 0, min = Long.MAX_VALUE;\r
+ for (int i=0; i<MAX_DELAYS && i<mDelaysCount; i++) {\r
+ sum += mResponseDelays[i];\r
+ max = Math.max(max, mResponseDelays[i]);\r
+ min = Math.min(min, mResponseDelays[i]);\r
+ }\r
+ mean = sum / mDelaysCount;\r
+ Log.e(TAG, "SYNC STATS - response: mean time = " + mean + " ; max time = " + max + " ; min time = " + min);\r
+ \r
+ sum = 0; max = 0; min = Long.MAX_VALUE;\r
+ for (int i=0; i<MAX_DELAYS && i<mDelaysCount; i++) {\r
+ sum += mSaveDelays[i];\r
+ max = Math.max(max, mSaveDelays[i]);\r
+ min = Math.min(min, mSaveDelays[i]);\r
+ }\r
+ mean = sum / mDelaysCount;\r
+ Log.e(TAG, "SYNC STATS - save: mean time = " + mean + " ; max time = " + max + " ; min time = " + min);\r
+ Log.e(TAG, "SYNC STATS - folders measured: " + mDelaysCount);\r
+ */\r
+ \r
sendStickyBroadcast(false, null); \r
}\r
\r
- private void fetchData(String uri, SyncResult syncResult, long parentId, Account account) {\r
+ private void fetchData(String uri, SyncResult syncResult, long parentId) {\r
try {\r
- Log.v(TAG, "syncing: fetching " + uri);\r
+ //Log.v(TAG, "syncing: fetching " + uri);\r
\r
// remote request \r
PropFindMethod query = new PropFindMethod(uri);\r
+ /* Commented code for ugly performance tests\r
+ long responseDelay = System.currentTimeMillis();\r
+ */\r
getClient().executeMethod(query);\r
+ /* Commented code for ugly performance tests\r
+ responseDelay = System.currentTimeMillis() - responseDelay;\r
+ Log.e(TAG, "syncing: RESPONSE TIME for " + uri + " contents, " + responseDelay + "ms");\r
+ */\r
MultiStatus resp = null;\r
- \r
resp = query.getResponseBodyAsMultiStatus();\r
\r
- // insertion of updated files\r
+ // insertion or update of files\r
+ List<OCFile> updatedFiles = new Vector<OCFile>(resp.getResponses().length - 1);\r
for (int i = 1; i < resp.getResponses().length; ++i) {\r
WebdavEntry we = new WebdavEntry(resp.getResponses()[i], getUri().getPath());\r
OCFile file = fillOCFile(we);\r
.getModificationTimestamp()) {\r
Intent intent = new Intent(this.getContext(), FileDownloader.class);\r
intent.putExtra(FileDownloader.EXTRA_ACCOUNT, getAccount());\r
- intent.putExtra(FileDownloader.EXTRA_FILE_PATH, file.getURLDecodedRemotePath());\r
+ intent.putExtra(FileDownloader.EXTRA_FILE_PATH, file.getRemotePath());\r
intent.putExtra(FileDownloader.EXTRA_REMOTE_PATH, file.getRemotePath());\r
+ intent.putExtra(FileDownloader.EXTRA_FILE_SIZE, file.getFileLength());\r
file.setKeepInSync(true);\r
getContext().startService(intent);\r
}\r
- getStorageManager().saveFile(file);\r
+ if (getStorageManager().getFileByPath(file.getRemotePath()) != null)\r
+ file.setKeepInSync(getStorageManager().getFileByPath(file.getRemotePath()).keepInSync());\r
+ \r
+ //getStorageManager().saveFile(file);\r
+ updatedFiles.add(file);\r
if (parentId == 0)\r
parentId = file.getFileId();\r
}\r
+ /* Commented code for ugly performance tests\r
+ long saveDelay = System.currentTimeMillis();\r
+ */ \r
+ getStorageManager().saveFiles(updatedFiles); // all "at once" ; trying to get a best performance in database update\r
+ /* Commented code for ugly performance tests\r
+ saveDelay = System.currentTimeMillis() - saveDelay;\r
+ Log.e(TAG, "syncing: SAVE TIME for " + uri + " contents, " + mSaveDelays[mDelaysIndex] + "ms");\r
+ */\r
\r
- // removal of old files\r
+ // removal of obsolete files\r
Vector<OCFile> files = getStorageManager().getDirectoryContent(\r
getStorageManager().getFileById(parentId));\r
OCFile file;\r
sendStickyBroadcast(true, getStorageManager().getFileById(parentId).getRemotePath());\r
\r
// recursive fetch\r
- for (OCFile newFile : files) {\r
+ for (int i=0; i < files.size() && !mCancellation; i++) {\r
+ OCFile newFile = files.get(i);\r
if (newFile.getMimetype().equals("DIR")) {\r
- fetchData(getUri().toString() + newFile.getRemotePath(), syncResult, newFile.getFileId(), account);\r
+ fetchData(getUri().toString() + WebdavUtils.encodePath(newFile.getRemotePath()), syncResult, newFile.getFileId());\r
}\r
}\r
+ if (mCancellation) Log.d(TAG, "Leaving " + uri + " because cancellation request");\r
+ \r
+ /* Commented code for ugly performance tests\r
+ mResponseDelays[mDelaysIndex] = responseDelay;\r
+ mSaveDelays[mDelaysIndex] = saveDelay;\r
+ mDelaysCount++;\r
+ mDelaysIndex++;\r
+ if (mDelaysIndex >= MAX_DELAYS)\r
+ mDelaysIndex = 0;\r
+ */\r
+ \r
\r
\r
} catch (OperationCanceledException e) {\r
e.printStackTrace();\r
} catch (Throwable t) {\r
// TODO update syncResult\r
- Log.e(TAG, "problem while synchronizing owncloud account " + account.name, t);\r
+ Log.e(TAG, "problem while synchronizing owncloud account " + mAccount.name, t);\r
t.printStackTrace();\r
}\r
}\r
\r
private OCFile fillOCFile(WebdavEntry we) {\r
- OCFile file = new OCFile(we.path());\r
+ OCFile file = new OCFile(we.decodedPath());\r
file.setCreationTimestamp(we.createTimestamp());\r
file.setFileLength(we.contentLength());\r
file.setMimetype(we.contentType());\r
}\r
getContext().sendStickyBroadcast(i);\r
}\r
+ \r
+ /**\r
+ * Called by system SyncManager when a synchronization is required to be cancelled.\r
+ * \r
+ * Sets the mCancellation flag to 'true'. THe synchronization will be stopped when before a new folder is fetched. Data of the last folder\r
+ * fetched will be still saved in the database. See onPerformSync implementation.\r
+ */\r
+ @Override\r
+ public void onSyncCanceled() {\r
+ Log.d(TAG, "Synchronization of " + mAccount.name + " has been requested to cancell");\r
+ mCancellation = true;\r
+ super.onSyncCanceled();\r
+ }\r
\r
}\r
projects / pub / Android / ownCloud.git / blobdiff