Added a way to disable the similarity engine

2023-11-02 09:57:51 +01:00
parent 33140ed20f
commit ac556bb95a
10 changed files with 108 additions and 114 deletions
@@ -32,72 +32,74 @@ LMS_DECLARE_IDTYPE(ScanSettingsId)

 namespace Database {

-class ClusterType;
-class Session;
+    class ClusterType;
+    class Session;

-class ScanSettings final : public Object<ScanSettings, ScanSettingsId>
-{
-	public:
-		// Do not modify values (just add)
-		enum class UpdatePeriod
-		{
-			Never = 0,
-			Daily,
-			Weekly,
-			Monthly,
-			Hourly,
-		};
+    class ScanSettings final : public Object<ScanSettings, ScanSettingsId>
+    {
+    public:
+        // Do not modify values (just add)
+        enum class UpdatePeriod
+        {
+            Never = 0,
+            Daily,
+            Weekly,
+            Monthly,
+            Hourly,
+        };

-		// Do not modify values (just add)
-		enum class RecommendationEngineType
-		{
-			Clusters = 0,
-			Features,
-		};
+        // Do not modify values (just add)
+        enum class SimilarityEngineType
+        {
+            Clusters = 0,
+            Features,
+            None,
+        };

-		static void init(Session& session);
+        static void init(Session& session);

-		static pointer get(Session& session);
+        static pointer get(Session& session);

-		// Getters
-		std::size_t				getScanVersion() const { return _scanVersion; }
-		std::filesystem::path	getMediaDirectory() const { return _mediaDirectory; }
-		Wt::WTime				getUpdateStartTime() const { return _startTime; }
-		UpdatePeriod			getUpdatePeriod() const { return _updatePeriod; }
-		std::vector<ObjectPtr<ClusterType>> getClusterTypes() const;
-		std::vector<std::filesystem::path> getAudioFileExtensions() const;
-		RecommendationEngineType	getRecommendationEngineType() const { return _recommendationEngineType; }
+        // Getters
+        std::size_t				getScanVersion() const { return _scanVersion; }
+        std::filesystem::path	getMediaDirectory() const { return _mediaDirectory; }
+        Wt::WTime				getUpdateStartTime() const { return _startTime; }
+        UpdatePeriod			getUpdatePeriod() const { return _updatePeriod; }
+        std::vector<ObjectPtr<ClusterType>> getClusterTypes() const;
+        std::vector<std::filesystem::path> getAudioFileExtensions() const;
+        SimilarityEngineType	getSimilarityEngineType() const { return _similarityEngineType; }

-		// Setters
-		void addAudioFileExtension(const std::filesystem::path& ext);
-		void setMediaDirectory(const std::filesystem::path& p);
-		void setUpdateStartTime(Wt::WTime t) { _startTime = t; }
-		void setUpdatePeriod(UpdatePeriod p) { _updatePeriod = p; }
-		void setClusterTypes(Session& session, const std::set<std::string>& clusterTypeNames);
-		void setRecommendationEngineType(RecommendationEngineType type) { _recommendationEngineType = type; }
-		void incScanVersion();
+        // Setters
+        void addAudioFileExtension(const std::filesystem::path& ext);
+        void setMediaDirectory(const std::filesystem::path& p);
+        void setUpdateStartTime(Wt::WTime t) { _startTime = t; }
+        void setUpdatePeriod(UpdatePeriod p) { _updatePeriod = p; }
+        void setClusterTypes(Session& session, const std::set<std::string>& clusterTypeNames);
+        void setSimilarityEngineType(SimilarityEngineType type) { _similarityEngineType = type; }
+        void incScanVersion();

-		template<class Action>
-		void persist(Action& a)
-		{
-			Wt::Dbo::field(a, _scanVersion,		"scan_version");
-			Wt::Dbo::field(a, _mediaDirectory,	"media_directory");
-			Wt::Dbo::field(a, _startTime,		"start_time");
-			Wt::Dbo::field(a, _updatePeriod,	"update_period");
-			Wt::Dbo::field(a, _audioFileExtensions,	"audio_file_extensions");
-			Wt::Dbo::field(a, _recommendationEngineType,"similarity_engine_type");
-			Wt::Dbo::hasMany(a, _clusterTypes, Wt::Dbo::ManyToOne, "scan_settings");
-		}
+        template<class Action>
+        void persist(Action& a)
+        {
+            Wt::Dbo::field(a, _scanVersion, "scan_version");
+            Wt::Dbo::field(a, _mediaDirectory, "media_directory");
+            Wt::Dbo::field(a, _startTime, "start_time");
+            Wt::Dbo::field(a, _updatePeriod, "update_period");
+            Wt::Dbo::field(a, _audioFileExtensions, "audio_file_extensions");
+            Wt::Dbo::field(a, _similarityEngineType, "similarity_engine_type");
+            Wt::Dbo::hasMany(a, _clusterTypes, Wt::Dbo::ManyToOne, "scan_settings");
+        }

-	private:
-		int		_scanVersion {};
-		std::string	_mediaDirectory;
-		Wt::WTime	_startTime = Wt::WTime {0,0,0};
-		UpdatePeriod	_updatePeriod {UpdatePeriod::Never};
-		RecommendationEngineType _recommendationEngineType {RecommendationEngineType::Clusters};
-		std::string	_audioFileExtensions {".alac .mp3 .ogg .oga .aac .m4a .m4b .flac .wav .wma .aif .aiff .ape .mpc .shn .opus .wv"};
-		Wt::Dbo::collection<Wt::Dbo::ptr<ClusterType>>	_clusterTypes;
-};
+    private:
+        int         	_scanVersion{};
+        std::string     _mediaDirectory;
+        Wt::WTime       _startTime = Wt::WTime{ 0,0,0 };
+        UpdatePeriod    _updatePeriod{ UpdatePeriod::Never };
+        SimilarityEngineType    _similarityEngineType{ SimilarityEngineType::Clusters };
+        std::string             _audioFileExtensions{ ".alac .mp3 .ogg .oga .aac .m4a .m4b .flac .wav .wma .aif .aiff .ape .mpc .shn .opus .wv" };
+        
+        Wt::Dbo::collection<Wt::Dbo::ptr<ClusterType>>	_clusterTypes;
+    };


 } // namespace Database