unardel: flatten wrapper archive folder

Author: chapmanjacobd

library/createdb/av.py

@@ -2,7 +2,18 @@
 
 from library.createdb import subtitle
 from library.mediafiles import media_check
-from library.utils import consts, date_utils, file_utils, iterables, nums, objects, path_utils, processes, strings
+from library.utils import (
+    consts,
+    date_utils,
+    file_utils,
+    iterables,
+    nums,
+    objects,
+    path_utils,
+    processes,
+    shell_utils,
+    strings,
+)
 from library.utils.consts import DBType
 from library.utils.log_utils import log
 
@@ -148,7 +159,7 @@ def munge_av_tags(args, m) -> dict:
             and not path.startswith("http")
             and not file_utils.is_file_open(path)
         ):
-            file_utils.trash(args, path, detach=False)
+            shell_utils.trash(args, path, detach=False)
             m["time_deleted"] = consts.APPLICATION_START
         m["error"] = "Metadata check failed"
         return m
@@ -207,7 +218,7 @@ def munge_av_tags(args, m) -> dict:
                 log.warning(
                     "Deleting %s corruption %.1f%% exceeded threshold %s", path, corruption * 100, threshold_str
                 )
-                file_utils.trash(args, path, detach=False)
+                shell_utils.trash(args, path, detach=False)
                 m["time_deleted"] = consts.APPLICATION_START
                 m["error"] = "Media check failed"
 

library/createdb/fs_add.py

@@ -14,10 +14,10 @@
     argparse_utils,
     consts,
     db_utils,
-    file_utils,
     iterables,
     objects,
     printing,
+    shell_utils,
 )
 from library.utils.consts import SC, DBType
 from library.utils.log_utils import log
@@ -167,7 +167,7 @@ def find_new_files(args, path) -> list[str]:
                 exts |= consts.SPEECH_RECOGNITION_EXTENSIONS
             exts = tuple(exts)
 
-    scanned_set = file_utils.rglob(path, exts or None, args.exclude)[0]
+    scanned_set = shell_utils.rglob(path, exts or None, args.exclude)[0]
 
     m_columns = db_utils.columns(args, "media")
 

library/createdb/fs_add_metadata.py

@@ -6,7 +6,7 @@
 from library.createdb import av
 from library.files import sample_hash
 from library.mediafiles import process_ffmpeg, process_image
-from library.utils import consts, file_utils, iterables, nums, objects, processes, strings
+from library.utils import consts, file_utils, iterables, nums, objects, processes, shell_utils, strings
 from library.utils.consts import DBType
 from library.utils.log_utils import log
 
@@ -110,10 +110,10 @@ def extract_metadata(mp_args, path) -> dict[str, str | int | None] | None:
         m["hash"] = sample_hash.sample_hash_file(path)
 
     if getattr(mp_args, "copy", False) and not file_utils.is_file_open(path):
-        path = m["path"] = file_utils.copy(mp_args, path, mp_args.copy)
+        path = m["path"] = shell_utils.copy(mp_args, path, mp_args.copy)
 
     if getattr(mp_args, "move", False) and not file_utils.is_file_open(path):
-        path = m["path"] = file_utils.rel_move(mp_args, path, mp_args.move)
+        path = m["path"] = shell_utils.rel_move(mp_args, path, mp_args.move)
 
     if getattr(mp_args, "process", False):
         if objects.is_profile(mp_args, DBType.audio) and Path(path).suffix not in [".opus", ".mka"]:

library/createdb/gallery_add.py

@@ -4,7 +4,7 @@
 from library import usage
 from library.createdb import gallery_backend
 from library.mediadb import db_media, db_playlists
-from library.utils import arggroups, argparse_utils, consts, db_utils, file_utils
+from library.utils import arggroups, argparse_utils, consts, db_utils, shell_utils
 from library.utils.consts import SC
 from library.utils.log_utils import log
 
@@ -38,7 +38,7 @@ def gallery_add(args=None) -> None:
     db_playlists.create(args)
     db_media.create(args)
 
-    paths = file_utils.gen_paths(args)
+    paths = shell_utils.gen_paths(args)
 
     if args.no_extract:
         args.db["media"].insert_all(

library/createdb/links_add.py

@@ -3,7 +3,6 @@
 
 import requests
 
-import library.utils.file_utils
 from library import usage
 from library.mediadb import db_media, db_playlists
 from library.text import extract_links
@@ -16,6 +15,7 @@
     devices,
     objects,
     printing,
+    shell_utils,
     strings,
     web,
 )
@@ -349,7 +349,7 @@ def links_add() -> None:
         try:
             media_new = set()
             media_known = set()
