mirror
/
mylar
mirror of https://github.com/evilhero/mylar
1
0
Fork 0
Code Issues Releases Wiki Activity

FIX:(#1784) On new installations, pull-list tab would give a float error due to some improper trapping of variables

This commit is contained in:
evilhero 2017-11-25 15:56:29 -05:00
parent 5e3000d311
commit 05a3c49c65
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mylar/__init__.py
View File

@ -414,6 +414,12 @@ def start():
#now the scheduler (check every 24 hours)
weekly_interval = weektimer * 60 * 60
try:
if SCHED_WEEKLY_LAST:
pass
except:
SCHED_WEEKLY_LAST = None
if SCHED_WEEKLY_LAST is not None:
weekly_timestamp = float(SCHED_WEEKLY_LAST)
else:

18
mylar/helpers.py
View File

@ -2858,7 +2858,12 @@ def weekly_info(week=None, year=None):
else:
weekdst = mylar.CONFIG.DESTINATION_DIR
weekly_last = datetime.datetime.fromtimestamp(mylar.SCHED_WEEKLY_LAST)
if mylar.SCHED_WEEKLY_LAST is not None:
weekly_last = datetime.datetime.fromtimestamp(mylar.SCHED_WEEKLY_LAST)
weekly_last = weekly_last.replace(microseconds=0)
else:
weekly_last = 'None'
weekinfo = {'weeknumber': weeknumber,
'startweek': con_startweek,
'midweek': midweek.strftime('%Y-%m-%d'),
@ -2869,12 +2874,15 @@ def weekly_info(week=None, year=None):
'next_weeknumber': next_week,
'next_year': next_year,
'current_weeknumber': current_weeknumber,
'last_update': weekly_last.replace(microsecond=0)}
'last_update': weekly_last}
if mylar.CONFIG.WEEKFOLDER_FORMAT == 0:
weekfold = os.path.join(weekdst, str( str(weekinfo['year']) + '-' + str(weeknumber) ))
if weekdst is not None:
if mylar.CONFIG.WEEKFOLDER_FORMAT == 0:
weekfold = os.path.join(weekdst, str( str(weekinfo['year']) + '-' + str(weeknumber) ))
else:
weekfold = os.path.join(weekdst, str( str(weekinfo['midweek']) ))
else:
weekfold = os.path.join(weekdst, str( str(weekinfo['midweek']) ))
weekfold = None
weekinfo['week_folder'] = weekfold