unicodedata-reader 1.1.0__tar.gz → 1.2.0__tar.gz

{unicodedata_reader-1.1.0 → unicodedata_reader-1.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: unicodedata-reader
-Version: 1.1.0
+Version: 1.2.0
 Summary: 
 Home-page: https://github.com/kojiishi/unicodedata-reader
 License: Apache-2.0

{unicodedata_reader-1.1.0 → unicodedata_reader-1.2.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "unicodedata-reader"
-version = "1.1.0"
+version = "1.2.0"
 description = ""
 authors = ["Koji Ishii <kojii@chromium.org>"]
 readme = "README.md"

{unicodedata_reader-1.1.0 → unicodedata_reader-1.2.0}/unicodedata_reader/cli.py

@@ -125,7 +125,8 @@ class UnicodeDataCli(object):
         parser.add_argument('text',
                             nargs='*',
                             help='show properties for the text')
-        parser.add_argument('-f', '--no-cache', action='store_true')
+        parser.add_argument('-f', '--clear-cache', action='store_true')
+        parser.add_argument('-F', '--no-cache', action='store_true')
         parser.add_argument('--name', help='$NAME in the template')
         parser.add_argument('-t',
                             '--template',
@@ -139,8 +140,10 @@ class UnicodeDataCli(object):
                             default=0)
         parser.parse_args(namespace=self)
         _init_logging(self.verbose)  # pytype: disable=attribute-error
+        if self.clear_cache:
+            UnicodeDataCachedReader.clear_cache()
         if self.no_cache:
-            UnicodeDataReader.is_caching_allowed = False
+            UnicodeDataReader.default = UnicodeDataReader()
 
     def main(self):
         if self.template:

{unicodedata_reader-1.1.0 → unicodedata_reader-1.2.0}/unicodedata_reader/reader.py

@@ -1,6 +1,7 @@
 import logging
 import pathlib
 from typing import Iterable
+import shutil
 import urllib.request
 
 from unicodedata_reader.entry import *
@@ -23,6 +24,12 @@ class UnicodeDataReader(object):
     default = None
     is_caching_allowed = True
 
+    def __init__(
+        self,
+        url_template: str = 'https://www.unicode.org/Public/UNIDATA/{0}.txt'
+    ) -> None:
+        self.url_template = url_template
+
     def bidi_brackets(self) -> UnicodeDataEntries:
         name = 'BidiBrackets'
         lines = self.read_lines(name)
@@ -74,8 +81,11 @@ class UnicodeDataReader(object):
         lines = self.read_lines(name)
         return UnicodeVerticalOrientationDataEntries(name=name, lines=lines)
 
+    def get_url(self, name: str) -> str:
+        return self.url_template.format(name)
+
     def read_lines(self, name: str) -> Iterable[str]:
-        url = f'https://www.unicode.org/Public/UNIDATA/{name}.txt'
+        url = self.get_url(name)
         _logger.debug('Downloading %s', url)
         with urllib.request.urlopen(url) as response:
             body = response.read().decode('utf-8')
@@ -112,5 +122,13 @@ class UnicodeDataCachedReader(UnicodeDataReader):
 
         return lines
 
+    @staticmethod
+    def clear_cache(ignore_errors: bool = False):
+        cache_dir = UnicodeDataCachedReader._cache_dir
+        if not cache_dir or not cache_dir.exists():
+            return
+        _logger.debug('Deleting cache %s', cache_dir)
+        shutil.rmtree(cache_dir, ignore_errors=ignore_errors)
+
 
 UnicodeDataReader.default = UnicodeDataCachedReader()