mirror/musikcube
1
0
Fork 0
mirror of https://github.com/clangen/musikcube.git synced 2025-01-30 15:32:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a bug in CddaIndexerSource where tracks may not get removed from

Browse Source 
the library if the drive letter changes.
This commit is contained in:
casey langen 2017-04-19 23:19:39 -07:00
parent a434cd14a1
commit 3c34c7a494
1 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/contrib/cddadecoder/CddaIndexerSource.cpp
View File

@ -71,13 +71,18 @@ static std::string createExternalId(const char driveLetter, const std::string& c
return "audiocd/" + std::string(1, driveLetter) + "/" + cddbId + "/" + std::to_string(track); return "audiocd/" + std::string(1, driveLetter) + "/" + cddbId + "/" + std::to_string(track);
} }
static bool exists(DiscIdList& discs, const std::string& externalId) { static bool exists(DiscIdList& discs, CddaDataModel& model, const std::string& externalId) {
std::vector<std::string> tokens = tokenize(externalId); std::vector<std::string> tokens = tokenize(externalId);
if (tokens.size() < 4) { /* see format above */ if (tokens.size() < 4) { /* see format above */
return false; return false;
} }
/* find by drive letter. */
if (!model.GetAudioDisc(tolower(tokens.at(1)[0]))) {
return false;
}
return discs.find(tokens.at(2)) != discs.end(); return discs.find(tokens.at(2)) != discs.end();
} }
@ -152,24 +157,6 @@ ScanResult CddaIndexerSource::Scan(IIndexerWriter* indexer) {
} }
} }
//for (int i = 1; i < 10; i++) {
// auto track = indexer->CreateWriter();
// std::string label = "[http]";
// std::string title = "[http] " + std::to_string(i);
// std::string filename = "http://casey.io/m/0" + std::to_string(i) + ".mp3";
// track->SetValue("album", label.c_str());
// track->SetValue("artist", label.c_str());
// track->SetValue("album_artist", label.c_str());
// track->SetValue("genre", label.c_str());
// track->SetValue("title", title.c_str());
// track->SetValue("filename", filename.c_str());
// track->SetValue("track", std::to_string(i).c_str());
// indexer->Save(this, track, filename.c_str());
// track->Release();
//}
return ScanCommit; return ScanCommit;
} }
@ -182,7 +169,7 @@ void CddaIndexerSource::ScanTrack(
IRetainedTrackWriter* track, IRetainedTrackWriter* track,
const char* externalId) const char* externalId)
{ {
if (!exists(this->discIds, externalId)) { if (!exists(this->discIds, this->model, externalId)) {
indexer->RemoveByExternalId(this, externalId); indexer->RemoveByExternalId(this, externalId);
} }
} }