-rw-r--r-- | libkdepim/ksyncmanager.cpp | 26 |
1 files changed, 24 insertions, 2 deletions
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp index 08a263c..5214fe7 100644 --- a/libkdepim/ksyncmanager.cpp +++ b/libkdepim/ksyncmanager.cpp | |||
@@ -1025,98 +1025,101 @@ QString KSyncManager::syncFileName() | |||
1025 | QString fn = "tempfile"; | 1025 | QString fn = "tempfile"; |
1026 | switch(mTargetApp) | 1026 | switch(mTargetApp) |
1027 | { | 1027 | { |
1028 | case (KAPI): | 1028 | case (KAPI): |
1029 | fn = "tempsyncab.vcf"; | 1029 | fn = "tempsyncab.vcf"; |
1030 | break; | 1030 | break; |
1031 | case (KOPI): | 1031 | case (KOPI): |
1032 | fn = "tempsynccal.ics"; | 1032 | fn = "tempsynccal.ics"; |
1033 | break; | 1033 | break; |
1034 | case (PWMPI): | 1034 | case (PWMPI): |
1035 | fn = "tempsyncpw.pwm"; | 1035 | fn = "tempsyncpw.pwm"; |
1036 | break; | 1036 | break; |
1037 | default: | 1037 | default: |
1038 | break; | 1038 | break; |
1039 | } | 1039 | } |
1040 | #ifdef _WIN32_ | 1040 | #ifdef _WIN32_ |
1041 | return locateLocal( "tmp", fn ); | 1041 | return locateLocal( "tmp", fn ); |
1042 | #else | 1042 | #else |
1043 | return (QString( "/tmp/" )+ fn ); | 1043 | return (QString( "/tmp/" )+ fn ); |
1044 | #endif | 1044 | #endif |
1045 | } | 1045 | } |
1046 | 1046 | ||
1047 | void KSyncManager::syncPi() | 1047 | void KSyncManager::syncPi() |
1048 | { | 1048 | { |
1049 | mIsKapiFile = true; | 1049 | mIsKapiFile = true; |
1050 | mPisyncFinished = false; | 1050 | mPisyncFinished = false; |
1051 | qApp->processEvents(); | 1051 | qApp->processEvents(); |
1052 | if ( mAskForPreferences ) | 1052 | if ( mAskForPreferences ) |
1053 | if ( !edit_pisync_options()) { | 1053 | if ( !edit_pisync_options()) { |
1054 | mParent->topLevelWidget()->setCaption( i18n("Syncing aborted. Nothing synced.") ); | 1054 | mParent->topLevelWidget()->setCaption( i18n("Syncing aborted. Nothing synced.") ); |
1055 | mPisyncFinished = true; | 1055 | mPisyncFinished = true; |
1056 | return; | 1056 | return; |
1057 | } | 1057 | } |
1058 | bool ok; | 1058 | bool ok; |
1059 | Q_UINT16 port = mActiveSyncPort.toUInt(&ok); | 1059 | Q_UINT16 port = mActiveSyncPort.toUInt(&ok); |
1060 | if ( ! ok ) { | 1060 | if ( ! ok ) { |
1061 | mParent->topLevelWidget()->setCaption( i18n("Sorry, no valid port.Syncing cancelled.") ); | 1061 | mParent->topLevelWidget()->setCaption( i18n("Sorry, no valid port.Syncing cancelled.") ); |
1062 | mPisyncFinished = true; | 1062 | mPisyncFinished = true; |
1063 | return; | 1063 | return; |
1064 | } | 1064 | } |
1065 | KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, port, mActiveSyncIP, this, mParent->topLevelWidget() ); | 1065 | KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, port, mActiveSyncIP, this, mParent->topLevelWidget() ); |
1066 | connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int )), this, SLOT(deleteCommandSocket(KCommandSocket*, int)) ); | 1066 | connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int )), this, SLOT(deleteCommandSocket(KCommandSocket*, int)) ); |
1067 | commandSocket->readFile( syncFileName() ); | 1067 | commandSocket->readFile( syncFileName() ); |
1068 | } | 1068 | } |
1069 | 1069 | ||
1070 | void KSyncManager::deleteCommandSocket(KCommandSocket*s, int state) | 1070 | void KSyncManager::deleteCommandSocket(KCommandSocket*s, int state) |
1071 | { | 1071 | { |
1072 | //enum { success, errorW, errorR, quiet }; | 1072 | //enum { success, errorW, errorR, quiet }; |
1073 | if ( state == KCommandSocket::errorR ||state == KCommandSocket::errorTO ) { | 1073 | if ( state == KCommandSocket::errorR ||state == KCommandSocket::errorTO ||state == KCommandSocket::errorPW ) { |
1074 | mParent->topLevelWidget()->setCaption( i18n("ERROR: Receiving remote file failed.") ); | 1074 | if ( state == KCommandSocket::errorPW ) |
1075 | mParent->topLevelWidget()->setCaption( i18n("Wrong password: Receiving remote file failed.") ); | ||
1076 | else | ||
1077 | mParent->topLevelWidget()->setCaption( i18n("ERROR: Receiving remote file failed.") ); | ||
1075 | delete s; | 1078 | delete s; |
1076 | if ( state == KCommandSocket::errorR ) { | 1079 | if ( state == KCommandSocket::errorR ) { |
1077 | KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, mActiveSyncPort.toUInt(), mActiveSyncIP, this, mParent->topLevelWidget()); | 1080 | KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, mActiveSyncPort.toUInt(), mActiveSyncIP, this, mParent->topLevelWidget()); |
1078 | connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int)), this, SLOT(deleteCommandSocket(KCommandSocket*, int )) ); | 1081 | connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int)), this, SLOT(deleteCommandSocket(KCommandSocket*, int )) ); |
1079 | commandSocket->sendStop(); | 1082 | commandSocket->sendStop(); |
1080 | } | 1083 | } |
1081 | mPisyncFinished = true; | 1084 | mPisyncFinished = true; |
1082 | return; | 1085 | return; |
1083 | 1086 | ||
1084 | } else if ( state == KCommandSocket::errorW ) { | 1087 | } else if ( state == KCommandSocket::errorW ) { |
1085 | mParent->topLevelWidget()->setCaption( i18n("ERROR:Writing back file failed.") ); | 1088 | mParent->topLevelWidget()->setCaption( i18n("ERROR:Writing back file failed.") ); |
1086 | mPisyncFinished = true; | 1089 | mPisyncFinished = true; |
1087 | 1090 | ||
1088 | } else if ( state == KCommandSocket::successR ) { | 1091 | } else if ( state == KCommandSocket::successR ) { |
1089 | QTimer::singleShot( 1, this , SLOT ( readFileFromSocket())); | 1092 | QTimer::singleShot( 1, this , SLOT ( readFileFromSocket())); |
1090 | 1093 | ||
1091 | } else if ( state == KCommandSocket::successW ) { | 1094 | } else if ( state == KCommandSocket::successW ) { |
1092 | mParent->topLevelWidget()->setCaption( i18n("Pi-Sync successful!") ); | 1095 | mParent->topLevelWidget()->setCaption( i18n("Pi-Sync successful!") ); |
1093 | mPisyncFinished = true; | 1096 | mPisyncFinished = true; |
1094 | } else if ( state == KCommandSocket::quiet ){ | 1097 | } else if ( state == KCommandSocket::quiet ){ |
1095 | qDebug("KSS: quiet "); | 1098 | qDebug("KSS: quiet "); |
1096 | mPisyncFinished = true; | 1099 | mPisyncFinished = true; |
1097 | } else { | 1100 | } else { |
1098 | qDebug("KSS: Error: unknown state: %d ", state); | 1101 | qDebug("KSS: Error: unknown state: %d ", state); |
1099 | mPisyncFinished = true; | 1102 | mPisyncFinished = true; |
1100 | } | 1103 | } |
1101 | 1104 | ||
1102 | delete s; | 1105 | delete s; |
1103 | } | 1106 | } |
1104 | 1107 | ||
1105 | void KSyncManager::readFileFromSocket() | 1108 | void KSyncManager::readFileFromSocket() |
1106 | { | 1109 | { |
1107 | QString fileName = syncFileName(); | 1110 | QString fileName = syncFileName(); |
1108 | bool syncOK = true; | 1111 | bool syncOK = true; |
1109 | mParent->topLevelWidget()->setCaption( i18n("Remote file saved to temp file.") ); | 1112 | mParent->topLevelWidget()->setCaption( i18n("Remote file saved to temp file.") ); |
1110 | if ( ! syncWithFile( fileName , true ) ) { | 1113 | if ( ! syncWithFile( fileName , true ) ) { |
1111 | mParent->topLevelWidget()->setCaption( i18n("Syncing failed.") ); | 1114 | mParent->topLevelWidget()->setCaption( i18n("Syncing failed.") ); |
1112 | syncOK = false; | 1115 | syncOK = false; |
1113 | } | 1116 | } |
1114 | KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, mActiveSyncPort.toUInt(), mActiveSyncIP, this, mParent->topLevelWidget() ); | 1117 | KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, mActiveSyncPort.toUInt(), mActiveSyncIP, this, mParent->topLevelWidget() ); |
1115 | connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int)), this, SLOT(deleteCommandSocket(KCommandSocket*, int )) ); | 1118 | connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int)), this, SLOT(deleteCommandSocket(KCommandSocket*, int )) ); |
1116 | if ( mWriteBackFile && syncOK ) | 1119 | if ( mWriteBackFile && syncOK ) |
1117 | commandSocket->writeFile( fileName ); | 1120 | commandSocket->writeFile( fileName ); |
1118 | else { | 1121 | else { |
1119 | commandSocket->sendStop(); | 1122 | commandSocket->sendStop(); |
1120 | if ( syncOK ) | 1123 | if ( syncOK ) |
1121 | mParent->topLevelWidget()->setCaption( i18n("Pi-Sync succesful!") ); | 1124 | mParent->topLevelWidget()->setCaption( i18n("Pi-Sync succesful!") ); |
1122 | mPisyncFinished = true; | 1125 | mPisyncFinished = true; |
@@ -1156,96 +1159,105 @@ void KServerSocket::discardClient() | |||
1156 | } | 1159 | } |
1157 | void KServerSocket::readClient() | 1160 | void KServerSocket::readClient() |
1158 | { | 1161 | { |
1159 | if ( blockRC ) | 1162 | if ( blockRC ) |
1160 | return; | 1163 | return; |
1161 | if ( mSocket == 0 ) { | 1164 | if ( mSocket == 0 ) { |
1162 | qDebug("ERROR::KSS::readClient(): mSocket == 0 "); | 1165 | qDebug("ERROR::KSS::readClient(): mSocket == 0 "); |
1163 | return; | 1166 | return; |
1164 | } | 1167 | } |
1165 | //qDebug("KServerSocket::readClient()"); | 1168 | //qDebug("KServerSocket::readClient()"); |
1166 | if ( mSocket->canReadLine() ) { | 1169 | if ( mSocket->canReadLine() ) { |
1167 | QString line = mSocket->readLine(); | 1170 | QString line = mSocket->readLine(); |
1168 | //qDebug("KServerSocket readline: %s ", line.latin1()); | 1171 | //qDebug("KServerSocket readline: %s ", line.latin1()); |
1169 | QStringList tokens = QStringList::split( QRegExp("[ \r\n][ \r\n]*"), line ); | 1172 | QStringList tokens = QStringList::split( QRegExp("[ \r\n][ \r\n]*"), line ); |
1170 | if ( tokens[0] == "GET" ) { | 1173 | if ( tokens[0] == "GET" ) { |
1171 | if ( tokens[1] == mPassWord ) { | 1174 | if ( tokens[1] == mPassWord ) { |
1172 | //emit sendFile( mSocket ); | 1175 | //emit sendFile( mSocket ); |
1173 | bool ok = false; | 1176 | bool ok = false; |
1174 | QDateTime dt = KGlobal::locale()->readDateTime( tokens[2], KLocale::ISODate, &ok); | 1177 | QDateTime dt = KGlobal::locale()->readDateTime( tokens[2], KLocale::ISODate, &ok); |
1175 | if ( ok ) { | 1178 | if ( ok ) { |
1176 | KSyncManager::mRequestedSyncEvent = dt; | 1179 | KSyncManager::mRequestedSyncEvent = dt; |
1177 | } | 1180 | } |
1178 | else | 1181 | else |
1179 | KSyncManager::mRequestedSyncEvent = QDateTime(); | 1182 | KSyncManager::mRequestedSyncEvent = QDateTime(); |
1180 | send_file(); | 1183 | send_file(); |
1181 | } | 1184 | } |
1182 | else { | 1185 | else { |
1183 | KMessageBox::error( 0, i18n("Got send file request\nwith invalid password")); | 1186 | KMessageBox::error( 0, i18n("Got send file request\nwith invalid password")); |
1184 | //qDebug("password %s, invalid password %s ",mPassWord.latin1(), tokens[1].latin1() ); | 1187 | //qDebug("password %s, invalid password %s ",mPassWord.latin1(), tokens[1].latin1() ); |
1185 | } | 1188 | } |
1186 | } | 1189 | } |
1187 | if ( tokens[0] == "PUT" ) { | 1190 | if ( tokens[0] == "PUT" ) { |
1188 | if ( tokens[1] == mPassWord ) { | 1191 | if ( tokens[1] == mPassWord ) { |
1189 | //emit getFile( mSocket ); | 1192 | //emit getFile( mSocket ); |
1190 | blockRC = true; | 1193 | blockRC = true; |
1191 | get_file(); | 1194 | get_file(); |
1192 | } | 1195 | } |
1193 | else { | 1196 | else { |
1194 | KMessageBox::error( 0, i18n("Got receive file request\nwith invalid password")); | 1197 | KMessageBox::error( 0, i18n("Got receive file request\nwith invalid password")); |
1195 | //qDebug("password %s, invalid password %s ",mPassWord.latin1(), tokens[1].latin1() ); | 1198 | //qDebug("password %s, invalid password %s ",mPassWord.latin1(), tokens[1].latin1() ); |
1196 | } | 1199 | } |
1197 | } | 1200 | } |
1198 | if ( tokens[0] == "STOP" ) { | 1201 | if ( tokens[0] == "STOP" ) { |
1199 | //emit endConnect(); | 1202 | //emit endConnect(); |
1200 | end_connect(); | 1203 | end_connect(); |
1201 | } | 1204 | } |
1202 | } | 1205 | } |
1203 | } | 1206 | } |
1207 | void KServerSocket::error_connect() | ||
1208 | { | ||
1209 | QTextStream os( mSocket ); | ||
1210 | os.setEncoding( QTextStream::Latin1 ); | ||
1211 | os << "ERROR_PW\r\n\r\n"; | ||
1212 | mSocket->close(); | ||
1213 | if ( mSocket->state() == QSocket::Idle ) | ||
1214 | QTimer::singleShot( 10, this , SLOT ( discardClient())); | ||
1215 | } | ||
1204 | void KServerSocket::end_connect() | 1216 | void KServerSocket::end_connect() |
1205 | { | 1217 | { |
1206 | delete mSyncActionDialog; | 1218 | delete mSyncActionDialog; |
1207 | mSyncActionDialog = 0; | 1219 | mSyncActionDialog = 0; |
1208 | } | 1220 | } |
1209 | void KServerSocket::send_file() | 1221 | void KServerSocket::send_file() |
1210 | { | 1222 | { |
1211 | //qDebug("MainWindow::sendFile(QSocket* s) "); | 1223 | //qDebug("MainWindow::sendFile(QSocket* s) "); |
1212 | if ( mSyncActionDialog ) | 1224 | if ( mSyncActionDialog ) |
1213 | delete mSyncActionDialog; | 1225 | delete mSyncActionDialog; |
1214 | mSyncActionDialog = new QDialog ( 0, "input-dialog", true ); | 1226 | mSyncActionDialog = new QDialog ( 0, "input-dialog", true ); |
1215 | mSyncActionDialog->setCaption(i18n("Received sync request")); | 1227 | mSyncActionDialog->setCaption(i18n("Received sync request")); |
1216 | QLabel* label = new QLabel( i18n("Synchronizing from remote ...\n\nDo not use this application!\n\nIf syncing fails\nyou can close this dialog."), mSyncActionDialog ); | 1228 | QLabel* label = new QLabel( i18n("Synchronizing from remote ...\n\nDo not use this application!\n\nIf syncing fails\nyou can close this dialog."), mSyncActionDialog ); |
1217 | label->setAlignment ( Qt::AlignHCenter ); | 1229 | label->setAlignment ( Qt::AlignHCenter ); |
1218 | QVBoxLayout* lay = new QVBoxLayout( mSyncActionDialog ); | 1230 | QVBoxLayout* lay = new QVBoxLayout( mSyncActionDialog ); |
1219 | lay->addWidget( label); | 1231 | lay->addWidget( label); |
1220 | lay->setMargin(7); | 1232 | lay->setMargin(7); |
1221 | lay->setSpacing(7); | 1233 | lay->setSpacing(7); |
1222 | if ( KSyncManager::mRequestedSyncEvent.isValid() ) { | 1234 | if ( KSyncManager::mRequestedSyncEvent.isValid() ) { |
1223 | int secs = QDateTime::currentDateTime().secsTo( KSyncManager::mRequestedSyncEvent ); | 1235 | int secs = QDateTime::currentDateTime().secsTo( KSyncManager::mRequestedSyncEvent ); |
1224 | if ( secs < 0 ) | 1236 | if ( secs < 0 ) |
1225 | secs = secs * (-1); | 1237 | secs = secs * (-1); |
1226 | if ( secs > 30 ) | 1238 | if ( secs > 30 ) |
1227 | //if ( true ) | 1239 | //if ( true ) |
1228 | { | 1240 | { |
1229 | QString warning = i18n("Clock skew of\nsyncing devices\nis %1 seconds!").arg( secs ); | 1241 | QString warning = i18n("Clock skew of\nsyncing devices\nis %1 seconds!").arg( secs ); |
1230 | QLabel* label = new QLabel( warning, mSyncActionDialog ); | 1242 | QLabel* label = new QLabel( warning, mSyncActionDialog ); |
1231 | label->setAlignment ( Qt::AlignHCenter ); | 1243 | label->setAlignment ( Qt::AlignHCenter ); |
1232 | lay->addWidget( label); | 1244 | lay->addWidget( label); |
1233 | if ( secs > 180 ) | 1245 | if ( secs > 180 ) |
1234 | { | 1246 | { |
1235 | if ( secs > 300 ) { | 1247 | if ( secs > 300 ) { |
1236 | if ( KMessageBox::Cancel == KMessageBox::warningContinueCancel(0, i18n("The clocks of the syncing\ndevices have a difference\nof more than 5 minutes.\nPlease adjust your clocks.\nYou may get wrong syncing results!\nPlease confirm synchronization!"), i18n("High clock skew!"),i18n("Synchronize!"))) { | 1248 | if ( KMessageBox::Cancel == KMessageBox::warningContinueCancel(0, i18n("The clocks of the syncing\ndevices have a difference\nof more than 5 minutes.\nPlease adjust your clocks.\nYou may get wrong syncing results!\nPlease confirm synchronization!"), i18n("High clock skew!"),i18n("Synchronize!"))) { |
1237 | qDebug("KSS::Sync cancelled ,cs"); | 1249 | qDebug("KSS::Sync cancelled ,cs"); |
1238 | return ; | 1250 | return ; |
1239 | } | 1251 | } |
1240 | } | 1252 | } |
1241 | QFont f = label->font(); | 1253 | QFont f = label->font(); |
1242 | f.setPointSize ( f.pointSize() *2 ); | 1254 | f.setPointSize ( f.pointSize() *2 ); |
1243 | f. setBold (true ); | 1255 | f. setBold (true ); |
1244 | QLabel* label = new QLabel( warning, mSyncActionDialog ); | 1256 | QLabel* label = new QLabel( warning, mSyncActionDialog ); |
1245 | label->setFont( f ); | 1257 | label->setFont( f ); |
1246 | warning = i18n("ADJUST\nYOUR\nCLOCKS!"); | 1258 | warning = i18n("ADJUST\nYOUR\nCLOCKS!"); |
1247 | label->setText( warning ); | 1259 | label->setText( warning ); |
1248 | label->setAlignment ( Qt::AlignHCenter ); | 1260 | label->setAlignment ( Qt::AlignHCenter ); |
1249 | lay->addWidget( label); | 1261 | lay->addWidget( label); |
1250 | mSyncActionDialog->setFixedSize( 230, 300); | 1262 | mSyncActionDialog->setFixedSize( 230, 300); |
1251 | } else { | 1263 | } else { |
@@ -1306,96 +1318,97 @@ void KServerSocket::readBackFileFromSocket() | |||
1306 | piTime.restart(); | 1318 | piTime.restart(); |
1307 | QString line = mSocket->readLine (); | 1319 | QString line = mSocket->readLine (); |
1308 | piFileString += line; | 1320 | piFileString += line; |
1309 | //qDebug("readline: %s ", line.latin1()); | 1321 | //qDebug("readline: %s ", line.latin1()); |
1310 | mSyncActionDialog->setCaption( i18n("Received %1 bytes").arg( piFileString.length() ) ); | 1322 | mSyncActionDialog->setCaption( i18n("Received %1 bytes").arg( piFileString.length() ) ); |
1311 | 1323 | ||
1312 | } | 1324 | } |
1313 | if ( piTime.elapsed () < 3000 ) { | 1325 | if ( piTime.elapsed () < 3000 ) { |
1314 | // wait for more | 1326 | // wait for more |
1315 | //qDebug("waitformore "); | 1327 | //qDebug("waitformore "); |
1316 | QTimer::singleShot( 100, this , SLOT (readBackFileFromSocket( ) )); | 1328 | QTimer::singleShot( 100, this , SLOT (readBackFileFromSocket( ) )); |
1317 | return; | 1329 | return; |
1318 | } | 1330 | } |
1319 | QString fileName = mFileName; | 1331 | QString fileName = mFileName; |
1320 | QFile file ( fileName ); | 1332 | QFile file ( fileName ); |
1321 | if (!file.open( IO_WriteOnly ) ) { | 1333 | if (!file.open( IO_WriteOnly ) ) { |
1322 | delete mSyncActionDialog; | 1334 | delete mSyncActionDialog; |
1323 | mSyncActionDialog = 0; | 1335 | mSyncActionDialog = 0; |
1324 | qDebug("KSS:Error open read back file "); | 1336 | qDebug("KSS:Error open read back file "); |
1325 | piFileString = ""; | 1337 | piFileString = ""; |
1326 | emit file_received( false ); | 1338 | emit file_received( false ); |
1327 | blockRC = false; | 1339 | blockRC = false; |
1328 | return ; | 1340 | return ; |
1329 | 1341 | ||
1330 | } | 1342 | } |
1331 | 1343 | ||
1332 | // mView->setLoadedFileVersion(QDateTime::currentDateTime().addSecs( -1)); | 1344 | // mView->setLoadedFileVersion(QDateTime::currentDateTime().addSecs( -1)); |
1333 | QTextStream ts ( &file ); | 1345 | QTextStream ts ( &file ); |
1334 | ts.setEncoding( QTextStream::Latin1 ); | 1346 | ts.setEncoding( QTextStream::Latin1 ); |
1335 | mSyncActionDialog->setCaption( i18n("Writing file to disk...") ); | 1347 | mSyncActionDialog->setCaption( i18n("Writing file to disk...") ); |
1336 | ts << piFileString; | 1348 | ts << piFileString; |
1337 | mSocket->close(); | 1349 | mSocket->close(); |
1338 | if ( mSocket->state() == QSocket::Idle ) | 1350 | if ( mSocket->state() == QSocket::Idle ) |
1339 | QTimer::singleShot( 10, this , SLOT ( discardClient())); | 1351 | QTimer::singleShot( 10, this , SLOT ( discardClient())); |
1340 | file.close(); | 1352 | file.close(); |
1341 | piFileString = ""; | 1353 | piFileString = ""; |
1342 | emit file_received( true ); | 1354 | emit file_received( true ); |
1343 | delete mSyncActionDialog; | 1355 | delete mSyncActionDialog; |
1344 | mSyncActionDialog = 0; | 1356 | mSyncActionDialog = 0; |
1345 | blockRC = false; | 1357 | blockRC = false; |
1346 | 1358 | ||
1347 | } | 1359 | } |
1348 | 1360 | ||
1349 | KCommandSocket::KCommandSocket ( QString password, Q_UINT16 port, QString host, QObject * parent, QWidget * cap, const char * name ): QObject( parent, name ) | 1361 | KCommandSocket::KCommandSocket ( QString password, Q_UINT16 port, QString host, QObject * parent, QWidget * cap, const char * name ): QObject( parent, name ) |
1350 | { | 1362 | { |
1351 | mPassWord = password; | 1363 | mPassWord = password; |
1352 | mSocket = 0; | 1364 | mSocket = 0; |
1353 | mFirst = false; | 1365 | mFirst = false; |
1366 | mFirstLine = true; | ||
1354 | mPort = port; | 1367 | mPort = port; |
1355 | mHost = host; | 1368 | mHost = host; |
1356 | tlw = cap; | 1369 | tlw = cap; |
1357 | mRetVal = quiet; | 1370 | mRetVal = quiet; |
1358 | mTimerSocket = new QTimer ( this ); | 1371 | mTimerSocket = new QTimer ( this ); |
1359 | connect( mTimerSocket, SIGNAL ( timeout () ), this, SLOT ( deleteSocket() ) ); | 1372 | connect( mTimerSocket, SIGNAL ( timeout () ), this, SLOT ( deleteSocket() ) ); |
1360 | } | 1373 | } |
1361 | void KCommandSocket::sendFileRequest() | 1374 | void KCommandSocket::sendFileRequest() |
1362 | { | 1375 | { |
1363 | if ( tlw ) | 1376 | if ( tlw ) |
1364 | tlw->setCaption( i18n("Connected! Sending request for remote file ...") ); | 1377 | tlw->setCaption( i18n("Connected! Sending request for remote file ...") ); |
1365 | mTimerSocket->start( 300000 ); | 1378 | mTimerSocket->start( 300000 ); |
1366 | QTextStream os( mSocket ); | 1379 | QTextStream os( mSocket ); |
1367 | os.setEncoding( QTextStream::Latin1 ); | 1380 | os.setEncoding( QTextStream::Latin1 ); |
1368 | 1381 | ||
1369 | QString curDt = " " +KGlobal::locale()->formatDateTime(QDateTime::currentDateTime().addSecs(-1),true, true,KLocale::ISODate ); | 1382 | QString curDt = " " +KGlobal::locale()->formatDateTime(QDateTime::currentDateTime().addSecs(-1),true, true,KLocale::ISODate ); |
1370 | os << "GET " << mPassWord << curDt <<"\r\n\r\n"; | 1383 | os << "GET " << mPassWord << curDt <<"\r\n\r\n"; |
1371 | } | 1384 | } |
1372 | 1385 | ||
1373 | void KCommandSocket::readFile( QString fn ) | 1386 | void KCommandSocket::readFile( QString fn ) |
1374 | { | 1387 | { |
1375 | if ( !mSocket ) { | 1388 | if ( !mSocket ) { |
1376 | mSocket = new QSocket( this ); | 1389 | mSocket = new QSocket( this ); |
1377 | connect( mSocket, SIGNAL(readyRead()), this, SLOT(startReadFileFromSocket()) ); | 1390 | connect( mSocket, SIGNAL(readyRead()), this, SLOT(startReadFileFromSocket()) ); |
1378 | connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) ); | 1391 | connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) ); |
1379 | connect( mSocket, SIGNAL(connected ()), this, SLOT(sendFileRequest() )); | 1392 | connect( mSocket, SIGNAL(connected ()), this, SLOT(sendFileRequest() )); |
1380 | } | 1393 | } |
1381 | mFileString = ""; | 1394 | mFileString = ""; |
1382 | mFileName = fn; | 1395 | mFileName = fn; |
1383 | mFirst = true; | 1396 | mFirst = true; |
1384 | if ( tlw ) | 1397 | if ( tlw ) |
1385 | tlw->setCaption( i18n("Trying to connect to remote...") ); | 1398 | tlw->setCaption( i18n("Trying to connect to remote...") ); |
1386 | mTimerSocket->start( 20000 ); | 1399 | mTimerSocket->start( 20000 ); |
1387 | mSocket->connectToHost( mHost, mPort ); | 1400 | mSocket->connectToHost( mHost, mPort ); |
1388 | qDebug("KSS: Waiting for connection"); | 1401 | qDebug("KSS: Waiting for connection"); |
1389 | } | 1402 | } |
1390 | 1403 | ||
1391 | void KCommandSocket::writeFile( QString fileName ) | 1404 | void KCommandSocket::writeFile( QString fileName ) |
1392 | { | 1405 | { |
1393 | if ( !mSocket ) { | 1406 | if ( !mSocket ) { |
1394 | mSocket = new QSocket( this ); | 1407 | mSocket = new QSocket( this ); |
1395 | connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) ); | 1408 | connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) ); |
1396 | connect( mSocket, SIGNAL(connected ()), this, SLOT(writeFileToSocket()) ); | 1409 | connect( mSocket, SIGNAL(connected ()), this, SLOT(writeFileToSocket()) ); |
1397 | } | 1410 | } |
1398 | mFileName = fileName ; | 1411 | mFileName = fileName ; |
1399 | mTimerSocket->start( 20000 ); | 1412 | mTimerSocket->start( 20000 ); |
1400 | mSocket->connectToHost( mHost, mPort ); | 1413 | mSocket->connectToHost( mHost, mPort ); |
1401 | } | 1414 | } |
@@ -1403,105 +1416,114 @@ void KCommandSocket::writeFileToSocket() | |||
1403 | { | 1416 | { |
1404 | mTimerSocket->stop(); | 1417 | mTimerSocket->stop(); |
1405 | QFile file2( mFileName ); | 1418 | QFile file2( mFileName ); |
1406 | if (!file2.open( IO_ReadOnly ) ) { | 1419 | if (!file2.open( IO_ReadOnly ) ) { |
1407 | mRetVal= errorW; | 1420 | mRetVal= errorW; |
1408 | mSocket->close(); | 1421 | mSocket->close(); |
1409 | if ( mSocket->state() == QSocket::Idle ) | 1422 | if ( mSocket->state() == QSocket::Idle ) |
1410 | QTimer::singleShot( 10, this , SLOT ( deleteSocket())); | 1423 | QTimer::singleShot( 10, this , SLOT ( deleteSocket())); |
1411 | return ; | 1424 | return ; |
1412 | } | 1425 | } |
1413 | QTextStream ts2( &file2 ); | 1426 | QTextStream ts2( &file2 ); |
1414 | ts2.setEncoding( QTextStream::Latin1 ); | 1427 | ts2.setEncoding( QTextStream::Latin1 ); |
1415 | QTextStream os2( mSocket ); | 1428 | QTextStream os2( mSocket ); |
1416 | os2.setEncoding( QTextStream::Latin1 ); | 1429 | os2.setEncoding( QTextStream::Latin1 ); |
1417 | os2 << "PUT " << mPassWord << "\r\n\r\n";; | 1430 | os2 << "PUT " << mPassWord << "\r\n\r\n";; |
1418 | while ( ! ts2.atEnd() ) { | 1431 | while ( ! ts2.atEnd() ) { |
1419 | os2 << ts2.readLine() << "\r\n"; | 1432 | os2 << ts2.readLine() << "\r\n"; |
1420 | } | 1433 | } |
1421 | os2 << "\r\n"; | 1434 | os2 << "\r\n"; |
1422 | mRetVal= successW; | 1435 | mRetVal= successW; |
1423 | file2.close(); | 1436 | file2.close(); |
1424 | mSocket->close(); | 1437 | mSocket->close(); |
1425 | if ( mSocket->state() == QSocket::Idle ) | 1438 | if ( mSocket->state() == QSocket::Idle ) |
1426 | QTimer::singleShot( 10, this , SLOT ( deleteSocket())); | 1439 | QTimer::singleShot( 10, this , SLOT ( deleteSocket())); |
1427 | } | 1440 | } |
1428 | void KCommandSocket::sendStop() | 1441 | void KCommandSocket::sendStop() |
1429 | { | 1442 | { |
1430 | if ( !mSocket ) { | 1443 | if ( !mSocket ) { |
1431 | mSocket = new QSocket( this ); | 1444 | mSocket = new QSocket( this ); |
1432 | connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) ); | 1445 | connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) ); |
1433 | } | 1446 | } |
1434 | mSocket->connectToHost( mHost, mPort ); | 1447 | mSocket->connectToHost( mHost, mPort ); |
1435 | QTextStream os2( mSocket ); | 1448 | QTextStream os2( mSocket ); |
1436 | os2.setEncoding( QTextStream::Latin1 ); | 1449 | os2.setEncoding( QTextStream::Latin1 ); |
1437 | os2 << "STOP\r\n\r\n"; | 1450 | os2 << "STOP\r\n\r\n"; |
1438 | mSocket->close(); | 1451 | mSocket->close(); |
1439 | if ( mSocket->state() == QSocket::Idle ) | 1452 | if ( mSocket->state() == QSocket::Idle ) |
1440 | QTimer::singleShot( 10, this , SLOT ( deleteSocket())); | 1453 | QTimer::singleShot( 10, this , SLOT ( deleteSocket())); |
1441 | } | 1454 | } |
1442 | 1455 | ||
1443 | void KCommandSocket::startReadFileFromSocket() | 1456 | void KCommandSocket::startReadFileFromSocket() |
1444 | { | 1457 | { |
1445 | if ( ! mFirst ) | 1458 | if ( ! mFirst ) |
1446 | return; | 1459 | return; |
1447 | mFirst = false; | 1460 | mFirst = false; |
1448 | mTimerSocket->stop(); | 1461 | mTimerSocket->stop(); |
1449 | mFileString = ""; | 1462 | mFileString = ""; |
1450 | mTime.start(); | 1463 | mTime.start(); |
1464 | mFirstLine = true; | ||
1451 | QTimer::singleShot( 1, this , SLOT (readFileFromSocket( ) )); | 1465 | QTimer::singleShot( 1, this , SLOT (readFileFromSocket( ) )); |
1452 | 1466 | ||
1453 | } | 1467 | } |
1454 | void KCommandSocket::readFileFromSocket() | 1468 | void KCommandSocket::readFileFromSocket() |
1455 | { | 1469 | { |
1456 | //qDebug("readBackFileFromSocket() %d ", mTime.elapsed ()); | 1470 | //qDebug("readBackFileFromSocket() %d ", mTime.elapsed ()); |
1457 | while ( mSocket->canReadLine () ) { | 1471 | while ( mSocket->canReadLine () ) { |
1458 | mTime.restart(); | 1472 | mTime.restart(); |
1459 | QString line = mSocket->readLine (); | 1473 | QString line = mSocket->readLine (); |
1474 | if ( mFirstLine ) { | ||
1475 | mFirstLine = false; | ||
1476 | if ( line.left( 8 ) == "ERROR_PW" ) { | ||
1477 | mRetVal = errorPW; | ||
1478 | deleteSocket(); | ||
1479 | return ; | ||
1480 | } | ||
1481 | } | ||
1460 | mFileString += line; | 1482 | mFileString += line; |
1461 | //qDebug("readline: %s ", line.latin1()); | 1483 | //qDebug("readline: %s ", line.latin1()); |
1462 | } | 1484 | } |
1463 | if ( mTime.elapsed () < 3000 ) { | 1485 | if ( mTime.elapsed () < 3000 ) { |
1464 | // wait for more | 1486 | // wait for more |
1465 | //qDebug("waitformore "); | 1487 | //qDebug("waitformore "); |
1466 | QTimer::singleShot( 100, this , SLOT (readFileFromSocket( ) )); | 1488 | QTimer::singleShot( 100, this , SLOT (readFileFromSocket( ) )); |
1467 | return; | 1489 | return; |
1468 | } | 1490 | } |
1469 | QString fileName = mFileName; | 1491 | QString fileName = mFileName; |
1470 | QFile file ( fileName ); | 1492 | QFile file ( fileName ); |
1471 | if (!file.open( IO_WriteOnly ) ) { | 1493 | if (!file.open( IO_WriteOnly ) ) { |
1472 | mFileString = ""; | 1494 | mFileString = ""; |
1473 | mRetVal = errorR; | 1495 | mRetVal = errorR; |
1474 | qDebug("KSS:Error open temp sync file for writing: %s",fileName.latin1() ); | 1496 | qDebug("KSS:Error open temp sync file for writing: %s",fileName.latin1() ); |
1475 | deleteSocket(); | 1497 | deleteSocket(); |
1476 | return ; | 1498 | return ; |
1477 | 1499 | ||
1478 | } | 1500 | } |
1479 | // mView->setLoadedFileVersion(QDateTime::currentDateTime().addSecs( -1)); | 1501 | // mView->setLoadedFileVersion(QDateTime::currentDateTime().addSecs( -1)); |
1480 | QTextStream ts ( &file ); | 1502 | QTextStream ts ( &file ); |
1481 | ts.setEncoding( QTextStream::Latin1 ); | 1503 | ts.setEncoding( QTextStream::Latin1 ); |
1482 | ts << mFileString; | 1504 | ts << mFileString; |
1483 | file.close(); | 1505 | file.close(); |
1484 | mFileString = ""; | 1506 | mFileString = ""; |
1485 | mRetVal = successR; | 1507 | mRetVal = successR; |
1486 | mSocket->close(); | 1508 | mSocket->close(); |
1487 | // if state is not idle, deleteSocket(); is called via | 1509 | // if state is not idle, deleteSocket(); is called via |
1488 | // connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) ); | 1510 | // connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) ); |
1489 | if ( mSocket->state() == QSocket::Idle ) | 1511 | if ( mSocket->state() == QSocket::Idle ) |
1490 | deleteSocket(); | 1512 | deleteSocket(); |
1491 | } | 1513 | } |
1492 | 1514 | ||
1493 | void KCommandSocket::deleteSocket() | 1515 | void KCommandSocket::deleteSocket() |
1494 | { | 1516 | { |
1495 | //qDebug("KCommandSocket::deleteSocket() "); | 1517 | //qDebug("KCommandSocket::deleteSocket() "); |
1496 | if ( mTimerSocket->isActive () ) { | 1518 | if ( mTimerSocket->isActive () ) { |
1497 | mTimerSocket->stop(); | 1519 | mTimerSocket->stop(); |
1498 | mRetVal = errorTO; | 1520 | mRetVal = errorTO; |
1499 | qDebug("KCS::Connection to remote host timed out"); | 1521 | qDebug("KCS::Connection to remote host timed out"); |
1500 | if ( mSocket ) { | 1522 | if ( mSocket ) { |
1501 | mSocket->close(); | 1523 | mSocket->close(); |
1502 | //if ( mSocket->state() == QSocket::Idle ) | 1524 | //if ( mSocket->state() == QSocket::Idle ) |
1503 | // deleteSocket(); | 1525 | // deleteSocket(); |
1504 | delete mSocket; | 1526 | delete mSocket; |
1505 | mSocket = 0; | 1527 | mSocket = 0; |
1506 | } | 1528 | } |
1507 | KMessageBox::error( 0, i18n("Connection to remote\nhost timed out!\nDid you forgot to enable\nsyncing on remote host?")); | 1529 | KMessageBox::error( 0, i18n("Connection to remote\nhost timed out!\nDid you forgot to enable\nsyncing on remote host?")); |