--- a/src/eric7/WebBrowser/Bookmarks/BookmarksImporters/FirefoxImporter.py Wed Jul 13 11:16:20 2022 +0200 +++ b/src/eric7/WebBrowser/Bookmarks/BookmarksImporters/FirefoxImporter.py Wed Jul 13 14:55:47 2022 +0200 @@ -21,7 +21,7 @@ def getImporterInfo(sourceId): """ Module function to get information for the given source id. - + @param sourceId id of the browser ("chrome" or "chromium") @return tuple with an icon (QPixmap), readable name (string), name of the default bookmarks file (string), an info text (string), @@ -30,15 +30,14 @@ @exception ValueError raised to indicate an invalid browser ID """ if sourceId != "firefox": - raise ValueError( - "Unsupported browser ID given ({0}).".format(sourceId)) - + raise ValueError("Unsupported browser ID given ({0}).".format(sourceId)) + if Globals.isWindowsPlatform(): - standardDir = os.path.expandvars( - "%APPDATA%\\Mozilla\\Firefox\\Profiles") + standardDir = os.path.expandvars("%APPDATA%\\Mozilla\\Firefox\\Profiles") elif Globals.isMacPlatform(): standardDir = os.path.expanduser( - "~/Library/Application Support/Firefox/Profiles") + "~/Library/Application Support/Firefox/Profiles" + ) else: standardDir = os.path.expanduser("~/.mozilla/firefox") return ( @@ -49,10 +48,12 @@ "FirefoxImporter", """Mozilla Firefox stores its bookmarks in the""" """ <b>places.sqlite</b> SQLite database. This file is""" - """ usually located in"""), + """ usually located in""", + ), QCoreApplication.translate( "FirefoxImporter", - """Please choose the file to begin importing bookmarks."""), + """Please choose the file to begin importing bookmarks.""", + ), standardDir, ) @@ -61,127 +62,129 @@ """ Class implementing the Chrome bookmarks importer. """ + def __init__(self, sourceId="", parent=None): """ Constructor - + @param sourceId source ID (string) @param parent reference to the parent object (QObject) """ super().__init__(sourceId, parent) - + self.__fileName = "" self.__db = None - + def setPath(self, path): """ Public method to set the path of the bookmarks file or directory. - + @param path bookmarks file or directory (string) """ self.__fileName = path - + def open(self): """ Public method to open the bookmarks file. - + @return flag indicating success (boolean) """ if not os.path.exists(self.__fileName): self._error = True - self._errorString = self.tr( - "File '{0}' does not exist." - ).format(self.__fileName) + self._errorString = self.tr("File '{0}' does not exist.").format( + self.__fileName + ) return False - + try: self.__db = sqlite3.connect(self.__fileName) except sqlite3.DatabaseError as err: self._error = True - self._errorString = self.tr( - "Unable to open database.\nReason: {0}").format(str(err)) + self._errorString = self.tr("Unable to open database.\nReason: {0}").format( + str(err) + ) return False - + return True - + def importedBookmarks(self): """ Public method to get the imported bookmarks. - + @return imported bookmarks (BookmarkNode) """ from ..BookmarkNode import BookmarkNode + importRootNode = BookmarkNode(BookmarkNode.Root) - + # step 1: build the hierarchy of bookmark folders folders = {} - + try: cursor = self.__db.cursor() cursor.execute( "SELECT id, parent, title FROM moz_bookmarks " - "WHERE type = 2 and title !=''") + "WHERE type = 2 and title !=''" + ) for row in cursor: id_ = row[0] parent = row[1] title = row[2] folder = ( BookmarkNode(BookmarkNode.Folder, folders[parent]) - if parent in folders else - BookmarkNode(BookmarkNode.Folder, importRootNode) + if parent in folders + else BookmarkNode(BookmarkNode.Folder, importRootNode) ) folder.title = title.replace("&", "&&") folders[id_] = folder except sqlite3.DatabaseError as err: self._error = True - self._errorString = self.tr( - "Unable to open database.\nReason: {0}").format(str(err)) + self._errorString = self.tr("Unable to open database.\nReason: {0}").format( + str(err) + ) return None - + try: cursor = self.__db.cursor() cursor.execute( "SELECT parent, title, fk, position FROM moz_bookmarks" - " WHERE type = 1 and title != '' ORDER BY position") + " WHERE type = 1 and title != '' ORDER BY position" + ) for row in cursor: parent = row[0] title = row[1] placesId = row[2] - + cursor2 = self.__db.cursor() cursor2.execute( - "SELECT url FROM moz_places WHERE id = {0}" # secok - .format(placesId)) + "SELECT url FROM moz_places WHERE id = {0}".format( # secok + placesId + ) + ) row2 = cursor2.fetchone() if row2: url = QUrl(row2[0]) - if ( - not title or - url.isEmpty() or - url.scheme() in ["place", "about"] - ): + if not title or url.isEmpty() or url.scheme() in ["place", "about"]: continue - + if parent in folders: - bookmark = BookmarkNode(BookmarkNode.Bookmark, - folders[parent]) + bookmark = BookmarkNode(BookmarkNode.Bookmark, folders[parent]) else: - bookmark = BookmarkNode(BookmarkNode.Bookmark, - importRootNode) + bookmark = BookmarkNode(BookmarkNode.Bookmark, importRootNode) bookmark.url = url.toString() bookmark.title = title.replace("&", "&&") except sqlite3.DatabaseError as err: self._error = True - self._errorString = self.tr( - "Unable to open database.\nReason: {0}").format(str(err)) + self._errorString = self.tr("Unable to open database.\nReason: {0}").format( + str(err) + ) return None - + importRootNode.setType(BookmarkNode.Folder) if self._id == "firefox": importRootNode.title = self.tr("Mozilla Firefox Import") else: - importRootNode.title = self.tr( - "Imported {0}" - ).format(QDate.currentDate().toString( - Qt.DateFormat.SystemLocaleShortDate)) + importRootNode.title = self.tr("Imported {0}").format( + QDate.currentDate().toString(Qt.DateFormat.SystemLocaleShortDate) + ) return importRootNode