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

epoupon · Nov 14, 2024 · 7b47910 · 7b47910
1 parent ffc780d
commit 7b47910
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 5 deletions.
diff --git a/src/libs/core/test/Path.cpp b/src/libs/core/test/Path.cpp
@@ -93,6 +93,8 @@ namespace lms::core::pathUtils::tests
             { "/root/", "/root/", true },
             { "/folder/file.txt", "/root", false },
             { "/folder/file.txt", "/root/", false },
+            { "/file.txt", "/root", false },
+            { "/file.txt", "/root/", false },
             { "", "/root", false },
         };
 

diff --git a/src/libs/database/impl/MediaLibrary.cpp b/src/libs/database/impl/MediaLibrary.cpp
@@ -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
diff --git a/src/libs/database/impl/Migration.cpp b/src/libs/database/impl/Migration.cpp
@@ -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{};

diff --git a/src/libs/database/include/database/MediaLibrary.hpp b/src/libs/database/include/database/MediaLibrary.hpp
@@ -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)

diff --git a/src/lms/ui/admin/MediaLibraryModal.cpp b/src/lms/ui/admin/MediaLibraryModal.cpp
@@ -87,7 +87,7 @@ namespace lms::ui
                 if (p.is_relative())
                     return Wt::WValidator::Result(Wt::ValidationState::Invalid, Wt::WString::tr("Lms.Admin.MediaLibrary.path-must-be-absolute"));
 
-                // TODO check and translate rights issues
+                // TODO check and translate access rights issues
                 bool res{ std::filesystem::is_directory(p, ec) };
                 if (ec)
                     return Wt::WValidator::Result(Wt::ValidationState::Invalid, ec.message()); // TODO translate common errors