From 962775e920950988a359c8b8fff9d70f7c8ea53d Mon Sep 17 00:00:00 2001 From: emeric Date: Sat, 11 Feb 2023 14:44:20 +0100 Subject: [PATCH] Fixed invalid local time usages. fixes #299 --- src/libs/services/scanner/impl/ScannerService.cpp | 10 ++++------ src/libs/subsonic/impl/SubsonicResource.cpp | 2 +- src/lms/ui/resource/DownloadResource.cpp | 4 ++-- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/libs/services/scanner/impl/ScannerService.cpp b/src/libs/services/scanner/impl/ScannerService.cpp index ce06b546..80b6fddd 100644 --- a/src/libs/services/scanner/impl/ScannerService.cpp +++ b/src/libs/services/scanner/impl/ScannerService.cpp @@ -22,8 +22,6 @@ #include #include -#include - #include "services/database/Artist.hpp" #include "services/database/Cluster.hpp" #include "services/database/Release.hpp" @@ -389,7 +387,7 @@ ScannerService::scheduleNextScan() refreshScanSettings(); - const Wt::WDateTime now {Wt::WLocalDateTime::currentServerDateTime().toUTC()}; + const Wt::WDateTime now {Wt::WDateTime::currentDateTime()}; Wt::WDateTime nextScanDateTime; switch (_updatePeriod) @@ -502,7 +500,7 @@ ScannerService::scan(bool forceScan) } ScanStats stats; - stats.startTime = Wt::WLocalDateTime::currentDateTime().toUTC(); + stats.startTime = Wt::WDateTime::currentDateTime(); LMS_LOG(UI, INFO) << "New scan started!"; @@ -534,7 +532,7 @@ ScannerService::scan(bool forceScan) if (!_abortScan) { - stats.stopTime = Wt::WLocalDateTime::currentDateTime().toUTC(); + stats.stopTime = Wt::WDateTime::currentDateTime(); { std::unique_lock lock {_statusMutex}; @@ -777,7 +775,7 @@ ScannerService::scanAudioFile(const std::filesystem::path& file, bool forceScan, track.modify()->setLastWriteTime(lastWriteTime); track.modify()->setName(title); track.modify()->setDuration(trackInfo->duration); - track.modify()->setAddedTime(Wt::WLocalDateTime::currentServerDateTime().toUTC()); + track.modify()->setAddedTime(Wt::WDateTime::currentDateTime()); track.modify()->setTrackNumber(trackInfo->trackNumber ? *trackInfo->trackNumber : 0); track.modify()->setDiscNumber(trackInfo->discNumber ? *trackInfo->discNumber : 0); track.modify()->setTotalTrack(trackInfo->totalTrack); diff --git a/src/libs/subsonic/impl/SubsonicResource.cpp b/src/libs/subsonic/impl/SubsonicResource.cpp index 58192c6a..79f4f7c4 100644 --- a/src/libs/subsonic/impl/SubsonicResource.cpp +++ b/src/libs/subsonic/impl/SubsonicResource.cpp @@ -25,7 +25,7 @@ #include #include -#include +#include #include "services/auth/IPasswordService.hpp" #include "services/auth/IEnvService.hpp" diff --git a/src/lms/ui/resource/DownloadResource.cpp b/src/lms/ui/resource/DownloadResource.cpp index 0d55bcb6..898e861a 100644 --- a/src/lms/ui/resource/DownloadResource.cpp +++ b/src/lms/ui/resource/DownloadResource.cpp @@ -24,7 +24,7 @@ #include #include -#include +#include #include "services/database/Artist.hpp" #include "services/database/Release.hpp" @@ -178,7 +178,7 @@ createZipper(const std::vector& tracks) files.emplace(fileName, track->getPath()); } - return std::make_unique(files, Wt::WLocalDateTime::currentDateTime().toUTC()); + return std::make_unique(files, Wt::WDateTime::currentDateTime()); } DownloadArtistResource::DownloadArtistResource(Database::ArtistId artistId)