Mercurial > dedupe
comparison DataController.cpp @ 14:e60d6caceb62
Fix error in boost findfile traversal.
Remove debug info.
| author | Tom Fredrik Blenning Klaussen <bfg@sim.no> |
|---|---|
| date | Fri, 24 Aug 2012 23:02:01 +0200 |
| parents | ec87a79770ee |
| children | 06166d6c083b |
comparison
equal
deleted
inserted
replaced
| 13:9463c0c22969 | 14:e60d6caceb62 |
|---|---|
| 38 fs::directory_iterator end_iter; | 38 fs::directory_iterator end_iter; |
| 39 | 39 |
| 40 if ( fs::exists(someDir) && fs::is_directory(someDir)) { | 40 if ( fs::exists(someDir) && fs::is_directory(someDir)) { |
| 41 for( fs::directory_iterator dir_iter(someDir) ; dir_iter != end_iter ; ++dir_iter) { | 41 for( fs::directory_iterator dir_iter(someDir) ; dir_iter != end_iter ; ++dir_iter) { |
| 42 if (fs::is_directory(dir_iter->status()) ) { | 42 if (fs::is_directory(dir_iter->status()) ) { |
| 43 findFiles(QString::fromStdWString(dir_iter->path().wstring())); | 43 findFiles(QString::fromStdWString(dir_iter->path().wstring()), list); |
| 44 } | 44 } |
| 45 if (fs::is_regular_file(dir_iter->status()) ) { | 45 if (fs::is_regular_file(dir_iter->status()) ) { |
| 46 list << QString::fromStdWString(dir_iter->path().wstring()); | 46 list << QString::fromStdWString(dir_iter->path().wstring()); |
| 47 } | 47 } |
| 48 } | 48 } |
| 96 foreach(QString filename, findFiles(dir)) { | 96 foreach(QString filename, findFiles(dir)) { |
| 97 try { | 97 try { |
| 98 dblink.updateIfModified(filename); | 98 dblink.updateIfModified(filename); |
| 99 } | 99 } |
| 100 catch (const PermissionException& e) { | 100 catch (const PermissionException& e) { |
| 101 qDebug() << e.toString(); | 101 dblink.deleteFileFromDB(filename); |
| 102 } | |
| 103 catch (const IOException& e) { | |
| 104 //FIXME: We have some strange errors, avoid them by ignoring them for now | |
| 105 dblink.deleteFileFromDB(filename); | |
| 102 } | 106 } |
| 103 catch (Exception& e) { | 107 catch (Exception& e) { |
| 104 qDebug() << e.toString(); | |
| 105 e.raise(); | 108 e.raise(); |
| 106 } | 109 } |
| 107 | 110 |
| 108 emit populateProgress(++n); | 111 emit populateProgress(++n); |
| 109 | 112 |
