--- a/src/eric7/WebBrowser/Sync/SyncManager.py Wed Jul 13 11:16:20 2022 +0200
+++ b/src/eric7/WebBrowser/Sync/SyncManager.py Wed Jul 13 14:55:47 2022 +0200
@@ -19,7 +19,7 @@
class SyncManager(QObject):
"""
Class implementing the synchronization manager.
-
+
@signal syncError(message) emitted for a general error with the error
message (string)
@signal syncMessage(message) emitted to give status info about the sync
@@ -31,41 +31,43 @@
synchronization has finished (string one of "bookmarks", "history",
"passwords", "useragents" or "speeddial", boolean, boolean)
"""
+
syncError = pyqtSignal(str)
syncMessage = pyqtSignal(str)
syncStatus = pyqtSignal(str, str)
syncFinished = pyqtSignal(str, bool, bool)
-
+
def __init__(self, parent=None):
"""
Constructor
-
+
@param parent reference to the parent object (QObject)
"""
super().__init__(parent)
-
+
self.__handler = None
-
+
def handler(self):
"""
Public method to get a reference to the sync handler object.
-
+
@return reference to the sync handler object (SyncHandler)
"""
return self.__handler
-
+
def showSyncDialog(self):
"""
Public method to show the synchronization dialog.
"""
from .SyncAssistantDialog import SyncAssistantDialog
+
dlg = SyncAssistantDialog()
dlg.exec()
-
+
def loadSettings(self, forceUpload=False):
"""
Public method to load the settings.
-
+
@param forceUpload flag indicating a forced upload of the files
(boolean)
"""
@@ -75,179 +77,185 @@
self.__handler.syncStatus.disconnect(self.__syncStatus)
self.__handler.syncMessage.disconnect(self.syncMessage)
self.__handler.shutdown()
-
+
if self.syncEnabled():
from . import SyncGlobals
- if (
- Preferences.getWebBrowser("SyncType") ==
- SyncGlobals.SyncTypeFtp
- ):
+
+ if Preferences.getWebBrowser("SyncType") == SyncGlobals.SyncTypeFtp:
from .FtpSyncHandler import FtpSyncHandler
+
self.__handler = FtpSyncHandler(self)
- elif (
- Preferences.getWebBrowser("SyncType") ==
- SyncGlobals.SyncTypeDirectory
- ):
+ elif Preferences.getWebBrowser("SyncType") == SyncGlobals.SyncTypeDirectory:
from .DirectorySyncHandler import DirectorySyncHandler
+
self.__handler = DirectorySyncHandler(self)
self.__handler.syncError.connect(self.__syncError)
self.__handler.syncFinished.connect(self.__syncFinished)
self.__handler.syncStatus.connect(self.__syncStatus)
self.__handler.syncMessage.connect(self.syncMessage)
-
+
self.__handler.initialLoadAndCheck(forceUpload=forceUpload)
-
+
# connect sync manager to bookmarks manager
if Preferences.getWebBrowser("SyncBookmarks"):
(
- WebBrowserWindow.bookmarksManager()
- .bookmarksSaved.connect(self.__syncBookmarks)
+ WebBrowserWindow.bookmarksManager().bookmarksSaved.connect(
+ self.__syncBookmarks
+ )
)
else:
with contextlib.suppress(TypeError):
(
- WebBrowserWindow.bookmarksManager()
- .bookmarksSaved.disconnect(self.__syncBookmarks)
+ WebBrowserWindow.bookmarksManager().bookmarksSaved.disconnect(
+ self.__syncBookmarks
+ )
)
-
+
# connect sync manager to history manager
if Preferences.getWebBrowser("SyncHistory"):
(
- WebBrowserWindow.historyManager().historySaved
- .connect(self.__syncHistory)
+ WebBrowserWindow.historyManager().historySaved.connect(
+ self.__syncHistory
+ )
)
else:
with contextlib.suppress(TypeError):
(
- WebBrowserWindow.historyManager()
- .historySaved.disconnect(self.__syncHistory)
+ WebBrowserWindow.historyManager().historySaved.disconnect(
+ self.__syncHistory
+ )
)
-
+
# connect sync manager to passwords manager
if Preferences.getWebBrowser("SyncPasswords"):
(
- WebBrowserWindow.passwordManager()
- .passwordsSaved.connect(self.__syncPasswords)
- )
- else:
- with contextlib.suppress(TypeError):
- (
- WebBrowserWindow.passwordManager()
- .passwordsSaved.disconnect(self.__syncPasswords)
+ WebBrowserWindow.passwordManager().passwordsSaved.connect(
+ self.__syncPasswords
)
-
- # connect sync manager to user agent manager
- if Preferences.getWebBrowser("SyncUserAgents"):
- (
- WebBrowserWindow.userAgentsManager()
- .userAgentSettingsSaved.connect(self.__syncUserAgents)
)
else:
with contextlib.suppress(TypeError):
(
- WebBrowserWindow.userAgentsManager()
- .userAgentSettingsSaved.disconnect(
- self.__syncUserAgents)
+ WebBrowserWindow.passwordManager().passwordsSaved.disconnect(
+ self.__syncPasswords
+ )
)
-
+
+ # connect sync manager to user agent manager
+ if Preferences.getWebBrowser("SyncUserAgents"):
+ (
+ WebBrowserWindow.userAgentsManager().userAgentSettingsSaved.connect(
+ self.__syncUserAgents
+ )
+ )
+ else:
+ with contextlib.suppress(TypeError):
+ uam = WebBrowserWindow.userAgentsManager()
+ uam.userAgentSettingsSaved.disconnect(self.__syncUserAgents)
+
# connect sync manager to speed dial
if Preferences.getWebBrowser("SyncSpeedDial"):
(
- WebBrowserWindow.speedDial()
- .speedDialSaved.connect(self.__syncSpeedDial)
+ WebBrowserWindow.speedDial().speedDialSaved.connect(
+ self.__syncSpeedDial
+ )
)
else:
with contextlib.suppress(TypeError):
(
- WebBrowserWindow.speedDial()
- .speedDialSaved.disconnect(self.__syncSpeedDial)
+ WebBrowserWindow.speedDial().speedDialSaved.disconnect(
+ self.__syncSpeedDial
+ )
)
else:
self.__handler = None
-
+
with contextlib.suppress(TypeError):
(
- WebBrowserWindow.bookmarksManager()
- .bookmarksSaved.disconnect(self.__syncBookmarks)
+ WebBrowserWindow.bookmarksManager().bookmarksSaved.disconnect(
+ self.__syncBookmarks
+ )
)
with contextlib.suppress(TypeError):
(
- WebBrowserWindow.historyManager().historySaved
- .disconnect(self.__syncHistory)
+ WebBrowserWindow.historyManager().historySaved.disconnect(
+ self.__syncHistory
+ )
)
with contextlib.suppress(TypeError):
(
- WebBrowserWindow.passwordManager()
- .passwordsSaved.disconnect(self.__syncPasswords)
+ WebBrowserWindow.passwordManager().passwordsSaved.disconnect(
+ self.__syncPasswords
+ )
)
with contextlib.suppress(TypeError):
- (
- WebBrowserWindow.userAgentsManager()
- .userAgentSettingsSaved.disconnect(self.__syncUserAgents)
- )
+ uam = WebBrowserWindow.userAgentsManager()
+ uam.userAgentSettingsSaved.disconnect(self.__syncUserAgents)
with contextlib.suppress(TypeError):
WebBrowserWindow.speedDial().speedDialSaved.disconnect(
- self.__syncSpeedDial)
-
+ self.__syncSpeedDial
+ )
+
def syncEnabled(self):
"""
Public method to check, if synchronization is enabled.
-
+
@return flag indicating enabled synchronization
"""
from . import SyncGlobals
+
return (
- Preferences.getWebBrowser("SyncEnabled") and
- Preferences.getWebBrowser("SyncType") != SyncGlobals.SyncTypeNone
+ Preferences.getWebBrowser("SyncEnabled")
+ and Preferences.getWebBrowser("SyncType") != SyncGlobals.SyncTypeNone
)
-
+
def __syncBookmarks(self):
"""
Private slot to synchronize the bookmarks.
"""
if self.__handler is not None:
self.__handler.syncBookmarks()
-
+
def __syncHistory(self):
"""
Private slot to synchronize the history.
"""
if self.__handler is not None:
self.__handler.syncHistory()
-
+
def __syncPasswords(self):
"""
Private slot to synchronize the passwords.
"""
if self.__handler is not None:
self.__handler.syncPasswords()
-
+
def __syncUserAgents(self):
"""
Private slot to synchronize the user agent settings.
"""
if self.__handler is not None:
self.__handler.syncUserAgents()
-
+
def __syncSpeedDial(self):
"""
Private slot to synchronize the speed dial settings.
"""
if self.__handler is not None:
self.__handler.syncSpeedDial()
-
+
def __syncError(self, message):
"""
Private slot to handle general synchronization issues.
-
+
@param message error message (string)
"""
self.syncError.emit(message)
-
+
def __syncFinished(self, type_, status, download):
"""
Private slot to handle a finished synchronization event.
-
+
@param type_ type of the synchronization event (string one
of "bookmarks", "history", "passwords", "useragents" or
"speeddial")
@@ -266,11 +274,11 @@
elif type_ == "speeddial":
WebBrowserWindow.speedDial().reload()
self.syncFinished.emit(type_, status, download)
-
+
def __syncStatus(self, type_, message):
"""
Private slot to handle a status update of a synchronization event.
-
+
@param type_ type of the synchronization event (string one
of "bookmarks", "history", "passwords", "useragents" or
"speeddial")
@@ -278,13 +286,13 @@
"""
self.syncMessage.emit(message)
self.syncStatus.emit(type_, message)
-
+
def close(self):
"""
Public slot to shut down the synchronization manager.
"""
if not self.syncEnabled():
return
-
+
if self.__handler is not None:
self.__handler.shutdown()
