mirror/musikcube
1
0
Fork 0
mirror of https://github.com/clangen/musikcube.git synced 2025-01-01 17:58:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIXED: Issue when syncpath was lost during indexing.

Browse Source
This commit is contained in:
Daniel Önnerby 2008-10-08 13:35:14 +00:00
parent a36ff1d5ec
commit 68a9acf605
1 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/core/Indexer.cpp
View File

@ -551,6 +551,8 @@ void Indexer::SyncDelete(std::vector<DBINT> aPaths){
// Remove unwanted folder-paths
this->dbConnection.Execute("DELETE FROM folders WHERE path_id NOT IN (SELECT id FROM paths)");
db::Statement stmtSyncPath("SELECT p.path FROM paths p WHERE p.id=?",this->dbConnection);
{
// Remove non existing folders
db::Statement stmt("SELECT f.id,p.path||f.relative_path FROM folders f,paths p WHERE f.path_id=p.id AND p.id=?",this->dbConnection);
@ -560,6 +562,12 @@ void Indexer::SyncDelete(std::vector<DBINT> aPaths){
stmt.BindInt(0,aPaths[i]);
// Get the syncpath
stmtSyncPath.BindInt(0,aPaths[i]);
stmtSyncPath.Step();
utfstring syncPathString( stmtSyncPath.ColumnTextUTF(0) );
stmtSyncPath.Reset();
while( stmt.Step()==db::ReturnCode::Row && !this->Exited() && !this->Restarted() ){
// Check to see if file still exists
@ -570,9 +578,16 @@ void Indexer::SyncDelete(std::vector<DBINT> aPaths){
boost::filesystem::utfpath oFolder(sFolder);
if(boost::filesystem::exists(oFolder)){
bRemove = false;
}else{
// Also do a check so that the syncpath is still up, or else do not remove
boost::filesystem::utfpath syncPath(syncPathString);
if(!boost::filesystem::exists(syncPath)){
bRemove = false;
}
}
}
catch(...){
bRemove = false;
}
if(bRemove){
@ -609,6 +624,12 @@ void Indexer::SyncDelete(std::vector<DBINT> aPaths){
for(int i(0);i<aPaths.size();++i){
stmt.BindInt(0,aPaths[i]);
// Get the syncpath
stmtSyncPath.BindInt(0,aPaths[i]);
stmtSyncPath.Step();
utfstring syncPathString( stmtSyncPath.ColumnTextUTF(0) );
stmtSyncPath.Reset();
while( stmt.Step()==db::ReturnCode::Row && !this->Exited() && !this->Restarted() ){
// Check to see if file still exists
{
@ -625,9 +646,16 @@ void Indexer::SyncDelete(std::vector<DBINT> aPaths){
boost::filesystem::utfpath oFile(sFile);
if(boost::filesystem::exists(oFile)){
bRemove = false;
}else{
// Also do a check so that the syncpath is still up, or else do not remove
boost::filesystem::utfpath syncPath(syncPathString);
if(!boost::filesystem::exists(syncPath)){
bRemove = false;
}
}
}
catch(...){
bRemove = false;
}
if(bRemove){