github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-07-08 06:00:51 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update helpers.now function

Browse source
This commit is contained in:
JonnyWong16 2020-08-02 13:48:10 -07:00
parent 9baecb0a41
commit f582f781f3
No known key found for this signature in database
GPG key ID: B1F1F9807184697A
3 changed files with 13 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

7
plexpy/config.py
View file

@ -17,7 +17,6 @@ from __future__ import unicode_literals
from future.builtins import object
from future.builtins import str
import arrow
import os
import re
import shutil
@ -28,8 +27,10 @@ from configobj import ConfigObj, ParseError
import plexpy
if plexpy.PYTHON2:
import helpers
import logger
else:
from plexpy import helpers
from plexpy import logger
@ -268,9 +269,9 @@ def make_backup(cleanup=False, scheduler=False):
""" Makes a backup of config file, removes all but the last 5 backups """
if scheduler:
backup_file = 'config.backup-%s.sched.ini' % arrow.now().format('YYYYMMDDHHmmss')
backup_file = 'config.backup-{}.sched.ini'.format(helpers.now(no_sep=True))
else:
backup_file = 'config.backup-%s.ini' % arrow.now().format('YYYYMMDDHHmmss')
backup_file = 'config.backup-{}.ini'.format(helpers.now(no_sep=True))
backup_folder = plexpy.CONFIG.BACKUP_DIR
backup_file_fp = os.path.join(backup_folder, backup_file)

13
plexpy/database.py
View file

@ -17,7 +17,6 @@ from __future__ import unicode_literals
from future.builtins import str
from future.builtins import object
import arrow
import os
import sqlite3
import shutil
@ -26,11 +25,11 @@ import time
import plexpy
if plexpy.PYTHON2:
import helpers
import logger
from helpers import cast_to_int, chunk
else:
from plexpy import helpers
from plexpy import logger
from plexpy.helpers import cast_to_int, chunk
FILENAME = "tautulli.db"
@ -219,7 +218,7 @@ def delete_recently_added():
def delete_rows_from_table(table, row_ids):
if row_ids and isinstance(row_ids, str):
row_ids = list(map(cast_to_int, row_ids.split(',')))
row_ids = list(map(helpers.cast_to_int, row_ids.split(',')))
if row_ids:
logger.info("Tautulli Database :: Deleting row ids %s from %s database table", row_ids, table)
@ -230,7 +229,7 @@ def delete_rows_from_table(table, row_ids):
monitor_db = MonitorDatabase()
try:
for row_ids_group in chunk(row_ids, sqlite_max_variable_number):
for row_ids_group in helpers.chunk(row_ids, sqlite_max_variable_number):
query = "DELETE FROM " + table + " WHERE id IN (%s) " % ','.join(['?'] * len(row_ids_group))
monitor_db.action(query, row_ids_group)
except Exception as e:
@ -293,9 +292,9 @@ def make_backup(cleanup=False, scheduler=False):
plexpy.NOTIFY_QUEUE.put({'notify_action': 'on_plexpydbcorrupt'})
if scheduler:
backup_file = 'tautulli.backup-{}{}.sched.db'.format(arrow.now().format('YYYYMMDDHHmmss'), corrupt)
backup_file = 'tautulli.backup-{}{}.sched.db'.format(helpers.now(no_sep=True), corrupt)
else:
backup_file = 'tautulli.backup-{}{}.db'.format(arrow.now().format('YYYYMMDDHHmmss'), corrupt)
backup_file = 'tautulli.backup-{}{}.db'.format(helpers.now(no_sep=True), corrupt)
backup_folder = plexpy.CONFIG.BACKUP_DIR
backup_file_fp = os.path.join(backup_folder, backup_file)

5
plexpy/helpers.py
View file

@ -213,9 +213,10 @@ def today():
return yyyymmdd
def now():
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")