15 from PyQt4.QtCore import pyqtSignal, Qt, QObject, QByteArray, QDateTime, QUrl, \ |
15 from PyQt4.QtCore import pyqtSignal, Qt, QObject, QByteArray, QDateTime, QUrl, \ |
16 QCryptographicHash, QFile, QIODevice, QTextStream, QDate, QTime |
16 QCryptographicHash, QFile, QIODevice, QTextStream, QDate, QTime |
17 from PyQt4.QtNetwork import QNetworkReply |
17 from PyQt4.QtNetwork import QNetworkReply |
18 |
18 |
19 from E5Gui import E5MessageBox |
19 from E5Gui import E5MessageBox |
20 |
|
21 from .AdBlockRule import AdBlockRule |
|
22 |
|
23 import Helpviewer.HelpWindow |
|
24 from Helpviewer.Network.FollowRedirectReply import FollowRedirectReply |
|
25 |
20 |
26 import Utilities |
21 import Utilities |
27 import Preferences |
22 import Preferences |
28 |
23 |
29 |
24 |
125 self.__requiresLocation = \ |
120 self.__requiresLocation = \ |
126 QUrl.fromPercentEncoding(url.encodedQueryItemValue("requiresLocation")) |
121 QUrl.fromPercentEncoding(url.encodedQueryItemValue("requiresLocation")) |
127 self.__requiresTitle = \ |
122 self.__requiresTitle = \ |
128 QUrl.fromPercentEncoding(url.encodedQueryItemValue("requiresTitle")) |
123 QUrl.fromPercentEncoding(url.encodedQueryItemValue("requiresTitle")) |
129 if self.__requiresLocation and self.__requiresTitle: |
124 if self.__requiresLocation and self.__requiresTitle: |
|
125 import Helpviewer.HelpWindow |
130 Helpviewer.HelpWindow.HelpWindow.adBlockManager().loadRequiredSubscription( |
126 Helpviewer.HelpWindow.HelpWindow.adBlockManager().loadRequiredSubscription( |
131 self.__requiresLocation, self.__requiresTitle) |
127 self.__requiresLocation, self.__requiresTitle) |
132 |
128 |
133 lastUpdateByteArray = url.encodedQueryItemValue("lastUpdate") |
129 lastUpdateByteArray = url.encodedQueryItemValue("lastUpdate") |
134 lastUpdateString = QUrl.fromPercentEncoding(lastUpdateByteArray) |
130 lastUpdateString = QUrl.fromPercentEncoding(lastUpdateByteArray) |
281 .format(fileName)) |
277 .format(fileName)) |
282 f.close() |
278 f.close() |
283 f.remove() |
279 f.remove() |
284 self.__lastUpdate = QDateTime() |
280 self.__lastUpdate = QDateTime() |
285 else: |
281 else: |
|
282 from .AdBlockRule import AdBlockRule |
|
283 |
286 self.__updatePeriod = 0 |
284 self.__updatePeriod = 0 |
287 self.__remoteModified = QDateTime() |
285 self.__remoteModified = QDateTime() |
288 self.__rules = [] |
286 self.__rules = [] |
289 self.__rules.append(AdBlockRule(header, self)) |
287 self.__rules.append(AdBlockRule(header, self)) |
290 while not textStream.atEnd(): |
288 while not textStream.atEnd(): |
344 if self.location().scheme() == "file": |
342 if self.location().scheme() == "file": |
345 self.__lastUpdate = QDateTime.currentDateTime() |
343 self.__lastUpdate = QDateTime.currentDateTime() |
346 self.__loadRules() |
344 self.__loadRules() |
347 return |
345 return |
348 |
346 |
|
347 import Helpviewer.HelpWindow |
|
348 from Helpviewer.Network.FollowRedirectReply import FollowRedirectReply |
349 self.__downloading = FollowRedirectReply(self.location(), |
349 self.__downloading = FollowRedirectReply(self.location(), |
350 Helpviewer.HelpWindow.HelpWindow.networkAccessManager()) |
350 Helpviewer.HelpWindow.HelpWindow.networkAccessManager()) |
351 self.__downloading.finished[()].connect(self.__rulesDownloaded) |
351 self.__downloading.finished[()].connect(self.__rulesDownloaded) |
352 |
352 |
353 def __rulesDownloaded(self): |
353 def __rulesDownloaded(self): |