Mercurial Repositories > eric / file comparison
comparison: Helpviewer/AdBlock/AdBlockSubscription.py
Helpviewer/AdBlock/AdBlockSubscription.py
- changeset 4339
- c2d1da8d2a05
- parent 4332
- 64034d85c709
- child 4352
- 86f7a3344d38
equal
deleted
inserted
replaced
| 4337:c29bb9f31972 | 4339:c2d1da8d2a05 |
|---|---|
| 114 return | 114 return |
| 115 | 115 |
| 116 if qVersion() >= "5.0.0": | 116 if qVersion() >= "5.0.0": |
| 117 from PyQt5.QtCore import QUrlQuery | 117 from PyQt5.QtCore import QUrlQuery |
| 118 urlQuery = QUrlQuery(url) | 118 urlQuery = QUrlQuery(url) |
| 119 self.__title = urlQuery.queryItemValue("title") | 119 self.__title = QUrl.fromPercentEncoding( |
| 120 QByteArray(urlQuery.queryItemValue("title").encode())) | |
| 120 self.__enabled = urlQuery.queryItemValue("enabled") != "false" | 121 self.__enabled = urlQuery.queryItemValue("enabled") != "false" |
| 121 self.__location = QByteArray(urlQuery.queryItemValue("location") | 122 self.__location = QByteArray(QUrl.fromPercentEncoding( |
| 122 .encode("utf-8")) | 123 QByteArray(urlQuery.queryItemValue("location").encode())) |
| 124 .encode("utf-8")) | |
| 123 | 125 |
| 124 # Check for required subscription | 126 # Check for required subscription |
| 125 self.__requiresLocation = urlQuery.queryItemValue( | 127 self.__requiresLocation = QUrl.fromPercentEncoding( |
| 126 "requiresLocation") | 128 QByteArray(urlQuery.queryItemValue( |
| 127 self.__requiresTitle = urlQuery.queryItemValue("requiresTitle") | 129 "requiresLocation").encode())) |
| 130 self.__requiresTitle = QUrl.fromPercentEncoding( | |
| 131 QByteArray(urlQuery.queryItemValue("requiresTitle").encode())) | |
| 128 if self.__requiresLocation and self.__requiresTitle: | 132 if self.__requiresLocation and self.__requiresTitle: |
| 129 import Helpviewer.HelpWindow | 133 import Helpviewer.HelpWindow |
| 130 Helpviewer.HelpWindow.HelpWindow.adBlockManager()\ | 134 Helpviewer.HelpWindow.HelpWindow.adBlockManager()\ |
| 131 .loadRequiredSubscription(self.__requiresLocation, | 135 .loadRequiredSubscription(self.__requiresLocation, |
| 132 self.__requiresTitle) | 136 self.__requiresTitle) |
| 134 lastUpdateString = urlQuery.queryItemValue("lastUpdate") | 138 lastUpdateString = urlQuery.queryItemValue("lastUpdate") |
| 135 self.__lastUpdate = QDateTime.fromString(lastUpdateString, | 139 self.__lastUpdate = QDateTime.fromString(lastUpdateString, |
| 136 Qt.ISODate) | 140 Qt.ISODate) |
| 137 else: | 141 else: |
| 138 self.__title = \ | 142 self.__title = \ |
| 139 QUrl.fromPercentEncoding(url.encodedQueryItemValue("title")) | 143 QUrl.fromPercentEncoding(url.encodedQueryItemValue(b"title")) |
| 140 self.__enabled = QUrl.fromPercentEncoding( | 144 self.__enabled = QUrl.fromPercentEncoding( |
| 141 url.encodedQueryItemValue("enabled")) != "false" | 145 url.encodedQueryItemValue(b"enabled")) != "false" |
| 142 self.__location = QByteArray(QUrl.fromPercentEncoding( | 146 self.__location = QByteArray(QUrl.fromPercentEncoding( |
| 143 url.encodedQueryItemValue("location")).encode("utf-8")) | 147 url.encodedQueryItemValue(b"location")).encode("utf-8")) |
| 144 | 148 |
| 145 # Check for required subscription | 149 # Check for required subscription |
| 146 self.__requiresLocation = QUrl.fromPercentEncoding( | 150 self.__requiresLocation = QUrl.fromPercentEncoding( |
| 147 url.encodedQueryItemValue("requiresLocation")) | 151 url.encodedQueryItemValue(b"requiresLocation")) |
| 148 self.__requiresTitle = QUrl.fromPercentEncoding( | 152 self.__requiresTitle = QUrl.fromPercentEncoding( |
| 149 url.encodedQueryItemValue("requiresTitle")) | 153 url.encodedQueryItemValue(b"requiresTitle")) |
| 150 if self.__requiresLocation and self.__requiresTitle: | 154 if self.__requiresLocation and self.__requiresTitle: |
| 151 import Helpviewer.HelpWindow | 155 import Helpviewer.HelpWindow |
| 152 Helpviewer.HelpWindow.HelpWindow.adBlockManager()\ | 156 Helpviewer.HelpWindow.HelpWindow.adBlockManager()\ |
| 153 .loadRequiredSubscription(self.__requiresLocation, | 157 .loadRequiredSubscription(self.__requiresLocation, |
| 154 self.__requiresTitle) | 158 self.__requiresTitle) |
| 155 | 159 |
| 156 lastUpdateByteArray = url.encodedQueryItemValue("lastUpdate") | 160 lastUpdateByteArray = url.encodedQueryItemValue(b"lastUpdate") |
| 157 lastUpdateString = QUrl.fromPercentEncoding(lastUpdateByteArray) | 161 lastUpdateString = QUrl.fromPercentEncoding(lastUpdateByteArray) |
| 158 self.__lastUpdate = QDateTime.fromString(lastUpdateString, | 162 self.__lastUpdate = QDateTime.fromString(lastUpdateString, |
| 159 Qt.ISODate) | 163 Qt.ISODate) |
| 160 | 164 |
| 161 self.__loadRules() | 165 self.__loadRules() |
| 441 if self.__validateCheckSum(fileName): | 445 if self.__validateCheckSum(fileName): |
| 442 self.__loadRules() | 446 self.__loadRules() |
| 443 else: | 447 else: |
| 444 QFile.remove(fileName) | 448 QFile.remove(fileName) |
| 445 self.__downloading = None | 449 self.__downloading = None |
| 450 reply.deleteLater() | |
| 446 | 451 |
| 447 def __validateCheckSum(self, fileName): | 452 def __validateCheckSum(self, fileName): |
| 448 """ | 453 """ |
| 449 Private method to check the subscription file's checksum. | 454 Private method to check the subscription file's checksum. |
| 450 | 455 |
