Fixed crash when a library is set with a trailing /, fixes #552

This commit is contained in:
emeric
2024-11-14 23:18:00 +01:00
parent ffc780d350
commit 7b4791005a
5 changed files with 23 additions and 5 deletions
+11 -2
View File
@@ -31,9 +31,9 @@
namespace lms::db
{
MediaLibrary::MediaLibrary(const std::filesystem::path& p, std::string_view name)
: _path{ p }
, _name{ std::string{ name, 0, maxNameLength } }
: _name{ std::string{ name, 0, maxNameLength } }
{
setPath(p);
}
MediaLibrary::pointer MediaLibrary::create(Session& session, const std::filesystem::path& p, std::string_view name)
@@ -77,4 +77,13 @@ namespace lms::db
func(mediaLibrary);
});
}
void MediaLibrary::setPath(const std::filesystem::path& p)
{
assert(p.is_absolute());
if (!p.has_filename() && p.has_parent_path())
_path = p.parent_path();
else
_path = p;
}
} // namespace lms::db
+8 -1
View File
@@ -35,7 +35,7 @@ namespace lms::db
{
namespace
{
static constexpr Version LMS_DATABASE_VERSION{ 73 };
static constexpr Version LMS_DATABASE_VERSION{ 74 };
}
VersionInfo::VersionInfo()
@@ -941,6 +941,12 @@ SELECT
utils::executeCommand(*session.getDboSession(), "UPDATE scan_settings SET scan_version = scan_version + 1");
}
void migrateFromV73(Session& session)
{
// Remove any trailing '/' in library paths
utils::executeCommand(*session.getDboSession(), "UPDATE media_library SET path = rtrim(path, '/') WHERE path LIKE '%/'");
}
bool doDbMigration(Session& session)
{
constexpr std::string_view outdatedMsg{ "Outdated database, please rebuild it (delete the .db file and restart)" };
@@ -990,6 +996,7 @@ SELECT
{ 70, migrateFromV70 },
{ 71, migrateFromV71 },
{ 72, migrateFromV72 },
{ 73, migrateFromV73 },
};
bool migrationPerformed{};
@@ -53,7 +53,7 @@ namespace lms::db
// setters
void setName(std::string_view name) { _name = name; }
void setPath(const std::filesystem::path& p) { _path = p; }
void setPath(const std::filesystem::path& p);
template<class Action>
void persist(Action& a)