Merge pull request #75 from j9ac9k/add-magic-like-link-support

Add magic like link support

src/doppkit/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.4.0rc1"
+__version__ = "0.4.0rc2"
 
 from . import cache
 from . import grid

src/doppkit/cache.py

@@ -100,7 +100,7 @@ async def cache(
         urls: Iterable[DownloadUrl],
         headers: dict[str, str],
         progress: Optional[Progress] = None
-) -> Iterable[Union[Content, Exception, httpx.Response]]:
+) -> Iterable[Union[Content, BaseException, httpx.Response]]:
     limits = httpx.Limits(
         max_keepalive_connections=app.threads, max_connections=app.threads
     )

src/doppkit/grid.py

@@ -126,8 +126,6 @@ class AOI(TypedDict):
     vector_intersects: list[VectorProduct]
 
 
-
-
 class Grid:
     def __init__(self, args):
         self.args = args

src/doppkit/gui/MagicLinkDialog.py

@@ -0,0 +1,42 @@
+import logging
+from qtpy import QtCore, QtWidgets
+
+from typing import Optional
+
+logger = logging.getLogger("doppkit")
+
+
+class MagicLinkDialog(QtWidgets.QDialog):
+
+	magicLinkText = QtCore.Signal(object)
+
+	def __init__(self, parent: Optional[QtWidgets.QWidget]=None) -> None:
+		super().__init__(parent)
+
+		self.lineEdit = QtWidgets.QLineEdit()
+		label = QtWidgets.QLabel("&Magic Link Text")
+		label.setBuddy(self.lineEdit)
+
+		labelFont = label.font()
+		labelFont.setPointSize(10)
+		label.setFont(labelFont)
+
+		standardButton = QtWidgets.QDialogButtonBox.StandardButton
+		self.buttonBox = QtWidgets.QDialogButtonBox(
+			standardButton.Ok | standardButton.Close,
+			QtCore.Qt.Orientation.Horizontal
+		)
+		self.buttonBox.accepted.connect(self.passMagicLinkText)
+		self.buttonBox.rejected.connect(self.close)
+
+		layout = QtWidgets.QVBoxLayout()
+		layout.addWidget(label)
+		layout.addWidget(self.lineEdit)
+		layout.addWidget(self.buttonBox)
+		self.setLayout(layout)
+		self.setWindowTitle("Magic Link Dialog")
+
+	@QtCore.Slot()
+	def passMagicLinkText(self):
+		self.magicLinkText.emit(self.lineEdit.text())
+		self.close()

src/doppkit/gui/MenuBar.py

@@ -7,6 +7,7 @@
 from qtpy.QtWidgets import QAction, QApplication, QFileDialog, QMenu, QMenuBar, QMainWindow
 
 from .SettingsDialog import SettingsDialog
+from .MagicLinkDialog import MagicLinkDialog
 
 class MenuBar(QMenuBar):
 
@@ -20,28 +21,31 @@ def __init__(self) -> None:
                 break
         else:
             raise RuntimeError("Main Window not Found")
-        self.fileMenu = FileMenu(self)
-        self.viewMenu = ViewMenu(self)
+        self.fileMenu = FileMenu(parent=self)
+        self.viewMenu = ViewMenu(parent=self)
         self.helpMenu = QMenu("Help", self)
 
         for menu in [self.fileMenu, self.viewMenu, self.helpMenu]:
             self.addMenu(menu)
 
-        self.settingsDialog: typing.Optional[SettingsDialog] = None
 
 class FileMenu(QMenu):
 
-    def __init__(self, title: typing.Optional[str] = None, parent: MenuBar = None) -> None:
-        if isinstance(title, str):
-            super().__init__(title, parent)
-        else:
-            parent, title = title, ""
-            super().__init__(parent)
+    def __init__(
+        self,
+        title: typing.Optional[str] = None,
+        parent: typing.Optional[MenuBar] = None
+    ) -> None:
+        if title is None:
+            title = ""
+        super().__init__(title, parent)
         self.setTitle("File")
         self.settingsDialog: typing.Optional['SettingsDialog'] = None
+        self.magicLinkDialog: typing.Optional['MagicLinkDialog'] = None
         self._settingsAction()
         self._uploadFileAction()
         self._uploadDirectoryAction()
+        self._provideMagicLinkAction()
         self._quitAction()
 
     def _settingsAction(self) -> None:
@@ -58,6 +62,14 @@ def invokeSettings(self):
             self.settingsDialog.rejected.connect(self._resetSettingsDialog)
             self.settingsDialog.show()
 
+    @Slot()
+    def invokeMagicLinkDialog(self):
+        if self.magicLinkDialog is None:
+            self.magicLinkDialog = MagicLinkDialog(parent=self)
+            mainWindow = self.parent().mainWindow
+            self.magicLinkDialog.magicLinkText.connect(mainWindow.parseMagicLink)
+        self.magicLinkDialog.show()
+
     @Slot()
     def uploadFileDialog(self):
         filename, filter_ = QFileDialog.getOpenFileName(
@@ -139,6 +151,11 @@ def _uploadDirectoryAction(self):
         uploadDirectoryAction.triggered.connect(self.uploadDirectoryDialog)
         self.addAction(uploadDirectoryAction)
 
+    def _provideMagicLinkAction(self):
+        provideMagicLinkAction = QAction("Import Magic Link", self)
+        provideMagicLinkAction.triggered.connect(self.invokeMagicLinkDialog)
+        self.addAction(provideMagicLinkAction)
+
 
 class ViewMenu(QMenu):