github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-07-15 09:42:57 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Update timestamp helper functions

Browse source
This commit is contained in:
JonnyWong16 2020-08-03 10:17:25 -07:00
parent b54576f08f
commit 4285b55c15
No known key found for this signature in database
GPG key ID: B1F1F9807184697A
3 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
plexpy/config.py
View file

@ -269,9 +269,9 @@ def make_backup(cleanup=False, scheduler=False):
""" Makes a backup of config file, removes all but the last 5 backups """ """ Makes a backup of config file, removes all but the last 5 backups """
if scheduler: if scheduler:
backup_file = 'config.backup-{}.sched.ini'.format(helpers.now(no_sep=True)) backup_file = 'config.backup-{}.sched.ini'.format(helpers.now())
else: else:
backup_file = 'config.backup-{}.ini'.format(helpers.now(no_sep=True)) backup_file = 'config.backup-{}.ini'.format(helpers.now())
backup_folder = plexpy.CONFIG.BACKUP_DIR backup_folder = plexpy.CONFIG.BACKUP_DIR
backup_file_fp = os.path.join(backup_folder, backup_file) backup_file_fp = os.path.join(backup_folder, backup_file)

4
plexpy/database.py
View file

@ -292,9 +292,9 @@ def make_backup(cleanup=False, scheduler=False):
plexpy.NOTIFY_QUEUE.put({'notify_action': 'on_plexpydbcorrupt'}) plexpy.NOTIFY_QUEUE.put({'notify_action': 'on_plexpydbcorrupt'})
if scheduler: if scheduler:
backup_file = 'tautulli.backup-{}{}.sched.db'.format(helpers.now(no_sep=True), corrupt) backup_file = 'tautulli.backup-{}{}.sched.db'.format(helpers.now(), corrupt)
else: else:
backup_file = 'tautulli.backup-{}{}.db'.format(helpers.now(no_sep=True), corrupt) backup_file = 'tautulli.backup-{}{}.db'.format(helpers.now(), corrupt)
backup_folder = plexpy.CONFIG.BACKUP_DIR backup_folder = plexpy.CONFIG.BACKUP_DIR
backup_file_fp = os.path.join(backup_folder, backup_file) backup_file_fp = os.path.join(backup_folder, backup_file)

22
plexpy/helpers.py
View file

@ -213,25 +213,25 @@ def today():
return yyyymmdd return yyyymmdd
def now(no_sep=False):
now = datetime.datetime.now()
if no_sep:
return now.strftime("%Y%m%d%H%M%S")
return now.strftime("%Y-%m-%d %H:%M:%S")
def utc_now_iso(): def utc_now_iso():
utcnow = datetime.datetime.utcnow() utcnow = datetime.datetime.utcnow()
return utcnow.isoformat() return utcnow.isoformat()
def timestamp_to_YMD(timestamp): def now(sep=False):
return timestamp_to_datetime(timestamp).strftime("%Y-%m-%d") return timestamp_to_YMDHMS(timestamp(), sep=sep)
def timestamp_to_datetime(timestamp): def timestamp_to_YMDHMS(ts, sep=False):
return datetime.datetime.fromtimestamp(cast_to_int(str(timestamp))) dt = timestamp_to_datetime(ts)
if sep:
return dt.strftime("%Y-%m-%d %H:%M:%S")
return dt.strftime("%Y%m%d%H%M%S")
def timestamp_to_datetime(ts):
return datetime.datetime.fromtimestamp(ts)
def iso_to_YMD(iso): def iso_to_YMD(iso):