Mercurial Repositories > eric / file comparison
comparison: Helpviewer/GreaseMonkey/GreaseMonkeyDownloader.py
Helpviewer/GreaseMonkey/GreaseMonkeyDownloader.py
- changeset 3022
- 57179e4cdadd
- parent 3020
- 542e97d4ecb3
- child 3035
- 36e9f388958b
- child 3058
- 0a02c433f52d
equal
deleted
inserted
replaced
| 3021:801289962f4e | 3022:57179e4cdadd |
|---|---|
| 35 """ | 35 """ |
| 36 super().__init__() | 36 super().__init__() |
| 37 | 37 |
| 38 self.__manager = manager | 38 self.__manager = manager |
| 39 | 39 |
| 40 self.__reply = FollowRedirectReply(request.url(), | 40 self.__reply = FollowRedirectReply( |
| 41 request.url(), | |
| 41 Helpviewer.HelpWindow.HelpWindow.networkAccessManager()) | 42 Helpviewer.HelpWindow.HelpWindow.networkAccessManager()) |
| 42 self.__reply.finished.connect(self.__scriptDownloaded) | 43 self.__reply.finished.connect(self.__scriptDownloaded) |
| 43 | 44 |
| 44 self.__fileName = "" | 45 self.__fileName = "" |
| 45 self.__requireUrls = [] | 46 self.__requireUrls = [] |
| 55 response = bytes(self.__reply.readAll()).decode() | 56 response = bytes(self.__reply.readAll()).decode() |
| 56 | 57 |
| 57 if self.__reply.error() == QNetworkReply.NoError and \ | 58 if self.__reply.error() == QNetworkReply.NoError and \ |
| 58 "// ==UserScript==" in response: | 59 "// ==UserScript==" in response: |
| 59 from Helpviewer import HelpUtilities | 60 from Helpviewer import HelpUtilities |
| 60 filePath = os.path.join(self.__manager.scriptsDirectory(), | 61 filePath = os.path.join( |
| 62 self.__manager.scriptsDirectory(), | |
| 61 HelpUtilities.getFileNameFromUrl(self.__reply.url())) | 63 HelpUtilities.getFileNameFromUrl(self.__reply.url())) |
| 62 self.__fileName = HelpUtilities.ensureUniqueFilename(filePath) | 64 self.__fileName = HelpUtilities.ensureUniqueFilename(filePath) |
| 63 | 65 |
| 64 try: | 66 try: |
| 65 f = open(self.__fileName, "w", encoding="utf-8") | 67 f = open(self.__fileName, "w", encoding="utf-8") |
| 142 def __downloadRequires(self): | 144 def __downloadRequires(self): |
| 143 """ | 145 """ |
| 144 Private slot to initiate the download of required scripts. | 146 Private slot to initiate the download of required scripts. |
| 145 """ | 147 """ |
| 146 if self.__requireUrls: | 148 if self.__requireUrls: |
| 147 self.__reply = FollowRedirectReply(self.__requireUrls.pop(0), | 149 self.__reply = FollowRedirectReply( |
| 150 self.__requireUrls.pop(0), | |
| 148 Helpviewer.HelpWindow.HelpWindow.networkAccessManager()) | 151 Helpviewer.HelpWindow.HelpWindow.networkAccessManager()) |
| 149 self.__reply.finished.connect(self.__requireDownloaded) | 152 self.__reply.finished.connect(self.__requireDownloaded) |
| 150 else: | 153 else: |
| 151 from .GreaseMonkeyScript import GreaseMonkeyScript | 154 from .GreaseMonkeyScript import GreaseMonkeyScript |
| 152 deleteScript = True | 155 deleteScript = True |
