refactor as an iterator class
This commit is contained in:
parent
d7f6dabb94
commit
fcc485c8cd
1 changed files with 45 additions and 29 deletions
74
flicksave.py
74
flicksave.py
|
|
@ -2,47 +2,63 @@ import os
|
||||||
import glob
|
import glob
|
||||||
import datetime
|
import datetime
|
||||||
|
|
||||||
def make_flick(save_dir, name, date, ext):
|
|
||||||
# Current date with second precision (without micro-seconds).
|
|
||||||
tag = date.isoformat().split(".")[0]
|
|
||||||
flick = name + "_" + tag + ext
|
|
||||||
return os.path.join(save_dir, flick)
|
|
||||||
|
|
||||||
|
|
||||||
def last_of(us):
|
def last_of(us):
|
||||||
return us[-1]
|
return us[-1]
|
||||||
|
|
||||||
|
|
||||||
def next_name(base, save_dir=".", delay=10):
|
class Flick:
|
||||||
full = os.path.expanduser(base)
|
def __init__(self, basename, save_dir=".", delay=10, stamp_sep='_', date_template="%Y-%m-%dT%H:%M:%S"):
|
||||||
head = os.path.basename(full)
|
self.base = basename
|
||||||
name,ext = os.path.splitext(head)
|
self.date_template = date_template
|
||||||
|
self.date_sep = stamp_sep
|
||||||
|
self.save_dir = save_dir
|
||||||
|
self.delay = delay
|
||||||
|
|
||||||
pattern = name+"_????-??-??T??:??:??"+ext
|
# Make a glob search expression with the date template.
|
||||||
existing = glob.glob(os.path.join(save_dir,pattern))
|
self.fields = {'Y':4,'m':2,'d':2,'H':2,'M':2,'S':2}
|
||||||
|
self.glob_template = self.date_template
|
||||||
|
for k in self.fields:
|
||||||
|
self.glob_template = self.glob_template.replace("%"+k,'?'*self.fields[k])
|
||||||
|
|
||||||
date_now = datetime.datetime.now()
|
def __iter__(self):
|
||||||
#print(date_now)
|
return self
|
||||||
|
|
||||||
if existing:
|
def make(self, save_dir, name, date, ext):
|
||||||
last = last_of(sorted(existing))
|
# Current date with second precision (without micro-seconds).
|
||||||
root,ext = os.path.splitext(last)
|
tag = date.isoformat().split(".")[0]
|
||||||
last_name = os.path.basename(root)
|
flick = name + self.date_sep + tag + ext
|
||||||
# As we globbed the pattern, no need for complex regexp.
|
return os.path.join(save_dir, flick)
|
||||||
last_tag = last_of(last_name.split("_"))
|
|
||||||
last_date = datetime.datetime.strptime(last_tag, "%Y-%m-%dT%H:%M:%S")
|
|
||||||
|
|
||||||
print("Last save:",last_date.isoformat())
|
def next(self):
|
||||||
|
full = os.path.expanduser(self.base)
|
||||||
|
head = os.path.basename(full)
|
||||||
|
name,ext = os.path.splitext(head)
|
||||||
|
|
||||||
assert(last_date <= date_now)
|
pattern = name+self.date_sep+self.glob_template+ext
|
||||||
if date_now - last_date < datetime.timedelta(seconds=delay):
|
existing = glob.glob(os.path.join(self.save_dir,pattern))
|
||||||
return make_flick(save_dir,name,last_date,ext)
|
|
||||||
|
|
||||||
return make_flick(save_dir,name,date_now,ext)
|
date_now = datetime.datetime.now()
|
||||||
|
#print(date_now)
|
||||||
|
|
||||||
|
if existing:
|
||||||
|
last = last_of(sorted(existing))
|
||||||
|
root,ext = os.path.splitext(last)
|
||||||
|
last_name = os.path.basename(root)
|
||||||
|
# As we globbed the pattern, no need for complex regexp.
|
||||||
|
last_tag = last_of(last_name.split(self.date_sep))
|
||||||
|
last_date = datetime.datetime.strptime(last_tag, self.date_template)
|
||||||
|
|
||||||
|
print("Last flick on:",last_date.isoformat())
|
||||||
|
|
||||||
|
assert(last_date <= date_now)
|
||||||
|
if date_now - last_date < datetime.timedelta(seconds=self.delay):
|
||||||
|
return self.make(self.save_dir,name,last_date,ext)
|
||||||
|
|
||||||
|
return self.make(self.save_dir,name,date_now,ext)
|
||||||
|
|
||||||
|
|
||||||
if __name__=="__main__":
|
if __name__=="__main__":
|
||||||
|
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
print(next_name(sys.argv[1]))
|
f = Flick(sys.argv[1])
|
||||||
|
print(f.next())
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue