Merge branch 'develop' into feature/underarmour
This commit is contained in:
@@ -783,6 +783,8 @@ def rdata(file,rower=rrower()):
|
||||
res = rrdata(csvfile=file+'.gz',rower=rower)
|
||||
except IOError,IndexError:
|
||||
res = 0
|
||||
except:
|
||||
res = 0
|
||||
|
||||
return res
|
||||
|
||||
|
||||
@@ -69,8 +69,15 @@ class Command(BaseCommand):
|
||||
]
|
||||
res += wid
|
||||
link = 'http://rowsandall.com/rowers/workout/'+str(wid[0])+'/edit'
|
||||
dd = send_confirm(rr.user,title,link)
|
||||
time.sleep(10)
|
||||
try:
|
||||
dd = send_confirm(rr.user,title,link)
|
||||
time.sleep(10)
|
||||
except:
|
||||
try:
|
||||
time.sleep(10)
|
||||
dd = send_confirm(rr.user,title,link)
|
||||
except:
|
||||
pass
|
||||
|
||||
else:
|
||||
# move attachment and make workout
|
||||
@@ -89,6 +96,7 @@ class Command(BaseCommand):
|
||||
donotdelete = 1
|
||||
try:
|
||||
dd = send_confirm(rr.user,name,link)
|
||||
time.sleep(10)
|
||||
except:
|
||||
pass
|
||||
|
||||
|
||||
Reference in New Issue
Block a user