owen/lms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed invalid local time usages. fixes #299

Browse Source
This commit is contained in:
emeric
2023-02-11 14:44:20 +01:00
parent d8b47d579b
commit 962775e920
3 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libs/services/scanner/impl/ScannerService.cpp
+4 -6
View File
@@ -22,8 +22,6 @@
#include <ctime> #include <ctime>
#include <boost/asio/placeholders.hpp> #include <boost/asio/placeholders.hpp>
#include <Wt/WLocalDateTime.h>
#include "services/database/Artist.hpp" #include "services/database/Artist.hpp"
#include "services/database/Cluster.hpp" #include "services/database/Cluster.hpp"
#include "services/database/Release.hpp" #include "services/database/Release.hpp"
@@ -389,7 +387,7 @@ ScannerService::scheduleNextScan()
refreshScanSettings(); refreshScanSettings();
const Wt::WDateTime now {Wt::WLocalDateTime::currentServerDateTime().toUTC()}; const Wt::WDateTime now {Wt::WDateTime::currentDateTime()};
Wt::WDateTime nextScanDateTime; Wt::WDateTime nextScanDateTime;
switch (_updatePeriod) switch (_updatePeriod)
@@ -502,7 +500,7 @@ ScannerService::scan(bool forceScan)
} }
ScanStats stats; ScanStats stats;
stats.startTime = Wt::WLocalDateTime::currentDateTime().toUTC(); stats.startTime = Wt::WDateTime::currentDateTime();
LMS_LOG(UI, INFO) << "New scan started!"; LMS_LOG(UI, INFO) << "New scan started!";
@@ -534,7 +532,7 @@ ScannerService::scan(bool forceScan)
if (!_abortScan) if (!_abortScan)
{ {
stats.stopTime = Wt::WLocalDateTime::currentDateTime().toUTC(); stats.stopTime = Wt::WDateTime::currentDateTime();
{ {
std::unique_lock lock {_statusMutex}; std::unique_lock lock {_statusMutex};
@@ -777,7 +775,7 @@ ScannerService::scanAudioFile(const std::filesystem::path& file, bool forceScan,
track.modify()->setLastWriteTime(lastWriteTime); track.modify()->setLastWriteTime(lastWriteTime);
track.modify()->setName(title); track.modify()->setName(title);
track.modify()->setDuration(trackInfo->duration); 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()->setTrackNumber(trackInfo->trackNumber ? *trackInfo->trackNumber : 0);
track.modify()->setDiscNumber(trackInfo->discNumber ? *trackInfo->discNumber : 0); track.modify()->setDiscNumber(trackInfo->discNumber ? *trackInfo->discNumber : 0);
track.modify()->setTotalTrack(trackInfo->totalTrack); track.modify()->setTotalTrack(trackInfo->totalTrack);
src/libs/subsonic/impl/SubsonicResource.cpp
+1 -1
View File
@@ -25,7 +25,7 @@
#include <map> #include <map>
#include <unordered_map> #include <unordered_map>
#include <Wt/WLocalDateTime.h> #include <Wt/WDateTime.h>
#include "services/auth/IPasswordService.hpp" #include "services/auth/IPasswordService.hpp"
#include "services/auth/IEnvService.hpp" #include "services/auth/IEnvService.hpp"
src/lms/ui/resource/DownloadResource.cpp
+2 -2
View File
@@ -24,7 +24,7 @@
#include <iomanip> #include <iomanip>
#include <Wt/Http/Response.h> #include <Wt/Http/Response.h>
#include <Wt/WLocalDateTime.h> #include <Wt/WDateTime.h>
#include "services/database/Artist.hpp" #include "services/database/Artist.hpp"
#include "services/database/Release.hpp" #include "services/database/Release.hpp"
@@ -178,7 +178,7 @@ createZipper(const std::vector<Database::Track::pointer>& tracks)
files.emplace(fileName, track->getPath()); files.emplace(fileName, track->getPath());
} }
return std::make_unique<Zip::Zipper>(files, Wt::WLocalDateTime::currentDateTime().toUTC()); return std::make_unique<Zip::Zipper>(files, Wt::WDateTime::currentDateTime());
} }
DownloadArtistResource::DownloadArtistResource(Database::ArtistId artistId) DownloadArtistResource::DownloadArtistResource(Database::ArtistId artistId)