diff --git a/serverhost/rename_camera_folder.py b/serverhost/rename_camera_folder.py index a48cc13..151f260 100644 --- a/serverhost/rename_camera_folder.py +++ b/serverhost/rename_camera_folder.py @@ -6,7 +6,8 @@ import sys from PIL import Image, ExifTags import subprocess import json -from serverLibary import safe_rename +from serverlibary import safe_rename +from pathlib import Path # Folder to scan folder_path = '.' @@ -136,6 +137,7 @@ def get_manufacturer(file_path): return author_no_spaces def process_images(folder): + folder = Path(folder) for fname in os.listdir(folder): fpath = os.path.join(folder, fname) @@ -181,7 +183,7 @@ def process_images(folder): else: basename, _ = os.path.splitext(fname) new_fname = f"{basename}{videoManufacturer}{ext}" - safe_rename(fpath, os.path.join(folder, new_fname)) + safe_rename(Path(fpath),folder / new_fname) continue print(f"[OK] {fname} already correctly named.") @@ -196,7 +198,7 @@ def process_images(folder): timestamp_str = '_'.join(parts[:2]) if len(parts) >= 2 else parts[0] dt = datetime.datetime.strptime(timestamp_str, fmt) new_fname = f"{file_prefix}_{dt.strftime('%Y%m%d_%H%M%S')}{videoManufacturer}{ext}" - safe_rename(fpath, os.path.join(folder, new_fname)) + safe_rename(Path(fpath),folder / new_fname) matched = True break except Exception as e: @@ -209,7 +211,7 @@ def process_images(folder): dt = get_exif_creation_datetime(fpath) if dt: new_fname = f"{file_prefix}_{dt.strftime('%Y%m%d_%H%M%S')}{videoManufacturer}{ext}" - safe_rename(fpath, new_fname) + safe_rename(Path(fpath),folder / new_fname) continue # 4. Fallback: keep original name, add _RX_ (only if not already added) @@ -220,7 +222,7 @@ def process_images(folder): basename, _ = os.path.splitext(fname) rand_num = random.randint(100000, 999999) new_fname = f"{basename}_RX_{rand_num}{videoManufacturer}{ext}" - safe_rename(fpath, new_fname) + safe_rename(Path(fpath),folder / new_fname) # ---- Main script entry ---- if __name__ == '__main__': diff --git a/serverhost/rename_camera_folder.sh b/serverhost/rename_camera_folder.sh index dfe2d9c..f1e229e 100644 --- a/serverhost/rename_camera_folder.sh +++ b/serverhost/rename_camera_folder.sh @@ -2,7 +2,8 @@ PW=$(cat /home/lucas/.PW) FOLDER=/torrent/Camera SERVER="https://someoneslinux.ddns.net" -nextcloudcmd --trust --user lucas --password ${PW} --path Media/Pictures/Camera ${FOLDER} ${SERVER} 1>/dev/null 2>& +nextcloudcmd --trust --user lucas --password ${PW} --path Media/Pictures/Camera ${FOLDER} ${SERVER} 1>/dev/null 2>&1 +export PYTHONPATH=/home/lucas/scripts /home/lucas/.venv_general/bin/python3 /home/lucas/scripts/serverhost/rename_camera_folder.py ${FOLDER} nextcloudcmd --trust --user lucas --password ${PW} --path Media/Pictures/Camera ${FOLDER} ${SERVER} 1>/dev/null 2>&1