hoverpower 1.0.4__tar.gz → 1.2.0__tar.gz

{hoverpower-1.0.4 → hoverpower-1.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hoverpower
-Version: 1.0.4
+Version: 1.2.0
 Author-email: Helmut Konrad Schewe <helmutus@outlook.com>
 License-Expression: MIT
 Project-URL: Homepage, https://github.com/anaticulae/hoverpower

{hoverpower-1.0.4 → hoverpower-1.2.0}/hoverpower/data.py

@@ -15,10 +15,24 @@ import utilo
 import hoverpower
 
 
-def collect_folder():
-    return [
-        item.name for item in os.scandir(hoverpower.REPO) if not item.is_file()
-    ]
+def collect_folder() -> list:
+    """\
+    >>> collect_folder()
+    ['bachelor', ...'paper', 'tech']
+    """
+    files = os.scandir(hoverpower.STORE)
+    result = sorted(item.name for item in files if not no_folder(item))
+    return result
+
+
+def no_folder(item) -> bool:
+    if item.is_file():
+        return True
+    if item.name.startswith('.'):
+        return True
+    if item.name == '__pycache__':
+        return True
+    return False
 
 
 def log_available_files(package: str):
@@ -34,7 +48,7 @@ def log_available_files(package: str):
     if package not in collected:
         utilo.error(f'package not available: {package}')
         sys.exit(utilo.FAILURE)
-    featurepath = os.path.join(hoverpower.REPO, package)
+    featurepath = os.path.join(hoverpower.STORE, package)
     # TODO: add recursive feature packages
     for item in os.scandir(featurepath):
         utilo.log(f'    {item.name}')
@@ -63,7 +77,7 @@ def copy_packages(matched: list, dest: str, merge: bool = False):
     def copy_package(package, dest):
         """If resource already exists and is unchanged, the file is not
         touched."""
-        source = os.path.join(hoverpower.REPO, package)
+        source = os.path.join(hoverpower.STORE, package)
         utilo.copy_content(
             source,
             dest,

{hoverpower-1.0.4 → hoverpower-1.2.0}/hoverpower/generator.py

@@ -112,7 +112,8 @@ def install():
     if not package:
         utilo.error('could not install, define tests.conftest.PACKAGE')
         return
-    utilotest.clean_install(resinf.configure.PROJECT, package)
+    # TODO: ADD INSTALL STEP LATER?
+    # utilotest.clean_install(resinf.configure.PROJECT, package)
     # run install hook after installing project
     install_after = conftest.install if hasattr(conftest, 'install') else None
     if not install_after:

{hoverpower-1.0.4 → hoverpower-1.2.0}/hoverpower/path.py

@@ -7,18 +7,24 @@
 # be prosecuted under federal law. Its content is company confidential.
 # =============================================================================
 
+import concurrent.futures
+import importlib.metadata
+import itertools
 import os
 import tarfile
+import tomllib
 
 import requests
 import utilo
 
-import hoverpower
-
 # TMP = utilo.tmp(hoverpower.ROOT)
 TMP = utilo.join('/tmp/power')  #nosec B108
 
-REPO = utilo.join(hoverpower.ROOT, 'hoverpower/repo', exist=True)
+REPO = utilo.join(
+    os.path.join(os.path.dirname(__file__), '..'),
+    'hoverpower/repo',
+    exist=True,
+)
 STORE = os.getenv('HOVERPOWER_STORE', REPO)
 
 BACHELOR = utilo.join(STORE, 'bachelor')
@@ -32,8 +38,17 @@ ORDER = utilo.join(STORE, 'order')
 PAPER = utilo.join(STORE, 'paper')
 TECH = utilo.join(STORE, 'tech')
 
-SOURCE = 'https://raw.githubusercontent.com/anaticulae/'+\
-         f'{hoverpower.PROCESS}/refs/tags/v{hoverpower.__version__}'
+# https://github.com/anaticulae/hoverpower/releases/download/v1.0.2/master.tar.gz
+SOURCE = 'https://github.com/anaticulae/hoverpower/releases/download/'+\
+         f'v{importlib.metadata.version("hoverpower")}/'
+
+TIMEOUT_DOWNLOAD_SEC = 15
+WORKER = utilo.parse_int(os.getenv('HOVERPOWER_DOWNLOAD_WORKER', '5'))
+
+PACKAGES_DEFAULT = 'bachelor book diss docu habil home master order paper tech'
+PACKAGES = os.getenv('HOVERPOWER_PACKAGES', PACKAGES_DEFAULT).strip().split()
+
+PYPROJECT = 'pyproject.toml'
 
 
 def download() -> list:
@@ -49,28 +64,57 @@ def download() -> list:
     return result
 
 
-def download_package(package: str):
-    os.makedirs(TMP, exist_ok=True)
-    path = utilo.join(TMP, package)
-    dl = utilo.join(TMP, '.' + package)
-    if utilo.exists(path):
-        utilo.log(f'already downloaded: {path}')
+def download_packages():
+    root = STORE
+    packages = PACKAGES
+    if utilo.exists(utilo.join(root, PYPROJECT)):
+        # determine packages by tool.hoverpower.packages in pyproject.toml
+        packages = requires(root)
+    with concurrent.futures.ThreadPoolExecutor(max_workers=WORKER) as executor:
+        executor.map(
+            download_and_extract,
+            packages,
+            itertools.repeat(root),
+        )
+
+
+def download_and_extract(package, root):
+    tar = download_package(package, root=root)
+    if not tar:
         return
-    url = SOURCE
+    outpath = utilo.join(root, package)
+    utilo.log(f'untar: {tar} {outpath}')
+    untar(
+        source=tar,
+        outpath=outpath,
+    )
+    utilo.log()
+
+
+def download_package(package: str, root=TMP):
+    utilo.debug(f'store: {root}')
+    os.makedirs(root, exist_ok=True)
+    path = utilo.join(root, package)
+    dl = utilo.join(root, f'{package}.tar.gz')
+    if utilo.exists(path):
+        utilo.log(f'already downloaded: {path}\n')
+        return None
+    url = f'{SOURCE}{package}.tar.gz'
     data = download_file(url)
     if not data:
         utilo.error(f'invalid download: {path}')
-        return
-    utilo.file_create_binary(dl, content=data)
+        return None
+    utilo.file_replace_binary(dl, content=data)
     os.makedirs(path)
-    utilo.log(f'extracted: {package}')
+    utilo.log(f'downloaded: {package}')
+    return dl
 
 
-def untar(path, data):
-    with tarfile.open(data) as tar:
+def untar(source, outpath):
+    with tarfile.open(source, mode='r:gz') as tar:
         tar.extractall(  #nosec B202
-            path=path,
-            members=safe_members(tar, path),
+            path=outpath,
+            # members=safe_members(tar, outpath),
         )
 
 
@@ -88,7 +132,7 @@ def download_file(url: str) -> bytes:
     try:
         response = requests.get(
             url,
-            timeout=5000,
+            timeout=TIMEOUT_DOWNLOAD_SEC,
         )
     except requests.HTTPError as msg:
         utilo.error(msg)
@@ -102,6 +146,23 @@ def download_file(url: str) -> bytes:
     return data
 
 
+def requires(root: str) -> tuple:
+    project = utilo.join(root, PYPROJECT)
+    if not utilo.exists(project):
+        return tuple()
+    with open(project, "rb") as f:
+        data = tomllib.load(f)
+    try:
+        result = data['tool']['hoverpower']['packages']
+    except KeyError:
+        utilo.error(f'invalid tool.hoverpower.packages: {data}')
+        return ()
+    result = utilo.sort(*result)
+    result = utilo.lower(*result)
+    result: tuple = tuple(result)
+    return result
+
+
 def bachelor(value: str, local: bool = True) -> str:
     name = f'bachelor{value}.pdf'
     if local:

{hoverpower-1.0.4 → hoverpower-1.2.0}/hoverpower/secret.py

@@ -60,8 +60,7 @@ def make_private():
 
 
 def make_public():
-    utilo.log(f'source: {hoverpower.path.STORE}')
-    utilo.log(f'write to public path: {hoverpower.path.TMP}')
+    utilo.log(f'store: {hoverpower.path.STORE}')
     for source in hoverpower.path.RESOURCES:
         if 'https://' in source:
             continue
@@ -102,7 +101,7 @@ def ensure_parant(source: str):
     fname = utilo.file_name(source, ext=True)
     # bachelor124.pdfs => bachelor/bachelor124.pdf
     base = utilo.join(
-        hoverpower.path.TMP,
+        hoverpower.path.STORE,
         re.split(r'(?=\d)', fname)[0],
     )
     os.makedirs(base, exist_ok=True)

{hoverpower-1.0.4 → hoverpower-1.2.0}/hoverpower.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hoverpower
-Version: 1.0.4
+Version: 1.2.0
 Author-email: Helmut Konrad Schewe <helmutus@outlook.com>
 License-Expression: MIT
 Project-URL: Homepage, https://github.com/anaticulae/hoverpower

{hoverpower-1.0.4 → hoverpower-1.2.0}/hoverpower.egg-info/SOURCES.txt

@@ -18,10 +18,12 @@ hoverpower.egg-info/requires.txt
 hoverpower.egg-info/top_level.txt
 hoverpower/cli/__init__.py
 hoverpower/cli/give.py
+hoverpower/repo/__init__.py
 tests/test_cli.py
 tests/test_generator.py
 tests/test_give.py
 tests/test_hardcore.py
+tests/test_path.py
 tests/test_repository.py
 tests/test_resources.py
 tests/test_secret.py

{hoverpower-1.0.4 → hoverpower-1.2.0}/hoverpower.egg-info/entry_points.txt

@@ -2,5 +2,6 @@
 give = hoverpower.cli.give:main
 power = hoverpower.cli:main
 powerdecrypt = hoverpower.secret:make_public
+powerdownload = hoverpower.path:download_packages
 powerencrypt = hoverpower.secret:make_private
 powersecret = hoverpower.secret:create_secret

{hoverpower-1.0.4 → hoverpower-1.2.0}/pyproject.toml

@@ -1,73 +1,91 @@
 [project]
 name = "hoverpower"
-version = "1.0.4"
+version = "1.2.0"
 description = ""
-readme = {file = "README", content-type = "text/markdown"}
 requires-python = ">=3.12"
 authors = [
-  {name = "Helmut Konrad Schewe", email = "helmutus@outlook.com"}
+    { name = "Helmut Konrad Schewe", email = "helmutus@outlook.com" },
 ]
-
 dependencies = [
     "resinf>=1.0.2,<2.0.0",
     "jamer>=1.0.0,<2.0.0",
     "utilo>=2.107.4,<3.0.0",
     "cryptography>=38.0.0,<47.0.0",
 ]
-
-# Optional but recommended metadata
 keywords = []
 classifiers = [
-  'Programming Language :: Python :: 3.12',
-  'Programming Language :: Python :: 3.13',
-  'Programming Language :: Python :: 3.14',
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
 ]
 license = "MIT"
-license-files = ["LICENSE"]
+license-files = [
+    "LICENSE",
+]
+
+[project.readme]
+file = "README"
+content-type = "text/markdown"
 
 [project.optional-dependencies]
 dev = [
     "utilotest>=1.0.1,<2.0.0",
-    # hardcore==0.9.0
     "pdflog==1.0.2",
-    # extract all pdf
-    # rawmaker>=2.40.2<3.0.0
 ]
 
 [project.urls]
 Homepage = "https://github.com/anaticulae/hoverpower"
 Repository = "https://github.com/anaticulae/hoverpower"
 
+[project.scripts]
+give = "hoverpower.cli.give:main"
+power = "hoverpower.cli:main"
+powersecret = "hoverpower.secret:create_secret"
+powerencrypt = "hoverpower.secret:make_private"
+powerdecrypt = "hoverpower.secret:make_public"
+powerdownload = "hoverpower.path:download_packages"
+
 [build-system]
 requires = [
     "setuptools>=82.0.1",
-    "wheel>=0.46.3"
+    "wheel>=0.46.3",
 ]
 build-backend = "setuptools.build_meta"
 
 [tool.semantic_release]
-version_toml = ["pyproject.toml:project.version"]
-[tool.semantic_release.changelog.default_templates]
-changelog_file = "CHANGELOG"
+version_toml = [
+    "pyproject.toml:project.version",
+]
+
 [tool.semantic_release.changelog]
 mode = "init"
 output_format = "md"
-[tool.semantic_release.commit_parser_options]
-# allways generate a new version
-patch_tags = ["fix", "perf", "build", "chore", "ci", "docs", "style", "refactor", "test", "deps"]
 
-[project.scripts]
-give = "hoverpower.cli.give:main"
-power = "hoverpower.cli:main"
-powersecret = "hoverpower.secret:create_secret"
-powerencrypt = "hoverpower.secret:make_private"
-powerdecrypt = "hoverpower.secret:make_public"
+[tool.semantic_release.changelog.default_templates]
+changelog_file = "CHANGELOG"
+
+[tool.semantic_release.commit_parser_options]
+patch_tags = [
+    "fix",
+    "perf",
+    "build",
+    "chore",
+    "ci",
+    "docs",
+    "style",
+    "refactor",
+    "test",
+    "deps",
+]
 
 [tool.setuptools.packages.find]
-where = ["."]
+where = [
+    ".",
+]
 include = [
     "hoverpower",
     "hoverpower.cli",
+    "hoverpower.repo",
 ]
 exclude = [
     "tests/*",

{hoverpower-1.0.4 → hoverpower-1.2.0}/tests/test_cli.py

@@ -14,6 +14,7 @@ import utilotest
 
 import hoverpower
 import hoverpower.cli
+import hoverpower.data
 import tests
 
 
@@ -87,8 +88,7 @@ def test_cli_all(td, mp):
         cmd='--all',
         mp=mp,
     )
-    # Subtract README.md => -1
-    expected = tests.foldersize(hoverpower.REPO) - 1
+    expected = len(hoverpower.data.collect_folder())
     assert tests.foldersize(td.tmpdir) == expected, f'{td.tmpdir} is empty'
 
 

hoverpower-1.2.0/tests/test_path.py

@@ -0,0 +1,54 @@
+import utilo
+
+import hoverpower.path
+
+PROJECT = """\
+[build-system]
+requires = [
+    "setuptools>=82.0.1",
+    "wheel>=0.47.0",
+]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "genex"
+version = "0.40.0"
+description = ""
+requires-python = ">=3.12"
+authors = [
+    { name = "Helmut Konrad Schewe", email = "helmutus@outlook.com" },
+]
+
+[project.readme]
+file = "README"
+content-type = "text/markdown"
+
+[project.optional-dependencies]
+dev = [
+    "utilotest>=1.0.4,<2.0.0",
+    "hoverpower>=1.1.0,<2.0.0",
+]
+
+[tool.hoverpower]
+packages = [
+    "BACHELOR",
+    "DOCU",
+    "HOME",
+]
+
+"""
+
+
+def test_project_requires(td):
+    project = utilo.join(td.tmpdir, 'pyproject.toml')
+    utilo.file_create(project, PROJECT)
+    requires = hoverpower.path.requires(root=td.tmpdir)
+    assert requires
+
+
+def test_project_requires_invalid_config(td):
+    project = utilo.join(td.tmpdir, 'pyproject.toml')
+    data = PROJECT.replace('packages = [', 'pack = [')
+    utilo.file_create(project, data)
+    requires = hoverpower.path.requires(root=td.tmpdir)
+    assert not requires