owen/lms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

do not fetch features if the recommendation engine is tags based

Browse Source
This commit is contained in:
emeric
2019-05-23 13:35:02 +02:00
parent 5f02dfeff1
commit 6be92ed241
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/main.cpp
+1 -1
View File
@@ -63,7 +63,7 @@ std::vector<std::string> generateWtConfig(std::string execPath)
args.push_back("--http-address=" + Config::instance().getString("listen-addr", "0.0.0.0")); args.push_back("--http-address=" + Config::instance().getString("listen-addr", "0.0.0.0"));
} }
// args.push_back("--gdb"); args.push_back("--gdb");
// Generate the wt_config.xml file // Generate the wt_config.xml file
boost::property_tree::ptree pt; boost::property_tree::ptree pt;
src/similarity/features/SimilarityFeaturesScannerAddon.cpp
+12 -1
View File
@@ -21,6 +21,7 @@
#include "AcousticBrainzUtils.hpp" #include "AcousticBrainzUtils.hpp"
#include "database/Track.hpp" #include "database/Track.hpp"
#include "database/SimilaritySettings.hpp"
#include "database/TrackFeatures.hpp" #include "database/TrackFeatures.hpp"
#include "similarity/features/SimilarityFeaturesCache.hpp" #include "similarity/features/SimilarityFeaturesCache.hpp"
#include "utils/Config.hpp" #include "utils/Config.hpp"
@@ -41,7 +42,7 @@ getTracksWithMBIDAndMissingFeatures(Wt::Dbo::Session& session)
{ {
std::vector<TrackInfo> res; std::vector<TrackInfo> res;
Wt::Dbo::Transaction transaction(session); Wt::Dbo::Transaction transaction {session};
auto tracks {Database::Track::getAllWithMBIDAndMissingFeatures(session)}; auto tracks {Database::Track::getAllWithMBIDAndMissingFeatures(session)};
for (const Database::Track::pointer& track : tracks) for (const Database::Track::pointer& track : tracks)
@@ -91,6 +92,16 @@ FeaturesScannerAddon::trackUpdated(Database::IdType trackId)
void void
FeaturesScannerAddon::preScanComplete() FeaturesScannerAddon::preScanComplete()
{ {
{
Wt::Dbo::Transaction transaction {_db.getSession()};
if (Database::SimilaritySettings::get(_db.getSession())->getEngineType() != Database::SimilaritySettings::EngineType::Features)
{
LMS_LOG(DBUPDATER, INFO) << "Do not fetch features since the engine type does not make use of them";
return;
}
}
LMS_LOG(DBUPDATER, DEBUG) << "Getting tracks with missing Features..."; LMS_LOG(DBUPDATER, DEBUG) << "Getting tracks with missing Features...";
std::vector<TrackInfo> tracksInfo {getTracksWithMBIDAndMissingFeatures(_db.getSession())}; std::vector<TrackInfo> tracksInfo {getTracksWithMBIDAndMissingFeatures(_db.getSession())};
LMS_LOG(DBUPDATER, DEBUG) << "Getting tracks with missing Features DONE (found " << tracksInfo.size() << ")"; LMS_LOG(DBUPDATER, DEBUG) << "Getting tracks with missing Features DONE (found " << tracksInfo.size() << ")";