diff --git a/ren_title.py b/ren_title.py index e13256e..ec91cfe 100644 --- a/ren_title.py +++ b/ren_title.py @@ -22,7 +22,7 @@ dry_run = False fileidx = defaultdict(int) for daydir in Path(SRC).iterdir(): - mo = re.match("(?P
\S*)\s(?P.*)", daydir.name) + mo = re.match(r"(?P<dt>\S*)\s(?P<title>.*)", daydir.name) md = mo.groupdict() title = md['title'] for raw in daydir.rglob(f"*.jpg"): @@ -31,7 +31,7 @@ for daydir in Path(SRC).iterdir(): exif_dict = piexif.load(str(raw)) model = exif_dict["0th"][piexif.ImageIFD.Model].decode("ascii") idto = exif_dict["Exif"][piexif.ExifIFD.DateTimeOriginal].decode("ascii") - rawdt = dt.datetime.strptime(idto,"%Y:%m:%d %H:%M:%S") + rawdt = dt.datetime.strptime(idto, "%Y:%m:%d %H:%M:%S") except: model = None print(f'exif failed {raw.name}, using file date') @@ -39,7 +39,7 @@ for daydir in Path(SRC).iterdir(): rawdt = dt.datetime.fromtimestamp(mtime) # digitized negative photo? if model == 'Canon EOS 5D': - rawdt = dt.datetime.strptime(md['dt'],"%Y%m%d") + rawdt = dt.datetime.strptime(md['dt'], "%Y%m%d") use_ts = False else: use_ts = True @@ -55,13 +55,14 @@ for daydir in Path(SRC).iterdir(): else: index = fileidx[day] + 1 fileidx[day] = index - destfn = raw.parent / f"{author}-{day}-{title}-{index:04}{raw.suffix}" + destfn = raw.parent / \ + f"{author}-{day}-{title}-{index:04}{raw.suffix}" # destfn = raw.parent / f"{author}-{day}-{title}-{index:04}-{camera}{raw.suffix}" print(raw.name, "->", destfn.name) if not dry_run: if not destfn.exists(): raw.rename(destfn) - else: + else: print(f"skipped {raw.name}, {destfn.name}, already exists") camera = "Sony TRV_25E" for raw in daydir.rglob(f"*.avi"): @@ -72,10 +73,11 @@ for daydir in Path(SRC).iterdir(): ts = f"{rawdt:%H%M%S}" index = fileidx[day] + 1 fileidx[day] = index - destfn = raw.parent / f"{author}-{day}-{title}-{ts}-{camera}{raw.suffix}" + destfn = raw.parent / \ + f"{author}-{day}-{title}-{ts}-{camera}{raw.suffix}" print(raw.name, "->", destfn.name) if not dry_run: if not destfn.exists(): raw.rename(destfn) - else: + else: print(f"skipped {raw.name}, {destfn.name}, already exists") diff --git a/ren_triage.py b/ren_triage.py index 5f123ce..03ea9ce 100644 --- a/ren_triage.py +++ b/ren_triage.py @@ -38,7 +38,7 @@ def recurse(dir, md, camera=None): # defaults use_ts = True use_camera = True - author = "th" + author = "ab" mtime = fp.stat().st_mtime rawdt = dt.datetime.fromtimestamp(mtime) if fp.suffix.lower() == ".jpg": @@ -112,10 +112,8 @@ def rename(old, new): for daydir in Path(SRC).iterdir(): if not daydir.is_dir(): continue - if daydir.name != "iPhone": - continue print(f"[{daydir.name}] -------------------------------------------------") - mo = re.match("(?P<dt>\S*)\s?(?P<title>.*)", daydir.name) + mo = re.match(r"(?P<dt>\S*)\s?(?P<title>.*)", daydir.name) md = mo.groupdict() title = md['title'] recurse(daydir, md)