24 QUrlQuery, |
24 QUrlQuery, |
25 pyqtSignal, |
25 pyqtSignal, |
26 ) |
26 ) |
27 from PyQt6.QtNetwork import QNetworkReply, QNetworkRequest |
27 from PyQt6.QtNetwork import QNetworkReply, QNetworkRequest |
28 |
28 |
29 from eric7 import Globals, Preferences |
29 from eric7 import EricUtilities, Preferences |
30 from eric7.EricWidgets import EricMessageBox |
30 from eric7.EricWidgets import EricMessageBox |
31 from eric7.WebBrowser.WebBrowserWindow import WebBrowserWindow |
31 from eric7.WebBrowser.WebBrowserWindow import WebBrowserWindow |
32 |
32 |
33 |
33 |
34 class AdBlockSubscription(QObject): |
34 class AdBlockSubscription(QObject): |
283 sha1 = bytes( |
283 sha1 = bytes( |
284 QCryptographicHash.hash( |
284 QCryptographicHash.hash( |
285 self.__location, QCryptographicHash.Algorithm.Sha1 |
285 self.__location, QCryptographicHash.Algorithm.Sha1 |
286 ).toHex() |
286 ).toHex() |
287 ).decode() |
287 ).decode() |
288 dataDir = os.path.join(Globals.getConfigDir(), "web_browser", "subscriptions") |
288 dataDir = os.path.join( |
|
289 EricUtilities.getConfigDir(), "web_browser", "subscriptions" |
|
290 ) |
289 if not os.path.exists(dataDir): |
291 if not os.path.exists(dataDir): |
290 os.makedirs(dataDir) |
292 os.makedirs(dataDir) |
291 fileName = os.path.join(dataDir, "adblock_subscription_{0}".format(sha1)) |
293 fileName = os.path.join(dataDir, "adblock_subscription_{0}".format(sha1)) |
292 return fileName |
294 return fileName |
293 |
295 |