author | zautrix <zautrix> | 2005-02-24 02:01:08 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-02-24 02:01:08 (UTC) |
commit | 5af16f69232073d1fa46d2dea3774beaaafb00c5 (patch) (unidiff) | |
tree | 0790afdd906df50520ac4415a9d35b95107d4d48 /libkdepim | |
parent | 513496c67403deb04339cfc87143ed5554720e32 (diff) | |
download | kdepimpi-5af16f69232073d1fa46d2dea3774beaaafb00c5.zip kdepimpi-5af16f69232073d1fa46d2dea3774beaaafb00c5.tar.gz kdepimpi-5af16f69232073d1fa46d2dea3774beaaafb00c5.tar.bz2 |
socket fixes
-rw-r--r-- | libkdepim/ksyncmanager.cpp | 94 | ||||
-rw-r--r-- | libkdepim/ksyncmanager.h | 7 |
2 files changed, 74 insertions, 27 deletions
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp index d8ca3ba..47d00a4 100644 --- a/libkdepim/ksyncmanager.cpp +++ b/libkdepim/ksyncmanager.cpp | |||
@@ -977,565 +977,609 @@ bool KSyncManager::syncExternalApplication(QString resource) | |||
977 | if ( mAskForPreferences ) | 977 | if ( mAskForPreferences ) |
978 | if ( !edit_sync_options()) { | 978 | if ( !edit_sync_options()) { |
979 | mParent->topLevelWidget()->setCaption( i18n("Syncing aborted. Nothing synced.") ); | 979 | mParent->topLevelWidget()->setCaption( i18n("Syncing aborted. Nothing synced.") ); |
980 | return false; | 980 | return false; |
981 | } | 981 | } |
982 | 982 | ||
983 | qDebug("KSM::Sync extern %s", resource.latin1()); | 983 | qDebug("KSM::Sync extern %s", resource.latin1()); |
984 | 984 | ||
985 | bool syncOK = mImplementation->syncExternal(this, resource); | 985 | bool syncOK = mImplementation->syncExternal(this, resource); |
986 | 986 | ||
987 | return syncOK; | 987 | return syncOK; |
988 | 988 | ||
989 | } | 989 | } |
990 | 990 | ||
991 | void KSyncManager::syncPhone() | 991 | void KSyncManager::syncPhone() |
992 | { | 992 | { |
993 | 993 | ||
994 | syncExternalApplication("phone"); | 994 | syncExternalApplication("phone"); |
995 | 995 | ||
996 | } | 996 | } |
997 | 997 | ||
998 | void KSyncManager::showProgressBar(int percentage, QString caption, int total) | 998 | void KSyncManager::showProgressBar(int percentage, QString caption, int total) |
999 | { | 999 | { |
1000 | if (!bar->isVisible()) | 1000 | if (!bar->isVisible()) |
1001 | { | 1001 | { |
1002 | bar->setCaption (caption); | 1002 | bar->setCaption (caption); |
1003 | bar->setTotalSteps ( total ) ; | 1003 | bar->setTotalSteps ( total ) ; |
1004 | bar->show(); | 1004 | bar->show(); |
1005 | } | 1005 | } |
1006 | bar->raise(); | 1006 | bar->raise(); |
1007 | bar->setProgress( percentage ); | 1007 | bar->setProgress( percentage ); |
1008 | qApp->processEvents(); | 1008 | qApp->processEvents(); |
1009 | } | 1009 | } |
1010 | 1010 | ||
1011 | void KSyncManager::hideProgressBar() | 1011 | void KSyncManager::hideProgressBar() |
1012 | { | 1012 | { |
1013 | bar->hide(); | 1013 | bar->hide(); |
1014 | qApp->processEvents(); | 1014 | qApp->processEvents(); |
1015 | } | 1015 | } |
1016 | 1016 | ||
1017 | bool KSyncManager::isProgressBarCanceled() | 1017 | bool KSyncManager::isProgressBarCanceled() |
1018 | { | 1018 | { |
1019 | return !bar->isVisible(); | 1019 | return !bar->isVisible(); |
1020 | } | 1020 | } |
1021 | 1021 | ||
1022 | QString KSyncManager::syncFileName() | 1022 | QString KSyncManager::syncFileName() |
1023 | { | 1023 | { |
1024 | 1024 | ||
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 ||state == KCommandSocket::errorPW ) { | 1073 | |
1074 | |||
1075 | |||
1076 | if ( state == KCommandSocket::errorR ||state == KCommandSocket::errorTO ||state == KCommandSocket::errorPW || | ||
1077 | state == KCommandSocket::errorCA ||state == KCommandSocket::errorFI ||state == KCommandSocket::errorUN ) { | ||
1074 | if ( state == KCommandSocket::errorPW ) | 1078 | if ( state == KCommandSocket::errorPW ) |
1075 | mParent->topLevelWidget()->setCaption( i18n("Wrong password: Receiving remote file failed.") ); | 1079 | mParent->topLevelWidget()->setCaption( i18n("Wrong password: Receiving remote file failed.") ); |
1076 | else | 1080 | else if ( state == KCommandSocket::errorR ||state == KCommandSocket::errorTO ) |
1077 | mParent->topLevelWidget()->setCaption( i18n("ERROR: Receiving remote file failed.") ); | 1081 | mParent->topLevelWidget()->setCaption( i18n("ERROR: Receiving remote file failed.") ); |
1082 | else if ( state == KCommandSocket::errorCA ) | ||
1083 | mParent->topLevelWidget()->setCaption( i18n("Sync cancelled from remote.") ); | ||
1084 | else if ( state == KCommandSocket::errorFI ) | ||
1085 | mParent->topLevelWidget()->setCaption( i18n("File error on remote.") ); | ||
1086 | else if ( state == KCommandSocket::errorUN ) | ||
1087 | mParent->topLevelWidget()->setCaption( i18n("Unknown error on remote.") ); | ||
1078 | delete s; | 1088 | delete s; |
1079 | if ( state == KCommandSocket::errorR ) { | 1089 | if ( state == KCommandSocket::errorR ) { |
1080 | KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, mActiveSyncPort.toUInt(), mActiveSyncIP, this, mParent->topLevelWidget()); | 1090 | KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, mActiveSyncPort.toUInt(), mActiveSyncIP, this, mParent->topLevelWidget()); |
1081 | connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int)), this, SLOT(deleteCommandSocket(KCommandSocket*, int )) ); | 1091 | connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int)), this, SLOT(deleteCommandSocket(KCommandSocket*, int )) ); |
1082 | commandSocket->sendStop(); | 1092 | commandSocket->sendStop(); |
1083 | } | 1093 | } |
1084 | mPisyncFinished = true; | 1094 | mPisyncFinished = true; |
1085 | return; | 1095 | return; |
1086 | 1096 | ||
1087 | } else if ( state == KCommandSocket::errorW ) { | 1097 | } else if ( state == KCommandSocket::errorW ) { |
1088 | mParent->topLevelWidget()->setCaption( i18n("ERROR:Writing back file failed.") ); | 1098 | mParent->topLevelWidget()->setCaption( i18n("ERROR:Writing back file failed.") ); |
1089 | mPisyncFinished = true; | 1099 | mPisyncFinished = true; |
1090 | 1100 | ||
1091 | } else if ( state == KCommandSocket::successR ) { | 1101 | } else if ( state == KCommandSocket::successR ) { |
1092 | QTimer::singleShot( 1, this , SLOT ( readFileFromSocket())); | 1102 | QTimer::singleShot( 1, this , SLOT ( readFileFromSocket())); |
1093 | 1103 | ||
1094 | } else if ( state == KCommandSocket::successW ) { | 1104 | } else if ( state == KCommandSocket::successW ) { |
1095 | mParent->topLevelWidget()->setCaption( i18n("Pi-Sync successful!") ); | 1105 | mParent->topLevelWidget()->setCaption( i18n("Pi-Sync successful!") ); |
1096 | mPisyncFinished = true; | 1106 | mPisyncFinished = true; |
1097 | } else if ( state == KCommandSocket::quiet ){ | 1107 | } else if ( state == KCommandSocket::quiet ){ |
1098 | qDebug("KSS: quiet "); | 1108 | qDebug("KSS: quiet "); |
1099 | mPisyncFinished = true; | 1109 | mPisyncFinished = true; |
1100 | } else { | 1110 | } else { |
1101 | qDebug("KSS: Error: unknown state: %d ", state); | 1111 | qDebug("KSS: Error: unknown state: %d ", state); |
1102 | mPisyncFinished = true; | 1112 | mPisyncFinished = true; |
1103 | } | 1113 | } |
1104 | 1114 | ||
1105 | delete s; | 1115 | delete s; |
1106 | } | 1116 | } |
1107 | 1117 | ||
1108 | void KSyncManager::readFileFromSocket() | 1118 | void KSyncManager::readFileFromSocket() |
1109 | { | 1119 | { |
1110 | QString fileName = syncFileName(); | 1120 | QString fileName = syncFileName(); |
1111 | bool syncOK = true; | 1121 | bool syncOK = true; |
1112 | mParent->topLevelWidget()->setCaption( i18n("Remote file saved to temp file.") ); | 1122 | mParent->topLevelWidget()->setCaption( i18n("Remote file saved to temp file.") ); |
1113 | if ( ! syncWithFile( fileName , true ) ) { | 1123 | if ( ! syncWithFile( fileName , true ) ) { |
1114 | mParent->topLevelWidget()->setCaption( i18n("Syncing failed.") ); | 1124 | mParent->topLevelWidget()->setCaption( i18n("Syncing failed.") ); |
1115 | syncOK = false; | 1125 | syncOK = false; |
1116 | } | 1126 | } |
1117 | KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, mActiveSyncPort.toUInt(), mActiveSyncIP, this, mParent->topLevelWidget() ); | 1127 | KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, mActiveSyncPort.toUInt(), mActiveSyncIP, this, mParent->topLevelWidget() ); |
1118 | connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int)), this, SLOT(deleteCommandSocket(KCommandSocket*, int )) ); | 1128 | connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int)), this, SLOT(deleteCommandSocket(KCommandSocket*, int )) ); |
1119 | if ( mWriteBackFile && syncOK ) | 1129 | if ( mWriteBackFile && syncOK ) |
1120 | commandSocket->writeFile( fileName ); | 1130 | commandSocket->writeFile( fileName ); |
1121 | else { | 1131 | else { |
1122 | commandSocket->sendStop(); | 1132 | commandSocket->sendStop(); |
1123 | if ( syncOK ) | 1133 | if ( syncOK ) |
1124 | mParent->topLevelWidget()->setCaption( i18n("Pi-Sync succesful!") ); | 1134 | mParent->topLevelWidget()->setCaption( i18n("Pi-Sync succesful!") ); |
1125 | mPisyncFinished = true; | 1135 | mPisyncFinished = true; |
1126 | } | 1136 | } |
1127 | } | 1137 | } |
1128 | 1138 | ||
1129 | KServerSocket:: KServerSocket ( QString pw, Q_UINT16 port, int backlog, QObject * parent, const char * name ) : QServerSocket( port, backlog, parent, name ) | 1139 | KServerSocket:: KServerSocket ( QString pw, Q_UINT16 port, int backlog, QObject * parent, const char * name ) : QServerSocket( port, backlog, parent, name ) |
1130 | { | 1140 | { |
1131 | mPassWord = pw; | 1141 | mPassWord = pw; |
1132 | mSocket = 0; | 1142 | mSocket = 0; |
1133 | mSyncActionDialog = 0; | 1143 | mSyncActionDialog = 0; |
1134 | blockRC = false; | 1144 | blockRC = false; |
1145 | mErrorMessage = 0; | ||
1135 | } | 1146 | } |
1136 | 1147 | ||
1137 | void KServerSocket::newConnection ( int socket ) | 1148 | void KServerSocket::newConnection ( int socket ) |
1138 | { | 1149 | { |
1139 | // qDebug("KServerSocket:New connection %d ", socket); | 1150 | // qDebug("KServerSocket:New connection %d ", socket); |
1140 | if ( mSocket ) { | 1151 | if ( mSocket ) { |
1141 | qDebug("KSS::newConnection Socket deleted! "); | 1152 | qDebug("KSS::newConnection Socket deleted! "); |
1142 | delete mSocket; | 1153 | delete mSocket; |
1143 | mSocket = 0; | 1154 | mSocket = 0; |
1144 | } | 1155 | } |
1145 | mSocket = new QSocket( this ); | 1156 | mSocket = new QSocket( this ); |
1146 | connect( mSocket , SIGNAL(readyRead()), this, SLOT(readClient()) ); | 1157 | connect( mSocket , SIGNAL(readyRead()), this, SLOT(readClient()) ); |
1147 | connect( mSocket , SIGNAL(delayedCloseFinished()), this, SLOT(discardClient()) ); | 1158 | connect( mSocket , SIGNAL(delayedCloseFinished()), this, SLOT(discardClient()) ); |
1148 | mSocket->setSocket( socket ); | 1159 | mSocket->setSocket( socket ); |
1149 | } | 1160 | } |
1150 | 1161 | ||
1151 | void KServerSocket::discardClient() | 1162 | void KServerSocket::discardClient() |
1152 | { | 1163 | { |
1153 | //qDebug(" KServerSocket::discardClient()"); | 1164 | QTimer::singleShot( 10, this , SLOT ( deleteSocket())); |
1165 | } | ||
1166 | void KServerSocket::deleteSocket() | ||
1167 | { | ||
1168 | qDebug("KSS::deleteSocket"); | ||
1154 | if ( mSocket ) { | 1169 | if ( mSocket ) { |
1155 | delete mSocket; | 1170 | delete mSocket; |
1156 | mSocket = 0; | 1171 | mSocket = 0; |
1157 | } | 1172 | } |
1158 | //emit endConnect(); | 1173 | if ( mErrorMessage ) |
1174 | QTimer::singleShot( 10, this , SLOT ( displayErrorMessage())); | ||
1159 | } | 1175 | } |
1160 | void KServerSocket::readClient() | 1176 | void KServerSocket::readClient() |
1161 | { | 1177 | { |
1162 | if ( blockRC ) | 1178 | if ( blockRC ) |
1163 | return; | 1179 | return; |
1164 | if ( mSocket == 0 ) { | 1180 | if ( mSocket == 0 ) { |
1165 | qDebug("ERROR::KSS::readClient(): mSocket == 0 "); | 1181 | qDebug("ERROR::KSS::readClient(): mSocket == 0 "); |
1166 | return; | 1182 | return; |
1167 | } | 1183 | } |
1184 | if ( mErrorMessage ) { | ||
1185 | mErrorMessage = 999; | ||
1186 | error_connect("ERROR_UN\r\n\r\n"); | ||
1187 | return; | ||
1188 | } | ||
1189 | mErrorMessage = 0; | ||
1168 | //qDebug("KServerSocket::readClient()"); | 1190 | //qDebug("KServerSocket::readClient()"); |
1169 | if ( mSocket->canReadLine() ) { | 1191 | if ( mSocket->canReadLine() ) { |
1170 | QString line = mSocket->readLine(); | 1192 | QString line = mSocket->readLine(); |
1171 | //qDebug("KServerSocket readline: %s ", line.latin1()); | 1193 | //qDebug("KServerSocket readline: %s ", line.latin1()); |
1172 | QStringList tokens = QStringList::split( QRegExp("[ \r\n][ \r\n]*"), line ); | 1194 | QStringList tokens = QStringList::split( QRegExp("[ \r\n][ \r\n]*"), line ); |
1173 | if ( tokens[0] == "GET" ) { | 1195 | if ( tokens[0] == "GET" ) { |
1174 | if ( tokens[1] == mPassWord ) { | 1196 | if ( tokens[1] == mPassWord ) { |
1175 | //emit sendFile( mSocket ); | 1197 | //emit sendFile( mSocket ); |
1176 | bool ok = false; | 1198 | bool ok = false; |
1177 | QDateTime dt = KGlobal::locale()->readDateTime( tokens[2], KLocale::ISODate, &ok); | 1199 | QDateTime dt = KGlobal::locale()->readDateTime( tokens[2], KLocale::ISODate, &ok); |
1178 | if ( ok ) { | 1200 | if ( ok ) { |
1179 | KSyncManager::mRequestedSyncEvent = dt; | 1201 | KSyncManager::mRequestedSyncEvent = dt; |
1180 | } | 1202 | } |
1181 | else | 1203 | else |
1182 | KSyncManager::mRequestedSyncEvent = QDateTime(); | 1204 | KSyncManager::mRequestedSyncEvent = QDateTime(); |
1183 | send_file(); | 1205 | send_file(); |
1184 | } | 1206 | } |
1185 | else { | 1207 | else { |
1186 | error_connect(); | 1208 | mErrorMessage = 1; |
1187 | KMessageBox::error( 0, i18n("Got send file request\nwith invalid password")); | 1209 | error_connect("ERROR_PW\r\n\r\n"); |
1188 | //qDebug("password %s, invalid password %s ",mPassWord.latin1(), tokens[1].latin1() ); | ||
1189 | } | 1210 | } |
1190 | } | 1211 | } |
1191 | if ( tokens[0] == "PUT" ) { | 1212 | if ( tokens[0] == "PUT" ) { |
1192 | if ( tokens[1] == mPassWord ) { | 1213 | if ( tokens[1] == mPassWord ) { |
1193 | //emit getFile( mSocket ); | 1214 | //emit getFile( mSocket ); |
1194 | blockRC = true; | 1215 | blockRC = true; |
1195 | get_file(); | 1216 | get_file(); |
1196 | } | 1217 | } |
1197 | else { | 1218 | else { |
1198 | error_connect(); | 1219 | mErrorMessage = 2; |
1220 | error_connect("ERROR_PW\r\n\r\n"); | ||
1199 | end_connect(); | 1221 | end_connect(); |
1200 | KMessageBox::error( 0, i18n("Got receive file request\nwith invalid password")); | ||
1201 | //qDebug("password %s, invalid password %s ",mPassWord.latin1(), tokens[1].latin1() ); | ||
1202 | } | 1222 | } |
1203 | } | 1223 | } |
1204 | if ( tokens[0] == "STOP" ) { | 1224 | if ( tokens[0] == "STOP" ) { |
1205 | //emit endConnect(); | 1225 | //emit endConnect(); |
1206 | end_connect(); | 1226 | end_connect(); |
1207 | } | 1227 | } |
1208 | } | 1228 | } |
1209 | } | 1229 | } |
1210 | void KServerSocket::error_connect() | 1230 | void KServerSocket::displayErrorMessage() |
1231 | { | ||
1232 | if ( mErrorMessage == 1 ) | ||
1233 | KMessageBox::error( 0, i18n("Got send file request\nwith invalid password")); | ||
1234 | else if ( mErrorMessage == 2 ) | ||
1235 | KMessageBox::error( 0, i18n("Got receive file request\nwith invalid password")); | ||
1236 | mErrorMessage = 0; | ||
1237 | } | ||
1238 | void KServerSocket::error_connect( QString errmess ) | ||
1211 | { | 1239 | { |
1212 | QTextStream os( mSocket ); | 1240 | QTextStream os( mSocket ); |
1213 | os.setEncoding( QTextStream::Latin1 ); | 1241 | os.setEncoding( QTextStream::Latin1 ); |
1214 | os << "ERROR_PW\r\n\r\n"; | 1242 | os << errmess ; |
1215 | mSocket->close(); | 1243 | mSocket->close(); |
1216 | if ( mSocket->state() == QSocket::Idle ) | 1244 | if ( mSocket->state() == QSocket::Idle ) { |
1217 | QTimer::singleShot( 10, this , SLOT ( discardClient())); | 1245 | QTimer::singleShot( 0, this , SLOT ( discardClient())); |
1246 | } | ||
1218 | } | 1247 | } |
1219 | void KServerSocket::end_connect() | 1248 | void KServerSocket::end_connect() |
1220 | { | 1249 | { |
1221 | delete mSyncActionDialog; | 1250 | delete mSyncActionDialog; |
1222 | mSyncActionDialog = 0; | 1251 | mSyncActionDialog = 0; |
1223 | } | 1252 | } |
1224 | void KServerSocket::send_file() | 1253 | void KServerSocket::send_file() |
1225 | { | 1254 | { |
1226 | //qDebug("MainWindow::sendFile(QSocket* s) "); | 1255 | //qDebug("MainWindow::sendFile(QSocket* s) "); |
1227 | if ( mSyncActionDialog ) | 1256 | if ( mSyncActionDialog ) |
1228 | delete mSyncActionDialog; | 1257 | delete mSyncActionDialog; |
1229 | mSyncActionDialog = new QDialog ( 0, "input-dialog", true ); | 1258 | mSyncActionDialog = new QDialog ( 0, "input-dialog", true ); |
1230 | mSyncActionDialog->setCaption(i18n("Received sync request")); | 1259 | mSyncActionDialog->setCaption(i18n("Received sync request")); |
1231 | QLabel* label = new QLabel( i18n("Synchronizing from remote ...\n\nDo not use this application!\n\nIf syncing fails\nyou can close this dialog."), mSyncActionDialog ); | 1260 | QLabel* label = new QLabel( i18n("Synchronizing from remote ...\n\nDo not use this application!\n\nIf syncing fails\nyou can close this dialog."), mSyncActionDialog ); |
1232 | label->setAlignment ( Qt::AlignHCenter ); | 1261 | label->setAlignment ( Qt::AlignHCenter ); |
1233 | QVBoxLayout* lay = new QVBoxLayout( mSyncActionDialog ); | 1262 | QVBoxLayout* lay = new QVBoxLayout( mSyncActionDialog ); |
1234 | lay->addWidget( label); | 1263 | lay->addWidget( label); |
1235 | lay->setMargin(7); | 1264 | lay->setMargin(7); |
1236 | lay->setSpacing(7); | 1265 | lay->setSpacing(7); |
1237 | if ( KSyncManager::mRequestedSyncEvent.isValid() ) { | 1266 | if ( KSyncManager::mRequestedSyncEvent.isValid() ) { |
1238 | int secs = QDateTime::currentDateTime().secsTo( KSyncManager::mRequestedSyncEvent ); | 1267 | int secs = QDateTime::currentDateTime().secsTo( KSyncManager::mRequestedSyncEvent ); |
1268 | secs = 333; | ||
1239 | if ( secs < 0 ) | 1269 | if ( secs < 0 ) |
1240 | secs = secs * (-1); | 1270 | secs = secs * (-1); |
1241 | if ( secs > 30 ) | 1271 | if ( secs > 30 ) |
1242 | //if ( true ) | 1272 | //if ( true ) |
1243 | { | 1273 | { |
1244 | QString warning = i18n("Clock skew of\nsyncing devices\nis %1 seconds!").arg( secs ); | 1274 | QString warning = i18n("Clock skew of\nsyncing devices\nis %1 seconds!").arg( secs ); |
1245 | QLabel* label = new QLabel( warning, mSyncActionDialog ); | 1275 | QLabel* label = new QLabel( warning, mSyncActionDialog ); |
1246 | label->setAlignment ( Qt::AlignHCenter ); | 1276 | label->setAlignment ( Qt::AlignHCenter ); |
1247 | lay->addWidget( label); | 1277 | lay->addWidget( label); |
1248 | if ( secs > 180 ) | 1278 | if ( secs > 180 ) |
1249 | { | 1279 | { |
1250 | if ( secs > 300 ) { | 1280 | if ( secs > 300 ) { |
1251 | 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!"))) { | 1281 | 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!"))) { |
1252 | qDebug("KSS::Sync cancelled ,cs"); | 1282 | qDebug("KSS::Sync cancelled ,cs"); |
1283 | mErrorMessage = 0; | ||
1284 | end_connect(); | ||
1285 | error_connect("ERROR_CA\r\n\r\n"); | ||
1253 | return ; | 1286 | return ; |
1254 | } | 1287 | } |
1255 | } | 1288 | } |
1256 | QFont f = label->font(); | 1289 | QFont f = label->font(); |
1257 | f.setPointSize ( f.pointSize() *2 ); | 1290 | f.setPointSize ( f.pointSize() *2 ); |
1258 | f. setBold (true ); | 1291 | f. setBold (true ); |
1259 | QLabel* label = new QLabel( warning, mSyncActionDialog ); | 1292 | QLabel* label = new QLabel( warning, mSyncActionDialog ); |
1260 | label->setFont( f ); | 1293 | label->setFont( f ); |
1261 | warning = i18n("ADJUST\nYOUR\nCLOCKS!"); | 1294 | warning = i18n("ADJUST\nYOUR\nCLOCKS!"); |
1262 | label->setText( warning ); | 1295 | label->setText( warning ); |
1263 | label->setAlignment ( Qt::AlignHCenter ); | 1296 | label->setAlignment ( Qt::AlignHCenter ); |
1264 | lay->addWidget( label); | 1297 | lay->addWidget( label); |
1265 | mSyncActionDialog->setFixedSize( 230, 300); | 1298 | mSyncActionDialog->setFixedSize( 230, 300); |
1266 | } else { | 1299 | } else { |
1267 | mSyncActionDialog->setFixedSize( 230, 200); | 1300 | mSyncActionDialog->setFixedSize( 230, 200); |
1268 | } | 1301 | } |
1269 | } else { | 1302 | } else { |
1270 | mSyncActionDialog->setFixedSize( 230, 120); | 1303 | mSyncActionDialog->setFixedSize( 230, 120); |
1271 | } | 1304 | } |
1272 | } else | 1305 | } else |
1273 | mSyncActionDialog->setFixedSize( 230, 120); | 1306 | mSyncActionDialog->setFixedSize( 230, 120); |
1274 | mSyncActionDialog->show(); | 1307 | mSyncActionDialog->show(); |
1275 | mSyncActionDialog->raise(); | 1308 | mSyncActionDialog->raise(); |
1276 | emit request_file(); | 1309 | emit request_file(); |
1277 | qApp->processEvents(); | 1310 | qApp->processEvents(); |
1278 | QString fileName = mFileName; | 1311 | QString fileName = mFileName; |
1279 | QFile file( fileName ); | 1312 | QFile file( fileName ); |
1280 | if (!file.open( IO_ReadOnly ) ) { | 1313 | if (!file.open( IO_ReadOnly ) ) { |
1281 | delete mSyncActionDialog; | 1314 | mErrorMessage = 0; |
1282 | mSyncActionDialog = 0; | 1315 | end_connect(); |
1283 | qDebug("KSS::error open sync file: %s ", fileName.latin1()); | 1316 | error_connect("ERROR_FI\r\n\r\n"); |
1284 | mSocket->close(); | 1317 | return ; |
1285 | if ( mSocket->state() == QSocket::Idle ) | ||
1286 | QTimer::singleShot( 10, this , SLOT ( discardClient())); | ||
1287 | return ; | ||
1288 | |||
1289 | } | 1318 | } |
1290 | mSyncActionDialog->setCaption( i18n("Sending file...") ); | 1319 | mSyncActionDialog->setCaption( i18n("Sending file...") ); |
1291 | QTextStream ts( &file ); | 1320 | QTextStream ts( &file ); |
1292 | ts.setEncoding( QTextStream::Latin1 ); | 1321 | ts.setEncoding( QTextStream::Latin1 ); |
1293 | 1322 | ||
1294 | QTextStream os( mSocket ); | 1323 | QTextStream os( mSocket ); |
1295 | os.setEncoding( QTextStream::Latin1 ); | 1324 | os.setEncoding( QTextStream::Latin1 ); |
1296 | while ( ! ts.atEnd() ) { | 1325 | while ( ! ts.atEnd() ) { |
1297 | os << ts.readLine() << "\r\n"; | 1326 | os << ts.readLine() << "\r\n"; |
1298 | } | 1327 | } |
1299 | os << "\r\n"; | 1328 | os << "\r\n"; |
1300 | //os << ts.read(); | 1329 | //os << ts.read(); |
1301 | file.close(); | 1330 | file.close(); |
1302 | mSyncActionDialog->setCaption( i18n("Waiting for synced file...") ); | 1331 | mSyncActionDialog->setCaption( i18n("Waiting for synced file...") ); |
1303 | mSocket->close(); | 1332 | mSocket->close(); |
1304 | if ( mSocket->state() == QSocket::Idle ) | 1333 | if ( mSocket->state() == QSocket::Idle ) |
1305 | QTimer::singleShot( 10, this , SLOT ( discardClient())); | 1334 | QTimer::singleShot( 10, this , SLOT ( discardClient())); |
1306 | } | 1335 | } |
1307 | void KServerSocket::get_file() | 1336 | void KServerSocket::get_file() |
1308 | { | 1337 | { |
1309 | mSyncActionDialog->setCaption( i18n("Receiving synced file...") ); | 1338 | mSyncActionDialog->setCaption( i18n("Receiving synced file...") ); |
1310 | 1339 | ||
1311 | piTime.start(); | 1340 | piTime.start(); |
1312 | piFileString = ""; | 1341 | piFileString = ""; |
1313 | QTimer::singleShot( 1, this , SLOT (readBackFileFromSocket( ) )); | 1342 | QTimer::singleShot( 1, this , SLOT (readBackFileFromSocket( ) )); |
1314 | } | 1343 | } |
1315 | 1344 | ||
1316 | 1345 | ||
1317 | void KServerSocket::readBackFileFromSocket() | 1346 | void KServerSocket::readBackFileFromSocket() |
1318 | { | 1347 | { |
1319 | //qDebug("readBackFileFromSocket() %d ", piTime.elapsed ()); | 1348 | //qDebug("readBackFileFromSocket() %d ", piTime.elapsed ()); |
1320 | while ( mSocket->canReadLine () ) { | 1349 | while ( mSocket->canReadLine () ) { |
1321 | piTime.restart(); | 1350 | piTime.restart(); |
1322 | QString line = mSocket->readLine (); | 1351 | QString line = mSocket->readLine (); |
1323 | piFileString += line; | 1352 | piFileString += line; |
1324 | //qDebug("readline: %s ", line.latin1()); | 1353 | //qDebug("readline: %s ", line.latin1()); |
1325 | mSyncActionDialog->setCaption( i18n("Received %1 bytes").arg( piFileString.length() ) ); | 1354 | mSyncActionDialog->setCaption( i18n("Received %1 bytes").arg( piFileString.length() ) ); |
1326 | 1355 | ||
1327 | } | 1356 | } |
1328 | if ( piTime.elapsed () < 3000 ) { | 1357 | if ( piTime.elapsed () < 3000 ) { |
1329 | // wait for more | 1358 | // wait for more |
1330 | //qDebug("waitformore "); | 1359 | //qDebug("waitformore "); |
1331 | QTimer::singleShot( 100, this , SLOT (readBackFileFromSocket( ) )); | 1360 | QTimer::singleShot( 100, this , SLOT (readBackFileFromSocket( ) )); |
1332 | return; | 1361 | return; |
1333 | } | 1362 | } |
1334 | QString fileName = mFileName; | 1363 | QString fileName = mFileName; |
1335 | QFile file ( fileName ); | 1364 | QFile file ( fileName ); |
1336 | if (!file.open( IO_WriteOnly ) ) { | 1365 | if (!file.open( IO_WriteOnly ) ) { |
1337 | delete mSyncActionDialog; | 1366 | delete mSyncActionDialog; |
1338 | mSyncActionDialog = 0; | 1367 | mSyncActionDialog = 0; |
1339 | qDebug("KSS:Error open read back file "); | 1368 | qDebug("KSS:Error open read back file "); |
1340 | piFileString = ""; | 1369 | piFileString = ""; |
1341 | emit file_received( false ); | 1370 | emit file_received( false ); |
1342 | blockRC = false; | 1371 | blockRC = false; |
1343 | return ; | 1372 | return ; |
1344 | 1373 | ||
1345 | } | 1374 | } |
1346 | 1375 | ||
1347 | // mView->setLoadedFileVersion(QDateTime::currentDateTime().addSecs( -1)); | 1376 | // mView->setLoadedFileVersion(QDateTime::currentDateTime().addSecs( -1)); |
1348 | QTextStream ts ( &file ); | 1377 | QTextStream ts ( &file ); |
1349 | ts.setEncoding( QTextStream::Latin1 ); | 1378 | ts.setEncoding( QTextStream::Latin1 ); |
1350 | mSyncActionDialog->setCaption( i18n("Writing file to disk...") ); | 1379 | mSyncActionDialog->setCaption( i18n("Writing file to disk...") ); |
1351 | ts << piFileString; | 1380 | ts << piFileString; |
1352 | mSocket->close(); | 1381 | mSocket->close(); |
1353 | if ( mSocket->state() == QSocket::Idle ) | 1382 | if ( mSocket->state() == QSocket::Idle ) |
1354 | QTimer::singleShot( 10, this , SLOT ( discardClient())); | 1383 | QTimer::singleShot( 10, this , SLOT ( discardClient())); |
1355 | file.close(); | 1384 | file.close(); |
1356 | piFileString = ""; | 1385 | piFileString = ""; |
1357 | emit file_received( true ); | 1386 | emit file_received( true ); |
1358 | delete mSyncActionDialog; | 1387 | delete mSyncActionDialog; |
1359 | mSyncActionDialog = 0; | 1388 | mSyncActionDialog = 0; |
1360 | blockRC = false; | 1389 | blockRC = false; |
1361 | 1390 | ||
1362 | } | 1391 | } |
1363 | 1392 | ||
1364 | KCommandSocket::KCommandSocket ( QString password, Q_UINT16 port, QString host, QObject * parent, QWidget * cap, const char * name ): QObject( parent, name ) | 1393 | KCommandSocket::KCommandSocket ( QString password, Q_UINT16 port, QString host, QObject * parent, QWidget * cap, const char * name ): QObject( parent, name ) |
1365 | { | 1394 | { |
1366 | mPassWord = password; | 1395 | mPassWord = password; |
1367 | mSocket = 0; | 1396 | mSocket = 0; |
1368 | mFirst = false; | 1397 | mFirst = false; |
1369 | mFirstLine = true; | 1398 | mFirstLine = true; |
1370 | mPort = port; | 1399 | mPort = port; |
1371 | mHost = host; | 1400 | mHost = host; |
1372 | tlw = cap; | 1401 | tlw = cap; |
1373 | mRetVal = quiet; | 1402 | mRetVal = quiet; |
1374 | mTimerSocket = new QTimer ( this ); | 1403 | mTimerSocket = new QTimer ( this ); |
1375 | connect( mTimerSocket, SIGNAL ( timeout () ), this, SLOT ( deleteSocket() ) ); | 1404 | connect( mTimerSocket, SIGNAL ( timeout () ), this, SLOT ( deleteSocket() ) ); |
1376 | } | 1405 | } |
1377 | void KCommandSocket::sendFileRequest() | 1406 | void KCommandSocket::sendFileRequest() |
1378 | { | 1407 | { |
1379 | if ( tlw ) | 1408 | if ( tlw ) |
1380 | tlw->setCaption( i18n("Connected! Sending request for remote file ...") ); | 1409 | tlw->setCaption( i18n("Connected! Sending request for remote file ...") ); |
1381 | mTimerSocket->start( 300000 ); | 1410 | mTimerSocket->start( 300000 ); |
1382 | QTextStream os( mSocket ); | 1411 | QTextStream os( mSocket ); |
1383 | os.setEncoding( QTextStream::Latin1 ); | 1412 | os.setEncoding( QTextStream::Latin1 ); |
1384 | 1413 | ||
1385 | QString curDt = " " +KGlobal::locale()->formatDateTime(QDateTime::currentDateTime().addSecs(-1),true, true,KLocale::ISODate ); | 1414 | QString curDt = " " +KGlobal::locale()->formatDateTime(QDateTime::currentDateTime().addSecs(-1),true, true,KLocale::ISODate ); |
1386 | os << "GET " << mPassWord << curDt <<"\r\n\r\n"; | 1415 | os << "GET " << mPassWord << curDt <<"\r\n\r\n"; |
1387 | } | 1416 | } |
1388 | 1417 | ||
1389 | void KCommandSocket::readFile( QString fn ) | 1418 | void KCommandSocket::readFile( QString fn ) |
1390 | { | 1419 | { |
1391 | if ( !mSocket ) { | 1420 | if ( !mSocket ) { |
1392 | mSocket = new QSocket( this ); | 1421 | mSocket = new QSocket( this ); |
1393 | connect( mSocket, SIGNAL(readyRead()), this, SLOT(startReadFileFromSocket()) ); | 1422 | connect( mSocket, SIGNAL(readyRead()), this, SLOT(startReadFileFromSocket()) ); |
1394 | connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) ); | 1423 | connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) ); |
1395 | connect( mSocket, SIGNAL(connected ()), this, SLOT(sendFileRequest() )); | 1424 | connect( mSocket, SIGNAL(connected ()), this, SLOT(sendFileRequest() )); |
1396 | } | 1425 | } |
1397 | mFileString = ""; | 1426 | mFileString = ""; |
1398 | mFileName = fn; | 1427 | mFileName = fn; |
1399 | mFirst = true; | 1428 | mFirst = true; |
1400 | if ( tlw ) | 1429 | if ( tlw ) |
1401 | tlw->setCaption( i18n("Trying to connect to remote...") ); | 1430 | tlw->setCaption( i18n("Trying to connect to remote...") ); |
1402 | mTimerSocket->start( 20000 ); | 1431 | mTimerSocket->start( 20000 ); |
1403 | mSocket->connectToHost( mHost, mPort ); | 1432 | mSocket->connectToHost( mHost, mPort ); |
1404 | qDebug("KSS: Waiting for connection"); | 1433 | qDebug("KSS: Waiting for connection"); |
1405 | } | 1434 | } |
1406 | 1435 | ||
1407 | void KCommandSocket::writeFile( QString fileName ) | 1436 | void KCommandSocket::writeFile( QString fileName ) |
1408 | { | 1437 | { |
1409 | if ( !mSocket ) { | 1438 | if ( !mSocket ) { |
1410 | mSocket = new QSocket( this ); | 1439 | mSocket = new QSocket( this ); |
1411 | connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) ); | 1440 | connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) ); |
1412 | connect( mSocket, SIGNAL(connected ()), this, SLOT(writeFileToSocket()) ); | 1441 | connect( mSocket, SIGNAL(connected ()), this, SLOT(writeFileToSocket()) ); |
1413 | } | 1442 | } |
1414 | mFileName = fileName ; | 1443 | mFileName = fileName ; |
1415 | mTimerSocket->start( 20000 ); | 1444 | mTimerSocket->start( 20000 ); |
1416 | mSocket->connectToHost( mHost, mPort ); | 1445 | mSocket->connectToHost( mHost, mPort ); |
1417 | } | 1446 | } |
1418 | void KCommandSocket::writeFileToSocket() | 1447 | void KCommandSocket::writeFileToSocket() |
1419 | { | 1448 | { |
1420 | mTimerSocket->stop(); | 1449 | mTimerSocket->stop(); |
1421 | QFile file2( mFileName ); | 1450 | QFile file2( mFileName ); |
1422 | if (!file2.open( IO_ReadOnly ) ) { | 1451 | if (!file2.open( IO_ReadOnly ) ) { |
1423 | mRetVal= errorW; | 1452 | mRetVal= errorW; |
1424 | mSocket->close(); | 1453 | mSocket->close(); |
1425 | if ( mSocket->state() == QSocket::Idle ) | 1454 | if ( mSocket->state() == QSocket::Idle ) |
1426 | QTimer::singleShot( 10, this , SLOT ( deleteSocket())); | 1455 | QTimer::singleShot( 10, this , SLOT ( deleteSocket())); |
1427 | return ; | 1456 | return ; |
1428 | } | 1457 | } |
1429 | QTextStream ts2( &file2 ); | 1458 | QTextStream ts2( &file2 ); |
1430 | ts2.setEncoding( QTextStream::Latin1 ); | 1459 | ts2.setEncoding( QTextStream::Latin1 ); |
1431 | QTextStream os2( mSocket ); | 1460 | QTextStream os2( mSocket ); |
1432 | os2.setEncoding( QTextStream::Latin1 ); | 1461 | os2.setEncoding( QTextStream::Latin1 ); |
1433 | os2 << "PUT " << mPassWord << "\r\n\r\n";; | 1462 | os2 << "PUT " << mPassWord << "\r\n\r\n";; |
1434 | while ( ! ts2.atEnd() ) { | 1463 | while ( ! ts2.atEnd() ) { |
1435 | os2 << ts2.readLine() << "\r\n"; | 1464 | os2 << ts2.readLine() << "\r\n"; |
1436 | } | 1465 | } |
1437 | os2 << "\r\n"; | 1466 | os2 << "\r\n"; |
1438 | mRetVal= successW; | 1467 | mRetVal= successW; |
1439 | file2.close(); | 1468 | file2.close(); |
1440 | mSocket->close(); | 1469 | mSocket->close(); |
1441 | if ( mSocket->state() == QSocket::Idle ) | 1470 | if ( mSocket->state() == QSocket::Idle ) |
1442 | QTimer::singleShot( 10, this , SLOT ( deleteSocket())); | 1471 | QTimer::singleShot( 10, this , SLOT ( deleteSocket())); |
1443 | } | 1472 | } |
1444 | void KCommandSocket::sendStop() | 1473 | void KCommandSocket::sendStop() |
1445 | { | 1474 | { |
1446 | if ( !mSocket ) { | 1475 | if ( !mSocket ) { |
1447 | mSocket = new QSocket( this ); | 1476 | mSocket = new QSocket( this ); |
1448 | connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) ); | 1477 | connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) ); |
1449 | } | 1478 | } |
1450 | mSocket->connectToHost( mHost, mPort ); | 1479 | mSocket->connectToHost( mHost, mPort ); |
1451 | QTextStream os2( mSocket ); | 1480 | QTextStream os2( mSocket ); |
1452 | os2.setEncoding( QTextStream::Latin1 ); | 1481 | os2.setEncoding( QTextStream::Latin1 ); |
1453 | os2 << "STOP\r\n\r\n"; | 1482 | os2 << "STOP\r\n\r\n"; |
1454 | mSocket->close(); | 1483 | mSocket->close(); |
1455 | if ( mSocket->state() == QSocket::Idle ) | 1484 | if ( mSocket->state() == QSocket::Idle ) |
1456 | QTimer::singleShot( 10, this , SLOT ( deleteSocket())); | 1485 | QTimer::singleShot( 10, this , SLOT ( deleteSocket())); |
1457 | } | 1486 | } |
1458 | 1487 | ||
1459 | void KCommandSocket::startReadFileFromSocket() | 1488 | void KCommandSocket::startReadFileFromSocket() |
1460 | { | 1489 | { |
1461 | if ( ! mFirst ) | 1490 | if ( ! mFirst ) |
1462 | return; | 1491 | return; |
1463 | mFirst = false; | 1492 | mFirst = false; |
1464 | mTimerSocket->stop(); | 1493 | mTimerSocket->stop(); |
1465 | mFileString = ""; | 1494 | mFileString = ""; |
1466 | mTime.start(); | 1495 | mTime.start(); |
1467 | mFirstLine = true; | 1496 | mFirstLine = true; |
1468 | QTimer::singleShot( 1, this , SLOT (readFileFromSocket( ) )); | 1497 | QTimer::singleShot( 1, this , SLOT (readFileFromSocket( ) )); |
1469 | 1498 | ||
1470 | } | 1499 | } |
1471 | void KCommandSocket::readFileFromSocket() | 1500 | void KCommandSocket::readFileFromSocket() |
1472 | { | 1501 | { |
1473 | //qDebug("readBackFileFromSocket() %d ", mTime.elapsed ()); | 1502 | //qDebug("readBackFileFromSocket() %d ", mTime.elapsed ()); |
1474 | while ( mSocket->canReadLine () ) { | 1503 | while ( mSocket->canReadLine () ) { |
1475 | mTime.restart(); | 1504 | mTime.restart(); |
1476 | QString line = mSocket->readLine (); | 1505 | QString line = mSocket->readLine (); |
1477 | if ( mFirstLine ) { | 1506 | if ( mFirstLine ) { |
1478 | mFirstLine = false; | 1507 | mFirstLine = false; |
1479 | if ( line.left( 8 ) == "ERROR_PW" ) { | 1508 | if ( line.left( 6 ) == "ERROR_" ) { |
1480 | mRetVal = errorPW; | 1509 | if ( line.left( 8 ) == "ERROR_PW" ) { |
1510 | mRetVal = errorPW; | ||
1511 | deleteSocket(); | ||
1512 | return ; | ||
1513 | } | ||
1514 | if ( line.left( 8 ) == "ERROR_CA" ) { | ||
1515 | mRetVal = errorCA; | ||
1516 | deleteSocket(); | ||
1517 | return ; | ||
1518 | } | ||
1519 | if ( line.left( 8 ) == "ERROR_FI" ) { | ||
1520 | mRetVal = errorFI; | ||
1521 | deleteSocket(); | ||
1522 | return ; | ||
1523 | } | ||
1524 | mRetVal = errorUN; | ||
1481 | deleteSocket(); | 1525 | deleteSocket(); |
1482 | return ; | 1526 | return ; |
1483 | } | 1527 | } |
1484 | } | 1528 | } |
1485 | mFileString += line; | 1529 | mFileString += line; |
1486 | //qDebug("readline: %s ", line.latin1()); | 1530 | //qDebug("readline: %s ", line.latin1()); |
1487 | } | 1531 | } |
1488 | if ( mTime.elapsed () < 3000 ) { | 1532 | if ( mTime.elapsed () < 3000 ) { |
1489 | // wait for more | 1533 | // wait for more |
1490 | //qDebug("waitformore "); | 1534 | //qDebug("waitformore "); |
1491 | QTimer::singleShot( 100, this , SLOT (readFileFromSocket( ) )); | 1535 | QTimer::singleShot( 100, this , SLOT (readFileFromSocket( ) )); |
1492 | return; | 1536 | return; |
1493 | } | 1537 | } |
1494 | QString fileName = mFileName; | 1538 | QString fileName = mFileName; |
1495 | QFile file ( fileName ); | 1539 | QFile file ( fileName ); |
1496 | if (!file.open( IO_WriteOnly ) ) { | 1540 | if (!file.open( IO_WriteOnly ) ) { |
1497 | mFileString = ""; | 1541 | mFileString = ""; |
1498 | mRetVal = errorR; | 1542 | mRetVal = errorR; |
1499 | qDebug("KSS:Error open temp sync file for writing: %s",fileName.latin1() ); | 1543 | qDebug("KSS:Error open temp sync file for writing: %s",fileName.latin1() ); |
1500 | deleteSocket(); | 1544 | deleteSocket(); |
1501 | return ; | 1545 | return ; |
1502 | 1546 | ||
1503 | } | 1547 | } |
1504 | // mView->setLoadedFileVersion(QDateTime::currentDateTime().addSecs( -1)); | 1548 | // mView->setLoadedFileVersion(QDateTime::currentDateTime().addSecs( -1)); |
1505 | QTextStream ts ( &file ); | 1549 | QTextStream ts ( &file ); |
1506 | ts.setEncoding( QTextStream::Latin1 ); | 1550 | ts.setEncoding( QTextStream::Latin1 ); |
1507 | ts << mFileString; | 1551 | ts << mFileString; |
1508 | file.close(); | 1552 | file.close(); |
1509 | mFileString = ""; | 1553 | mFileString = ""; |
1510 | mRetVal = successR; | 1554 | mRetVal = successR; |
1511 | mSocket->close(); | 1555 | mSocket->close(); |
1512 | // if state is not idle, deleteSocket(); is called via | 1556 | // if state is not idle, deleteSocket(); is called via |
1513 | // connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) ); | 1557 | // connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) ); |
1514 | if ( mSocket->state() == QSocket::Idle ) | 1558 | if ( mSocket->state() == QSocket::Idle ) |
1515 | deleteSocket(); | 1559 | deleteSocket(); |
1516 | } | 1560 | } |
1517 | 1561 | ||
1518 | void KCommandSocket::deleteSocket() | 1562 | void KCommandSocket::deleteSocket() |
1519 | { | 1563 | { |
1520 | //qDebug("KCommandSocket::deleteSocket() "); | 1564 | //qDebug("KCommandSocket::deleteSocket() "); |
1521 | if ( mTimerSocket->isActive () ) { | 1565 | if ( mTimerSocket->isActive () ) { |
1522 | mTimerSocket->stop(); | 1566 | mTimerSocket->stop(); |
1523 | mRetVal = errorTO; | 1567 | mRetVal = errorTO; |
1524 | qDebug("KCS::Connection to remote host timed out"); | 1568 | qDebug("KCS::Connection to remote host timed out"); |
1525 | if ( mSocket ) { | 1569 | if ( mSocket ) { |
1526 | mSocket->close(); | 1570 | mSocket->close(); |
1527 | //if ( mSocket->state() == QSocket::Idle ) | 1571 | //if ( mSocket->state() == QSocket::Idle ) |
1528 | // deleteSocket(); | 1572 | // deleteSocket(); |
1529 | delete mSocket; | 1573 | delete mSocket; |
1530 | mSocket = 0; | 1574 | mSocket = 0; |
1531 | } | 1575 | } |
1532 | KMessageBox::error( 0, i18n("Connection to remote\nhost timed out!\nDid you forgot to enable\nsyncing on remote host?")); | 1576 | KMessageBox::error( 0, i18n("Connection to remote\nhost timed out!\nDid you forgot to enable\nsyncing on remote host?")); |
1533 | emit commandFinished( this, mRetVal ); | 1577 | emit commandFinished( this, mRetVal ); |
1534 | return; | 1578 | return; |
1535 | } | 1579 | } |
1536 | //qDebug("KCommandSocket::deleteSocket() %d", mRetVal ); | 1580 | //qDebug("KCommandSocket::deleteSocket() %d", mRetVal ); |
1537 | if ( mSocket) | 1581 | if ( mSocket) |
1538 | delete mSocket; | 1582 | delete mSocket; |
1539 | mSocket = 0; | 1583 | mSocket = 0; |
1540 | emit commandFinished( this, mRetVal ); | 1584 | emit commandFinished( this, mRetVal ); |
1541 | } | 1585 | } |
diff --git a/libkdepim/ksyncmanager.h b/libkdepim/ksyncmanager.h index 810a515..bd3ecdc 100644 --- a/libkdepim/ksyncmanager.h +++ b/libkdepim/ksyncmanager.h | |||
@@ -1,174 +1,177 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of KDE-Pim/Pi. | 2 | This file is part of KDE-Pim/Pi. |
3 | Copyright (c) 2004 Ulf Schenk | 3 | Copyright (c) 2004 Ulf Schenk |
4 | 4 | ||
5 | This library is free software; you can redistribute it and/or | 5 | This library is free software; you can redistribute it and/or |
6 | modify it under the terms of the GNU Library General Public | 6 | modify it under the terms of the GNU Library General Public |
7 | License as published by the Free Software Foundation; either | 7 | License as published by the Free Software Foundation; either |
8 | version 2 of the License, or (at your option) any later version. | 8 | version 2 of the License, or (at your option) any later version. |
9 | 9 | ||
10 | This library is distributed in the hope that it will be useful, | 10 | This library is distributed in the hope that it will be useful, |
11 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
13 | Library General Public License for more details. | 13 | Library General Public License for more details. |
14 | 14 | ||
15 | You should have received a copy of the GNU Library General Public License | 15 | You should have received a copy of the GNU Library General Public License |
16 | along with this library; see the file COPYING.LIB. If not, write to | 16 | along with this library; see the file COPYING.LIB. If not, write to |
17 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | 17 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
18 | Boston, MA 02111-1307, USA. | 18 | Boston, MA 02111-1307, USA. |
19 | 19 | ||
20 | $Id$ | 20 | $Id$ |
21 | */ | 21 | */ |
22 | #ifndef _KSYNCMANAGER_H | 22 | #ifndef _KSYNCMANAGER_H |
23 | #define _KSYNCMANAGER_H | 23 | #define _KSYNCMANAGER_H |
24 | 24 | ||
25 | #include <qobject.h> | 25 | #include <qobject.h> |
26 | #include <qstring.h> | 26 | #include <qstring.h> |
27 | #include <qsocket.h> | 27 | #include <qsocket.h> |
28 | #include <qdatetime.h> | 28 | #include <qdatetime.h> |
29 | #include <qserversocket.h> | 29 | #include <qserversocket.h> |
30 | #include <qtextstream.h> | 30 | #include <qtextstream.h> |
31 | #include <qregexp.h> | 31 | #include <qregexp.h> |
32 | 32 | ||
33 | class QPopupMenu; | 33 | class QPopupMenu; |
34 | class KSyncProfile; | 34 | class KSyncProfile; |
35 | class KPimPrefs; | 35 | class KPimPrefs; |
36 | class QWidget; | 36 | class QWidget; |
37 | class KSyncManager; | 37 | class KSyncManager; |
38 | class KSyncInterface; | 38 | class KSyncInterface; |
39 | class QProgressBar; | 39 | class QProgressBar; |
40 | 40 | ||
41 | 41 | ||
42 | class KServerSocket : public QServerSocket | 42 | class KServerSocket : public QServerSocket |
43 | { | 43 | { |
44 | Q_OBJECT | 44 | Q_OBJECT |
45 | 45 | ||
46 | public: | 46 | public: |
47 | KServerSocket ( QString password, Q_UINT16 port, int backlog = 0, QObject * parent=0, const char * name=0 ); | 47 | KServerSocket ( QString password, Q_UINT16 port, int backlog = 0, QObject * parent=0, const char * name=0 ); |
48 | 48 | ||
49 | void newConnection ( int socket ) ; | 49 | void newConnection ( int socket ) ; |
50 | void setFileName( QString fn ) {mFileName = fn;}; | 50 | void setFileName( QString fn ) {mFileName = fn;}; |
51 | signals: | 51 | signals: |
52 | void file_received( bool ); | 52 | void file_received( bool ); |
53 | void request_file(); | 53 | void request_file(); |
54 | void saveFile(); | 54 | void saveFile(); |
55 | void endConnect(); | 55 | void endConnect(); |
56 | private slots: | 56 | private slots: |
57 | void discardClient(); | 57 | void discardClient(); |
58 | void deleteSocket(); | ||
58 | void readClient(); | 59 | void readClient(); |
60 | void displayErrorMessage(); | ||
59 | void readBackFileFromSocket(); | 61 | void readBackFileFromSocket(); |
60 | private : | 62 | private : |
63 | int mErrorMessage; | ||
61 | bool blockRC; | 64 | bool blockRC; |
62 | void send_file(); | 65 | void send_file(); |
63 | void get_file(); | 66 | void get_file(); |
64 | void end_connect(); | 67 | void end_connect(); |
65 | void error_connect(); | 68 | void error_connect( QString ); |
66 | QDialog* mSyncActionDialog; | 69 | QDialog* mSyncActionDialog; |
67 | QSocket* mSocket; | 70 | QSocket* mSocket; |
68 | QString mPassWord; | 71 | QString mPassWord; |
69 | QString mFileName; | 72 | QString mFileName; |
70 | QTime piTime; | 73 | QTime piTime; |
71 | QString piFileString; | 74 | QString piFileString; |
72 | }; | 75 | }; |
73 | 76 | ||
74 | class KCommandSocket : public QObject | 77 | class KCommandSocket : public QObject |
75 | { | 78 | { |
76 | Q_OBJECT | 79 | Q_OBJECT |
77 | public: | 80 | public: |
78 | enum state { successR, errorR, successW, errorW, errorTO, errorPW,quiet }; | 81 | enum state { successR, errorR, successW, errorW, errorTO, errorPW, errorCA, errorFI, errorUN,quiet }; |
79 | KCommandSocket ( QString password, Q_UINT16 port, QString host, QObject * parent=0, QWidget* cap = 0, const char * name=0 ); | 82 | KCommandSocket ( QString password, Q_UINT16 port, QString host, QObject * parent=0, QWidget* cap = 0, const char * name=0 ); |
80 | void readFile( QString ); | 83 | void readFile( QString ); |
81 | void writeFile( QString ); | 84 | void writeFile( QString ); |
82 | void sendStop(); | 85 | void sendStop(); |
83 | 86 | ||
84 | private slots : | 87 | private slots : |
85 | void sendFileRequest(); | 88 | void sendFileRequest(); |
86 | 89 | ||
87 | signals: | 90 | signals: |
88 | void commandFinished( KCommandSocket*, int ); | 91 | void commandFinished( KCommandSocket*, int ); |
89 | private slots: | 92 | private slots: |
90 | void startReadFileFromSocket(); | 93 | void startReadFileFromSocket(); |
91 | void readFileFromSocket(); | 94 | void readFileFromSocket(); |
92 | void deleteSocket(); | 95 | void deleteSocket(); |
93 | void writeFileToSocket(); | 96 | void writeFileToSocket(); |
94 | private : | 97 | private : |
95 | QWidget* tlw; | 98 | QWidget* tlw; |
96 | QSocket* mSocket; | 99 | QSocket* mSocket; |
97 | QString mPassWord; | 100 | QString mPassWord; |
98 | Q_UINT16 mPort; | 101 | Q_UINT16 mPort; |
99 | QString mHost; | 102 | QString mHost; |
100 | QString mFileName; | 103 | QString mFileName; |
101 | QTimer* mTimerSocket; | 104 | QTimer* mTimerSocket; |
102 | int mRetVal; | 105 | int mRetVal; |
103 | QTime mTime; | 106 | QTime mTime; |
104 | QString mFileString; | 107 | QString mFileString; |
105 | bool mFirst; | 108 | bool mFirst; |
106 | bool mFirstLine; | 109 | bool mFirstLine; |
107 | }; | 110 | }; |
108 | 111 | ||
109 | 112 | ||
110 | class KSyncManager : public QObject | 113 | class KSyncManager : public QObject |
111 | { | 114 | { |
112 | Q_OBJECT | 115 | Q_OBJECT |
113 | 116 | ||
114 | public: | 117 | public: |
115 | enum TargetApp { | 118 | enum TargetApp { |
116 | KOPI = 0, | 119 | KOPI = 0, |
117 | KAPI = 1, | 120 | KAPI = 1, |
118 | PWMPI = 2 }; | 121 | PWMPI = 2 }; |
119 | 122 | ||
120 | KSyncManager(QWidget* parent, KSyncInterface* implementation, TargetApp ta, KPimPrefs* prefs, QPopupMenu* syncmenu); | 123 | KSyncManager(QWidget* parent, KSyncInterface* implementation, TargetApp ta, KPimPrefs* prefs, QPopupMenu* syncmenu); |
121 | ~KSyncManager() ; | 124 | ~KSyncManager() ; |
122 | 125 | ||
123 | void multiSync( bool askforPrefs ); | 126 | void multiSync( bool askforPrefs ); |
124 | bool blockSave() { return mBlockSaveFlag; } | 127 | bool blockSave() { return mBlockSaveFlag; } |
125 | void setBlockSave(bool sa) { mBlockSaveFlag = sa; } | 128 | void setBlockSave(bool sa) { mBlockSaveFlag = sa; } |
126 | void setDefaultFileName( QString s) ; | 129 | void setDefaultFileName( QString s) ; |
127 | QString defaultFileName() { return mDefFileName ;} | 130 | QString defaultFileName() { return mDefFileName ;} |
128 | QString syncFileName(); | 131 | QString syncFileName(); |
129 | void enableQuick( bool ask = true); | 132 | void enableQuick( bool ask = true); |
130 | 133 | ||
131 | bool syncWithDesktop () { return mSyncWithDesktop;} | 134 | bool syncWithDesktop () { return mSyncWithDesktop;} |
132 | QString getCurrentSyncDevice() { return mCurrentSyncDevice; } | 135 | QString getCurrentSyncDevice() { return mCurrentSyncDevice; } |
133 | QString getCurrentSyncName() { return mCurrentSyncName; } | 136 | QString getCurrentSyncName() { return mCurrentSyncName; } |
134 | 137 | ||
135 | void showProgressBar(int percentage, QString caption = QString::null, int total=100); | 138 | void showProgressBar(int percentage, QString caption = QString::null, int total=100); |
136 | void hideProgressBar(); | 139 | void hideProgressBar(); |
137 | bool isProgressBarCanceled(); | 140 | bool isProgressBarCanceled(); |
138 | 141 | ||
139 | // sync stuff | 142 | // sync stuff |
140 | QString mLocalMachineName; | 143 | QString mLocalMachineName; |
141 | QStringList mExternSyncProfiles; | 144 | QStringList mExternSyncProfiles; |
142 | QStringList mSyncProfileNames; | 145 | QStringList mSyncProfileNames; |
143 | bool mAskForPreferences; | 146 | bool mAskForPreferences; |
144 | bool mShowSyncSummary; | 147 | bool mShowSyncSummary; |
145 | bool mIsKapiFile; | 148 | bool mIsKapiFile; |
146 | bool mWriteBackExistingOnly; | 149 | bool mWriteBackExistingOnly; |
147 | int mSyncAlgoPrefs; | 150 | int mSyncAlgoPrefs; |
148 | bool mWriteBackFile; | 151 | bool mWriteBackFile; |
149 | int mWriteBackInFuture; | 152 | int mWriteBackInFuture; |
150 | int mWriteBackInPast; | 153 | int mWriteBackInPast; |
151 | QString mPhoneDevice; | 154 | QString mPhoneDevice; |
152 | QString mPhoneConnection; | 155 | QString mPhoneConnection; |
153 | QString mPhoneModel; | 156 | QString mPhoneModel; |
154 | QString mPassWordPiSync; | 157 | QString mPassWordPiSync; |
155 | QString mActiveSyncPort; | 158 | QString mActiveSyncPort; |
156 | QString mActiveSyncIP ; | 159 | QString mActiveSyncIP ; |
157 | QString mFilterInCal; | 160 | QString mFilterInCal; |
158 | QString mFilterOutCal; | 161 | QString mFilterOutCal; |
159 | QString mFilterInAB; | 162 | QString mFilterInAB; |
160 | QString mFilterOutAB; | 163 | QString mFilterOutAB; |
161 | static QDateTime mRequestedSyncEvent; | 164 | static QDateTime mRequestedSyncEvent; |
162 | 165 | ||
163 | signals: | 166 | signals: |
164 | void save(); | 167 | void save(); |
165 | void request_file(); | 168 | void request_file(); |
166 | void getFile( bool ); | 169 | void getFile( bool ); |
167 | 170 | ||
168 | public slots: | 171 | public slots: |
169 | void slotSyncMenu( int ); | 172 | void slotSyncMenu( int ); |
170 | void slotClearMenu( int action ); | 173 | void slotClearMenu( int action ); |
171 | void deleteCommandSocket(KCommandSocket*s, int state); | 174 | void deleteCommandSocket(KCommandSocket*s, int state); |
172 | void readFileFromSocket(); | 175 | void readFileFromSocket(); |
173 | void fillSyncMenu(); | 176 | void fillSyncMenu(); |
174 | 177 | ||