-rw-r--r-- | noncore/settings/backup/backuprestore.cpp | 44 | ||||
-rw-r--r-- | noncore/settings/backup/backuprestore.h | 1 |
2 files changed, 38 insertions, 7 deletions
diff --git a/noncore/settings/backup/backuprestore.cpp b/noncore/settings/backup/backuprestore.cpp index 6b83bc9..164055e 100644 --- a/noncore/settings/backup/backuprestore.cpp +++ b/noncore/settings/backup/backuprestore.cpp | |||
@@ -63,419 +63,449 @@ BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name, WFlags f | |||
63 | applicationSettings = new QListViewItem(backupList, "Application Data", "", "Applications/"); | 63 | applicationSettings = new QListViewItem(backupList, "Application Data", "", "Applications/"); |
64 | selectItem(applicationSettings); | 64 | selectItem(applicationSettings); |
65 | documents= new QListViewItem(backupList, "Documents", "", "Documents/"); | 65 | documents= new QListViewItem(backupList, "Documents", "", "Documents/"); |
66 | selectItem(documents); | 66 | selectItem(documents); |
67 | 67 | ||
68 | scanForApplicationSettings(); | 68 | scanForApplicationSettings(); |
69 | 69 | ||
70 | OStorageInfo storage; | 70 | OStorageInfo storage; |
71 | 71 | ||
72 | backupLocations.insert( "Documents", QDir::homeDirPath() + "/Documents" ); | 72 | backupLocations.insert( "Documents", QDir::homeDirPath() + "/Documents" ); |
73 | if ( storage.hasCf() ) | 73 | if ( storage.hasCf() ) |
74 | { | 74 | { |
75 | backupLocations.insert( "CF", storage.cfPath() ); | 75 | backupLocations.insert( "CF", storage.cfPath() ); |
76 | qDebug( "Cf Path: " + storage.cfPath() ); | 76 | qDebug( "Cf Path: " + storage.cfPath() ); |
77 | } | 77 | } |
78 | if ( storage.hasSd() ) | 78 | if ( storage.hasSd() ) |
79 | { | 79 | { |
80 | backupLocations.insert( "SD", storage.sdPath() ); | 80 | backupLocations.insert( "SD", storage.sdPath() ); |
81 | qDebug( " Sd Path: " + storage.sdPath() ); | 81 | qDebug( " Sd Path: " + storage.sdPath() ); |
82 | } | 82 | } |
83 | if ( storage.hasMmc() ) | 83 | if ( storage.hasMmc() ) |
84 | { | 84 | { |
85 | backupLocations.insert( "MMC", storage.mmcPath() ); | 85 | backupLocations.insert( "MMC", storage.mmcPath() ); |
86 | qDebug( "Mmc Path: " + storage.mmcPath() ); | 86 | qDebug( "Mmc Path: " + storage.mmcPath() ); |
87 | } | 87 | } |
88 | 88 | ||
89 | Config config("BackupAndRestore"); | 89 | Config config("BackupAndRestore"); |
90 | //read last locations | 90 | //read last locations |
91 | config.setGroup("LastLocation"); | 91 | config.setGroup("LastLocation"); |
92 | QString lastStoreLocation = config.readEntry( "LastStoreLocation", "" ); | 92 | QString lastStoreLocation = config.readEntry( "LastStoreLocation", "" ); |
93 | QString lastRestoreLocation = config.readEntry( "LastRestoreLocation", "" ); | 93 | QString lastRestoreLocation = config.readEntry( "LastRestoreLocation", "" ); |
94 | int locationIndex = 0; | 94 | int locationIndex = 0; |
95 | 95 | ||
96 | QMap<QString, QString>::Iterator it; | 96 | QMap<QString, QString>::Iterator it; |
97 | for( it = backupLocations.begin(); it != backupLocations.end(); ++it ) | 97 | for( it = backupLocations.begin(); it != backupLocations.end(); ++it ) |
98 | { | 98 | { |
99 | storeToLocation->insertItem(it.key()); | 99 | storeToLocation->insertItem(it.key()); |
100 | restoreSource->insertItem(it.key()); | 100 | restoreSource->insertItem(it.key()); |
101 | 101 | ||
102 | //check for last locations | 102 | //check for last locations |
103 | if ( it.key() == lastStoreLocation ) | 103 | if ( it.key() == lastStoreLocation ) |
104 | storeToLocation->setCurrentItem( locationIndex ); | 104 | storeToLocation->setCurrentItem( locationIndex ); |
105 | if ( it.key() == lastRestoreLocation ) | 105 | if ( it.key() == lastRestoreLocation ) |
106 | restoreSource->setCurrentItem( locationIndex ); | 106 | restoreSource->setCurrentItem( locationIndex ); |
107 | locationIndex++; | 107 | locationIndex++; |
108 | } | 108 | } |
109 | 109 | ||
110 | // Read the list of items to ignore. | 110 | // Read the list of items to ignore. |
111 | QList<QString> dontBackupList; | 111 | QList<QString> dontBackupList; |
112 | dontBackupList.setAutoDelete(true); | 112 | dontBackupList.setAutoDelete(true); |
113 | config.setGroup("DontBackup"); | 113 | config.setGroup("DontBackup"); |
114 | int total = config.readNumEntry("Total", 0); | 114 | int total = config.readNumEntry("Total", 0); |
115 | for(int i = 0; i < total; i++) | 115 | for(int i = 0; i < total; i++) |
116 | { | 116 | { |
117 | dontBackupList.append(new QString(config.readEntry(QString("%1").arg(i), ""))); | 117 | dontBackupList.append(new QString(config.readEntry(QString("%1").arg(i), ""))); |
118 | } | 118 | } |
119 | 119 | ||
120 | QList<QListViewItem> list; | 120 | QList<QListViewItem> list; |
121 | getAllItems(backupList->firstChild(), list); | 121 | getAllItems(backupList->firstChild(), list); |
122 | 122 | ||
123 | for(uint i = 0; i < list.count(); i++) | 123 | for(uint i = 0; i < list.count(); i++) |
124 | { | 124 | { |
125 | QString text = list.at(i)->text(HEADER_NAME); | 125 | QString text = list.at(i)->text(HEADER_NAME); |
126 | for(uint i2 = 0; i2 < dontBackupList.count(); i2++) | 126 | for(uint i2 = 0; i2 < dontBackupList.count(); i2++) |
127 | { | 127 | { |
128 | if(*dontBackupList.at(i2) == text) | 128 | if(*dontBackupList.at(i2) == text) |
129 | { | 129 | { |
130 | selectItem(list.at(i)); | 130 | selectItem(list.at(i)); |
131 | break; | 131 | break; |
132 | } | 132 | } |
133 | } | 133 | } |
134 | } | 134 | } |
135 | QPEApplication::showWidget( this ); | 135 | QPEApplication::showWidget( this ); |
136 | } | 136 | } |
137 | 137 | ||
138 | BackupAndRestore::~BackupAndRestore() | 138 | BackupAndRestore::~BackupAndRestore() |
139 | { | 139 | { |
140 | QList<QListViewItem> list; | 140 | QList<QListViewItem> list; |
141 | getAllItems(backupList->firstChild(), list); | 141 | getAllItems(backupList->firstChild(), list); |
142 | 142 | ||
143 | Config config("BackupAndRestore"); | 143 | Config config("BackupAndRestore"); |
144 | config.setGroup("DontBackup"); | 144 | config.setGroup("DontBackup"); |
145 | config.clearGroup(); | 145 | config.clearGroup(); |
146 | 146 | ||
147 | int count = 0; | 147 | int count = 0; |
148 | for(uint i = 0; i < list.count(); i++) | 148 | for(uint i = 0; i < list.count(); i++) |
149 | { | 149 | { |
150 | if(list.at(i)->text(HEADER_BACKUP) == "") | 150 | if(list.at(i)->text(HEADER_BACKUP) == "") |
151 | { | 151 | { |
152 | config.writeEntry(QString("%1").arg(count), list.at(i)->text(HEADER_NAME)); | 152 | config.writeEntry(QString("%1").arg(count), list.at(i)->text(HEADER_NAME)); |
153 | count++; | 153 | count++; |
154 | } | 154 | } |
155 | } | 155 | } |
156 | config.writeEntry("Total", count); | 156 | config.writeEntry("Total", count); |
157 | 157 | ||
158 | // Remove Temp File | 158 | // Remove Temp File |
159 | if ( QFile::exists( tempFileName ) ) | 159 | if ( QFile::exists( tempFileName ) ) |
160 | QFile::remove( tempFileName ); | 160 | QFile::remove( tempFileName ); |
161 | } | 161 | } |
162 | 162 | ||
163 | QList<QListViewItem> BackupAndRestore::getAllItems(QListViewItem *item, QList<QListViewItem> &list) | 163 | QList<QListViewItem> BackupAndRestore::getAllItems(QListViewItem *item, QList<QListViewItem> &list) |
164 | { | 164 | { |
165 | while(item) | 165 | while(item) |
166 | { | 166 | { |
167 | if(item->childCount() > 0) | 167 | if(item->childCount() > 0) |
168 | getAllItems(item->firstChild(), list); | 168 | getAllItems(item->firstChild(), list); |
169 | list.append(item); | 169 | list.append(item); |
170 | item = item->nextSibling(); | 170 | item = item->nextSibling(); |
171 | } | 171 | } |
172 | return list; | 172 | return list; |
173 | } | 173 | } |
174 | 174 | ||
175 | /** | 175 | /** |
176 | * Selects and unselects the item by setting the HEADER_BACKUP to B or !. | 176 | * Selects and unselects the item by setting the HEADER_BACKUP to B or !. |
177 | * and changing the icon to match | 177 | * and changing the icon to match |
178 | * @param currentItem the item to swich the selection choice. | 178 | * @param currentItem the item to swich the selection choice. |
179 | */ | 179 | */ |
180 | void BackupAndRestore::selectItem(QListViewItem *currentItem) | 180 | void BackupAndRestore::selectItem(QListViewItem *currentItem) |
181 | { | 181 | { |
182 | if(!currentItem) | 182 | if(!currentItem) |
183 | return; | 183 | return; |
184 | 184 | ||
185 | if(currentItem->text(HEADER_BACKUP) == "B") | 185 | if(currentItem->text(HEADER_BACKUP) == "B") |
186 | { | 186 | { |
187 | currentItem->setPixmap(HEADER_NAME, Resource::loadPixmap("backup/null")); | 187 | currentItem->setPixmap(HEADER_NAME, Resource::loadPixmap("backup/null")); |
188 | currentItem->setText(HEADER_BACKUP, ""); | 188 | currentItem->setText(HEADER_BACKUP, ""); |
189 | } | 189 | } |
190 | else | 190 | else |
191 | { | 191 | { |
192 | currentItem->setPixmap(HEADER_NAME, Resource::loadPixmap("backup/check")); | 192 | currentItem->setPixmap(HEADER_NAME, Resource::loadPixmap("backup/check")); |
193 | currentItem->setText(HEADER_BACKUP, "B"); | 193 | currentItem->setText(HEADER_BACKUP, "B"); |
194 | } | 194 | } |
195 | } | 195 | } |
196 | 196 | ||
197 | void BackupAndRestore::scanForApplicationSettings() | 197 | void BackupAndRestore::scanForApplicationSettings() |
198 | { | 198 | { |
199 | QDir d( QDir::homeDirPath() + "/" + QString( applicationSettings->text(BACKUP_LOCATION) ) ); | 199 | QDir d( QDir::homeDirPath() + "/" + QString( applicationSettings->text(BACKUP_LOCATION) ) ); |
200 | d.setFilter( QDir::Dirs | QDir::Files | QDir::NoSymLinks ); | 200 | d.setFilter( QDir::Dirs | QDir::Files | QDir::NoSymLinks ); |
201 | const QFileInfoList *list = d.entryInfoList(); | 201 | const QFileInfoList *list = d.entryInfoList(); |
202 | QFileInfoListIterator it( *list ); | 202 | QFileInfoListIterator it( *list ); |
203 | QFileInfo *fi; | 203 | QFileInfo *fi; |
204 | while ( (fi=it.current()) ) | 204 | while ( (fi=it.current()) ) |
205 | { | 205 | { |
206 | //qDebug((d.path()+"/"+fi->fileName()).latin1()); | 206 | //qDebug((d.path()+"/"+fi->fileName()).latin1()); |
207 | if ( ( fi->fileName() != "." ) && ( fi->fileName() != ".." ) ) | 207 | if ( ( fi->fileName() != "." ) && ( fi->fileName() != ".." ) ) |
208 | { | 208 | { |
209 | QListViewItem *newItem = new QListViewItem(applicationSettings, fi->fileName()); | 209 | QListViewItem *newItem = new QListViewItem(applicationSettings, fi->fileName()); |
210 | selectItem(newItem); | 210 | selectItem(newItem); |
211 | } | 211 | } |
212 | ++it; | 212 | ++it; |
213 | } | 213 | } |
214 | } | 214 | } |
215 | 215 | ||
216 | /** | 216 | /** |
217 | * The "Backup" button has been pressed. Get a list of all of the files that | 217 | * The "Backup" button has been pressed. Get a list of all of the files that |
218 | * should be backed up. If there are no files, emit and error and exit. | 218 | * should be backed up. If there are no files, emit and error and exit. |
219 | * Determine the file name to store the backup in. Backup the file(s) using | 219 | * Determine the file name to store the backup in. Backup the file(s) using |
220 | * tar and gzip --best. Report failure or success | 220 | * tar and gzip --best. Report failure or success |
221 | */ | 221 | */ |
222 | void BackupAndRestore::backup() | 222 | void BackupAndRestore::backup() |
223 | { | 223 | { |
224 | QString backupFiles; | 224 | QString backupFiles; |
225 | if(getBackupFiles(backupFiles, NULL) == 0) | 225 | if(getBackupFiles(backupFiles, NULL) == 0) |
226 | { | 226 | { |
227 | QMessageBox::critical(this, "Message", | 227 | QMessageBox::critical(this, "Message", |
228 | "No items selected.",QString("Ok") ); | 228 | "No items selected.",QString("Ok") ); |
229 | return; | 229 | return; |
230 | } | 230 | } |
231 | 231 | ||
232 | setCaption(tr("Backup and Restore... working...")); | 232 | setCaption(tr("Backup and Restore... working...")); |
233 | QString outputFile = backupLocations[storeToLocation->currentText()]; | 233 | QString outputFile = backupLocations[storeToLocation->currentText()]; |
234 | 234 | ||
235 | QDateTime datetime = QDateTime::currentDateTime(); | 235 | QDateTime datetime = QDateTime::currentDateTime(); |
236 | QString dateString = QString::number( datetime.date().year() ) + QString::number( datetime.date().month() ).rightJustify(2, '0') + | 236 | QString dateString = QString::number( datetime.date().year() ) + QString::number( datetime.date().month() ).rightJustify(2, '0') + |
237 | QString::number( datetime.date().day() ).rightJustify(2, '0'); | 237 | QString::number( datetime.date().day() ).rightJustify(2, '0'); |
238 | 238 | ||
239 | outputFile += "/" + dateString; | 239 | outputFile += "/" + dateString; |
240 | 240 | ||
241 | QString t = outputFile; | 241 | QString t = outputFile; |
242 | int c = 1; | 242 | int c = 1; |
243 | while(QFile::exists(outputFile + EXTENSION)) | 243 | while(QFile::exists(outputFile + EXTENSION)) |
244 | { | 244 | { |
245 | outputFile = t + QString("%1").arg(c); | 245 | outputFile = t + QString("%1").arg(c); |
246 | c++; | 246 | c++; |
247 | } | 247 | } |
248 | 248 | ||
249 | // We execute tar and compressing its output with gzip.. | 249 | // We execute tar and compressing its output with gzip.. |
250 | // The error output will be written into a temp-file which could be provided | 250 | // The error output will be written into a temp-file which could be provided |
251 | // for debugging.. | 251 | // for debugging.. |
252 | qDebug( "Storing file: %s", outputFile.latin1() ); | 252 | qDebug( "Storing file: %s", outputFile.latin1() ); |
253 | outputFile += EXTENSION; | 253 | outputFile += EXTENSION; |
254 | 254 | ||
255 | QString commandLine = QString( "(tar -C %1 -z --exclude=*.bck -c %2 > %3 ) 2> %4" ).arg( QDir::homeDirPath() ) | 255 | QString commandLine = QString( "cd %1 && (tar -X %1 -cz %2 -f %3 ) 2> %4" ).arg( QDir::homeDirPath() ) |
256 | .arg( backupFiles ) | 256 | .arg( getExcludeFile() ) |
257 | .arg( outputFile.latin1() ) | 257 | .arg( backupFiles ) |
258 | .arg( tempFileName.latin1() ); | 258 | .arg( outputFile.latin1() ) |
259 | .arg( tempFileName.latin1() ); | ||
259 | 260 | ||
260 | qDebug( commandLine ); | 261 | qDebug( commandLine ); |
261 | 262 | ||
262 | int r = system( commandLine ); | 263 | int r = system( commandLine ); |
263 | 264 | ||
264 | if(r != 0) | 265 | if(r != 0) |
265 | { | 266 | { |
266 | perror("Error: "); | 267 | perror("Error: "); |
267 | QString errorMsg= tr( "Error from System:\n" ) + (QString)strerror( errno ); | 268 | QString errorMsg= tr( "Error from System:\n" ) + (QString)strerror( errno ); |
268 | 269 | ||
269 | switch( QMessageBox::critical(this, tr( "Message" ), tr( "Backup Failed!" ) + "\n" | 270 | switch( QMessageBox::critical(this, tr( "Message" ), tr( "Backup Failed!" ) + "\n" |
270 | + errorMsg, QString( tr( "Ok" ) ), QString( tr( "Details" ) ) ) ) | 271 | + errorMsg, QString( tr( "Ok" ) ), QString( tr( "Details" ) ) ) ) |
271 | { | 272 | { |
272 | 273 | ||
273 | case 1: | 274 | case 1: |
274 | qWarning("Details pressed !"); | 275 | qWarning("Details pressed !"); |
275 | ErrorDialog* pErrDialog = new ErrorDialog( this, NULL, true ); | 276 | ErrorDialog* pErrDialog = new ErrorDialog( this, NULL, true ); |
276 | QFile errorFile( tempFileName ); | 277 | QFile errorFile( tempFileName ); |
277 | if ( errorFile.open(IO_ReadOnly) ) | 278 | if ( errorFile.open(IO_ReadOnly) ) |
278 | { | 279 | { |
279 | QTextStream t( &errorFile ); | 280 | QTextStream t( &errorFile ); |
280 | QString s; | 281 | QString s; |
281 | while ( !t.eof() ) | 282 | while ( !t.eof() ) |
282 | { // until end of file... | 283 | { // until end of file... |
283 | s += t.readLine(); // line of text excluding '\n' | 284 | s += t.readLine(); // line of text excluding '\n' |
284 | } | 285 | } |
285 | errorFile.close(); | 286 | errorFile.close(); |
286 | 287 | ||
287 | pErrDialog->m_textarea->setText( s ); | 288 | pErrDialog->m_textarea->setText( s ); |
288 | } | 289 | } |
289 | else | 290 | else |
290 | { | 291 | { |
291 | pErrDialog->m_textarea->setText( "Unable to open File: /tmp/backup.er" ); | 292 | pErrDialog->m_textarea->setText( "Unable to open File: /tmp/backup.er" ); |
292 | } | 293 | } |
293 | QPEApplication::execDialog( pErrDialog ); | 294 | QPEApplication::execDialog( pErrDialog ); |
294 | delete pErrDialog; | 295 | delete pErrDialog; |
295 | break; | 296 | break; |
296 | } | 297 | } |
297 | setCaption(tr("Backup and Restore.. Failed !!")); | 298 | setCaption(tr("Backup and Restore.. Failed !!")); |
298 | return; | 299 | return; |
299 | } | 300 | } |
300 | else | 301 | else |
301 | { | 302 | { |
302 | QMessageBox::information(this, tr( "Message" ), tr( "Backup Successful." ), QString(tr( "Ok" ) ) ); | 303 | QMessageBox::information(this, tr( "Message" ), tr( "Backup Successful." ), QString(tr( "Ok" ) ) ); |
303 | 304 | ||
304 | } | 305 | } |
305 | 306 | ||
306 | //write store-location | 307 | //write store-location |
307 | Config config( "BackupAndRestore" ); | 308 | Config config( "BackupAndRestore" ); |
308 | config.setGroup( "LastLocation" ); | 309 | config.setGroup( "LastLocation" ); |
309 | config.writeEntry( "LastStoreLocation", storeToLocation->currentText() ); | 310 | config.writeEntry( "LastStoreLocation", storeToLocation->currentText() ); |
310 | 311 | ||
311 | setCaption(tr("Backup and Restore")); | 312 | setCaption(tr("Backup and Restore")); |
312 | } | 313 | } |
313 | 314 | ||
314 | /*** | 315 | /*** |
315 | * Get a list of all of the files to backup. | 316 | * Get a list of all of the files to backup. |
316 | */ | 317 | */ |
317 | int BackupAndRestore::getBackupFiles(QString &backupFiles, QListViewItem *parent) | 318 | int BackupAndRestore::getBackupFiles(QString &backupFiles, QListViewItem *parent) |
318 | { | 319 | { |
319 | QListViewItem * currentItem; | 320 | QListViewItem * currentItem; |
320 | QString currentHome; | 321 | QString currentHome; |
321 | if(!parent) | 322 | if(!parent) |
322 | currentItem = backupList->firstChild(); | 323 | currentItem = backupList->firstChild(); |
323 | else | 324 | else |
324 | { | 325 | { |
325 | currentItem = parent->firstChild(); | 326 | currentItem = parent->firstChild(); |
326 | currentHome = parent->text(BACKUP_LOCATION); | 327 | currentHome = parent->text(BACKUP_LOCATION); |
327 | } | 328 | } |
328 | 329 | ||
329 | uint count = 0; | 330 | uint count = 0; |
330 | while( currentItem != 0 ) | 331 | while( currentItem != 0 ) |
331 | { | 332 | { |
332 | if(currentItem->text(HEADER_BACKUP) == "B" ) | 333 | if(currentItem->text(HEADER_BACKUP) == "B" ) |
333 | { | 334 | { |
334 | if(currentItem->childCount() == 0 ) | 335 | if(currentItem->childCount() == 0 ) |
335 | { | 336 | { |
336 | if(parent == NULL) | 337 | if(parent == NULL) |
337 | backupFiles += currentItem->text(BACKUP_LOCATION); | 338 | backupFiles += currentItem->text(BACKUP_LOCATION); |
338 | else | 339 | else |
339 | backupFiles += currentHome + currentItem->text(HEADER_NAME); | 340 | backupFiles += currentHome + currentItem->text(HEADER_NAME); |
340 | backupFiles += " "; | 341 | backupFiles += " "; |
341 | count++; | 342 | count++; |
342 | } | 343 | } |
343 | else | 344 | else |
344 | { | 345 | { |
345 | count += getBackupFiles(backupFiles, currentItem); | 346 | count += getBackupFiles(backupFiles, currentItem); |
346 | } | 347 | } |
347 | } | 348 | } |
348 | currentItem = currentItem->nextSibling(); | 349 | currentItem = currentItem->nextSibling(); |
349 | } | 350 | } |
350 | return count; | 351 | return count; |
351 | } | 352 | } |
352 | 353 | ||
353 | void BackupAndRestore::sourceDirChanged(int selection) | 354 | void BackupAndRestore::sourceDirChanged(int selection) |
354 | { | 355 | { |
355 | restoreList->clear(); | 356 | restoreList->clear(); |
356 | rescanFolder(backupLocations[restoreSource->text(selection)]); | 357 | rescanFolder(backupLocations[restoreSource->text(selection)]); |
357 | } | 358 | } |
358 | 359 | ||
359 | void BackupAndRestore::fileListUpdate() | 360 | void BackupAndRestore::fileListUpdate() |
360 | { | 361 | { |
361 | qWarning("void BackupAndRestore::fileListUpdate()"); | 362 | qWarning("void BackupAndRestore::fileListUpdate()"); |
362 | restoreList->clear(); | 363 | restoreList->clear(); |
363 | rescanFolder( backupLocations[restoreSource->currentText()] ); | 364 | rescanFolder( backupLocations[restoreSource->currentText()] ); |
364 | } | 365 | } |
365 | 366 | ||
366 | /** | 367 | /** |
367 | * Scans directory for any backup files. Will recursivly go down, | 368 | * Scans directory for any backup files. Will recursivly go down, |
368 | * but will not follow symlinks. | 369 | * but will not follow symlinks. |
369 | * @param directory - the directory to look in. | 370 | * @param directory - the directory to look in. |
370 | */ | 371 | */ |
371 | void BackupAndRestore::rescanFolder(QString directory) | 372 | void BackupAndRestore::rescanFolder(QString directory) |
372 | { | 373 | { |
373 | //qDebug(QString("rescanFolder: ") + directory.latin1()); | 374 | //qDebug(QString("rescanFolder: ") + directory.latin1()); |
374 | QDir d(directory); | 375 | QDir d(directory); |
375 | if(!d.exists()) | 376 | if(!d.exists()) |
376 | return; | 377 | return; |
377 | 378 | ||
378 | d.setFilter( QDir::Files | QDir::Hidden | QDir::Dirs); | 379 | d.setFilter( QDir::Files | QDir::Hidden | QDir::Dirs); |
379 | const QFileInfoList *list = d.entryInfoList(); | 380 | const QFileInfoList *list = d.entryInfoList(); |
380 | QFileInfoListIterator it( *list ); | 381 | QFileInfoListIterator it( *list ); |
381 | QFileInfo *file; | 382 | QFileInfo *file; |
382 | while ( (file=it.current()) ) | 383 | while ( (file=it.current()) ) |
383 | { // for each file... | 384 | { // for each file... |
384 | // If it is a dir and not .. or . then add it as a tab and go down. | 385 | // If it is a dir and not .. or . then add it as a tab and go down. |
385 | if(file->isDir()) | 386 | if(file->isDir()) |
386 | { | 387 | { |
387 | if(file->fileName() != ".." && file->fileName() != ".") | 388 | if(file->fileName() != ".." && file->fileName() != ".") |
388 | { | 389 | { |
389 | rescanFolder(directory + "/" + file->fileName()); | 390 | rescanFolder(directory + "/" + file->fileName()); |
390 | } | 391 | } |
391 | } | 392 | } |
392 | else | 393 | else |
393 | { | 394 | { |
394 | // If it is a backup file add to list. | 395 | // If it is a backup file add to list. |
395 | if(file->fileName().contains(EXTENSION)) | 396 | if(file->fileName().contains(EXTENSION)) |
396 | (void)new QListViewItem(restoreList, file->fileName()); | 397 | (void)new QListViewItem(restoreList, file->fileName()); |
397 | } | 398 | } |
398 | ++it; | 399 | ++it; |
399 | } | 400 | } |
400 | } | 401 | } |
401 | 402 | ||
402 | /** | 403 | /** |
403 | * Restore a backup file. | 404 | * Restore a backup file. |
404 | * Report errors or success | 405 | * Report errors or success |
405 | */ | 406 | */ |
406 | void BackupAndRestore::restore() | 407 | void BackupAndRestore::restore() |
407 | { | 408 | { |
408 | QListViewItem *restoreItem = restoreList->currentItem(); | 409 | QListViewItem *restoreItem = restoreList->currentItem(); |
409 | if(!restoreItem) | 410 | if(!restoreItem) |
410 | { | 411 | { |
411 | QMessageBox::critical(this, tr( "Message" ), | 412 | QMessageBox::critical(this, tr( "Message" ), |
412 | tr( "Please select something to restore." ),QString( tr( "Ok") ) ); | 413 | tr( "Please select something to restore." ),QString( tr( "Ok") ) ); |
413 | return; | 414 | return; |
414 | } | 415 | } |
415 | setCaption(tr("Backup and Restore... working...")); | 416 | setCaption(tr("Backup and Restore... working...")); |
416 | 417 | ||
417 | QString restoreFile = backupLocations[restoreSource->currentText()]; | 418 | QString restoreFile = backupLocations[restoreSource->currentText()]; |
418 | 419 | ||
419 | restoreFile += "/" + restoreItem->text(0); | 420 | restoreFile += "/" + restoreItem->text(0); |
420 | 421 | ||
421 | qDebug( restoreFile ); | 422 | qDebug( restoreFile ); |
422 | 423 | ||
423 | QString commandLine = QString( "tar -C %1 -zxf %2 2> %3" ).arg( QDir::homeDirPath() ) | 424 | QString commandLine = QString( "cd %1 && tar -zxf %2 2> %3" ).arg( QDir::homeDirPath() ) |
424 | .arg( restoreFile.latin1() ) | 425 | .arg( restoreFile.latin1() ) |
425 | .arg( tempFileName.latin1() ); | 426 | .arg( tempFileName.latin1() ); |
426 | 427 | ||
427 | qDebug( commandLine ); | 428 | qDebug( commandLine ); |
428 | 429 | ||
429 | int r = system( commandLine ); | 430 | int r = system( commandLine ); |
430 | 431 | ||
431 | if(r != 0) | 432 | if(r != 0) |
432 | { | 433 | { |
433 | QString errorMsg= tr( "Error from System:\n" ) + (QString)strerror( errno ); | 434 | QString errorMsg= tr( "Error from System:\n" ) + (QString)strerror( errno ); |
434 | switch( QMessageBox::critical(this, tr( "Message" ), tr( "Restore Failed." ) + "\n" | 435 | switch( QMessageBox::critical(this, tr( "Message" ), tr( "Restore Failed." ) + "\n" |
435 | + errorMsg, QString( tr( "Ok") ), QString( tr( "Details" ) ) ) ) | 436 | + errorMsg, QString( tr( "Ok") ), QString( tr( "Details" ) ) ) ) |
436 | { | 437 | { |
437 | case 1: | 438 | case 1: |
438 | qWarning("Details pressed !"); | 439 | qWarning("Details pressed !"); |
439 | ErrorDialog* pErrDialog = new ErrorDialog( this, NULL, true ); | 440 | ErrorDialog* pErrDialog = new ErrorDialog( this, NULL, true ); |
440 | QFile errorFile( tempFileName ); | 441 | QFile errorFile( tempFileName ); |
441 | if ( errorFile.open(IO_ReadOnly) ) | 442 | if ( errorFile.open(IO_ReadOnly) ) |
442 | { | 443 | { |
443 | QTextStream t( &errorFile ); | 444 | QTextStream t( &errorFile ); |
444 | QString s; | 445 | QString s; |
445 | while ( !t.eof() ) | 446 | while ( !t.eof() ) |
446 | { // until end of file... | 447 | { // until end of file... |
447 | s += t.readLine(); // line of text excluding '\n' | 448 | s += t.readLine(); // line of text excluding '\n' |
448 | } | 449 | } |
449 | errorFile.close(); | 450 | errorFile.close(); |
450 | 451 | ||
451 | pErrDialog->m_textarea->setText( s ); | 452 | pErrDialog->m_textarea->setText( s ); |
452 | } | 453 | } |
453 | else | 454 | else |
454 | { | 455 | { |
455 | pErrDialog->m_textarea->setText( tr( "Unable to open File: %1" ).arg( "/tmp/backup.er" ) ); | 456 | pErrDialog->m_textarea->setText( tr( "Unable to open File: %1" ).arg( "/tmp/backup.er" ) ); |
456 | } | 457 | } |
457 | QPEApplication::execDialog( pErrDialog ); | 458 | QPEApplication::execDialog( pErrDialog ); |
458 | delete pErrDialog; | 459 | delete pErrDialog; |
459 | 460 | ||
460 | setCaption(tr("Backup and Restore.. Failed !!")); | 461 | setCaption(tr("Backup and Restore.. Failed !!")); |
461 | return; | 462 | return; |
462 | 463 | ||
463 | break; | 464 | break; |
464 | 465 | ||
465 | } | 466 | } |
466 | } | 467 | } |
467 | else | 468 | else |
468 | { | 469 | { |
469 | QMessageBox::information(this, tr( "Message" ), tr( "Restore Successful." ), QString( tr( "Ok") ) ); | 470 | QMessageBox::information(this, tr( "Message" ), tr( "Restore Successful." ), QString( tr( "Ok") ) ); |
470 | } | 471 | } |
471 | 472 | ||
472 | //write restore-location | 473 | //write restore-location |
473 | Config config( "BackupAndRestore" ); | 474 | Config config( "BackupAndRestore" ); |
474 | config.setGroup( "LastLocation" ); | 475 | config.setGroup( "LastLocation" ); |
475 | config.writeEntry( "LastRestoreLocation", restoreSource->currentText() ); | 476 | config.writeEntry( "LastRestoreLocation", restoreSource->currentText() ); |
476 | 477 | ||
477 | setCaption(tr("Backup and Restore")); | 478 | setCaption(tr("Backup and Restore")); |
478 | } | 479 | } |
479 | 480 | ||
481 | |||
482 | /** | ||
483 | * Check for exclude in Applications/backup | ||
484 | * If it does not exist, the function will create the file with *.bck as content | ||
485 | * The exclude_files is read by tar and will provide to exclude special files out from backup. | ||
486 | * e.g. alle *.bck files (backup-files) will not be backed up by default | ||
487 | */ | ||
488 | |||
489 | QString BackupAndRestore::getExcludeFile() | ||
490 | { | ||
491 | QString excludeFileName = Global::applicationFileName( "backup", "exclude" ); | ||
492 | if ( !QFile::exists( excludeFileName ) ) | ||
493 | { | ||
494 | QFile excludeFile( excludeFileName); | ||
495 | if ( excludeFile.open( IO_WriteOnly ) == true ) | ||
496 | { | ||
497 | QTextStream writeStream( &excludeFile ); | ||
498 | writeStream << "*.bck" << "\n"; | ||
499 | excludeFile.close(); | ||
500 | } | ||
501 | else | ||
502 | { | ||
503 | return QString::null; | ||
504 | } | ||
505 | } | ||
506 | |||
507 | return excludeFileName; | ||
508 | } | ||
509 | |||
480 | // backuprestore.cpp | 510 | // backuprestore.cpp |
481 | 511 | ||
diff --git a/noncore/settings/backup/backuprestore.h b/noncore/settings/backup/backuprestore.h index fdc2bf2..0d88f8d 100644 --- a/noncore/settings/backup/backuprestore.h +++ b/noncore/settings/backup/backuprestore.h | |||
@@ -1,46 +1,47 @@ | |||
1 | #ifndef WINDOW_H | 1 | #ifndef WINDOW_H |
2 | #define WINDOW_H | 2 | #define WINDOW_H |
3 | 3 | ||
4 | #include <qmainwindow.h> | 4 | #include <qmainwindow.h> |
5 | #include "backuprestorebase.h" | 5 | #include "backuprestorebase.h" |
6 | #include <qmap.h> | 6 | #include <qmap.h> |
7 | #include <qlist.h> | 7 | #include <qlist.h> |
8 | 8 | ||
9 | class QListViewItem; | 9 | class QListViewItem; |
10 | 10 | ||
11 | class BackupAndRestore : public BackupAndRestoreBase | 11 | class BackupAndRestore : public BackupAndRestoreBase |
12 | { | 12 | { |
13 | 13 | ||
14 | Q_OBJECT | 14 | Q_OBJECT |
15 | 15 | ||
16 | public: | 16 | public: |
17 | 17 | ||
18 | BackupAndRestore( QWidget* parent = 0, const char* name = 0, WFlags fl = 0); | 18 | BackupAndRestore( QWidget* parent = 0, const char* name = 0, WFlags fl = 0); |
19 | ~BackupAndRestore(); | 19 | ~BackupAndRestore(); |
20 | 20 | ||
21 | static QString appName() { return QString::fromLatin1("backup"); } | 21 | static QString appName() { return QString::fromLatin1("backup"); } |
22 | 22 | ||
23 | private slots: | 23 | private slots: |
24 | void backup(); | 24 | void backup(); |
25 | void restore(); | 25 | void restore(); |
26 | void selectItem(QListViewItem *currentItem); | 26 | void selectItem(QListViewItem *currentItem); |
27 | void sourceDirChanged(int); | 27 | void sourceDirChanged(int); |
28 | void rescanFolder(QString directory); | 28 | void rescanFolder(QString directory); |
29 | void fileListUpdate(); | 29 | void fileListUpdate(); |
30 | 30 | ||
31 | private: | 31 | private: |
32 | void scanForApplicationSettings(); | 32 | void scanForApplicationSettings(); |
33 | int getBackupFiles(QString &backupFiles, QListViewItem *parent); | 33 | int getBackupFiles(QString &backupFiles, QListViewItem *parent); |
34 | QString getExcludeFile(); | ||
34 | QMap<QString, QString> backupLocations; | 35 | QMap<QString, QString> backupLocations; |
35 | QList<QListViewItem> getAllItems(QListViewItem *item, QList<QListViewItem> &list); | 36 | QList<QListViewItem> getAllItems(QListViewItem *item, QList<QListViewItem> &list); |
36 | 37 | ||
37 | QListViewItem *systemSettings; | 38 | QListViewItem *systemSettings; |
38 | QListViewItem *applicationSettings; | 39 | QListViewItem *applicationSettings; |
39 | QListViewItem *documents; | 40 | QListViewItem *documents; |
40 | 41 | ||
41 | }; | 42 | }; |
42 | 43 | ||
43 | #endif | 44 | #endif |
44 | 45 | ||
45 | // backuprestore.h | 46 | // backuprestore.h |
46 | 47 | ||