From 3acfa9d4a061a2e0fa0a373967c4652ed48be483 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Fri, 1 Jan 2021 11:02:47 +0100 Subject: [PATCH 1/3] removing print statements --- rowers/dataprep.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/rowers/dataprep.py b/rowers/dataprep.py index 705e398c..9aa856ac 100644 --- a/rowers/dataprep.py +++ b/rowers/dataprep.py @@ -1478,7 +1478,6 @@ def checkbreakthrough(w, r): def checkduplicates(r,workoutdate,workoutstartdatetime,workoutenddatetime): - print(workoutdate,workoutstartdatetime,workoutenddatetime) duplicate = False ws = Workout.objects.filter(user=r,date=workoutdate,duplicate=False).exclude( startdatetime__gt=workoutenddatetime @@ -1487,18 +1486,15 @@ def checkduplicates(r,workoutdate,workoutstartdatetime,workoutenddatetime): ws2 = [] for ww in ws: - print(ww) t = ww.duration delta = datetime.timedelta(hours=t.hour, minutes=t.minute, seconds=t.second) enddatetime = ww.startdatetime+delta print(enddatetime,workoutstartdatetime) if enddatetime > workoutstartdatetime: - print('ja') ws2.append(ww) if (len(ws2) != 0): - print('len ws2 ',len(ws2)) message = "Warning: This workout overlaps with an existing one and was marked as a duplicate" duplicate = True return duplicate From a8c0fb666e9ca350d05cf8bd77b4eed70ed6b349 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Sat, 2 Jan 2021 21:18:23 +0100 Subject: [PATCH 2/3] sync stops if row is duplicate --- rowers/uploads.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/rowers/uploads.py b/rowers/uploads.py index 0104a2fd..6dd978f2 100644 --- a/rowers/uploads.py +++ b/rowers/uploads.py @@ -524,6 +524,9 @@ def make_private(w,options): return 1 def do_sync(w,options, quick=False): + if row.duplicate: + return 0 + try: upload_to_strava = options['upload_to_Strava'] except KeyError: From e36237a928a47d875a757fc7bede72c7904a6ad8 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Sat, 2 Jan 2021 21:25:15 +0100 Subject: [PATCH 3/3] no sync for duplicates --- rowers/uploads.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rowers/uploads.py b/rowers/uploads.py index 6dd978f2..b0168a62 100644 --- a/rowers/uploads.py +++ b/rowers/uploads.py @@ -524,7 +524,7 @@ def make_private(w,options): return 1 def do_sync(w,options, quick=False): - if row.duplicate: + if w.duplicate: return 0 try: