Properly delete songs from cache

etternagame · Feb 10, 2018 · 7c70b82 · 7c70b82
1 parent 45c8722
commit 7c70b82
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 27 deletions.
diff --git a/src/SongCacheIndex.cpp b/src/SongCacheIndex.cpp
@@ -75,7 +75,7 @@ SongCacheIndex::SongCacheIndex()
 	DBEmpty = !OpenDB();
 }
 
-int SongCacheIndex::InsertStepsTimingData(TimingData timing)
+__int64 SongCacheIndex::InsertStepsTimingData(TimingData timing)
 {
 	SQLite::Statement insertTimingData(*db, "INSERT INTO timingdatas VALUES (NULL, "
 		"?, ?, ?, "
@@ -232,7 +232,7 @@ int SongCacheIndex::InsertStepsTimingData(TimingData timing)
 	return sqlite3_last_insert_rowid(db->getHandle());
 }
 
-int SongCacheIndex::InsertSteps(const Steps* pSteps, int songID)
+__int64 SongCacheIndex::InsertSteps(const Steps* pSteps, __int64 songID)
 {
 	SQLite::Statement insertSteps(*db, "INSERT INTO steps VALUES (NULL, "
 		"?, ?, ?, ?, ?, "
@@ -269,7 +269,7 @@ int SongCacheIndex::InsertSteps(const Steps* pSteps, int songID)
 		insertSteps.bind(stepsIndex++);
 	}
 	else {
-		int timingDataID = InsertStepsTimingData(pSteps->m_Timing);
+		sqlite3_int64 timingDataID = InsertStepsTimingData(pSteps->m_Timing);
 		insertSteps.bind(stepsIndex++, timingDataID);
 	}
 
@@ -538,7 +538,8 @@ void SongCacheIndex::CreateDBTables()
 		"MUSIC TEXT, RADARVALUES TEXT, CREDIT TEXT, "
 		"TIMINGDATAID INTEGER, DISPLAYBPMMIN FLOAT, DISPLAYBPMMAX FLOAT, STEPFILENAME TEXT, SONGID INTEGER, "
 		"CONSTRAINT fk_songid FOREIGN KEY (SONGID) REFERENCES songs(ID), "
-		"CONSTRAINT fk_timingdataid FOREIGN KEY (TIMINGDATAID) REFERENCES timingdatas(ID))");
+		"CONSTRAINT fk_timingdataid FOREIGN KEY (TIMINGDATAID) REFERENCES timingdatas(ID), "
+		"CONSTRAINT unique_diffandsong UNIQUE(SONGID, DIFFICULTY))");
 	db->exec("CREATE INDEX IF NOT EXISTS idx_dirs "
 		"ON songs(DIR, DIRHASH)");
 	db->exec("CREATE INDEX IF NOT EXISTS idx_timingdatas "
@@ -662,35 +663,26 @@ void SongCacheIndex::LoadCache(LoadingWindow * ld, map<pair<RString, unsigned in
 	}
 	return;
 }
+void SongCacheIndex::DeleteSongFromDBByCondition(string& condition)
+{
+	db->exec(("DELETE FROM timingdatas WHERE ID IN (SELECT TIMINGDATAID FROM steps WHERE SONGID IN(SELECT ID from songs WHERE "+condition+"))").c_str());
+	db->exec(("DELETE FROM steps WHERE SONGID IN (SELECT ID from songs WHERE "+condition+")").c_str());
+	db->exec(("DELETE FROM songs WHERE "+condition).c_str());
+}
 void SongCacheIndex::DeleteSongFromDB(Song* songPtr)
 {
-	if (curTransaction != nullptr)
-		db->exec(("DELETE FROM songs WHERE dir=" + songPtr->GetSongDir() + " AND hash=" + to_string(GetHashForDirectory(songPtr->GetSongDir()))).c_str());
-	else {
-		StartTransaction();
-		db->exec(("DELETE FROM songs WHERE dir=" + songPtr->GetSongDir() + " AND hash=" + to_string(GetHashForDirectory(songPtr->GetSongDir()))).c_str());
-		FinishTransaction();
-	}
+	string cond = "dir = " + songPtr->GetSongDir() + " AND hash = " + to_string(GetHashForDirectory(songPtr->GetSongDir()));
+	DeleteSongFromDBByCondition(cond);
 }
 void SongCacheIndex::DeleteSongFromDBByDir(string dir)
 {
-	if (curTransaction != nullptr)
-		db->exec(("DELETE FROM songs WHERE dir=\"" + dir+"\"").c_str());
-	else {
-		StartTransaction();
-		db->exec(("DELETE FROM songs WHERE dir=\"" + dir + "\"").c_str());
-		FinishTransaction();
-	}
+	string cond = "dir=\"" + dir+"\"";
+	DeleteSongFromDBByCondition(cond);
 }
 void SongCacheIndex::DeleteSongFromDBByDirHash(unsigned int hash)
 {
-	if(curTransaction!=nullptr)
-		db->exec(("DELETE FROM songs WHERE hash=" + to_string(hash)).c_str());
-	else {
-		StartTransaction();
-		db->exec(("DELETE FROM songs WHERE hash=" + to_string(hash)).c_str());
-		FinishTransaction();
-	}
+	string cond = "hash=" + to_string(hash);
+	DeleteSongFromDBByCondition(cond);
 }
 void SongCacheIndex::ReadFromDisk()
 {

diff --git a/src/SongCacheIndex.h b/src/SongCacheIndex.h
@@ -31,6 +31,7 @@ class SongCacheIndex
 	inline pair<RString, int> SongFromStatement(Song* song, SQLite::Statement &query);
 	void LoadHyperCache(LoadingWindow * ld, map<RString, Song*>& hyperCache);
 	void LoadCache(LoadingWindow* ld, map<pair<RString, unsigned int>, Song*>&cache);
+	void DeleteSongFromDBByCondition(string& condition);
 	void DeleteSongFromDB(Song* songPtr); 
 	void DeleteSongFromDBByDir(string dir);
 	void DeleteSongFromDBByDirHash(unsigned int hash);
@@ -43,8 +44,8 @@ class SongCacheIndex
 	unsigned GetCacheHash( const RString &path ) const;
 	bool delay_save_cache;
 
-	int InsertStepsTimingData(TimingData timing);
-	int InsertSteps(const Steps* pSteps, int songID);
+	__int64 InsertStepsTimingData(TimingData timing);
+	__int64 InsertSteps(const Steps* pSteps, __int64 songID);
 	bool LoadSongFromCache(Song* song, string dir);
 	bool CacheSong(Song& song, string dir);
 	void StartTransaction();