diff --git a/rowers/admin.py b/rowers/admin.py index 775d8383..47f56a78 100644 --- a/rowers/admin.py +++ b/rowers/admin.py @@ -96,7 +96,7 @@ class C2WorldClassAgePerformanceAdmin(admin.ModelAdmin): class SiteAnnouncementAdmin(admin.ModelAdmin): list_display = ('announcement', 'created', - 'modified', 'expires', 'dotweet') + 'modified', 'expires') class TeamAdmin(admin.ModelAdmin): diff --git a/rowers/models.py b/rowers/models.py index 2fbdc295..719518bc 100644 --- a/rowers/models.py +++ b/rowers/models.py @@ -26,7 +26,7 @@ from django.contrib.admin.widgets import AdminDateWidget, AdminTimeWidget, Admin import os import json -import twitter + import re import pytz from django_countries.fields import CountryField @@ -72,12 +72,6 @@ from rowsandall_app.settings import ( # END PERMISSIONS -tweetapi = twitter.Api(consumer_key=TWEET_CONSUMER_KEY, - consumer_secret=TWEET_CONSUMER_SECRET, - access_token_key=TWEET_ACCESS_TOKEN_KEY, - access_token_secret=TWEET_ACCESS_TOKEN_SECRET) - - timezones = ( (x, x) for x in pytz.common_timezones ) @@ -4928,21 +4922,12 @@ class SiteAnnouncement(models.Model): announcement = models.TextField(max_length=280) expires = models.DateField(default=current_day) modified = models.DateField(default=current_day) - dotweet = models.BooleanField(default=False) def save(self, *args, **kwargs): if not self.id: self.created = timezone.now() self.expires = timezone.now()+datetime.timedelta(days=10) self.modified = timezone.now() - if self.dotweet: # pragma: no cover - try: - _ = tweetapi.PostUpdate(self.announcement) - except: - try: - _ = tweetapi.PostUpdate(self.announcement[:270]) - except: - pass return super(SiteAnnouncement, self).save(*args, **kwargs) # A comment by a user on a training diff --git a/rowers/tasks.py b/rowers/tasks.py index 6a78d09f..3a085a8c 100644 --- a/rowers/tasks.py +++ b/rowers/tasks.py @@ -3404,6 +3404,9 @@ def handle_nk_async_workout(alldata, userid, nktoken, nkid, delaysec, defaulttim workoutid, error = add_workout_from_data(userid, nkid, data, df) # dologging('nklog.log','NK Workout ID {id}'.format(id=workoutid)) + if workoutid == 0: + return 0 + workout = Workout.objects.get(id=workoutid) newnkid = workout.uploadedtonk sr = SyncRecord.objects.filter(nkid=newnkid) diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz index 4c85ad73..a6d7ca33 100644 Binary files a/rowers/tests/testdata/testdata.tcx.gz and b/rowers/tests/testdata/testdata.tcx.gz differ diff --git a/rowers/uploads.py b/rowers/uploads.py index 4de8a2f6..5d89477a 100644 --- a/rowers/uploads.py +++ b/rowers/uploads.py @@ -149,7 +149,10 @@ def do_sync(w, options, quick=False): w.uploadedtonk = options['nkid'] w.save() record = SyncRecord(workout=w,nkid=options['nkid']) - record.save() + try: + record.save() + except: + pass except KeyError: pass diff --git a/rowers/views/racesviews.py b/rowers/views/racesviews.py index 4e926444..e3526de1 100644 --- a/rowers/views/racesviews.py +++ b/rowers/views/racesviews.py @@ -2615,14 +2615,6 @@ def indoorvirtualevent_create_view(request): vs.save() - # create Site Announcement & Tweet - if settings.DEBUG or settings.TESTING: - dotweet = False - elif 'dev' in settings.SITE_URL: # pragma: no cover - dotweet = False - else: # pragma: no cover - dotweet = True - announcementshort = "New Virtual Indoor Challenge on rowsandall.com: {name}".format( name=name, ) @@ -2637,7 +2629,6 @@ def indoorvirtualevent_create_view(request): sa = SiteAnnouncement( announcement=announcement, - dotweet=dotweet ) sa.save() @@ -2763,14 +2754,6 @@ def fastestvirtualevent_create_view(request): vs.save() - # create Site Announcement & Tweet - if settings.DEBUG or settings.TESTING: - dotweet = False - elif 'dev' in settings.SITE_URL: # pragma: no cover - dotweet = False - else: # pragma: no cover - dotweet = True - announcementshort = "New Virtual Challenge on rowsandall.com: {name}".format( name=name, ) @@ -2785,7 +2768,6 @@ def fastestvirtualevent_create_view(request): sa = SiteAnnouncement( announcement=announcement, - dotweet=dotweet ) sa.save() @@ -2896,14 +2878,6 @@ def virtualevent_create_view(request): vs.save() - # create Site Announcement & Tweet - if settings.DEBUG or settings.TESTING: - dotweet = False - elif 'dev' in settings.SITE_URL: # pragma: no cover - dotweet = False - else: # pragma: no cover - dotweet = True - announcementshort = "New Virtual Challenge on rowsandall.com: {name} on course {course}".format( name=name, course=course.name, @@ -2919,7 +2893,6 @@ def virtualevent_create_view(request): sa = SiteAnnouncement( announcement=announcement, - dotweet=dotweet ) sa.save()