Mercurial Repositories > eric / file comparison
comparison: eric7/WebBrowser/GreaseMonkey/GreaseMonkeyDownloader.py
eric7/WebBrowser/GreaseMonkey/GreaseMonkeyDownloader.py
- branch
- eric7
- changeset 9153
- 506e35e424d5
- parent 8881
- 54e42bc2437a
equal
deleted
inserted
replaced
| 9152:8a68afaf1ba2 | 9153:506e35e424d5 |
|---|---|
| 6 """ | 6 """ |
| 7 Module implementing the downloader for GreaseMonkey scripts. | 7 Module implementing the downloader for GreaseMonkey scripts. |
| 8 """ | 8 """ |
| 9 | 9 |
| 10 import os | 10 import os |
| 11 import pathlib | |
| 11 | 12 |
| 12 from PyQt6.QtCore import pyqtSignal, pyqtSlot, QObject, QSettings, QFileInfo | 13 from PyQt6.QtCore import pyqtSignal, pyqtSlot, QObject, QSettings |
| 13 from PyQt6.QtNetwork import QNetworkReply, QNetworkRequest | 14 from PyQt6.QtNetwork import QNetworkReply, QNetworkRequest |
| 14 | 15 |
| 15 from WebBrowser.WebBrowserWindow import WebBrowserWindow | 16 from WebBrowser.WebBrowserWindow import WebBrowserWindow |
| 16 | 17 |
| 17 | 18 |
| 123 if not self.__fileName: | 124 if not self.__fileName: |
| 124 self.__fileName = settings.value( | 125 self.__fileName = settings.value( |
| 125 self.__reply.request().url().toString()) | 126 self.__reply.request().url().toString()) |
| 126 if not self.__fileName: | 127 if not self.__fileName: |
| 127 name = ( | 128 name = ( |
| 128 QFileInfo(self.__reply.request().url().path()) | 129 pathlib.Path(self.__reply.request().url().path()).name |
| 129 .fileName() | |
| 130 ) | 130 ) |
| 131 if not name: | 131 if not name: |
| 132 name = "require.js" | 132 name = "require.js" |
| 133 elif not name.endswith(".js"): | 133 elif not name.endswith(".js"): |
| 134 name += ".js" | 134 name += ".js" |
| 135 filePath = os.path.join( | 135 filePath = os.path.join( |
| 136 self.__manager.requireScriptsDirectory(), name) | 136 self.__manager.requireScriptsDirectory(), name) |
| 137 from WebBrowser.Tools import WebBrowserTools | 137 from WebBrowser.Tools import WebBrowserTools |
| 138 self.__fileName = WebBrowserTools.ensureUniqueFilename( | 138 self.__fileName = WebBrowserTools.ensureUniqueFilename( |
| 139 filePath, "{0}") | 139 filePath, "{0}") |
| 140 if not QFileInfo(self.__fileName).isAbsolute(): | 140 if not pathlib.Path(self.__fileName).is_absolute(): |
| 141 self.__fileName = os.path.join( | 141 self.__fileName = os.path.join( |
| 142 self.__manager.requireScriptsDirectory(), | 142 self.__manager.requireScriptsDirectory(), |
| 143 self.__fileName) | 143 self.__fileName) |
| 144 | 144 |
| 145 try: | 145 try: |
| 148 except OSError: | 148 except OSError: |
| 149 self.error.emit() | 149 self.error.emit() |
| 150 return | 150 return |
| 151 | 151 |
| 152 settings.setValue(self.__reply.request().url().toString(), | 152 settings.setValue(self.__reply.request().url().toString(), |
| 153 QFileInfo(self.__fileName).fileName()) | 153 pathlib.Path(self.__fileName).name) |
| 154 | 154 |
| 155 self.finished.emit(self.__fileName) | 155 self.finished.emit(self.__fileName) |
