Merge branch 'feature/newdataflow' into develop
This commit is contained in:
@@ -572,7 +572,7 @@ def setcp(workout, background=False, recurrance=True):
|
||||
strokesdf = read_data(
|
||||
['power', 'workoutid', 'time'], ids=[workout.id])
|
||||
strokesdf = remove_nulls_pl(strokesdf)
|
||||
|
||||
|
||||
if strokesdf.is_empty():
|
||||
return pl.DataFrame({'delta': [], 'cp': [], 'cr': []}), pl.Series(dtype=pl.Float64), pl.Series(dtype=pl.Float64), pl.Series(dtype=pl.Float64)
|
||||
|
||||
@@ -1658,18 +1658,6 @@ def new_workout_from_file(r, f2,
|
||||
|
||||
if fileformat == 'unknown': # pragma: no cover
|
||||
message = "We couldn't recognize the file type"
|
||||
extension = os.path.splitext(f2)[1]
|
||||
filename = os.path.splitext(f2)[0]
|
||||
if extension == '.gz':
|
||||
filename = os.path.splitext(filename)[0]
|
||||
extension2 = os.path.splitext(filename)[1]+extension
|
||||
extension = extension2
|
||||
f4 = filename+'a'+extension
|
||||
copyfile(f2, f4)
|
||||
_ = myqueue(queuehigh,
|
||||
handle_sendemail_unrecognized,
|
||||
f4,
|
||||
r.user.email)
|
||||
|
||||
return (0, message, f2)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user