OpenSubsonic: changed the originalReleaseDate field format, fixes #400

src/libs/database/impl/Migration.cpp

@@ -299,6 +299,16 @@ CREATE TABLE IF NOT EXISTS "track_backup" (
         session.getDboSession().execute("UPDATE scan_settings SET scan_version = scan_version + 1");
     }
 
+    void migrateFromV49(Session& session)
+    {
+        // Add year / originalYear fields, as date / originalDate are not enough (we don't want a wrong date but year or nothing)
+        session.getDboSession().execute("ALTER TABLE track ADD year INTEGER");
+        session.getDboSession().execute("ALTER TABLE track ADD original_year INTEGER");
+
+        // Just increment the scan version of the settings to make the next scheduled scan rescan everything
+        session.getDboSession().execute("UPDATE scan_settings SET scan_version = scan_version + 1");
+    }
+
     void doDbMigration(Session& session)
     {
         static const std::string outdatedMsg{ "Outdated database, please rebuild it (delete the .db file and restart)" };
@@ -326,6 +336,7 @@ CREATE TABLE IF NOT EXISTS "track_backup" (
             {46, migrateFromV46},
             {47, migrateFromV47},
             {48, migrateFromV48},
+            {49, migrateFromV49},
         };
 
         {

src/libs/database/impl/Migration.hpp

@@ -26,7 +26,7 @@ namespace Database
     class Session;
 
     using Version = std::size_t;
-    static constexpr Version LMS_DATABASE_VERSION{ 49 };
+    static constexpr Version LMS_DATABASE_VERSION{ 50 };
     class VersionInfo
     {
     public:

src/libs/database/impl/Release.cpp

@@ -66,8 +66,8 @@ namespace Database
 
             if (params.dateRange)
             {
-                query.where("t.date >= ?").bind(params.dateRange->begin);
-                query.where("t.date <= ?").bind(params.dateRange->end);
+                query.where("COALESCE(CAST(SUBSTR(t.date, 1, 4) AS INTEGER), t.year) >= ?").bind(params.dateRange->begin);
+                query.where("COALESCE(CAST(SUBSTR(t.date, 1, 4) AS INTEGER), t.year) <= ?").bind(params.dateRange->end);
             }
 
             for (std::string_view keyword : params.keywords)
@@ -170,13 +170,13 @@ namespace Database
                 query.orderBy("t.file_last_write DESC");
                 break;
             case ReleaseSortMethod::Date:
-                query.orderBy("t.date, r.name COLLATE NOCASE");
+                query.orderBy("COALESCE(t.date, CAST(t.year AS TEXT)), r.name COLLATE NOCASE");
                 break;
             case ReleaseSortMethod::OriginalDate:
-                query.orderBy("CASE WHEN t.original_date IS NULL THEN t.date ELSE t.original_date END, t.date, r.name COLLATE NOCASE");
+                query.orderBy("COALESCE(original_date, CAST(original_year AS TEXT), date, CAST(year AS TEXT)), r.name COLLATE NOCASE");
                 break;
             case ReleaseSortMethod::OriginalDateDesc:
-                query.orderBy("CASE WHEN t.original_date IS NULL THEN t.date ELSE t.original_date END DESC, t.date, r.name COLLATE NOCASE");
+                query.orderBy("COALESCE(original_date, CAST(original_year AS TEXT), date, CAST(year AS TEXT)) DESC, r.name COLLATE NOCASE");
                 break;
             case ReleaseSortMethod::StarredDateDesc:
                 assert(params.starringUser.isValid());
@@ -359,17 +359,17 @@ namespace Database
         return discs;
     }
 
-    Wt::WDate Release::getReleaseDate() const
+    Wt::WDate Release::getDate() const
     {
-        return getReleaseDate(false);
+        return getDate(false);
     }
 
-    Wt::WDate Release::getOriginalReleaseDate() const
+    Wt::WDate Release::getOriginalDate() const
     {
-        return getReleaseDate(true);
+        return getDate(true);
     }
 
-    Wt::WDate Release::getReleaseDate(bool original) const
+    Wt::WDate Release::getDate(bool original) const
     {
         assert(session());
 
@@ -388,6 +388,35 @@ namespace Database
 
         return dates.front();
     }
+    
+    std::optional<int> Release::getYear() const
+    {
+        return getYear(false);
+    }
+
+    std::optional<int> Release::getOriginalYear() const
+    {
+        return getYear(true);
+    }
+
+    std::optional<int> Release::getYear(bool original) const
+    {
+        assert(session());
+
+        const char* field{ original ? "original_year" : "year" };
+
+        auto years{ session()->query<std::optional<int>>(
+                std::string {"SELECT "} + "t." + field + " FROM track t INNER JOIN release r ON r.id = t.release_id")
+            .where("r.id = ?").bind(getId())
+            .groupBy(field)
+            .resultList() };
+
+        // various years => invalid years
+        if (years.empty() || years.size() > 1)
+            return std::nullopt;
+
+        return years.front();
+    }
 
     std::optional<std::string> Release::getCopyright() const
     {

src/libs/database/impl/Track.cpp

@@ -158,7 +158,7 @@ namespace Database
                 query.orderBy("t.name COLLATE NOCASE");
                 break;
             case TrackSortMethod::DateDescAndRelease:
-                query.orderBy("t.date DESC,t.release_id,t.disc_number,t.track_number");
+                query.orderBy("COALESCE(t.date, CAST(t.year AS TEXT)) DESC,t.release_id,t.disc_number,t.track_number");
                 break;
             case TrackSortMethod::Release:
                 query.orderBy("t.disc_number,t.track_number");
@@ -382,16 +382,6 @@ namespace Database
             _clusters.insert(getDboPtr(cluster));
     }
 
-    std::optional<int> Track::getYear() const
-    {
-        return (_date.isValid() ? std::make_optional<int>(_date.year()) : std::nullopt);
-    }
-
-    std::optional<int> Track::getOriginalYear() const
-    {
-        return (_originalDate.isValid() ? std::make_optional<int>(_originalDate.year()) : std::nullopt);
-    }
-
     std::optional<std::string> Track::getCopyright() const
     {
         return _copyright != "" ? std::make_optional<std::string>(_copyright) : std::nullopt;

src/libs/database/impl/Types.cpp

@@ -23,30 +23,29 @@
 
 namespace Database
 {
-	static const std::set<Bitrate> allowedAudioBitrates
-	{
-		64000,
-		96000,
-		128000,
-		192000,
-		320000,
-	};
+    static const std::set<Bitrate> allowedAudioBitrates
+    {
+        64000,
+        96000,
+        128000,
+        192000,
+        320000,
+    };
 
-	void visitAllowedAudioBitrates(std::function<void(Bitrate)> func)
-	{
-		for (Bitrate bitrate : allowedAudioBitrates)
-			func(bitrate);
-	}
+    void visitAllowedAudioBitrates(std::function<void(Bitrate)> func)
+    {
+        for (Bitrate bitrate : allowedAudioBitrates)
+            func(bitrate);
+    }
 
-	bool isAudioBitrateAllowed(Bitrate bitrate)
-	{
-		return allowedAudioBitrates.find(bitrate) != std::cend(allowedAudioBitrates);
-	}
+    bool isAudioBitrateAllowed(Bitrate bitrate)
+    {
+        return allowedAudioBitrates.find(bitrate) != std::cend(allowedAudioBitrates);
+    }
 
-	DateRange
-	DateRange::fromYearRange(int from, int to)
-	{
-		return DateRange {{from, 1, 1}, {to, 12, 31}};
-	}
+    DateRange DateRange::fromYearRange(int from, int to)
+    {
+        return DateRange{ from, to };
+    }
 }