Merge pull request #752 from rix1337/dev

v.18.1.1 Bugfixes
rix1337 · Sep 6, 2023 · a4a5092 · a4a5092
2 parents 22726ff + 2117c54
commit a4a5092
Show file tree

Hide file tree

Showing 7 changed files with 3,279 additions and 3,691 deletions.
diff --git a/.github/Changelog.md b/.github/Changelog.md
@@ -6,6 +6,8 @@
 
 ### Changelog FeedCrawler:
 
+- **18.1.1** Bugfix im Abruf von Download-Links, bspw. für NK
+- **18.1.1** Bugfix im Match der Ignore-Liste während der Feedsuche 
 - **18.1.0** Die [Desktop-GUI](https://github.com/rix1337/FeedCrawler/wiki/7.-Desktop-GUI) nutzt nun `tkinter`
   - Diese Bibliothek ist in Python enthalten und muss nicht mehr separat installiert werden.
   - Ab sofort ist die GUI (außer im Docker-Container) standardmäßig aktiviert.

diff --git a/feedcrawler/external_sites/web_search/content_all.py b/feedcrawler/external_sites/web_search/content_all.py
@@ -240,7 +240,7 @@ class DW:
                         "ddownload", "ddl")
                     if check_hoster(link_hoster):
                         link = url_hoster[0]
-                        if by in link:
+                        if (by and by in link) or (nk and nk in link):
                             demasked_link = get_redirected_url(link)
                             if demasked_link:
                                 link = demasked_link

diff --git a/feedcrawler/providers/common_functions.py b/feedcrawler/providers/common_functions.py
@@ -35,12 +35,13 @@ def __getattr__(self, attr):
 
 
 def check_hoster(to_check):
-    to_check = to_check.replace("ddownload", "ddl")
-    hosters = CrawlerConfig("Hosters").get_section()
-    for hoster in hosters:
-        if hosters[hoster] == "True":
-            if hoster in to_check.lower() or to_check.lower() in hoster:
-                return True
+    if to_check:
+        to_check = to_check.replace("ddownload", "ddl")
+        hosters = CrawlerConfig("Hosters").get_section()
+        for hoster in hosters:
+            if hosters[hoster] == "True":
+                if hoster in to_check.lower() or to_check.lower() in hoster:
+                    return True
     return False
 
 
@@ -264,6 +265,10 @@ def check_is_ignored(title, ignore):
         title = title.replace(" ", ".").lower()
         ignore_list = ignore.replace(" ", ".").lower().split(",")
         for i in ignore_list:
+            if not i.startswith("."):
+                i = "." + i
+            if not i.endswith("."):
+                i = i + "."
             if i in title:
                 return True
     return False

diff --git a/feedcrawler/providers/version.py b/feedcrawler/providers/version.py
@@ -9,7 +9,7 @@
 
 
 def get_version():
-    return "18.1.0"
+    return "18.1.1"
 
 
 def create_version_file():