-rw-r--r-- | libkdepim/ksyncmanager.cpp | 97 |
1 files changed, 78 insertions, 19 deletions
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp index fc0ac6b..f2ee0ab 100644 --- a/libkdepim/ksyncmanager.cpp +++ b/libkdepim/ksyncmanager.cpp | |||
@@ -332,49 +332,49 @@ void KSyncManager::slotSyncMenu( int action ) | |||
332 | //qDebug("waiting "); | 332 | //qDebug("waiting "); |
333 | qApp->processEvents(); | 333 | qApp->processEvents(); |
334 | } | 334 | } |
335 | } else | 335 | } else |
336 | syncRemote( temp ); | 336 | syncRemote( temp ); |
337 | 337 | ||
338 | } | 338 | } |
339 | } | 339 | } |
340 | delete temp; | 340 | delete temp; |
341 | setBlockSave(false); | 341 | setBlockSave(false); |
342 | } | 342 | } |
343 | 343 | ||
344 | void KSyncManager::enableQuick( bool ask ) | 344 | void KSyncManager::enableQuick( bool ask ) |
345 | { | 345 | { |
346 | bool autoStart; | 346 | bool autoStart; |
347 | bool changed = false; | 347 | bool changed = false; |
348 | if ( ask ) { | 348 | if ( ask ) { |
349 | QDialog dia ( 0, "input-dialog", true ); | 349 | QDialog dia ( 0, "input-dialog", true ); |
350 | QLineEdit lab ( &dia ); | 350 | QLineEdit lab ( &dia ); |
351 | QVBoxLayout lay( &dia ); | 351 | QVBoxLayout lay( &dia ); |
352 | lab.setText( mPrefs->mPassiveSyncPort ); | 352 | lab.setText( mPrefs->mPassiveSyncPort ); |
353 | lay.setMargin(7); | 353 | lay.setMargin(7); |
354 | lay.setSpacing(7); | 354 | lay.setSpacing(7); |
355 | int po = 9197+mTargetApp; | 355 | int po = 9197+mTargetApp; |
356 | QLabel label ( i18n("Port number (Default: %1)").arg(po), &dia ); | 356 | QLabel label ( i18n("Port number (Default: %1)\nValid range from 1 to 65535").arg(po), &dia ); |
357 | lay.addWidget( &label); | 357 | lay.addWidget( &label); |
358 | lay.addWidget( &lab); | 358 | lay.addWidget( &lab); |
359 | 359 | ||
360 | QLineEdit lepw ( &dia ); | 360 | QLineEdit lepw ( &dia ); |
361 | lepw.setText( mPrefs->mPassiveSyncPw ); | 361 | lepw.setText( mPrefs->mPassiveSyncPw ); |
362 | QLabel label2 ( i18n("Password to enable\naccess from remote:"), &dia ); | 362 | QLabel label2 ( i18n("Password to enable\naccess from remote:"), &dia ); |
363 | lay.addWidget( &label2); | 363 | lay.addWidget( &label2); |
364 | lay.addWidget( &lepw); | 364 | lay.addWidget( &lepw); |
365 | QCheckBox autostart(i18n("Automatically start\nat application startup"), &dia ); | 365 | QCheckBox autostart(i18n("Automatically start\nat application startup"), &dia ); |
366 | lay.addWidget( &autostart); | 366 | lay.addWidget( &autostart); |
367 | autostart.setChecked( mPrefs->mPassiveSyncAutoStart ); | 367 | autostart.setChecked( mPrefs->mPassiveSyncAutoStart ); |
368 | #ifdef DESKTOP_VERSION | 368 | #ifdef DESKTOP_VERSION |
369 | #ifdef _WIN32_ | 369 | #ifdef _WIN32_ |
370 | QCheckBox syncdesktop( i18n("Automatically sync with Outlook\nwhen receiving sync request"),&dia ); | 370 | QCheckBox syncdesktop( i18n("Automatically sync with Outlook\nwhen receiving sync request"),&dia ); |
371 | syncdesktop.hide();// not implemented! | 371 | syncdesktop.hide();// not implemented! |
372 | #else | 372 | #else |
373 | QCheckBox syncdesktop( i18n("Automatically sync with KDE-Desktop\nwhen receiving sync request"),&dia ); | 373 | QCheckBox syncdesktop( i18n("Automatically sync with KDE-Desktop\nwhen receiving sync request"),&dia ); |
374 | #endif | 374 | #endif |
375 | lay.addWidget( &syncdesktop); | 375 | lay.addWidget( &syncdesktop); |
376 | #else | 376 | #else |
377 | mPrefs->mPassiveSyncWithDesktop = false; | 377 | mPrefs->mPassiveSyncWithDesktop = false; |
378 | QCheckBox syncdesktop( i18n("Automatically sync\nwith KDE-Desktop"),&dia ); | 378 | QCheckBox syncdesktop( i18n("Automatically sync\nwith KDE-Desktop"),&dia ); |
379 | syncdesktop.hide(); | 379 | syncdesktop.hide(); |
380 | #endif | 380 | #endif |
@@ -394,70 +394,75 @@ void KSyncManager::enableQuick( bool ask ) | |||
394 | if ( ! dia.exec() ) | 394 | if ( ! dia.exec() ) |
395 | return; | 395 | return; |
396 | dia.hide(); | 396 | dia.hide(); |
397 | qApp->processEvents(); | 397 | qApp->processEvents(); |
398 | if ( mPrefs->mPassiveSyncPw != lepw.text() ) { | 398 | if ( mPrefs->mPassiveSyncPw != lepw.text() ) { |
399 | changed = true; | 399 | changed = true; |
400 | mPrefs->mPassiveSyncPw = lepw.text(); | 400 | mPrefs->mPassiveSyncPw = lepw.text(); |
401 | } | 401 | } |
402 | if ( mPrefs->mPassiveSyncPort != lab.text() ) { | 402 | if ( mPrefs->mPassiveSyncPort != lab.text() ) { |
403 | mPrefs->mPassiveSyncPort = lab.text(); | 403 | mPrefs->mPassiveSyncPort = lab.text(); |
404 | changed = true; | 404 | changed = true; |
405 | } | 405 | } |
406 | autoStart = autostart.isChecked(); | 406 | autoStart = autostart.isChecked(); |
407 | if (mPrefs->mPassiveSyncWithDesktop != syncdesktop.isChecked() ) { | 407 | if (mPrefs->mPassiveSyncWithDesktop != syncdesktop.isChecked() ) { |
408 | changed = true; | 408 | changed = true; |
409 | mPrefs->mPassiveSyncWithDesktop = syncdesktop.isChecked(); | 409 | mPrefs->mPassiveSyncWithDesktop = syncdesktop.isChecked(); |
410 | } | 410 | } |
411 | } | 411 | } |
412 | else | 412 | else |
413 | autoStart = mPrefs->mPassiveSyncAutoStart; | 413 | autoStart = mPrefs->mPassiveSyncAutoStart; |
414 | if ( autoStart != mPrefs->mPassiveSyncAutoStart ) | 414 | if ( autoStart != mPrefs->mPassiveSyncAutoStart ) |
415 | changed = true; | 415 | changed = true; |
416 | bool ok; | 416 | bool ok; |
417 | mPrefs->mPassiveSyncAutoStart = false; | 417 | mPrefs->mPassiveSyncAutoStart = false; |
418 | Q_UINT16 port = mPrefs->mPassiveSyncPort.toUInt(&ok); | 418 | Q_UINT32 port_t = mPrefs->mPassiveSyncPort.toUInt(&ok); |
419 | if ( ! ok ) { | 419 | qDebug("%d ", port_t); |
420 | KMessageBox::information( 0, i18n("No valid port")); | 420 | if ( ! ok || port_t > 65535 ) { |
421 | KMessageBox::information( 0, i18n("No valid port number:\n%1").arg ( mPrefs->mPassiveSyncPort ), i18n("Pi-Sync Port Error")); | ||
421 | return; | 422 | return; |
422 | } | 423 | } |
424 | Q_UINT16 port = port_t; | ||
423 | //qDebug("port %d ", port); | 425 | //qDebug("port %d ", port); |
424 | mServerSocket = new KServerSocket ( mPrefs->mPassiveSyncPw, port ,1 ); | 426 | mServerSocket = new KServerSocket ( mPrefs->mPassiveSyncPw, port ,1 ); |
425 | mServerSocket->setFileName( defaultFileName() );//bbb | 427 | mServerSocket->setFileName( defaultFileName() );//bbb |
426 | if ( !mServerSocket->ok() ) { | 428 | if ( !mServerSocket->ok() ) { |
427 | KMessageBox::information( 0, i18n("Failed to bind or\nlisten to the port!")); | 429 | QTimer::singleShot( 2000, this, SLOT ( displayErrorPort() ) ); |
428 | delete mServerSocket; | 430 | delete mServerSocket; |
429 | mServerSocket = 0; | 431 | mServerSocket = 0; |
430 | return; | 432 | return; |
431 | } | 433 | } |
432 | mPrefs->mPassiveSyncAutoStart = autoStart; | 434 | mPrefs->mPassiveSyncAutoStart = autoStart; |
433 | if ( changed ) { | 435 | if ( changed ) { |
434 | mPrefs->writeConfig(); | 436 | mPrefs->writeConfig(); |
435 | } | 437 | } |
436 | connect( mServerSocket, SIGNAL ( request_file() ),this, SIGNAL ( request_file() ) ); | 438 | connect( mServerSocket, SIGNAL ( request_file() ),this, SIGNAL ( request_file() ) ); |
437 | connect( mServerSocket, SIGNAL ( file_received( bool ) ), this, SIGNAL ( getFile( bool ) ) ); | 439 | connect( mServerSocket, SIGNAL ( file_received( bool ) ), this, SIGNAL ( getFile( bool ) ) ); |
438 | } | 440 | } |
439 | 441 | void KSyncManager::displayErrorPort() | |
442 | { | ||
443 | KMessageBox::information( 0, i18n("<b>Enabling Pi-Sync failed!</b> Failed to bind or listen to the port %1! Is another instance already listening to that port?").arg( mPrefs->mPassiveSyncPort) , i18n("Pi-Sync Port Error")); | ||
444 | } | ||
440 | void KSyncManager::syncLocalFile() | 445 | void KSyncManager::syncLocalFile() |
441 | { | 446 | { |
442 | 447 | ||
443 | QString fn =mPrefs->mLastSyncedLocalFile; | 448 | QString fn =mPrefs->mLastSyncedLocalFile; |
444 | QString ext; | 449 | QString ext; |
445 | 450 | ||
446 | switch(mTargetApp) | 451 | switch(mTargetApp) |
447 | { | 452 | { |
448 | case (KAPI): | 453 | case (KAPI): |
449 | ext = "(*.vcf)"; | 454 | ext = "(*.vcf)"; |
450 | break; | 455 | break; |
451 | case (KOPI): | 456 | case (KOPI): |
452 | ext = "(*.ics/*.vcs)"; | 457 | ext = "(*.ics/*.vcs)"; |
453 | break; | 458 | break; |
454 | case (PWMPI): | 459 | case (PWMPI): |
455 | ext = "(*.pwm)"; | 460 | ext = "(*.pwm)"; |
456 | break; | 461 | break; |
457 | default: | 462 | default: |
458 | qDebug("KSM::syncLocalFile: invalid apptype selected"); | 463 | qDebug("KSM::syncLocalFile: invalid apptype selected"); |
459 | break; | 464 | break; |
460 | 465 | ||
461 | } | 466 | } |
462 | 467 | ||
463 | fn =KFileDialog:: getOpenFileName( fn, i18n("Sync filename"+ext), mParent ); | 468 | fn =KFileDialog:: getOpenFileName( fn, i18n("Sync filename"+ext), mParent ); |
@@ -775,49 +780,49 @@ void KSyncManager::syncRemote( KSyncProfile* prof, bool ask) | |||
775 | mParent->topLevelWidget()->setCaption ( i18n( "Writing back file result: " )+QString::number( result ) ); | 780 | mParent->topLevelWidget()->setCaption ( i18n( "Writing back file result: " )+QString::number( result ) ); |
776 | return; | 781 | return; |
777 | } else { | 782 | } else { |
778 | mParent->topLevelWidget()->setCaption ( i18n( "Syncronization sucessfully completed" ) ); | 783 | mParent->topLevelWidget()->setCaption ( i18n( "Syncronization sucessfully completed" ) ); |
779 | } | 784 | } |
780 | } | 785 | } |
781 | } | 786 | } |
782 | return; | 787 | return; |
783 | } | 788 | } |
784 | bool KSyncManager::edit_pisync_options() | 789 | bool KSyncManager::edit_pisync_options() |
785 | { | 790 | { |
786 | QDialog dia( mParent, "dia", true ); | 791 | QDialog dia( mParent, "dia", true ); |
787 | dia.setCaption( i18n("Pi-Sync options for device: " ) +mCurrentSyncDevice ); | 792 | dia.setCaption( i18n("Pi-Sync options for device: " ) +mCurrentSyncDevice ); |
788 | QVBoxLayout lay ( &dia ); | 793 | QVBoxLayout lay ( &dia ); |
789 | lay.setSpacing( 5 ); | 794 | lay.setSpacing( 5 ); |
790 | lay.setMargin( 3 ); | 795 | lay.setMargin( 3 ); |
791 | QLabel lab1 ( i18n("Password for remote access:"), &dia); | 796 | QLabel lab1 ( i18n("Password for remote access:"), &dia); |
792 | lay.addWidget( &lab1 ); | 797 | lay.addWidget( &lab1 ); |
793 | QLineEdit le1 (&dia ); | 798 | QLineEdit le1 (&dia ); |
794 | lay.addWidget( &le1 ); | 799 | lay.addWidget( &le1 ); |
795 | QLabel lab2 ( i18n("Remote IP address:"), &dia); | 800 | QLabel lab2 ( i18n("Remote IP address:"), &dia); |
796 | lay.addWidget( &lab2 ); | 801 | lay.addWidget( &lab2 ); |
797 | QLineEdit le2 (&dia ); | 802 | QLineEdit le2 (&dia ); |
798 | lay.addWidget( &le2 ); | 803 | lay.addWidget( &le2 ); |
799 | QLabel lab3 ( i18n("Remote port number:"), &dia); | 804 | QLabel lab3 ( i18n("Remote port number:\n(May be: 1 - 65535)"), &dia); |
800 | lay.addWidget( &lab3 ); | 805 | lay.addWidget( &lab3 ); |
801 | QLineEdit le3 (&dia ); | 806 | QLineEdit le3 (&dia ); |
802 | lay.addWidget( &le3 ); | 807 | lay.addWidget( &le3 ); |
803 | QPushButton pb ( "OK", &dia); | 808 | QPushButton pb ( "OK", &dia); |
804 | lay.addWidget( &pb ); | 809 | lay.addWidget( &pb ); |
805 | connect(&pb, SIGNAL( clicked() ), &dia, SLOT ( accept() ) ); | 810 | connect(&pb, SIGNAL( clicked() ), &dia, SLOT ( accept() ) ); |
806 | le1.setText( mPassWordPiSync ); | 811 | le1.setText( mPassWordPiSync ); |
807 | le2.setText( mActiveSyncIP ); | 812 | le2.setText( mActiveSyncIP ); |
808 | le3.setText( mActiveSyncPort ); | 813 | le3.setText( mActiveSyncPort ); |
809 | if ( dia.exec() ) { | 814 | if ( dia.exec() ) { |
810 | mPassWordPiSync = le1.text(); | 815 | mPassWordPiSync = le1.text(); |
811 | mActiveSyncPort = le3.text(); | 816 | mActiveSyncPort = le3.text(); |
812 | mActiveSyncIP = le2.text(); | 817 | mActiveSyncIP = le2.text(); |
813 | return true; | 818 | return true; |
814 | } | 819 | } |
815 | return false; | 820 | return false; |
816 | } | 821 | } |
817 | bool KSyncManager::edit_sync_options() | 822 | bool KSyncManager::edit_sync_options() |
818 | { | 823 | { |
819 | 824 | ||
820 | QDialog dia( mParent, "dia", true ); | 825 | QDialog dia( mParent, "dia", true ); |
821 | dia.setCaption( i18n("Device: " ) +mCurrentSyncDevice ); | 826 | dia.setCaption( i18n("Device: " ) +mCurrentSyncDevice ); |
822 | QButtonGroup gr ( 1, Qt::Horizontal, i18n("Sync preferences"), &dia); | 827 | QButtonGroup gr ( 1, Qt::Horizontal, i18n("Sync preferences"), &dia); |
823 | QVBoxLayout lay ( &dia ); | 828 | QVBoxLayout lay ( &dia ); |
@@ -1167,50 +1172,52 @@ void KSyncManager::deleteCommandSocket(KCommandSocket*s, int state) | |||
1167 | mParent->topLevelWidget()->setCaption( i18n("Pi-Sync successful!") ); | 1172 | mParent->topLevelWidget()->setCaption( i18n("Pi-Sync successful!") ); |
1168 | mPisyncFinished = true; | 1173 | mPisyncFinished = true; |
1169 | } else if ( state == KCommandSocket::quiet ){ | 1174 | } else if ( state == KCommandSocket::quiet ){ |
1170 | qDebug("KSS: quiet "); | 1175 | qDebug("KSS: quiet "); |
1171 | mPisyncFinished = true; | 1176 | mPisyncFinished = true; |
1172 | } else { | 1177 | } else { |
1173 | qDebug("KSS: Error: unknown state: %d ", state); | 1178 | qDebug("KSS: Error: unknown state: %d ", state); |
1174 | mPisyncFinished = true; | 1179 | mPisyncFinished = true; |
1175 | } | 1180 | } |
1176 | 1181 | ||
1177 | delete s; | 1182 | delete s; |
1178 | } | 1183 | } |
1179 | 1184 | ||
1180 | void KSyncManager::readFileFromSocket() | 1185 | void KSyncManager::readFileFromSocket() |
1181 | { | 1186 | { |
1182 | QString fileName = syncFileName(); | 1187 | QString fileName = syncFileName(); |
1183 | bool syncOK = true; | 1188 | bool syncOK = true; |
1184 | mParent->topLevelWidget()->setCaption( i18n("Remote file saved to temp file.") ); | 1189 | mParent->topLevelWidget()->setCaption( i18n("Remote file saved to temp file.") ); |
1185 | if ( ! syncWithFile( fileName , true ) ) { | 1190 | if ( ! syncWithFile( fileName , true ) ) { |
1186 | mParent->topLevelWidget()->setCaption( i18n("Syncing failed.") ); | 1191 | mParent->topLevelWidget()->setCaption( i18n("Syncing failed.") ); |
1187 | syncOK = false; | 1192 | syncOK = false; |
1188 | } | 1193 | } |
1189 | KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, mActiveSyncPort.toUInt(), mActiveSyncIP, this, mParent->topLevelWidget() ); | 1194 | KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, mActiveSyncPort.toUInt(), mActiveSyncIP, this, mParent->topLevelWidget() ); |
1190 | connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int)), this, SLOT(deleteCommandSocket(KCommandSocket*, int )) ); | 1195 | connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int)), this, SLOT(deleteCommandSocket(KCommandSocket*, int )) ); |
1191 | if ( mWriteBackFile && syncOK ) | 1196 | if ( mWriteBackFile && syncOK ) { |
1197 | mParent->topLevelWidget()->setCaption( i18n("Sending back file ...") ); | ||
1192 | commandSocket->writeFile( fileName ); | 1198 | commandSocket->writeFile( fileName ); |
1199 | } | ||
1193 | else { | 1200 | else { |
1194 | commandSocket->sendStop(); | 1201 | commandSocket->sendStop(); |
1195 | if ( syncOK ) | 1202 | if ( syncOK ) |
1196 | mParent->topLevelWidget()->setCaption( i18n("Pi-Sync succesful!") ); | 1203 | mParent->topLevelWidget()->setCaption( i18n("Pi-Sync succesful!") ); |
1197 | mPisyncFinished = true; | 1204 | mPisyncFinished = true; |
1198 | } | 1205 | } |
1199 | } | 1206 | } |
1200 | 1207 | ||
1201 | KServerSocket:: KServerSocket ( QString pw, Q_UINT16 port, int backlog, QObject * parent, const char * name ) : QServerSocket( port, backlog, parent, name ) | 1208 | KServerSocket:: KServerSocket ( QString pw, Q_UINT16 port, int backlog, QObject * parent, const char * name ) : QServerSocket( port, backlog, parent, name ) |
1202 | { | 1209 | { |
1203 | mPassWord = pw; | 1210 | mPassWord = pw; |
1204 | mSocket = 0; | 1211 | mSocket = 0; |
1205 | mSyncActionDialog = 0; | 1212 | mSyncActionDialog = 0; |
1206 | blockRC = false; | 1213 | blockRC = false; |
1207 | mErrorMessage = 0; | 1214 | mErrorMessage = 0; |
1208 | } | 1215 | } |
1209 | 1216 | ||
1210 | void KServerSocket::newConnection ( int socket ) | 1217 | void KServerSocket::newConnection ( int socket ) |
1211 | { | 1218 | { |
1212 | // qDebug("KServerSocket:New connection %d ", socket); | 1219 | // qDebug("KServerSocket:New connection %d ", socket); |
1213 | if ( mSocket ) { | 1220 | if ( mSocket ) { |
1214 | qDebug("KSS::newConnection Socket deleted! "); | 1221 | qDebug("KSS::newConnection Socket deleted! "); |
1215 | delete mSocket; | 1222 | delete mSocket; |
1216 | mSocket = 0; | 1223 | mSocket = 0; |
@@ -1271,53 +1278,53 @@ void KServerSocket::readClient() | |||
1271 | error_connect("ERROR_PW\r\n\r\n"); | 1278 | error_connect("ERROR_PW\r\n\r\n"); |
1272 | } | 1279 | } |
1273 | } | 1280 | } |
1274 | if ( tokens[0] == "PUT" ) { | 1281 | if ( tokens[0] == "PUT" ) { |
1275 | if ( tokens[1] == mPassWord ) { | 1282 | if ( tokens[1] == mPassWord ) { |
1276 | //emit getFile( mSocket ); | 1283 | //emit getFile( mSocket ); |
1277 | blockRC = true; | 1284 | blockRC = true; |
1278 | get_file(); | 1285 | get_file(); |
1279 | } | 1286 | } |
1280 | else { | 1287 | else { |
1281 | mErrorMessage = 2; | 1288 | mErrorMessage = 2; |
1282 | error_connect("ERROR_PW\r\n\r\n"); | 1289 | error_connect("ERROR_PW\r\n\r\n"); |
1283 | end_connect(); | 1290 | end_connect(); |
1284 | } | 1291 | } |
1285 | } | 1292 | } |
1286 | if ( tokens[0] == "STOP" ) { | 1293 | if ( tokens[0] == "STOP" ) { |
1287 | //emit endConnect(); | 1294 | //emit endConnect(); |
1288 | end_connect(); | 1295 | end_connect(); |
1289 | } | 1296 | } |
1290 | } | 1297 | } |
1291 | } | 1298 | } |
1292 | void KServerSocket::displayErrorMessage() | 1299 | void KServerSocket::displayErrorMessage() |
1293 | { | 1300 | { |
1294 | if ( mErrorMessage == 1 ) { | 1301 | if ( mErrorMessage == 1 ) { |
1295 | KMessageBox::error( 0, i18n("Got send file request\nwith invalid password")); | 1302 | KMessageBox::error( 0, i18n("Got send file request\nwith invalid password"), i18n("Pi-Sync Error")); |
1296 | mErrorMessage = 0; | 1303 | mErrorMessage = 0; |
1297 | } | 1304 | } |
1298 | else if ( mErrorMessage == 2 ) { | 1305 | else if ( mErrorMessage == 2 ) { |
1299 | KMessageBox::error( 0, i18n("Got receive file request\nwith invalid password")); | 1306 | KMessageBox::error( 0, i18n("Got receive file request\nwith invalid password"), i18n("Pi-Sync Error")); |
1300 | mErrorMessage = 0; | 1307 | mErrorMessage = 0; |
1301 | } | 1308 | } |
1302 | } | 1309 | } |
1303 | void KServerSocket::error_connect( QString errmess ) | 1310 | void KServerSocket::error_connect( QString errmess ) |
1304 | { | 1311 | { |
1305 | QTextStream os( mSocket ); | 1312 | QTextStream os( mSocket ); |
1306 | os.setEncoding( QTextStream::Latin1 ); | 1313 | os.setEncoding( QTextStream::Latin1 ); |
1307 | os << errmess ; | 1314 | os << errmess ; |
1308 | mSocket->close(); | 1315 | mSocket->close(); |
1309 | if ( mSocket->state() == QSocket::Idle ) { | 1316 | if ( mSocket->state() == QSocket::Idle ) { |
1310 | QTimer::singleShot( 0, this , SLOT ( discardClient())); | 1317 | QTimer::singleShot( 0, this , SLOT ( discardClient())); |
1311 | } | 1318 | } |
1312 | } | 1319 | } |
1313 | void KServerSocket::end_connect() | 1320 | void KServerSocket::end_connect() |
1314 | { | 1321 | { |
1315 | delete mSyncActionDialog; | 1322 | delete mSyncActionDialog; |
1316 | mSyncActionDialog = 0; | 1323 | mSyncActionDialog = 0; |
1317 | } | 1324 | } |
1318 | void KServerSocket::send_file() | 1325 | void KServerSocket::send_file() |
1319 | { | 1326 | { |
1320 | //qDebug("MainWindow::sendFile(QSocket* s) "); | 1327 | //qDebug("MainWindow::sendFile(QSocket* s) "); |
1321 | if ( mSyncActionDialog ) | 1328 | if ( mSyncActionDialog ) |
1322 | delete mSyncActionDialog; | 1329 | delete mSyncActionDialog; |
1323 | mSyncActionDialog = new QDialog ( 0, "input-dialog", true ); | 1330 | mSyncActionDialog = new QDialog ( 0, "input-dialog", true ); |
@@ -1445,211 +1452,263 @@ void KServerSocket::readBackFileFromSocket() | |||
1445 | ts << piFileString; | 1452 | ts << piFileString; |
1446 | mSocket->close(); | 1453 | mSocket->close(); |
1447 | if ( mSocket->state() == QSocket::Idle ) | 1454 | if ( mSocket->state() == QSocket::Idle ) |
1448 | QTimer::singleShot( 10, this , SLOT ( discardClient())); | 1455 | QTimer::singleShot( 10, this , SLOT ( discardClient())); |
1449 | file.close(); | 1456 | file.close(); |
1450 | piFileString = ""; | 1457 | piFileString = ""; |
1451 | emit file_received( true ); | 1458 | emit file_received( true ); |
1452 | delete mSyncActionDialog; | 1459 | delete mSyncActionDialog; |
1453 | mSyncActionDialog = 0; | 1460 | mSyncActionDialog = 0; |
1454 | blockRC = false; | 1461 | blockRC = false; |
1455 | 1462 | ||
1456 | } | 1463 | } |
1457 | 1464 | ||
1458 | KCommandSocket::KCommandSocket ( QString password, Q_UINT16 port, QString host, QObject * parent, QWidget * cap, const char * name ): QObject( parent, name ) | 1465 | KCommandSocket::KCommandSocket ( QString password, Q_UINT16 port, QString host, QObject * parent, QWidget * cap, const char * name ): QObject( parent, name ) |
1459 | { | 1466 | { |
1460 | mPassWord = password; | 1467 | mPassWord = password; |
1461 | mSocket = 0; | 1468 | mSocket = 0; |
1462 | mFirst = false; | 1469 | mFirst = false; |
1463 | mFirstLine = true; | 1470 | mFirstLine = true; |
1464 | mPort = port; | 1471 | mPort = port; |
1465 | mHost = host; | 1472 | mHost = host; |
1466 | tlw = cap; | 1473 | tlw = cap; |
1467 | mRetVal = quiet; | 1474 | mRetVal = quiet; |
1468 | mTimerSocket = new QTimer ( this ); | 1475 | mTimerSocket = new QTimer ( this ); |
1469 | connect( mTimerSocket, SIGNAL ( timeout () ), this, SLOT ( deleteSocket() ) ); | 1476 | connect( mTimerSocket, SIGNAL ( timeout () ), this, SLOT ( updateConnectDialog() ) ); |
1477 | mConnectProgress.setCaption( i18n("Pi-Sync") ); | ||
1478 | connect( &mConnectProgress, SIGNAL ( cancelled () ), this, SLOT ( deleteSocket() ) ); | ||
1479 | mConnectCount = -1; | ||
1470 | } | 1480 | } |
1471 | void KCommandSocket::sendFileRequest() | 1481 | void KCommandSocket::sendFileRequest() |
1472 | { | 1482 | { |
1473 | if ( tlw ) | 1483 | if ( tlw ) |
1474 | tlw->setCaption( i18n("Connected! Sending request for remote file ...") ); | 1484 | tlw->setCaption( i18n("Connected! Sending request for remote file ...") ); |
1475 | mTimerSocket->start( 300000 ); | 1485 | mConnectProgress.hide(); |
1486 | mConnectCount = 300;mConnectMax = 300; | ||
1487 | mConnectProgress.setCaption( i18n("Pi-Sync: Connected!") ); | ||
1488 | mTimerSocket->start( 100, true ); | ||
1476 | QTextStream os( mSocket ); | 1489 | QTextStream os( mSocket ); |
1477 | os.setEncoding( QTextStream::Latin1 ); | 1490 | os.setEncoding( QTextStream::Latin1 ); |
1478 | 1491 | ||
1479 | QString curDt = " " +KGlobal::locale()->formatDateTime(QDateTime::currentDateTime().addSecs(-1),true, true,KLocale::ISODate ); | 1492 | QString curDt = " " +KGlobal::locale()->formatDateTime(QDateTime::currentDateTime().addSecs(-1),true, true,KLocale::ISODate ); |
1480 | os << "GET " << mPassWord << curDt <<"\r\n\r\n"; | 1493 | os << "GET " << mPassWord << curDt <<"\r\n\r\n"; |
1481 | } | 1494 | } |
1482 | 1495 | ||
1483 | void KCommandSocket::readFile( QString fn ) | 1496 | void KCommandSocket::readFile( QString fn ) |
1484 | { | 1497 | { |
1485 | if ( !mSocket ) { | 1498 | if ( !mSocket ) { |
1486 | mSocket = new QSocket( this ); | 1499 | mSocket = new QSocket( this ); |
1487 | connect( mSocket, SIGNAL(readyRead()), this, SLOT(startReadFileFromSocket()) ); | 1500 | connect( mSocket, SIGNAL(readyRead()), this, SLOT(startReadFileFromSocket()) ); |
1488 | connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) ); | 1501 | connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) ); |
1489 | connect( mSocket, SIGNAL(connected ()), this, SLOT(sendFileRequest() )); | 1502 | connect( mSocket, SIGNAL(connected ()), this, SLOT(sendFileRequest() )); |
1490 | } | 1503 | } |
1491 | mFileString = ""; | 1504 | mFileString = ""; |
1492 | mFileName = fn; | 1505 | mFileName = fn; |
1493 | mFirst = true; | 1506 | mFirst = true; |
1494 | if ( tlw ) | 1507 | if ( tlw ) |
1495 | tlw->setCaption( i18n("Trying to connect to remote...") ); | 1508 | tlw->setCaption( i18n("Trying to connect to remote...") ); |
1496 | mTimerSocket->start( 20000 ); | 1509 | mConnectCount = 30;mConnectMax = 30; |
1510 | mTimerSocket->start( 1000, true ); | ||
1497 | mSocket->connectToHost( mHost, mPort ); | 1511 | mSocket->connectToHost( mHost, mPort ); |
1498 | qDebug("KSS: Waiting for connection"); | 1512 | qDebug("KSS: Waiting for connection"); |
1499 | } | 1513 | } |
1500 | 1514 | void KCommandSocket::updateConnectDialog() | |
1515 | { | ||
1516 | |||
1517 | if ( mConnectCount == mConnectMax ) { | ||
1518 | //qDebug("MAXX %d", mConnectMax); | ||
1519 | mConnectProgress.setTotalSteps ( 30 ); | ||
1520 | mConnectProgress.show(); | ||
1521 | mConnectProgress.setLabelText( i18n("Trying to connect to remote...") ); | ||
1522 | } | ||
1523 | //qDebug("updateConnectDialog() %d", mConnectCount); | ||
1524 | mConnectProgress.raise(); | ||
1525 | mConnectProgress.setProgress( (mConnectMax - mConnectCount)%30 ); | ||
1526 | --mConnectCount; | ||
1527 | if ( mConnectCount > 0 ) | ||
1528 | mTimerSocket->start( 1000, true ); | ||
1529 | else | ||
1530 | deleteSocket(); | ||
1531 | |||
1532 | } | ||
1501 | void KCommandSocket::writeFile( QString fileName ) | 1533 | void KCommandSocket::writeFile( QString fileName ) |
1502 | { | 1534 | { |
1503 | if ( !mSocket ) { | 1535 | if ( !mSocket ) { |
1504 | mSocket = new QSocket( this ); | 1536 | mSocket = new QSocket( this ); |
1505 | connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) ); | 1537 | connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) ); |
1506 | connect( mSocket, SIGNAL(connected ()), this, SLOT(writeFileToSocket()) ); | 1538 | connect( mSocket, SIGNAL(connected ()), this, SLOT(writeFileToSocket()) ); |
1507 | } | 1539 | } |
1508 | mFileName = fileName ; | 1540 | mFileName = fileName ; |
1509 | mTimerSocket->start( 20000 ); | 1541 | mConnectCount = 30;mConnectMax = 30; |
1542 | mTimerSocket->start( 1000, true ); | ||
1510 | mSocket->connectToHost( mHost, mPort ); | 1543 | mSocket->connectToHost( mHost, mPort ); |
1511 | } | 1544 | } |
1512 | void KCommandSocket::writeFileToSocket() | 1545 | void KCommandSocket::writeFileToSocket() |
1513 | { | 1546 | { |
1514 | mTimerSocket->stop(); | 1547 | mTimerSocket->stop(); |
1515 | QFile file2( mFileName ); | 1548 | QFile file2( mFileName ); |
1516 | if (!file2.open( IO_ReadOnly ) ) { | 1549 | if (!file2.open( IO_ReadOnly ) ) { |
1550 | mConnectProgress.hide(); | ||
1551 | mConnectCount = -1; | ||
1517 | mRetVal= errorW; | 1552 | mRetVal= errorW; |
1518 | mSocket->close(); | 1553 | mSocket->close(); |
1519 | if ( mSocket->state() == QSocket::Idle ) | 1554 | if ( mSocket->state() == QSocket::Idle ) |
1520 | QTimer::singleShot( 10, this , SLOT ( deleteSocket())); | 1555 | QTimer::singleShot( 10, this , SLOT ( deleteSocket())); |
1521 | return ; | 1556 | return ; |
1522 | } | 1557 | } |
1558 | mConnectProgress.setTotalSteps ( file2.size() ); | ||
1559 | mConnectProgress.show(); | ||
1560 | int count = 0; | ||
1561 | mConnectProgress.setLabelText( i18n("Sending back synced file...") ); | ||
1562 | mConnectProgress.setProgress( count ); | ||
1563 | mConnectProgress.blockSignals( true ); | ||
1523 | QTextStream ts2( &file2 ); | 1564 | QTextStream ts2( &file2 ); |
1524 | ts2.setEncoding( QTextStream::Latin1 ); | 1565 | ts2.setEncoding( QTextStream::Latin1 ); |
1525 | QTextStream os2( mSocket ); | 1566 | QTextStream os2( mSocket ); |
1526 | os2.setEncoding( QTextStream::Latin1 ); | 1567 | os2.setEncoding( QTextStream::Latin1 ); |
1527 | os2 << "PUT " << mPassWord << "\r\n\r\n";; | 1568 | os2 << "PUT " << mPassWord << "\r\n\r\n";; |
1528 | while ( ! ts2.atEnd() ) { | 1569 | while ( ! ts2.atEnd() ) { |
1529 | os2 << ts2.readLine() << "\r\n"; | 1570 | qApp->processEvents(); |
1571 | mConnectProgress.setProgress( count ); | ||
1572 | QString temp = ts2.readLine(); | ||
1573 | count += temp.length(); | ||
1574 | os2 << temp << "\r\n"; | ||
1530 | } | 1575 | } |
1576 | file2.close(); | ||
1577 | mConnectProgress.hide(); | ||
1578 | mConnectCount = -1; | ||
1531 | os2 << "\r\n"; | 1579 | os2 << "\r\n"; |
1532 | mRetVal= successW; | 1580 | mRetVal= successW; |
1533 | file2.close(); | ||
1534 | mSocket->close(); | 1581 | mSocket->close(); |
1535 | if ( mSocket->state() == QSocket::Idle ) | 1582 | if ( mSocket->state() == QSocket::Idle ) |
1536 | QTimer::singleShot( 10, this , SLOT ( deleteSocket())); | 1583 | QTimer::singleShot( 10, this , SLOT ( deleteSocket())); |
1584 | mConnectProgress.blockSignals( false ); | ||
1537 | } | 1585 | } |
1538 | void KCommandSocket::sendStop() | 1586 | void KCommandSocket::sendStop() |
1539 | { | 1587 | { |
1540 | if ( !mSocket ) { | 1588 | if ( !mSocket ) { |
1541 | mSocket = new QSocket( this ); | 1589 | mSocket = new QSocket( this ); |
1542 | connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) ); | 1590 | connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) ); |
1543 | } | 1591 | } |
1544 | mSocket->connectToHost( mHost, mPort ); | 1592 | mSocket->connectToHost( mHost, mPort ); |
1545 | QTextStream os2( mSocket ); | 1593 | QTextStream os2( mSocket ); |
1546 | os2.setEncoding( QTextStream::Latin1 ); | 1594 | os2.setEncoding( QTextStream::Latin1 ); |
1547 | os2 << "STOP\r\n\r\n"; | 1595 | os2 << "STOP\r\n\r\n"; |
1548 | mSocket->close(); | 1596 | mSocket->close(); |
1549 | if ( mSocket->state() == QSocket::Idle ) | 1597 | if ( mSocket->state() == QSocket::Idle ) |
1550 | QTimer::singleShot( 10, this , SLOT ( deleteSocket())); | 1598 | QTimer::singleShot( 10, this , SLOT ( deleteSocket())); |
1551 | } | 1599 | } |
1552 | 1600 | ||
1553 | void KCommandSocket::startReadFileFromSocket() | 1601 | void KCommandSocket::startReadFileFromSocket() |
1554 | { | 1602 | { |
1555 | if ( ! mFirst ) | 1603 | if ( ! mFirst ) |
1556 | return; | 1604 | return; |
1605 | mConnectProgress.setLabelText( i18n("Receiving file from remote...") ); | ||
1557 | mFirst = false; | 1606 | mFirst = false; |
1558 | mTimerSocket->stop(); | ||
1559 | mFileString = ""; | 1607 | mFileString = ""; |
1560 | mTime.start(); | 1608 | mTime.start(); |
1561 | mFirstLine = true; | 1609 | mFirstLine = true; |
1562 | QTimer::singleShot( 1, this , SLOT (readFileFromSocket( ) )); | 1610 | QTimer::singleShot( 1, this , SLOT (readFileFromSocket( ) )); |
1563 | 1611 | ||
1564 | } | 1612 | } |
1565 | void KCommandSocket::readFileFromSocket() | 1613 | void KCommandSocket::readFileFromSocket() |
1566 | { | 1614 | { |
1567 | //qDebug("readBackFileFromSocket() %d ", mTime.elapsed ()); | 1615 | //qDebug("readBackFileFromSocket() %d ", mTime.elapsed ()); |
1568 | while ( mSocket->canReadLine () ) { | 1616 | while ( mSocket->canReadLine () ) { |
1569 | mTime.restart(); | 1617 | mTime.restart(); |
1570 | QString line = mSocket->readLine (); | 1618 | QString line = mSocket->readLine (); |
1571 | if ( mFirstLine ) { | 1619 | if ( mFirstLine ) { |
1572 | mFirstLine = false; | 1620 | mFirstLine = false; |
1573 | if ( line.left( 6 ) == "ERROR_" ) { | 1621 | if ( line.left( 6 ) == "ERROR_" ) { |
1622 | mTimerSocket->stop(); | ||
1623 | mConnectCount = -1; | ||
1574 | if ( line.left( 8 ) == "ERROR_PW" ) { | 1624 | if ( line.left( 8 ) == "ERROR_PW" ) { |
1575 | mRetVal = errorPW; | 1625 | mRetVal = errorPW; |
1576 | deleteSocket(); | 1626 | deleteSocket(); |
1577 | return ; | 1627 | return ; |
1578 | } | 1628 | } |
1579 | if ( line.left( 8 ) == "ERROR_CA" ) { | 1629 | if ( line.left( 8 ) == "ERROR_CA" ) { |
1580 | mRetVal = errorCA; | 1630 | mRetVal = errorCA; |
1581 | deleteSocket(); | 1631 | deleteSocket(); |
1582 | return ; | 1632 | return ; |
1583 | } | 1633 | } |
1584 | if ( line.left( 8 ) == "ERROR_FI" ) { | 1634 | if ( line.left( 8 ) == "ERROR_FI" ) { |
1585 | mRetVal = errorFI; | 1635 | mRetVal = errorFI; |
1586 | deleteSocket(); | 1636 | deleteSocket(); |
1587 | return ; | 1637 | return ; |
1588 | } | 1638 | } |
1589 | if ( line.left( 8 ) == "ERROR_ED" ) { | 1639 | if ( line.left( 8 ) == "ERROR_ED" ) { |
1590 | mRetVal = errorED; | 1640 | mRetVal = errorED; |
1591 | deleteSocket(); | 1641 | deleteSocket(); |
1592 | return ; | 1642 | return ; |
1593 | } | 1643 | } |
1594 | mRetVal = errorUN; | 1644 | mRetVal = errorUN; |
1595 | deleteSocket(); | 1645 | deleteSocket(); |
1596 | return ; | 1646 | return ; |
1597 | } | 1647 | } |
1598 | } | 1648 | } |
1599 | mFileString += line; | 1649 | mFileString += line; |
1600 | //qDebug("readline: %s ", line.latin1()); | 1650 | //qDebug("readline: %s ", line.latin1()); |
1601 | } | 1651 | } |
1602 | if ( mTime.elapsed () < 3000 ) { | 1652 | if ( mTime.elapsed () < 3000 ) { |
1603 | // wait for more | 1653 | // wait for more |
1604 | //qDebug("waitformore "); | 1654 | //qDebug("waitformore "); |
1605 | QTimer::singleShot( 100, this , SLOT (readFileFromSocket( ) )); | 1655 | QTimer::singleShot( 100, this , SLOT (readFileFromSocket( ) )); |
1606 | return; | 1656 | return; |
1607 | } | 1657 | } |
1658 | mTimerSocket->stop(); | ||
1659 | mConnectCount = -1; | ||
1660 | mConnectProgress.hide(); | ||
1608 | QString fileName = mFileName; | 1661 | QString fileName = mFileName; |
1609 | QFile file ( fileName ); | 1662 | QFile file ( fileName ); |
1610 | if (!file.open( IO_WriteOnly ) ) { | 1663 | if (!file.open( IO_WriteOnly ) ) { |
1611 | mFileString = ""; | 1664 | mFileString = ""; |
1612 | mRetVal = errorR; | 1665 | mRetVal = errorR; |
1613 | qDebug("KSS:Error open temp sync file for writing: %s",fileName.latin1() ); | 1666 | qDebug("KSS:Error open temp sync file for writing: %s",fileName.latin1() ); |
1614 | deleteSocket(); | 1667 | deleteSocket(); |
1615 | return ; | 1668 | return ; |
1616 | 1669 | ||
1617 | } | 1670 | } |
1618 | // mView->setLoadedFileVersion(QDateTime::currentDateTime().addSecs( -1)); | 1671 | // mView->setLoadedFileVersion(QDateTime::currentDateTime().addSecs( -1)); |
1619 | QTextStream ts ( &file ); | 1672 | QTextStream ts ( &file ); |
1620 | ts.setEncoding( QTextStream::Latin1 ); | 1673 | ts.setEncoding( QTextStream::Latin1 ); |
1621 | ts << mFileString; | 1674 | ts << mFileString; |
1622 | file.close(); | 1675 | file.close(); |
1623 | mFileString = ""; | 1676 | mFileString = ""; |
1624 | mRetVal = successR; | 1677 | mRetVal = successR; |
1625 | mSocket->close(); | 1678 | mSocket->close(); |
1626 | // if state is not idle, deleteSocket(); is called via | 1679 | // if state is not idle, deleteSocket(); is called via |
1627 | // connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) ); | 1680 | // connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) ); |
1628 | if ( mSocket->state() == QSocket::Idle ) | 1681 | if ( mSocket->state() == QSocket::Idle ) |
1629 | deleteSocket(); | 1682 | deleteSocket(); |
1630 | } | 1683 | } |
1631 | 1684 | ||
1632 | void KCommandSocket::deleteSocket() | 1685 | void KCommandSocket::deleteSocket() |
1633 | { | 1686 | { |
1634 | //qDebug("KCommandSocket::deleteSocket() "); | 1687 | //qDebug("KCommandSocket::deleteSocket() "); |
1635 | if ( mTimerSocket->isActive () ) { | 1688 | mConnectProgress.hide(); |
1689 | |||
1690 | if ( mConnectCount >= 0 ) { | ||
1636 | mTimerSocket->stop(); | 1691 | mTimerSocket->stop(); |
1637 | mRetVal = errorTO; | 1692 | mRetVal = errorTO; |
1638 | qDebug("KCS::Connection to remote host timed out"); | 1693 | qDebug("KCS::Connection to remote host timed out"); |
1639 | if ( mSocket ) { | 1694 | if ( mSocket ) { |
1640 | mSocket->close(); | 1695 | mSocket->close(); |
1641 | //if ( mSocket->state() == QSocket::Idle ) | 1696 | //if ( mSocket->state() == QSocket::Idle ) |
1642 | // deleteSocket(); | 1697 | // deleteSocket(); |
1643 | delete mSocket; | 1698 | delete mSocket; |
1644 | mSocket = 0; | 1699 | mSocket = 0; |
1645 | } | 1700 | } |
1701 | if ( mConnectCount == 0 ) | ||
1646 | KMessageBox::error( 0, i18n("Connection to remote\nhost timed out!\nDid you forgot to enable\nsyncing on remote host?")); | 1702 | KMessageBox::error( 0, i18n("Connection to remote\nhost timed out!\nDid you forgot to enable\nsyncing on remote host?")); |
1703 | else if ( tlw ) | ||
1704 | tlw->setCaption( i18n("Connection to remote host cancelled!") ); | ||
1647 | emit commandFinished( this, mRetVal ); | 1705 | emit commandFinished( this, mRetVal ); |
1648 | return; | 1706 | return; |
1649 | } | 1707 | } |
1650 | //qDebug("KCommandSocket::deleteSocket() %d", mRetVal ); | 1708 | //qDebug("KCommandSocket::deleteSocket() %d", mRetVal ); |
1651 | if ( mSocket) | 1709 | if ( mSocket) |
1652 | delete mSocket; | 1710 | delete mSocket; |
1653 | mSocket = 0; | 1711 | mSocket = 0; |
1712 | qDebug("commandFinished "); | ||
1654 | emit commandFinished( this, mRetVal ); | 1713 | emit commandFinished( this, mRetVal ); |
1655 | } | 1714 | } |