deblan/abraunegg-onedrive
deblan
/
abraunegg-onedrive
mirror of https://github.com/abraunegg/onedrive
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Search all distinct drive id's rather than just default drive id for --get-file-link (#1230) 

* Add new DB query to return distinct driveId's from database
* Use all distinct drive ID's to query if path is in-sync with OneDrive before attempting to retreive the item file link from OneDrive
This commit is contained in:
abraunegg 2021-01-20 19:46:56 +11:00 committed by GitHub
parent 525504f91a
commit 6b0b6a66f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 36 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/itemdb.d
View File

@ -484,4 +484,18 @@ final class ItemDatabase
auto stmt = db.prepare("VACUUM;");
stmt.exec();
}
// Select distinct driveId items from database
string[] selectDistinctDriveIds()
{
string[] driveIdArray;
auto stmt = db.prepare("SELECT DISTINCT driveId FROM item;");
auto res = stmt.exec();
if (res.empty) return driveIdArray;
while (!res.empty) {
driveIdArray ~= res.front[0].dup;
res.step();
}
return driveIdArray;
}
}

38
src/sync.d
View File

@ -5529,25 +5529,31 @@ final class SyncEngine
if (exists(localFilePath)) {
// File exists locally, does it exist in the database
// Path needs to be relative to sync_dir path
string relativePath = relativePath(localFilePath, syncDir);
Item item;
if (itemdb.selectByPath(relativePath, defaultDriveId, item)) {
// File is in the local database cache
JSONValue fileDetails;
try {
fileDetails = onedrive.getFileDetails(item.driveId, item.id);
} catch (OneDriveException e) {
// display what the error is
displayOneDriveErrorMessage(e.msg, getFunctionName!({}));
return;
}
string[] distinctDriveIds = itemdb.selectDistinctDriveIds();
string relativePath = relativePath(localFilePath, syncDir);
bool fileInDB = false;
foreach (searchDriveId; distinctDriveIds) {
if (itemdb.selectByPath(relativePath, searchDriveId, item)) {
// File is in the local database cache
fileInDB = true;
JSONValue fileDetails;
try {
fileDetails = onedrive.getFileDetails(item.driveId, item.id);
} catch (OneDriveException e) {
// display what the error is
displayOneDriveErrorMessage(e.msg, getFunctionName!({}));
return;
}
if ((fileDetails.type() == JSONType.object) && ("webUrl" in fileDetails)) {
// Valid JSON object
writeln(fileDetails["webUrl"].str);
if ((fileDetails.type() == JSONType.object) && ("webUrl" in fileDetails)) {
// Valid JSON object
writeln(fileDetails["webUrl"].str);
}
}
} else {
}
// was file found?
if (!fileInDB) {
// File has not been synced with OneDrive
log.error("File has not been synced with OneDrive: ", localFilePath);
}