Python 3.13 (#259)

* lchown in one cmd

* update dependencies and python 3.13 support

* refactoring

* update dependencies

Author: DirtyRacer1337

.eslintrc.yml

@@ -13,7 +13,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: [ '3.9', '3.10', '3.11', '3.12' ]
+        python-version: [ '3.10', '3.11', '3.12', '3.13' ]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -31,7 +31,7 @@ jobs:
       - name: Install poetry
         uses: abatilo/actions-poetry@v2
         with:
-          poetry-version: '1.8.3'
+          poetry-version: '1.8.4'
 
       - name: Install Go
         uses: actions/setup-go@v5
@@ -77,7 +77,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: '3.12'
+          python-version: '3.13'
 
       - name: Display Python version
         run: python --version
@@ -102,7 +102,7 @@ jobs:
       - name: Install poetry
         uses: abatilo/actions-poetry@v2
         with:
-          poetry-version: '1.8.3'
+          poetry-version: '1.8.4'
 
       - uses: pnpm/action-setup@v3
         with:
@@ -161,15 +161,15 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: '3.12'
+          python-version: '3.13'
 
       - name: Display Python version
         run: python --version
 
       - name: install poetry
         uses: abatilo/actions-poetry@v2
         with:
-          poetry-version: '1.8.3'
+          poetry-version: '1.8.4'
 
       - name: create tag from pyproject version on change.
         id: auto-tag
@@ -206,15 +206,15 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: '3.12'
+          python-version: '3.13'
 
       - name: Display Python version
         run: python --version
 
       - name: Install poetry
         uses: abatilo/actions-poetry@v2
         with:
-          poetry-version: '1.8.3'
+          poetry-version: '1.8.4'
 
       - name: Install Go
         uses: actions/setup-go@v5

.github/workflows/ci.yml

@@ -0,0 +1,7 @@
+import globals from 'globals'
+import pluginJs from '@eslint/js'
+
+export default [
+  { languageOptions: { globals: globals.browser } },
+  pluginJs.configs.recommended,
+]

eslint.config.mjs

@@ -20,11 +20,11 @@
 
 import namer.metadataapi
 import namer.namer
+import namer.videohashes
 import namer.watchdog
 import namer.web
 from namer.configuration_utils import default_config
 from namer.models import db
-from namer.namer import calculate_phash
 
 DESCRIPTION = (
     namer.namer.DESCRIPTION
@@ -33,9 +33,11 @@
     The first argument should be 'watchdog', 'rename', 'suggest', or 'help' to see this message, for more help on rename, call
     namer 'namer rename -h'
 
-    watchdog and help take no arguments (please see the config file example https://github.com/4c0d3r/namer/blob/main/namer.cfg)
+    watchdog and help take no arguments (please see the config file example https://github.com/ThePornDatabase/namer/blob/main/namer/namer.cfg.default)
 
     'suggest' takes a file name as input and will output a suggested file name.
+    'url' print url to namer web ui.
+    'hash' takes a file name as input and will output a hashes in json format.
     """
 )
 
@@ -79,9 +81,7 @@ def main():
     elif arg1 == 'url':
         print(f'http://{config.host}:{config.port}{config.web_root}')
     elif arg1 == 'hash':
-        file = Path(arg_list[1])
-        file_hash = calculate_phash(file, config)
-        print(file_hash.to_dict())
+        namer.videohashes.main(arg_list[1:])
     elif arg1 in ['-h', 'help', None]:
         print(DESCRIPTION)
 

namer/__main__.py

@@ -128,11 +128,8 @@ def _set_perms(target: Path, config: NamerConfig):
     file_perm: Optional[int] = int(str(config.set_file_permissions), 8) if config.set_file_permissions else None
     dir_perm: Optional[int] = int(str(config.set_dir_permissions), 8) if config.set_dir_permissions else None
 
-    if config.set_gid:
-        os.lchown(target, uid=-1, gid=config.set_gid)
-
-    if config.set_uid:
-        os.lchown(target, uid=config.set_uid, gid=-1)
+    if config.set_gid or config.set_uid:
+        os.lchown(target, uid=config.set_uid if config.set_uid else -1, gid=config.set_gid if config.set_gid else -1)
 
     if target.is_dir() and dir_perm:
         target.chmod(dir_perm)

namer/command.py

@@ -35,7 +35,7 @@
     File names are assumed to be of the form SITE.[YY]YY.MM.DD.String.of.performers.and.or.scene.name.<IGNORED_INFO>.[mp4|mkv].
     In the name, read the periods, ".", as any number of spaces " ", dashes "-", or periods ".".
 
-    Provided you have an access token to the porndb (free sign up) https://www.theporndb.net/, this program will
+    Provided you have an access token to the porndb (free sign up) https://theporndb.net/, this program will
     attempt to match your file's name to search results from the porndb.   Please note that the site must at least be
     a substring of the actual site name on the porndb, and the date must be within one day or the release date on the
     porndb for a match to be considered.  If the log file flag is enabled then a <original file name minus ext>_namer.json.gz

namer/namer.py

@@ -0,0 +1,31 @@
+import argparse
+import sys
+from pathlib import Path
+from typing import List
+
+from loguru import logger
+
+from namer.configuration_utils import default_config
+from namer.namer import calculate_phash
+
+
+def main(args_list: List[str]):
+    """
+    Command line interface to calculate hashes for a file.
+    """
+    description = """
+    Command line interface to calculate hashes for a file
+    """
+    parser = argparse.ArgumentParser(description=description)
+    parser.add_argument('-c', '--configfile', help='override location for a configuration file.', type=Path)
+    parser.add_argument('-f', '--file', help='File we want to provide a match name for.', required=True, type=Path)
+    parser.add_argument('-v', '--verbose', help='verbose, print logs', action='store_true')
+    args = parser.parse_args(args=args_list)
+
+    config = default_config(args.configfile.absolute() if args.configfile else None)
+    if args.verbose:
+        level = 'DEBUG' if config.debug else 'INFO'
+        logger.add(sys.stdout, format=config.console_format, level=level, diagnose=config.diagnose_errors)
+
+    file_hash = calculate_phash(args.file.absolute(), config)
+    print(file_hash.to_dict())

namer/videohashes.py

@@ -15,8 +15,8 @@
     "@popperjs/core": "^2.11.8",
     "bootstrap": "^5.3.3",
     "bootstrap-icons": "^1.11.3",
-    "datatables.net": "^2.1.7",
-    "datatables.net-bs5": "^2.1.7",
+    "datatables.net": "^2.1.8",
+    "datatables.net-bs5": "^2.1.8",
     "datatables.net-buttons": "^3.1.2",
     "datatables.net-buttons-bs5": "^3.1.2",
     "datatables.net-colreorder": "^2.0.4",
@@ -29,26 +29,26 @@
     "lodash": "^4.17.21"
   },
   "devDependencies": {
-    "@babel/core": "^7.25.2",
-    "@babel/preset-env": "^7.25.4",
+    "@babel/core": "^7.25.8",
+    "@babel/preset-env": "^7.25.8",
+    "@eslint/eslintrc": "^3.1.0",
+    "@eslint/js": "^9.12.0",
     "babel-loader": "^9.2.1",
     "copy-webpack-plugin": "^12.0.2",
     "css-loader": "^7.1.2",
     "css-minimizer-webpack-plugin": "^7.0.0",
-    "eslint": "^9.11.1",
+    "eslint": "^9.12.0",
     "eslint-config-standard": "^17.1.0",
-    "eslint-plugin-import": "^2.30.0",
-    "eslint-plugin-n": "^17.10.3",
-    "eslint-plugin-promise": "^7.1.0",
     "file-loader": "^6.2.0",
+    "globals": "^15.11.0",
     "html-minimizer-webpack-plugin": "^5.0.0",
     "husky": "^9.1.6",
     "lint-staged": "^15.2.10",
     "mini-css-extract-plugin": "^2.9.1",
     "postcss": "^8.4.47",
     "postcss-loader": "^8.1.1",
-    "postcss-preset-env": "^10.0.5",
-    "sass": "^1.79.4",
+    "postcss-preset-env": "^10.0.7",
+    "sass": "^1.80.0",
     "sass-loader": "^16.0.2",
     "terser-webpack-plugin": "^5.3.10",
     "webpack": "^5.95.0",