Mercurial Repositories > eric / file comparison
comparison: WebBrowser/AdBlock/AdBlockManager.py
WebBrowser/AdBlock/AdBlockManager.py
- changeset 6150
- 20efcd29b237
- parent 6048
- 82ad8ec9548c
- child 6160
- 70441ce79d5a
equal
deleted
inserted
replaced
| 6149:e611e45a17d6 | 6150:20efcd29b237 |
|---|---|
| 64 | 64 |
| 65 self.__defaultSubscriptionUrlString = \ | 65 self.__defaultSubscriptionUrlString = \ |
| 66 "abp:subscribe?location=" \ | 66 "abp:subscribe?location=" \ |
| 67 "https://easylist-downloads.adblockplus.org/easylist.txt&"\ | 67 "https://easylist-downloads.adblockplus.org/easylist.txt&"\ |
| 68 "title=EasyList" | 68 "title=EasyList" |
| 69 self.__additionalDefaultSubscriptionUrlStrings = ( | |
| 70 "abp:subscribe?location=https://raw.githubusercontent.com/" | |
| 71 "hoshsadiq/adblock-nocoin-list/master/nocoin.txt&" | |
| 72 "title=NoCoin", | |
| 73 ) | |
| 69 self.__customSubscriptionUrlString = \ | 74 self.__customSubscriptionUrlString = \ |
| 70 bytes(self.__customSubscriptionUrl().toEncoded()).decode() | 75 bytes(self.__customSubscriptionUrl().toEncoded()).decode() |
| 71 | 76 |
| 72 self.__mutex = QMutex() | 77 self.__mutex = QMutex() |
| 73 self.__matcher = AdBlockMatcher(self) | 78 self.__matcher = AdBlockMatcher(self) |
| 405 return | 410 return |
| 406 | 411 |
| 407 subscriptions = Preferences.getWebBrowser("AdBlockSubscriptions") | 412 subscriptions = Preferences.getWebBrowser("AdBlockSubscriptions") |
| 408 if subscriptions: | 413 if subscriptions: |
| 409 for subscription in subscriptions: | 414 for subscription in subscriptions: |
| 410 if subscription.startswith( | |
| 411 self.__defaultSubscriptionUrlString): | |
| 412 break | |
| 413 else: | |
| 414 subscriptions.insert(0, self.__defaultSubscriptionUrlString) | |
| 415 for subscription in subscriptions: | |
| 416 if subscription.startswith(self.__customSubscriptionUrlString): | 415 if subscription.startswith(self.__customSubscriptionUrlString): |
| 417 break | 416 break |
| 418 else: | 417 else: |
| 419 subscriptions.append(self.__customSubscriptionUrlString) | 418 subscriptions.append(self.__customSubscriptionUrlString) |
| 420 else: | 419 else: |
| 421 subscriptions = [self.__defaultSubscriptionUrlString, | 420 subscriptions = [ |
| 422 self.__customSubscriptionUrlString] | 421 self.__defaultSubscriptionUrlString, |
| 422 *self.__additionalDefaultSubscriptionUrlStrings, | |
| 423 self.__customSubscriptionUrlString, | |
| 424 ] | |
| 423 for subscription in subscriptions: | 425 for subscription in subscriptions: |
| 424 url = QUrl.fromEncoded(subscription.encode("utf-8")) | 426 url = QUrl.fromEncoded(subscription.encode("utf-8")) |
| 425 adBlockSubscription = AdBlockSubscription( | 427 adBlockSubscription = AdBlockSubscription( |
| 426 url, | 428 url, |
| 427 subscription.startswith(self.__customSubscriptionUrlString), | 429 subscription.startswith(self.__customSubscriptionUrlString), |
