Mercurial Repositories > eric / file comparison
comparison: Helpviewer/Sync/FtpSyncHandler.py
Helpviewer/Sync/FtpSyncHandler.py
- changeset 3190
- a9a94491c4fd
- parent 3160
- 209a07d7e401
- child 3484
- 645c12de6b0c
equal
deleted
inserted
replaced
| 3189:9a21c547de5f | 3190:a9a94491c4fd |
|---|---|
| 259 type_, fileName, | 259 type_, fileName, |
| 260 self.__remoteFilesFound[self._remoteFiles[type_]] | 260 self.__remoteFilesFound[self._remoteFiles[type_]] |
| 261 .toTime_t()) | 261 .toTime_t()) |
| 262 else: | 262 else: |
| 263 self.syncStatus.emit( | 263 self.syncStatus.emit( |
| 264 type_, self.trUtf8("No synchronization required.")) | 264 type_, self.tr("No synchronization required.")) |
| 265 self.syncFinished.emit(type_, True, True) | 265 self.syncFinished.emit(type_, True, True) |
| 266 else: | 266 else: |
| 267 if self._remoteFiles[type_] not in self.__remoteFilesFound: | 267 if self._remoteFiles[type_] not in self.__remoteFilesFound: |
| 268 self.syncStatus.emit( | 268 self.syncStatus.emit( |
| 269 type_, self._messages[type_]["RemoteMissing"]) | 269 type_, self._messages[type_]["RemoteMissing"]) |
| 329 self.__idleTimeout() | 329 self.__idleTimeout() |
| 330 if not self.__connected or self.__ftp.sock is None: | 330 if not self.__connected or self.__ftp.sock is None: |
| 331 ok = self.__connectAndLogin() | 331 ok = self.__connectAndLogin() |
| 332 if not ok: | 332 if not ok: |
| 333 self.syncStatus.emit( | 333 self.syncStatus.emit( |
| 334 type_, self.trUtf8("Cannot log in to FTP host.")) | 334 type_, self.tr("Cannot log in to FTP host.")) |
| 335 return | 335 return |
| 336 | 336 |
| 337 # upload the changed file | 337 # upload the changed file |
| 338 self.__state = "uploading" | 338 self.__state = "uploading" |
| 339 self.syncStatus.emit(type_, self._messages[type_]["Uploading"]) | 339 self.syncStatus.emit(type_, self._messages[type_]["Uploading"]) |
| 340 if self.__uploadFile(type_, fileName): | 340 if self.__uploadFile(type_, fileName): |
| 341 self.syncStatus.emit( | 341 self.syncStatus.emit( |
| 342 type_, self.trUtf8("Synchronization finished.")) | 342 type_, self.tr("Synchronization finished.")) |
| 343 self.__state = "idle" | 343 self.__state = "idle" |
| 344 | 344 |
| 345 def syncBookmarks(self): | 345 def syncBookmarks(self): |
| 346 """ | 346 """ |
| 347 Public method to synchronize the bookmarks. | 347 Public method to synchronize the bookmarks. |
