From 6284b1d7d597463347b471ed8ec2770f4e2d449b Mon Sep 17 00:00:00 2001 From: zautrix Date: Thu, 21 Apr 2005 22:07:10 +0000 Subject: fixes --- diff --git a/kabc/plugins/file/resourcefile.cpp b/kabc/plugins/file/resourcefile.cpp index 2bd9e71..c89939d 100644 --- a/kabc/plugins/file/resourcefile.cpp +++ b/kabc/plugins/file/resourcefile.cpp @@ -43,6 +43,7 @@ $Id$ //US #include #include #include +#include #include "formatfactory.h" @@ -79,12 +80,13 @@ ResourceFile::ResourceFile( const KConfig *config ) QString fileName, formatName, default_fileName; default_fileName = StdAddressBook::fileName(); - + mLastBackupDate = -1; KConfig *cfg = (KConfig *)config; if ( cfg ) { fileName = cfg->readEntry( "FileName", default_fileName ); formatName = cfg->readEntry( "FileFormat", "vcard" ); mFamily = cfg->readEntry( "ResourceName", "std" ); + mLastBackupDate = cfg->readNumEntry( "LastBackupDate", 0 ); } else { fileName = default_fileName; formatName = "vcard"; @@ -100,7 +102,7 @@ ResourceFile::ResourceFile( const QString &fileName , // qDebug("ResourceFile::ResourceFile : 3 %s, %s", fileName.latin1(), formatName.latin1()); - + mLastBackupDate = -1; init( fileName, formatName ); } @@ -257,6 +259,49 @@ bool ResourceFile::save( Ticket *ticket ) #ifndef NO_DIRWATCH mDirWatch.stopScan(); #endif + if ( mLastBackupDate >= 0 && mFamily != "sync_res") { + KConfig conf (locateLocal("config","microkdeglobalrc")); + conf.setGroup( "BackupSettings" ); + bool b_enabled = conf.readBoolEntry( "BackupEnabled" ); + if ( b_enabled ) { + int num = conf.readNumEntry( "BackupNumbers" ); + int d_count = conf.readNumEntry( "BackupDayCount" ); + bool stdDir = conf.readBoolEntry( "BackupUseDefaultDir" ); + QString bupDir = conf.readEntry( "BackupDatadir" ); + QDate reference ( 2000,1,1 ); + int daysTo = reference.daysTo ( QDate::currentDate() ); + bool saveDate = false; + if ( daysTo - d_count >= mLastBackupDate ) { + qDebug("KA: Last backup was %d days ago ", daysTo - mLastBackupDate ); + if ( stdDir ) + bupDir = KGlobalSettings::backupDataDir(); + int retval = KApplication::createBackup( fileName(), bupDir, num ); + if ( retval == 0 ) { + qDebug("KO: Backup cancelled. Will try again tomorrow "); + // retval == 0 : backup skipped for today, try again tomorrow + mLastBackupDate = daysTo - d_count+1; + saveDate = true; + } else if ( retval == 1 ){ + qDebug("KO: Backup created."); + // backup ok + mLastBackupDate = daysTo; + saveDate = true; + } else if ( retval == 2 ){ + qDebug("KO: Backup globally cancelled."); + // backup globally cancelled + b_enabled = false; + } + if ( !b_enabled ) { + conf.writeEntry( "mBackupEnabled", false ); + } + if ( saveDate ) { + KConfig config ( locateLocal("config","kabcrc") ); + config.setGroup( "Resource_" + identifier() ); + config.writeEntry( "LastBackupDate", mLastBackupDate ); + } + } + } + } QFile info; info.setName( fileName() ); bool ok = info.open( IO_WriteOnly ); diff --git a/kabc/plugins/file/resourcefile.h b/kabc/plugins/file/resourcefile.h index 3e9edfc..61da154 100644 --- a/kabc/plugins/file/resourcefile.h +++ b/kabc/plugins/file/resourcefile.h @@ -147,6 +147,7 @@ protected: void unlock( const QString &fileName ); private: + int mLastBackupDate; QString mFamily; QString mFileName2; QString mFormatName; diff --git a/pwmanager/pwmanager/pwmdoc.cpp b/pwmanager/pwmanager/pwmdoc.cpp index 61f2616..36b0df5 100644 --- a/pwmanager/pwmanager/pwmdoc.cpp +++ b/pwmanager/pwmanager/pwmdoc.cpp @@ -35,6 +35,8 @@ #endif #include +#include +#include #include @@ -427,6 +429,49 @@ PwMerror PwMDoc::saveDoc(char compress, const QString *file) if (!backupFile(filename)) return e_fileBackup; } + int mLastBackupDate = 0; + KConfig configGlobal (locateLocal("config","pwmanagerbuprc")); + QFileInfo fileInfo ( filename ); + mLastBackupDate = configGlobal.readNumEntry( "LastBackupDate-"+ fileInfo.fileName (), 0 ); + KConfig config (locateLocal("config","microkdeglobalrc")); + config.setGroup( "BackupSettings" ); + bool b_enabled = config.readBoolEntry( "BackupEnabled" ); + if ( b_enabled ) { + int num = config.readNumEntry( "BackupNumbers" ); + int d_count = config.readNumEntry( "BackupDayCount" ); + bool stdDir = config.readBoolEntry( "BackupUseDefaultDir" ); + QString bupDir = config.readEntry( "BackupDatadir" ); + QDate reference ( 2000,1,1 ); + int daysTo = reference.daysTo ( QDate::currentDate() ); + bool saveDate = false; + if ( daysTo - d_count >= mLastBackupDate ) { + qDebug("KA: Last backup was %d days ago ", daysTo - mLastBackupDate ); + if ( stdDir ) + bupDir = KGlobalSettings::backupDataDir(); + int retval = KApplication::createBackup( filename, bupDir, num ); + if ( retval == 0 ) { + qDebug("KO: Backup cancelled. Will try again tomorrow "); + // retval == 0 : backup skipped for today, try again tomorrow + mLastBackupDate = daysTo - d_count+1; + saveDate = true; + } else if ( retval == 1 ){ + qDebug("KO: Backup created."); + // backup ok + mLastBackupDate = daysTo; + saveDate = true; + } else if ( retval == 2 ){ + qDebug("KO: Backup globally cancelled."); + // backup globally cancelled + b_enabled = false; + } + if ( !b_enabled ) { + config.writeEntry( "mBackupEnabled", false ); + } + if ( saveDate ) { + configGlobal.writeEntry( "LastBackupDate-"+ fileInfo.fileName (), mLastBackupDate ); + } + } + } if (QFile::exists(filename)) { /* Move the existing file to some tmp file. * When saving file succeeds, delete tmp file. Otherwise -- cgit v0.9.0.2