Cleanup (#211)

* Add path cleanup feature

* Update dependencies

* Fix default cfg

* Fix linting

* Minor changes

Author: DirtyRacer1337

namer/comparison_results.py

@@ -254,6 +254,15 @@ def new_file_name(self, template: str, config: NamerConfig, infix: str = "(0)")
         if config.plex_hack:
             name = re.sub(r'[sS]\d{1,3}:?[eE]\d{1,3}', '', name)
 
+        if config.path_cleanup:
+            path = PurePath(name)
+            name = path.stem
+            name = re.sub(r'[- ]+$', '', name)
+            name = re.sub(r'-\s+-', '-', name)
+            name = name + path.suffix
+            if path.parts:
+                name = str(path.parent / name)
+
         return name
 
     @staticmethod

namer/configuration.py

@@ -259,6 +259,11 @@ class NamerConfig:
     Should plex movies have S##E## stripped out of movie names (to allow videos to be visible in plex)
     """
 
+    path_cleanup: bool = False
+    """
+    Cleanup final filename
+    """
+
     override_tpdb_address: str = "https://api.metadataapi.net"
     """
     Used only for testing, can override the location of the porn database - usually to point at a locally
@@ -506,6 +511,7 @@ def to_dict(self) -> dict:
                 "requests_cache_expire_minutes": self.requests_cache_expire_minutes,
                 "override_tpdb_address": self.override_tpdb_address,
                 "plex_hack": self.plex_hack,
+                "path_cleanup": self.path_cleanup,
             },
             "Phash": {
                 "search_phash": self.search_phash,

namer/configuration_utils.py

@@ -235,6 +235,7 @@ def set_boolean(updater: ConfigUpdater, section: str, key: str, value: bool) ->
     "requests_cache_expire_minutes": ("namer", to_int, from_int),
     "override_tpdb_address": ("namer", None, None),
     "plex_hack": ("namer", to_bool, from_bool),
+    "path_cleanup": ("namer", to_bool, from_bool),
     "search_phash": ("Phash", to_bool, from_bool),
     "use_distant_matching": ("Phash", to_bool, from_bool),
     "send_phash": ("Phash", to_bool, from_bool),

namer/namer.cfg.default

@@ -122,6 +122,9 @@ max_performer_names = 6
 # When plex hack is set to True, any matches of e##s## are removed from the Scene name.
 plex_hack = False
 
+# Cleanup final filename
+path_cleanup = False
+
 # Path where stores namer system data.
 database_path = ./database
 

package.json

@@ -13,34 +13,34 @@
   },
   "dependencies": {
     "@popperjs/core": "^2.11.8",
-    "bootstrap": "^5.3.1",
-    "bootstrap-icons": "^1.10.5",
+    "bootstrap": "^5.3.2",
+    "bootstrap-icons": "^1.11.1",
     "datatables.net": "^1.13.6",
     "datatables.net-bs5": "^1.13.6",
-    "jquery": "^3.7.0",
+    "jquery": "^3.7.1",
     "lodash": "^4.17.21"
   },
   "devDependencies": {
-    "@babel/core": "^7.22.10",
-    "@babel/preset-env": "^7.22.10",
+    "@babel/core": "^7.23.0",
+    "@babel/preset-env": "^7.22.20",
     "babel-loader": "^9.1.3",
     "copy-webpack-plugin": "^11.0.0",
     "css-loader": "^6.8.1",
     "css-minimizer-webpack-plugin": "^5.0.1",
-    "eslint": "^8.47.0",
+    "eslint": "^8.50.0",
     "eslint-config-standard": "^17.1.0",
     "eslint-plugin-import": "^2.28.1",
-    "eslint-plugin-n": "^16.0.2",
+    "eslint-plugin-n": "^16.1.0",
     "eslint-plugin-promise": "^6.1.1",
     "file-loader": "^6.2.0",
     "html-minimizer-webpack-plugin": "^4.4.0",
     "husky": "^8.0.3",
     "lint-staged": "^14.0.1",
     "mini-css-extract-plugin": "^2.7.6",
-    "postcss": "^8.4.28",
+    "postcss": "^8.4.30",
     "postcss-loader": "^7.3.3",
-    "postcss-preset-env": "^9.1.1",
-    "sass": "^1.66.1",
+    "postcss-preset-env": "^9.1.4",
+    "sass": "^1.68.0",
     "sass-loader": "^13.3.2",
     "terser-webpack-plugin": "^5.3.9",
     "webpack": "^5.88.2",