Mercurial Repositories > eric / file comparison
comparison: Helpviewer/AdBlock/AdBlockSubscription.py
Helpviewer/AdBlock/AdBlockSubscription.py
- changeset 3034
- 7ce719013078
- parent 3022
- 57179e4cdadd
- child 3035
- 36e9f388958b
equal
deleted
inserted
replaced
| 3033:58fe260e7469 | 3034:7ce719013078 |
|---|---|
| 267 if not f.open(QIODevice.ReadOnly): | 267 if not f.open(QIODevice.ReadOnly): |
| 268 E5MessageBox.warning( | 268 E5MessageBox.warning( |
| 269 None, | 269 None, |
| 270 self.trUtf8("Load subscription rules"), | 270 self.trUtf8("Load subscription rules"), |
| 271 self.trUtf8( | 271 self.trUtf8( |
| 272 """Unable to open adblock file '{0}' for reading.""")\ | 272 """Unable to open adblock file '{0}' for reading.""") |
| 273 .format(fileName)) | 273 .format(fileName)) |
| 274 else: | 274 else: |
| 275 textStream = QTextStream(f) | 275 textStream = QTextStream(f) |
| 276 header = textStream.readLine(1024) | 276 header = textStream.readLine(1024) |
| 277 if not header.startswith("[Adblock"): | 277 if not header.startswith("[Adblock"): |
| 278 E5MessageBox.warning( | 278 E5MessageBox.warning( |
| 279 None, | 279 None, |
| 280 self.trUtf8("Load subscription rules"), | 280 self.trUtf8("Load subscription rules"), |
| 281 self.trUtf8("""AdBlock file '{0}' does not start""" | 281 self.trUtf8("""AdBlock file '{0}' does not start""" |
| 282 """ with [Adblock.""")\ | 282 """ with [Adblock.""") |
| 283 .format(fileName)) | 283 .format(fileName)) |
| 284 f.close() | 284 f.close() |
| 285 f.remove() | 285 f.remove() |
| 286 self.__lastUpdate = QDateTime() | 286 self.__lastUpdate = QDateTime() |
| 287 else: | 287 else: |
| 329 if self.__updatePeriod: | 329 if self.__updatePeriod: |
| 330 updatePeriod = self.__updatePeriod | 330 updatePeriod = self.__updatePeriod |
| 331 else: | 331 else: |
| 332 updatePeriod = Preferences.getHelp("AdBlockUpdatePeriod") * 24 | 332 updatePeriod = Preferences.getHelp("AdBlockUpdatePeriod") * 24 |
| 333 if not self.__lastUpdate.isValid() or \ | 333 if not self.__lastUpdate.isValid() or \ |
| 334 (self.__remoteModified.isValid() and \ | 334 (self.__remoteModified.isValid() and |
| 335 self.__remoteModified.addSecs(updatePeriod * 3600) < \ | 335 self.__remoteModified.addSecs(updatePeriod * 3600) < |
| 336 QDateTime.currentDateTime()) or \ | 336 QDateTime.currentDateTime()) or \ |
| 337 self.__lastUpdate.addSecs(updatePeriod * 3600) < \ | 337 self.__lastUpdate.addSecs(updatePeriod * 3600) < \ |
| 338 QDateTime.currentDateTime(): | 338 QDateTime.currentDateTime(): |
| 339 self.updateNow() | 339 self.updateNow() |
| 340 | 340 |
| 398 if not f.open(QIODevice.ReadWrite): | 398 if not f.open(QIODevice.ReadWrite): |
| 399 E5MessageBox.warning( | 399 E5MessageBox.warning( |
| 400 None, | 400 None, |
| 401 self.trUtf8("Downloading subscription rules"), | 401 self.trUtf8("Downloading subscription rules"), |
| 402 self.trUtf8( | 402 self.trUtf8( |
| 403 """Unable to open adblock file '{0}' for writing.""")\ | 403 """Unable to open adblock file '{0}' for writing.""") |
| 404 .file(fileName)) | 404 .file(fileName)) |
| 405 return | 405 return |
| 406 f.write(response) | 406 f.write(response) |
| 407 f.close() | 407 f.close() |
| 408 self.__lastUpdate = QDateTime.currentDateTime() | 408 self.__lastUpdate = QDateTime.currentDateTime() |
| 454 self.trUtf8( | 454 self.trUtf8( |
| 455 """<p>AdBlock subscription <b>{0}</b> has a wrong""" | 455 """<p>AdBlock subscription <b>{0}</b> has a wrong""" |
| 456 """ checksum.<br/>""" | 456 """ checksum.<br/>""" |
| 457 """Found: {1}<br/>""" | 457 """Found: {1}<br/>""" |
| 458 """Calculated: {2}<br/>""" | 458 """Calculated: {2}<br/>""" |
| 459 """Use it anyway?</p>""")\ | 459 """Use it anyway?</p>""") |
| 460 .format(self.__title, expectedChecksum, | 460 .format(self.__title, expectedChecksum, |
| 461 calculatedChecksum)) | 461 calculatedChecksum)) |
| 462 return res | 462 return res |
| 463 | 463 |
| 464 def saveRules(self): | 464 def saveRules(self): |
| 473 if not f.open(QIODevice.ReadWrite | QIODevice.Truncate): | 473 if not f.open(QIODevice.ReadWrite | QIODevice.Truncate): |
| 474 E5MessageBox.warning( | 474 E5MessageBox.warning( |
| 475 None, | 475 None, |
| 476 self.trUtf8("Saving subscription rules"), | 476 self.trUtf8("Saving subscription rules"), |
| 477 self.trUtf8( | 477 self.trUtf8( |
| 478 """Unable to open adblock file '{0}' for writing.""")\ | 478 """Unable to open adblock file '{0}' for writing.""") |
| 479 .format(fileName)) | 479 .format(fileName)) |
| 480 return | 480 return |
| 481 | 481 |
| 482 textStream = QTextStream(f) | 482 textStream = QTextStream(f) |
| 483 if not self.__rules or not self.__rules[0].isHeader(): | 483 if not self.__rules or not self.__rules[0].isHeader(): |
