urlicon 0.2.0__tar.gz → 0.2.2__tar.gz

{urlicon-0.2.0 → urlicon-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: urlicon
-Version: 0.2.0
+Version: 0.2.2
 Summary: `URLicon` helps you to discover an possible icon from a URL.
 Author-email: Cesar Cardoso <hello@cesarcardoso.cc>
 License-Expression: MIT
@@ -9,8 +9,9 @@ Description-Content-Type: text/markdown
 Requires-Dist: bs4>=0.0.2
 Requires-Dist: dotenv>=0.9.9
 Requires-Dist: requests>=2.32.5
+Requires-Dist: unforgettable
 
-# URLicon - v0.2.0
+# URLicon - v0.2.2
 
 `URLicon` helps you to discover an possible icon from a URL.
 
@@ -42,19 +43,19 @@ print("icon:", icon_url)
 
 ### Caching
 
-`URLicon` use a simple "cache" method to avoid unecessary URL requests.
+`URLicon` use the [unforgettable "cache"](https://github.com/bouli/unforgettable) to avoid unecessary URL requests.
 It uses a [temp dir](https://docs.python.org/3/library/tempfile.html) for each
 execution. But you can define a your own directory and use the cache as much as
 you want setting `SIMPLE_CACHE_ROOT_DIR` env var.
 
 ```python
 SIMPLE_CACHE_ROOT_DIR = os.getenv("SIMPLE_CACHE_ROOT_DIR", None)
-cache = simple_cache(cache_folder=SIMPLE_CACHE_ROOT_DIR)
+cache = unforgettable(cache_folder=SIMPLE_CACHE_ROOT_DIR)
 ```
 
 And you can clean the cache with:
 ```python
-urlicon.simple_cache.clean()
+urlicon.unforgettable.clean()
 ```
 
 ## See Also

{urlicon-0.2.0 → urlicon-0.2.2}/README.md

@@ -1,4 +1,4 @@
-# URLicon - v0.2.0
+# URLicon - v0.2.2
 
 `URLicon` helps you to discover an possible icon from a URL.
 
@@ -30,19 +30,19 @@ print("icon:", icon_url)
 
 ### Caching
 
-`URLicon` use a simple "cache" method to avoid unecessary URL requests.
+`URLicon` use the [unforgettable "cache"](https://github.com/bouli/unforgettable) to avoid unecessary URL requests.
 It uses a [temp dir](https://docs.python.org/3/library/tempfile.html) for each
 execution. But you can define a your own directory and use the cache as much as
 you want setting `SIMPLE_CACHE_ROOT_DIR` env var.
 
 ```python
 SIMPLE_CACHE_ROOT_DIR = os.getenv("SIMPLE_CACHE_ROOT_DIR", None)
-cache = simple_cache(cache_folder=SIMPLE_CACHE_ROOT_DIR)
+cache = unforgettable(cache_folder=SIMPLE_CACHE_ROOT_DIR)
 ```
 
 And you can clean the cache with:
 ```python
-urlicon.simple_cache.clean()
+urlicon.unforgettable.clean()
 ```
 
 ## See Also

{urlicon-0.2.0 → urlicon-0.2.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "urlicon"
-version = "0.2.0"
+version = "0.2.2"
 license = "MIT"
 description = "`URLicon` helps you to discover an possible icon from a URL."
 authors = [
@@ -12,6 +12,7 @@ dependencies = [
     "bs4>=0.0.2",
     "dotenv>=0.9.9",
     "requests>=2.32.5",
+    "unforgettable",
 ]
 
 [tool.bumpversion]

{urlicon-0.2.0 → urlicon-0.2.2}/src/urlicon/urlicon.py

@@ -5,14 +5,14 @@ import urllib
 import requests
 from bs4 import BeautifulSoup
 from dotenv import load_dotenv
+from unforgettable import unforgettable
 
 from urlicon import urls
-from urlicon.simple_cache import simple_cache
 
 load_dotenv()
 
 SIMPLE_CACHE_ROOT_DIR = os.getenv("SIMPLE_CACHE_ROOT_DIR", None)
-cache = simple_cache(cache_folder=SIMPLE_CACHE_ROOT_DIR)
+cache = unforgettable(cache_folder=SIMPLE_CACHE_ROOT_DIR)
 
 
 def get_url_icon(url):
@@ -53,6 +53,14 @@ def get_meta_icon_from_url(url, url_soup=None):
                 final_icon = soup_icon
         img = final_icon["href"]
 
+        try:
+            url_request = requests_get(url)
+        except:
+            return None
+
+        if url_request is None:
+            img = None
+
     img = urls.ensure_relative_path(img, url)
     return img, url_soup
 
@@ -153,7 +161,7 @@ def requests_get(url):
         return None
 
     code = req.content
-    cache.set(text=code, cache_id=cache_prefix + url)
+    cache.set(content=code, cache_id=cache_prefix + url)
     return code
 
 

{urlicon-0.2.0 → urlicon-0.2.2}/src/urlicon.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: urlicon
-Version: 0.2.0
+Version: 0.2.2
 Summary: `URLicon` helps you to discover an possible icon from a URL.
 Author-email: Cesar Cardoso <hello@cesarcardoso.cc>
 License-Expression: MIT
@@ -9,8 +9,9 @@ Description-Content-Type: text/markdown
 Requires-Dist: bs4>=0.0.2
 Requires-Dist: dotenv>=0.9.9
 Requires-Dist: requests>=2.32.5
+Requires-Dist: unforgettable
 
-# URLicon - v0.2.0
+# URLicon - v0.2.2
 
 `URLicon` helps you to discover an possible icon from a URL.
 
@@ -42,19 +43,19 @@ print("icon:", icon_url)
 
 ### Caching
 
-`URLicon` use a simple "cache" method to avoid unecessary URL requests.
+`URLicon` use the [unforgettable "cache"](https://github.com/bouli/unforgettable) to avoid unecessary URL requests.
 It uses a [temp dir](https://docs.python.org/3/library/tempfile.html) for each
 execution. But you can define a your own directory and use the cache as much as
 you want setting `SIMPLE_CACHE_ROOT_DIR` env var.
 
 ```python
 SIMPLE_CACHE_ROOT_DIR = os.getenv("SIMPLE_CACHE_ROOT_DIR", None)
-cache = simple_cache(cache_folder=SIMPLE_CACHE_ROOT_DIR)
+cache = unforgettable(cache_folder=SIMPLE_CACHE_ROOT_DIR)
 ```
 
 And you can clean the cache with:
 ```python
-urlicon.simple_cache.clean()
+urlicon.unforgettable.clean()
 ```
 
 ## See Also

{urlicon-0.2.0 → urlicon-0.2.2}/src/urlicon.egg-info/SOURCES.txt

@@ -1,6 +1,5 @@
 README.md
 pyproject.toml
-src/urlicon/simple_cache.py
 src/urlicon/urlicon.py
 src/urlicon/urls.py
 src/urlicon.egg-info/PKG-INFO

{urlicon-0.2.0 → urlicon-0.2.2}/src/urlicon.egg-info/requires.txt

@@ -1,3 +1,4 @@
 bs4>=0.0.2
 dotenv>=0.9.9
 requests>=2.32.5
+unforgettable

urlicon-0.2.0/src/urlicon/simple_cache.py

@@ -1,129 +0,0 @@
-import os
-
-
-class simple_cache:
-    cache_folder: str | None = None
-    cache_files_extension: str = "cache"
-
-    def __init__(self, cache_folder: str | None = None):
-        if cache_folder is not None:
-            self.cache_folder = cache_folder
-        else:
-            self.cache_folder = self.get_cache_folder()
-        pass
-
-    def safe_cache_id(func):
-        def filter_cache_id(cache_id):
-            cache_id = cache_id.replace('"', "").replace("\\", "")
-            cache_id = f'"{cache_id}"'
-            return cache_id
-
-        def _filter_cache_id_func(*args, **kwargs):
-            if "cache_id" in args:
-                args["cache_id"] = filter_cache_id(cache_id=args["cache_id"])
-
-            if "cache_id" in kwargs:
-                kwargs["cache_id"] = filter_cache_id(cache_id=kwargs["cache_id"])
-
-            return func(*args, **kwargs)
-
-        return _filter_cache_id_func
-
-    @safe_cache_id
-    def set(self, text: str, cache_id: str):
-        cache_folder = self.get_cache_folder()
-        cache_index_file_path = self.get_cache_index_path()
-
-        cache_folder_files = os.listdir(cache_folder)
-        cached_file_index = self.get_index_from_file_index(_safe_cache_id=cache_id)
-        if cached_file_index is not None:
-            new_file_index = cached_file_index
-        else:
-            new_file_index = len(cache_folder_files)
-            with open(cache_index_file_path, "a") as cache_index_file_writer:
-                cache_index_file_writer.write(f"\n{new_file_index}: {cache_id}")
-
-        new_file_name = f"{new_file_index}.{self.cache_files_extension}"
-        new_file_path = os.path.join(cache_folder, new_file_name)
-        with open(new_file_path, "wb") as new_file_writer:
-            new_file_writer.write(text)
-
-    @safe_cache_id
-    def get(self, cache_id: str) -> str:
-        cached_file_index = self.get_index_from_file_index(_safe_cache_id=cache_id)
-        code = self.get_cached_file_by_index(cached_file_index=cached_file_index)
-        return code
-
-    def get_index_from_file_index(self, _safe_cache_id):
-        cache_index_file = self.get_cache_index_file()
-        if cache_index_file.find(_safe_cache_id) < 1:
-            return None
-        cache_index_file = cache_index_file[: cache_index_file.find(_safe_cache_id) - 2]
-        cached_file_index = int(cache_index_file.split("\n")[-1].strip())
-        return cached_file_index
-
-    def get_cache_index_path(
-        self,
-    ) -> str:
-        cache_index_file_name = "cache_index.yaml"
-        cache_folder = self.get_cache_folder()
-        cache_index_file_path = os.path.join(cache_folder, cache_index_file_name)
-
-        if not os.path.exists(cache_index_file_path):
-            with open(cache_index_file_path, "w+") as cache_index_file_writer:
-                cache_index_file_writer.write(f"0: {cache_index_file_name}")
-
-        return cache_index_file_path
-
-    def get_cache_index_file(
-        self,
-    ) -> str:
-        with open(self.get_cache_index_path(), "r") as f:
-            cache_index_file_content = f.read()
-
-        return cache_index_file_content
-
-    def get_cached_file_by_index(self, cached_file_index: int) -> str:
-        code = None
-        cache_folder = self.get_cache_folder()
-        cached_file_name = f"{cached_file_index}.{self.cache_files_extension}"
-        cached_file_path = os.path.join(cache_folder, cached_file_name)
-        if not os.path.exists(cached_file_path):
-            return None
-        if self.is_file_binary(cached_file_path):
-            read_mode = "rb"
-        else:
-            read_mode = "r"
-
-        with open(cached_file_path, read_mode) as cached_file_reader:
-            code = cached_file_reader.read()
-        return code
-
-    def clean(
-        self,
-    ):
-        cache_folder = self.get_cache_folder()
-        cache_folder_files = os.listdir(cache_folder)
-        for file in cache_folder_files:
-            file_to_clean = os.path.join(cache_folder, file)
-            if os.path.exists(file_to_clean):
-                os.remove(file_to_clean)
-
-    def get_cache_folder(
-        self,
-    ):
-        import tempfile
-
-        if self.cache_folder is not None:
-            return self.cache_folder
-
-        tmpdirname = tempfile.mkdtemp()
-        return tmpdirname
-
-    def is_file_binary(self, file_path: str) -> bool:
-        try:
-            with open(file_path, "r") as fp:
-                fp.read(16)
-                return False
-        except UnicodeDecodeError:
-            return True