oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

storage/FileInfo: convert mtime to std::chrono::system_clock::time_point

Browse Source
This commit is contained in:
Max Kellermann 2017-02-11 22:47:05 +01:00
parent 0ccaf4a1ff
commit 6636c69a11
12 changed files with 29 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/SongUpdate.cxx
View File

@ -88,7 +88,7 @@ Song::UpdateFile(Storage &storage)
return false;
}
mtime = info.mtime;
mtime = std::chrono::system_clock::to_time_t(info.mtime);
tag_builder.Commit(tag);
return true;
}

3
src/command/StorageCommands.cxx
View File

@ -24,6 +24,7 @@
#include "Request.hxx"
#include "CommandError.hxx"
#include "util/UriUtil.hxx"
#include "util/ChronoUtil.hxx"
#include "util/ConstBuffer.hxx"
#include "fs/Traits.hxx"
#include "client/Client.hxx"
@ -88,7 +89,7 @@ handle_listfiles_storage(Response &r, StorageDirectoryReader &reader)
break;
}
if (info.mtime != 0)
if (!IsNegative(info.mtime))
time_print(r, "Last-Modified", info.mtime);
}
}

4
src/db/update/Archive.cxx
View File

@ -137,7 +137,7 @@ UpdateWalk::UpdateArchiveFile(Directory &parent, const char *name,
{
Directory *directory = LockFindChild(parent, name);
if (directory != nullptr && directory->mtime == info.mtime &&
if (directory != nullptr && directory->mtime == std::chrono::system_clock::to_time_t(info.mtime) &&
!walk_discard)
/* MPD has already scanned the archive, and it hasn't
changed since - don't consider updating it */
@ -173,7 +173,7 @@ UpdateWalk::UpdateArchiveFile(Directory &parent, const char *name,
directory->device = DEVICE_INARCHIVE;
}
directory->mtime = info.mtime;
directory->mtime = std::chrono::system_clock::to_time_t(info.mtime);
UpdateArchiveVisitor visitor(*this, *file, directory);
file->Visit(visitor);

6
src/db/update/Container.cxx
View File

@ -43,7 +43,7 @@ UpdateWalk::MakeDirectoryIfModified(Directory &parent, const char *name,
if (directory->IsMount())
return nullptr;
if (directory->mtime == info.mtime && !walk_discard) {
if (directory->mtime == std::chrono::system_clock::to_time_t(info.mtime) && !walk_discard) {
/* not modified */
return nullptr;
}
@ -53,7 +53,7 @@ UpdateWalk::MakeDirectoryIfModified(Directory &parent, const char *name,
}
directory = parent.MakeChild(name);
directory->mtime = info.mtime;
directory->mtime = std::chrono::system_clock::to_time_t(info.mtime);
return directory;
}
@ -107,7 +107,7 @@ UpdateWalk::UpdateContainerFile(Directory &directory,
*contdir);
// shouldn't be necessary but it's there..
song->mtime = info.mtime;
song->mtime = std::chrono::system_clock::to_time_t(info.mtime);
FormatDefault(update_domain, "added %s/%s",
contdir->GetPath(), song->uri);

5
src/db/update/UpdateSong.cxx
View File

@ -51,7 +51,8 @@ UpdateWalk::UpdateSongFile2(Directory &directory,
return;
}
if (!(song != nullptr && info.mtime == song->mtime &&
if (!(song != nullptr &&
std::chrono::system_clock::to_time_t(info.mtime) == song->mtime &&
!walk_discard) &&
UpdateContainerFile(directory, name, suffix, info)) {
if (song != nullptr)
@ -79,7 +80,7 @@ UpdateWalk::UpdateSongFile2(Directory &directory,
modified = true;
FormatDefault(update_domain, "added %s/%s",
directory.GetPath(), name);
} else if (info.mtime != song->mtime || walk_discard) {
} else if (std::chrono::system_clock::to_time_t(info.mtime) != song->mtime || walk_discard) {
FormatDefault(update_domain, "updating %s/%s",
directory.GetPath(), name);
if (!song->UpdateFile(storage)) {

4
src/db/update/Walk.cxx
View File

@ -192,7 +192,7 @@ UpdateWalk::UpdatePlaylistFile(Directory &directory,
if (!playlist_suffix_supported(suffix))
return false;
PlaylistInfo pi(name, info.mtime);
PlaylistInfo pi(name, std::chrono::system_clock::to_time_t(info.mtime));
const ScopeDatabaseLock protect;
if (directory.playlists.UpdateOrInsert(std::move(pi)))
@ -382,7 +382,7 @@ UpdateWalk::UpdateDirectory(Directory &directory,
UpdateDirectoryChild(directory, child_exclude_list, name_utf8, info2);
}
directory.mtime = info.mtime;
directory.mtime = std::chrono::system_clock::to_time_t(info.mtime);
return true;
}

10
src/storage/FileInfo.hxx
View File

@ -22,7 +22,8 @@
#include "check.h"
#include <time.h>
#include <chrono>
#include <stdint.h>
struct StorageFileInfo {
@ -40,9 +41,10 @@ struct StorageFileInfo {
uint64_t size;
/**
* The modification time. 0 means unknown / not applicable.
* The modification time. A negative value means unknown /
* not applicable.
*/
time_t mtime;
std::chrono::system_clock::time_point mtime;
/**
* Device id and inode number. 0 means unknown / not
@ -55,7 +57,7 @@ struct StorageFileInfo {
explicit constexpr StorageFileInfo(Type _type)
:type(_type),
size(0),
mtime(0),
mtime(std::chrono::system_clock::time_point::min()),
device(0), inode(0) {}
constexpr bool IsRegular() const {

8
src/storage/plugins/CurlStorage.cxx
View File

@ -418,9 +418,7 @@ protected:
? StorageFileInfo::Type::DIRECTORY
: StorageFileInfo::Type::REGULAR;
info.size = r.length;
info.mtime = !IsNegative(r.mtime)
? std::chrono::system_clock::to_time_t(r.mtime)
: 0;
info.mtime = r.mtime;
}
};
@ -514,9 +512,7 @@ protected:
? StorageFileInfo::Type::DIRECTORY
: StorageFileInfo::Type::REGULAR);
info.size = r.length;
info.mtime = !IsNegative(r.mtime)
? std::chrono::system_clock::to_time_t(r.mtime)
: 0;
info.mtime = r.mtime;
}
};

2
src/storage/plugins/LocalStorage.cxx
View File

@ -86,7 +86,7 @@ Stat(Path path, bool follow)
info.type = StorageFileInfo::Type::OTHER;
info.size = src.GetSize();
info.mtime = std::chrono::system_clock::to_time_t(src.GetModificationTime());
info.mtime = src.GetModificationTime();
#ifdef WIN32
info.device = info.inode = 0;
#else

4
src/storage/plugins/NfsStorage.cxx
View File

@ -250,7 +250,7 @@ Copy(StorageFileInfo &info, const struct stat &st)
info.type = StorageFileInfo::Type::OTHER;
info.size = st.st_size;
info.mtime = st.st_mtime;
info.mtime = std::chrono::system_clock::from_time_t(st.st_mtime);
info.device = st.st_dev;
info.inode = st.st_ino;
}
@ -316,7 +316,7 @@ Copy(StorageFileInfo &info, const struct nfsdirent &ent)
}
info.size = ent.size;
info.mtime = ent.mtime.tv_sec;
info.mtime = std::chrono::system_clock::from_time_t(ent.mtime.tv_sec);
info.device = 0;
info.inode = ent.inode;
}

2
src/storage/plugins/SmbclientStorage.cxx
View File

@ -111,7 +111,7 @@ GetInfo(const char *path)
info.type = StorageFileInfo::Type::OTHER;
info.size = st.st_size;
info.mtime = st.st_mtime;
info.mtime = std::chrono::system_clock::from_time_t(st.st_mtime);
info.device = st.st_dev;
info.inode = st.st_ino;
return info;

6
test/run_storage.cxx
View File

@ -23,6 +23,7 @@
#include "storage/Registry.hxx"
#include "storage/StorageInterface.hxx"
#include "storage/FileInfo.hxx"
#include "util/ChronoUtil.hxx"
#include <memory>
#include <stdexcept>
@ -69,9 +70,10 @@ Ls(Storage &storage, const char *path)
char mtime_buffer[32];
const char *mtime = " ";
if (info.mtime > 0) {
if (!IsNegative(info.mtime)) {
time_t t = std::chrono::system_clock::to_time_t(info.mtime);
strftime(mtime_buffer, sizeof(mtime_buffer), "%F",
gmtime(&info.mtime));
gmtime(&t));
mtime = mtime_buffer;
}