-            for url in library.utils.file_utils.gen_paths(args):
+            for url in shell_utils.gen_paths(args):
                 if url in media_known:
                     continue
 
@@ -371,7 +371,7 @@ def links_add() -> None:
     elif args.no_extract:
         media_new = set()
         media_known = set()
-        for p in library.utils.file_utils.gen_paths(args):
+        for p in shell_utils.gen_paths(args):
             if db_media.exists(args, p):
                 media_known.add(p)
                 if args.category:
@@ -386,7 +386,7 @@ def links_add() -> None:
             web.load_selenium(args)
         try:
             playlist_count = 0
-            for playlist_path in library.utils.file_utils.gen_paths(args):
+            for playlist_path in shell_utils.gen_paths(args):
                 args.playlists_id = add_playlist(args, playlist_path)
                 extractor(args, playlist_path)
 

library/createdb/site_add.py

@@ -5,7 +5,7 @@
 from bs4 import BeautifulSoup, element
 
 from library import usage
-from library.utils import arggroups, argparse_utils, consts, db_utils, file_utils, iterables, objects, strings, web
+from library.utils import arggroups, argparse_utils, consts, db_utils, iterables, objects, shell_utils, strings, web
 from library.utils.log_utils import log
 
 
@@ -301,7 +301,7 @@ def site_add(args=None) -> None:
 
     web.load_selenium(args, wire=True)
     try:
-        for url in file_utils.gen_paths(args):
+        for url in shell_utils.gen_paths(args):
             load_page(args, url)
     finally:
         web.quit_selenium(args)

library/createdb/tabs_add.py

@@ -5,8 +5,8 @@
 from library import usage
 from library.mediadb import db_history, db_media
 from library.utils import arggroups, argparse_utils, consts, iterables
-from library.utils.file_utils import gen_paths
 from library.utils.log_utils import log
+from library.utils.shell_utils import gen_paths
 
 
 def parse_args() -> argparse.Namespace:

library/createdb/torrents_add.py

@@ -4,10 +4,10 @@
 
 from library import usage
 from library.mediadb import db_media, db_playlists
-from library.utils import arggroups, argparse_utils, consts, db_utils, file_utils, iterables, nums, objects, printing
-from library.utils.file_utils import trash
+from library.utils import arggroups, argparse_utils, consts, db_utils, iterables, nums, objects, printing, shell_utils
 from library.utils.log_utils import log
 from library.utils.path_utils import tld_from_url
+from library.utils.shell_utils import trash
 
 
 def parse_args():
@@ -122,7 +122,7 @@ def torrents_add():
     db_playlists.create(args)
     db_media.create(args)
 
-    scanned_set = set(file_utils.gen_paths(args, default_exts=(".torrent",)))
+    scanned_set = set(shell_utils.gen_paths(args, default_exts=(".torrent",)))
 
     known_hashes = set()
     try:

library/createdb/tube_add.py

@@ -4,7 +4,7 @@
 from library import usage
 from library.createdb import tube_backend
 from library.mediadb import db_media, db_playlists
-from library.utils import arggroups, argparse_utils, consts, db_utils, file_utils
+from library.utils import arggroups, argparse_utils, consts, db_utils, shell_utils
 from library.utils.consts import SC
 from library.utils.log_utils import log
 
@@ -35,7 +35,7 @@ def tube_add(args=None) -> None:
         sys.argv = ["tubeadd", *args]
 
     args = parse_args(SC.tube_add, usage=usage.tube_add)
-    paths = file_utils.gen_paths(args)
+    paths = shell_utils.gen_paths(args)
 
     db_playlists.create(args)
     db_media.create(args)

library/createdb/tube_backend.py

@@ -14,7 +14,7 @@
 )
 from library.mediadb import db_media, db_playlists
 from library.mediafiles import media_check
-from library.utils import consts, db_utils, file_utils, iterables, objects, path_utils, printing, sql_utils, strings
+from library.utils import consts, db_utils, iterables, objects, path_utils, printing, shell_utils, sql_utils, strings
 from library.utils.consts import DBType, DLStatus, VideoArchiveError
 from library.utils.log_utils import Timer, log
 from library.utils.processes import FFProbe
@@ -579,7 +579,7 @@ def blocklist_check(info, *pargs, incomplete):
                 )
                 local_path = path_utils.clean_path(local_path.encode())
                 if Path(temp_path).exists():  # may be download error
-                    file_utils.rename_move_file(temp_path, local_path)
+                    shell_utils.rename_move_file(temp_path, local_path)
                 # TODO: wtf is this doing...
                 elif Path(local_path).exists():  # media might already be in download archive
                     local_path = temp_path