--- a/src/eric7/WebBrowser/Bookmarks/BookmarksImporters/OperaImporter.py Wed Jul 13 11:16:20 2022 +0200
+++ b/src/eric7/WebBrowser/Bookmarks/BookmarksImporters/OperaImporter.py Wed Jul 13 14:55:47 2022 +0200
@@ -20,7 +20,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),
@@ -29,14 +29,12 @@
@exception ValueError raised to indicate an invalid browser ID
"""
if sourceId != "opera":
- 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%\\Opera\\Opera")
elif Globals.isMacPlatform():
- standardDir = os.path.expanduser(
- "~/Library/Opera")
+ standardDir = os.path.expanduser("~/Library/Opera")
else:
standardDir = os.path.expanduser("~/.opera")
return (
@@ -46,10 +44,11 @@
QCoreApplication.translate(
"OperaImporter",
"""Opera stores its bookmarks in the <b>bookmarks.adr</b> """
- """text file. This file is usually located in"""),
+ """text file. This file is usually located in""",
+ ),
QCoreApplication.translate(
- "OperaImporter",
- """Please choose the file to begin importing bookmarks."""),
+ "OperaImporter", """Please choose the file to begin importing bookmarks."""
+ ),
standardDir,
)
@@ -58,43 +57,44 @@
"""
Class implementing the Opera 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 = ""
-
+
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
return True
-
+
def importedBookmarks(self):
"""
Public method to get the imported bookmarks.
-
+
@return imported bookmarks (BookmarkNode)
"""
try:
@@ -106,13 +106,14 @@
"File '{0}' cannot be read.\nReason: {1}"
).format(self.__fileName, str(err))
return None
-
+
folderStack = []
-
+
from ..BookmarkNode import BookmarkNode
+
importRootNode = BookmarkNode(BookmarkNode.Folder)
folderStack.append(importRootNode)
-
+
for line in contents.splitlines():
line = line.strip()
if line == "#FOLDER":
@@ -126,12 +127,11 @@
node.title = line.replace("NAME=", "").replace("&", "&&")
elif line.startswith("URL="):
node.url = line.replace("URL=", "")
-
+
if self._id == "opera":
importRootNode.title = self.tr("Opera 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
