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

storage/FileInfo: add initializing constructor

Browse Source
This commit is contained in:
Max Kellermann
2017-02-11 22:57:38 +01:00
parent 5cdbad7937
commit 0ccaf4a1ff
3 changed files with 16 additions and 24 deletions

17
src/storage/CompositeStorage.cxx

@ -86,12 +86,7 @@ CompositeDirectoryReader::GetInfo(bool follow)
assert(current != names.end()); assert(current != names.end());
StorageFileInfo info; return StorageFileInfo(StorageFileInfo::Type::DIRECTORY);
info.type = StorageFileInfo::Type::DIRECTORY;
info.mtime = 0;
info.device = 0;
info.inode = 0;
return info;
} }
static std::string static std::string
@ -280,14 +275,8 @@ CompositeStorage::GetInfo(const char *uri, bool follow)
} }
const Directory *directory = f.directory->Find(f.uri); const Directory *directory = f.directory->Find(f.uri);
if (directory != nullptr) { if (directory != nullptr)
StorageFileInfo info; return StorageFileInfo(StorageFileInfo::Type::DIRECTORY);
info.type = StorageFileInfo::Type::DIRECTORY;
info.mtime = 0;
info.device = 0;
info.inode = 0;
return info;
}
if (error) if (error)
std::rethrow_exception(error); std::rethrow_exception(error);

8
src/storage/FileInfo.hxx

@ -50,6 +50,14 @@ struct StorageFileInfo {
*/ */
unsigned device, inode; unsigned device, inode;
StorageFileInfo() = default;
explicit constexpr StorageFileInfo(Type _type)
:type(_type),
size(0),
mtime(0),
device(0), inode(0) {}
constexpr bool IsRegular() const { constexpr bool IsRegular() const {
return type == Type::REGULAR; return type == Type::REGULAR;
} }

15
src/storage/plugins/CurlStorage.cxx

@ -399,11 +399,8 @@ class HttpGetInfoOperation final : public PropfindOperation {
public: public:
HttpGetInfoOperation(CurlGlobal &curl, const char *uri) HttpGetInfoOperation(CurlGlobal &curl, const char *uri)
:PropfindOperation(curl, uri, 0) { :PropfindOperation(curl, uri, 0),
info.type = StorageFileInfo::Type::OTHER; info(StorageFileInfo::Type::OTHER) {
info.size = 0;
info.mtime = 0;
info.device = info.inode = 0;
} }
const StorageFileInfo &Perform() { const StorageFileInfo &Perform() {
@ -424,7 +421,6 @@ protected:
info.mtime = !IsNegative(r.mtime) info.mtime = !IsNegative(r.mtime)
? std::chrono::system_clock::to_time_t(r.mtime) ? std::chrono::system_clock::to_time_t(r.mtime)
: 0; : 0;
info.device = info.inode = 0;
} }
}; };
@ -514,14 +510,13 @@ protected:
entries.emplace_front(std::string(name.data, name.size)); entries.emplace_front(std::string(name.data, name.size));
auto &info = entries.front().info; auto &info = entries.front().info;
info.type = r.collection info = StorageFileInfo(r.collection
? StorageFileInfo::Type::DIRECTORY ? StorageFileInfo::Type::DIRECTORY
: StorageFileInfo::Type::REGULAR; : StorageFileInfo::Type::REGULAR);
info.size = r.length; info.size = r.length;
info.mtime = !IsNegative(r.mtime) info.mtime = !IsNegative(r.mtime)
? std::chrono::system_clock::to_time_t(r.mtime) ? std::chrono::system_clock::to_time_t(r.mtime)
: 0; : 0;
info.device = info.inode = 0;
} }
}; };