From 4a8456fa962564d6bdf1fe4de124444af58b46b1 Mon Sep 17 00:00:00 2001 From: abraunegg Date: Sat, 21 Apr 2018 07:24:19 +1000 Subject: [PATCH] Manually revert lastModifiedDateTime * Manually revert lastModifiedDateTime --- Makefile | 10 +++++----- src/sync.d | 6 +++++- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 15acd861..24017a7d 100644 --- a/Makefile +++ b/Makefile @@ -22,15 +22,15 @@ clean: rm -f onedrive onedrive.o onedrive.service install: all - install -D onedrive $(DESTDIR)$(PREFIX)/bin/onedrive - install -D -m 644 onedrive.service $(DESTDIR)/usr/lib/systemd/user/onedrive.service - install -D -m 644 onedrive@.service $(DESTDIR)/usr/lib/systemd/user/onedrive@.service - install -D -m 644 logrotate/onedrive.logrotate /etc/logrotate.d/onedrive mkdir -p /var/log/onedrive chown root.users /var/log/onedrive chmod 0775 /var/log/onedrive + install -D onedrive $(DESTDIR)$(PREFIX)/bin/onedrive + install -D -m 644 logrotate/onedrive.logrotate /etc/logrotate.d/onedrive + install -D -m 644 onedrive.service $(DESTDIR)/usr/lib/systemd/user/onedrive.service + install -D -m 644 onedrive@.service $(DESTDIR)/usr/lib/systemd/user/onedrive@.service rm -f ~/.config/onedrive/items.sqlite3 - + onedrive: version $(SOURCES) $(DC) $(DFLAGS) $(SOURCES) diff --git a/src/sync.d b/src/sync.d index e47d9633..e512c550 100644 --- a/src/sync.d +++ b/src/sync.d @@ -46,7 +46,11 @@ private Item makeItem(const ref JSONValue driveItem) cTag: "cTag" in driveItem ? driveItem["cTag"].str : null, // cTag is missing in old files (and all folders in OneDrive Biz) // OneDrive API Change: https://github.com/OneDrive/onedrive-api-docs/issues/834 // Fixes issue 'Key not found: lastModifiedDateTime' (#334, #337) - mtime: ("fileSystemInfo" in driveItem && "lastModifiedDateTime" in driveItem["fileSystemInfo"])? SysTime.fromISOExtString(driveItem["fileSystemInfo"]["lastModifiedDateTime"].str) : SysTime(0), + // mtime: ("fileSystemInfo" in driveItem && "lastModifiedDateTime" in driveItem["fileSystemInfo"])? SysTime.fromISOExtString(driveItem["fileSystemInfo"]["lastModifiedDateTime"].str) : SysTime(0), + + // Revert 77c0cdbe24b1360b82685b4e5842df2ae23e7999 temporarily + mtime: "fileSystemInfo" in driveItem ? SysTime.fromISOExtString(driveItem["fileSystemInfo"]["lastModifiedDateTime"].str) : SysTime(0), + }; if (isItemFile(driveItem)) {