updated author

This commit is contained in:
2020-11-29 17:42:08 +01:00
parent 18ab2e60cc
commit 167d42c19d
2 changed files with 11 additions and 11 deletions

View File

@@ -22,7 +22,7 @@ dry_run = False
fileidx = defaultdict(int) fileidx = defaultdict(int)
for daydir in Path(SRC).iterdir(): for daydir in Path(SRC).iterdir():
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() md = mo.groupdict()
title = md['title'] title = md['title']
for raw in daydir.rglob(f"*.jpg"): for raw in daydir.rglob(f"*.jpg"):
@@ -31,7 +31,7 @@ for daydir in Path(SRC).iterdir():
exif_dict = piexif.load(str(raw)) exif_dict = piexif.load(str(raw))
model = exif_dict["0th"][piexif.ImageIFD.Model].decode("ascii") model = exif_dict["0th"][piexif.ImageIFD.Model].decode("ascii")
idto = exif_dict["Exif"][piexif.ExifIFD.DateTimeOriginal].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: except:
model = None model = None
print(f'exif failed {raw.name}, using file date') print(f'exif failed {raw.name}, using file date')
@@ -39,7 +39,7 @@ for daydir in Path(SRC).iterdir():
rawdt = dt.datetime.fromtimestamp(mtime) rawdt = dt.datetime.fromtimestamp(mtime)
# digitized negative photo? # digitized negative photo?
if model == 'Canon EOS 5D': 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 use_ts = False
else: else:
use_ts = True use_ts = True
@@ -55,7 +55,8 @@ for daydir in Path(SRC).iterdir():
else: else:
index = fileidx[day] + 1 index = fileidx[day] + 1
fileidx[day] = index 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}" # destfn = raw.parent / f"{author}-{day}-{title}-{index:04}-{camera}{raw.suffix}"
print(raw.name, "->", destfn.name) print(raw.name, "->", destfn.name)
if not dry_run: if not dry_run:
@@ -72,7 +73,8 @@ for daydir in Path(SRC).iterdir():
ts = f"{rawdt:%H%M%S}" ts = f"{rawdt:%H%M%S}"
index = fileidx[day] + 1 index = fileidx[day] + 1
fileidx[day] = index 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) print(raw.name, "->", destfn.name)
if not dry_run: if not dry_run:
if not destfn.exists(): if not destfn.exists():

View File

@@ -38,7 +38,7 @@ def recurse(dir, md, camera=None):
# defaults # defaults
use_ts = True use_ts = True
use_camera = True use_camera = True
author = "th" author = "ab"
mtime = fp.stat().st_mtime mtime = fp.stat().st_mtime
rawdt = dt.datetime.fromtimestamp(mtime) rawdt = dt.datetime.fromtimestamp(mtime)
if fp.suffix.lower() == ".jpg": if fp.suffix.lower() == ".jpg":
@@ -112,10 +112,8 @@ def rename(old, new):
for daydir in Path(SRC).iterdir(): for daydir in Path(SRC).iterdir():
if not daydir.is_dir(): if not daydir.is_dir():
continue continue
if daydir.name != "iPhone":
continue
print(f"[{daydir.name}] -------------------------------------------------") 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() md = mo.groupdict()
title = md['title'] title = md['title']
recurse(daydir, md) recurse(daydir, md)