From 103a946fe7c0726eecbe2a2a0e7dd4de15977c46 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Wed, 10 Feb 2021 08:03:43 +0100
Subject: [PATCH] c2list checking for tombstones

---
 rowers/views/importviews.py | 13 +++++++++++++
 rowers/views/statements.py  |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/rowers/views/importviews.py b/rowers/views/importviews.py
index 9cdaa889..999ca471 100644
--- a/rowers/views/importviews.py
+++ b/rowers/views/importviews.py
@@ -1706,6 +1706,19 @@ def workout_c2import_view(request,page=1,userid=0,message=""):
     knownc2ids = uniqify([
         w.uploadedtoc2 for w in Workout.objects.filter(user=r)
     ])
+    tombstones = [
+        t.uploadedtoc2 for t in TombStone.objects.filter(user=r)
+    ]
+    parkedids = []
+    try:
+        with open('c2blocked.json','r') as c2blocked:
+            jsondata = json.load(c2blocked)
+            parkedids = jsondata['ids']
+    except FileNotFoundError:
+        pass
+
+    knownc2ids = uniqify(knownc2ids+tombstones+parkedids)
+
     newids = [c2id for c2id in c2ids if not c2id in knownc2ids]
     for item in res.json()['data']:
         d = item['distance']
diff --git a/rowers/views/statements.py b/rowers/views/statements.py
index 4570f56f..233d6abb 100644
--- a/rowers/views/statements.py
+++ b/rowers/views/statements.py
@@ -118,7 +118,7 @@ from rowers.models import (
     PlannedSessionComment,CoachRequest,CoachOffer,
     VideoAnalysis,ShareKey,
     StandardCollection,CourseStandard,
-    VirtualRaceFollower,
+    VirtualRaceFollower,TombStone
     )
 from rowers.models import (
     RowerPowerForm,RowerHRZonesForm,RowerForm,RowerCPForm,GraphImage,AdvancedWorkoutForm,