-rw-r--r-- | noncore/settings/backup/backuprestore.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/noncore/settings/backup/backuprestore.cpp b/noncore/settings/backup/backuprestore.cpp index 78d1414..457282a 100644 --- a/noncore/settings/backup/backuprestore.cpp +++ b/noncore/settings/backup/backuprestore.cpp | |||
@@ -145,129 +145,129 @@ void BackupAndRestore::selectItem(QListViewItem *currentItem){ | |||
145 | } | 145 | } |
146 | else{ | 146 | else{ |
147 | currentItem->setPixmap(HEADER_NAME, Resource::loadPixmap("backup/check")); | 147 | currentItem->setPixmap(HEADER_NAME, Resource::loadPixmap("backup/check")); |
148 | currentItem->setText(HEADER_BACKUP, "B"); | 148 | currentItem->setText(HEADER_BACKUP, "B"); |
149 | } | 149 | } |
150 | } | 150 | } |
151 | 151 | ||
152 | void BackupAndRestore::scanForApplicationSettings(){ | 152 | void BackupAndRestore::scanForApplicationSettings(){ |
153 | QDir d(applicationSettings->text(BACKUP_LOCATION)); | 153 | QDir d(applicationSettings->text(BACKUP_LOCATION)); |
154 | d.setFilter( QDir::Files | QDir::NoSymLinks ); | 154 | d.setFilter( QDir::Files | QDir::NoSymLinks ); |
155 | const QFileInfoList *list = d.entryInfoList(); | 155 | const QFileInfoList *list = d.entryInfoList(); |
156 | QFileInfoListIterator it( *list ); | 156 | QFileInfoListIterator it( *list ); |
157 | QFileInfo *fi; | 157 | QFileInfo *fi; |
158 | while ( (fi=it.current()) ) { | 158 | while ( (fi=it.current()) ) { |
159 | //qDebug((d.path()+fi->fileName()).latin1()); | 159 | //qDebug((d.path()+fi->fileName()).latin1()); |
160 | QListViewItem *newItem = new QListViewItem(applicationSettings, fi->fileName()); | 160 | QListViewItem *newItem = new QListViewItem(applicationSettings, fi->fileName()); |
161 | selectItem(newItem); | 161 | selectItem(newItem); |
162 | ++it; | 162 | ++it; |
163 | } | 163 | } |
164 | } | 164 | } |
165 | 165 | ||
166 | /** | 166 | /** |
167 | * The "Backup" button has been pressed. Get a list of all of the files that | 167 | * The "Backup" button has been pressed. Get a list of all of the files that |
168 | * should be backed up. If there are no files, emit and error and exit. | 168 | * should be backed up. If there are no files, emit and error and exit. |
169 | * Determine the file name to store the backup in. Backup the file(s) using | 169 | * Determine the file name to store the backup in. Backup the file(s) using |
170 | * tar and gzip --best. Report failure or success | 170 | * tar and gzip --best. Report failure or success |
171 | */ | 171 | */ |
172 | void BackupAndRestore::backupPressed(){ | 172 | void BackupAndRestore::backupPressed(){ |
173 | QString backupFiles; | 173 | QString backupFiles; |
174 | if(getBackupFiles(backupFiles, NULL) == 0){ | 174 | if(getBackupFiles(backupFiles, NULL) == 0){ |
175 | QMessageBox::critical(this, "Message", | 175 | QMessageBox::critical(this, "Message", |
176 | "No items selected.",QString("Ok") ); | 176 | "No items selected.",QString("Ok") ); |
177 | return; | 177 | return; |
178 | } | 178 | } |
179 | 179 | ||
180 | setCaption(tr("Backup and Restore... working...")); | 180 | setCaption(tr("Backup and Restore... working...")); |
181 | QString outputFile = backupLocations[storeToLocation->currentText()]; | 181 | QString outputFile = backupLocations[storeToLocation->currentText()]; |
182 | 182 | ||
183 | QDateTime time = QDateTime::currentDateTime(); | 183 | QDateTime time = QDateTime::currentDateTime(); |
184 | QString dateString = time.date().toString().replace(QRegExp(" "), ""); | 184 | QString dateString = time.date().toString().replace(QRegExp(" "), ""); |
185 | outputFile += "/" + dateString; | 185 | outputFile += "/" + dateString; |
186 | 186 | ||
187 | QString t = outputFile; | 187 | QString t = outputFile; |
188 | int c = 1; | 188 | int c = 1; |
189 | while(QFile::exists(outputFile + EXTENSION)){ | 189 | while(QFile::exists(outputFile + EXTENSION)){ |
190 | outputFile = t + QString("%1").arg(c); | 190 | outputFile = t + QString("%1").arg(c); |
191 | c++; | 191 | c++; |
192 | } | 192 | } |
193 | 193 | ||
194 | qDebug(QString("system(\"tar -c %1 | gzip > %2\")").arg(backupFiles).arg(outputFile).latin1()); | 194 | qDebug(QString("system(\"tar -c %1 | gzip > %2\")").arg(backupFiles).arg(outputFile).latin1()); |
195 | outputFile += EXTENSION; | 195 | outputFile += EXTENSION; |
196 | 196 | ||
197 | int r = system( QString("tar -c %1 | gzip > %2").arg(backupFiles).arg(outputFile).latin1() ); | 197 | int r = system( QString("tar -c %1 | gzip > %2").arg(backupFiles).arg(outputFile).latin1() ); |
198 | 198 | ||
199 | 199 | ||
200 | 200 | ||
201 | if(r != 0){ | 201 | if(r != 0){ |
202 | perror("Error: "); | 202 | perror("Error: "); |
203 | QString errorMsg="Error\n"+(QString)strerror(errno); | 203 | QString errorMsg="Error\n"+(QString)strerror(errno); |
204 | 204 | ||
205 | QMessageBox::critical(this, "Message", "Backup Failed.\n"+errorMsg, QString("Ok") ); | 205 | QMessageBox::critical(this, "Message", "Backup Failed.\n"+errorMsg, QString("Ok") ); |
206 | return; | 206 | return; |
207 | } | 207 | } |
208 | else{ | 208 | else{ |
209 | QMessageBox::critical(this, "Message", "Backup Successfull.",QString("Ok") ); | 209 | QMessageBox::information(this, "Message", "Backup Successfull.",QString("Ok") ); |
210 | 210 | ||
211 | } | 211 | } |
212 | setCaption(tr("Backup and Restore")); | 212 | setCaption(tr("Backup and Restore")); |
213 | } | 213 | } |
214 | 214 | ||
215 | /*** | 215 | /*** |
216 | * Get a list of all of the files to backup. | 216 | * Get a list of all of the files to backup. |
217 | */ | 217 | */ |
218 | int BackupAndRestore::getBackupFiles(QString &backupFiles, QListViewItem *parent){ | 218 | int BackupAndRestore::getBackupFiles(QString &backupFiles, QListViewItem *parent){ |
219 | QListViewItem * currentItem; | 219 | QListViewItem * currentItem; |
220 | QString currentHome; | 220 | QString currentHome; |
221 | if(!parent) | 221 | if(!parent) |
222 | currentItem = backupList->firstChild(); | 222 | currentItem = backupList->firstChild(); |
223 | else{ | 223 | else{ |
224 | currentItem = parent->firstChild(); | 224 | currentItem = parent->firstChild(); |
225 | currentHome = parent->text(BACKUP_LOCATION); | 225 | currentHome = parent->text(BACKUP_LOCATION); |
226 | } | 226 | } |
227 | 227 | ||
228 | uint count = 0; | 228 | uint count = 0; |
229 | while( currentItem != 0 ){ | 229 | while( currentItem != 0 ){ |
230 | if(currentItem->text(HEADER_BACKUP) == "B" ){ | 230 | if(currentItem->text(HEADER_BACKUP) == "B" ){ |
231 | if(currentItem->childCount() == 0 ){ | 231 | if(currentItem->childCount() == 0 ){ |
232 | if(parent == NULL) | 232 | if(parent == NULL) |
233 | backupFiles += currentItem->text(BACKUP_LOCATION); | 233 | backupFiles += currentItem->text(BACKUP_LOCATION); |
234 | else | 234 | else |
235 | backupFiles += currentHome + currentItem->text(HEADER_NAME); | 235 | backupFiles += currentHome + currentItem->text(HEADER_NAME); |
236 | backupFiles += " "; | 236 | backupFiles += " "; |
237 | count++; | 237 | count++; |
238 | } | 238 | } |
239 | else{ | 239 | else{ |
240 | count += getBackupFiles(backupFiles, currentItem); | 240 | count += getBackupFiles(backupFiles, currentItem); |
241 | } | 241 | } |
242 | } | 242 | } |
243 | currentItem = currentItem->nextSibling(); | 243 | currentItem = currentItem->nextSibling(); |
244 | } | 244 | } |
245 | return count; | 245 | return count; |
246 | } | 246 | } |
247 | 247 | ||
248 | void BackupAndRestore::sourceDirChanged(int selection){ | 248 | void BackupAndRestore::sourceDirChanged(int selection){ |
249 | restoreList->clear(); | 249 | restoreList->clear(); |
250 | rescanFolder(backupLocations[restoreSource->text(selection)]); | 250 | rescanFolder(backupLocations[restoreSource->text(selection)]); |
251 | } | 251 | } |
252 | 252 | ||
253 | /** | 253 | /** |
254 | * Scans directory for any backup files. Will recursivly go down, | 254 | * Scans directory for any backup files. Will recursivly go down, |
255 | * but will not follow symlinks. | 255 | * but will not follow symlinks. |
256 | * @param directory - the directory to look in. | 256 | * @param directory - the directory to look in. |
257 | */ | 257 | */ |
258 | void BackupAndRestore::rescanFolder(QString directory){ | 258 | void BackupAndRestore::rescanFolder(QString directory){ |
259 | //qDebug(QString("rescanFolder: ") + directory.latin1()); | 259 | //qDebug(QString("rescanFolder: ") + directory.latin1()); |
260 | QDir d(directory); | 260 | QDir d(directory); |
261 | if(!d.exists()) | 261 | if(!d.exists()) |
262 | return; | 262 | return; |
263 | 263 | ||
264 | d.setFilter( QDir::Files | QDir::Hidden | QDir::Dirs); | 264 | d.setFilter( QDir::Files | QDir::Hidden | QDir::Dirs); |
265 | const QFileInfoList *list = d.entryInfoList(); | 265 | const QFileInfoList *list = d.entryInfoList(); |
266 | QFileInfoListIterator it( *list ); | 266 | QFileInfoListIterator it( *list ); |
267 | QFileInfo *file; | 267 | QFileInfo *file; |
268 | while ( (file=it.current()) ) { // for each file... | 268 | while ( (file=it.current()) ) { // for each file... |
269 | // If it is a dir and not .. or . then add it as a tab and go down. | 269 | // If it is a dir and not .. or . then add it as a tab and go down. |
270 | if(file->isDir()){ | 270 | if(file->isDir()){ |
271 | if(file->fileName() != ".." && file->fileName() != ".") { | 271 | if(file->fileName() != ".." && file->fileName() != ".") { |
272 | rescanFolder(directory + "/" + file->fileName()); | 272 | rescanFolder(directory + "/" + file->fileName()); |
273 | } | 273 | } |