sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

rmore autopep

Browse Source
This commit is contained in:
Sander Roosendaal
2022-02-17 11:53:37 +01:00
parent 3c2454cb3e
commit 31109da378
4 changed files with 65 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
rowers/management/commands/autojoin.py
View File

@@ -7,20 +7,22 @@ import arrow
from django.utils import timezone
from django.core.management.base import BaseCommand
from rowers.models import Rower,Workout
from rowers.models import Rower, Workout
import re
from django.db.models import Q
from rowers.dataprep import join_workouts
def name_short(name):
expr = '(.*)\s.*\(\d+\)'
match = re.findall(expr,name)
match = re.findall(expr, name)
if match:
return match[0]
return name
def get_duplicates(a):
seen = {}
dupes = []
@@ -38,28 +40,25 @@ def get_duplicates(a):
class Command(BaseCommand):
def handle(self, *args, **options):
rs = (r for r in Rower.objects.all() if r.ispaid and r.autojoin)
now = timezone.now()
rs = (r for r in Rower.objects.all() if r.ispaid and r.autojoin)
for r in rs:
workouts = Workout.objects.filter(user=r,
duplicate=False,
startdatetime__gte=timezone.now()-datetime.timedelta(days=2))
duplicates = get_duplicates(name_short(w.name) for w in workouts)
for name, count in duplicates.items():
if count > 1:
workouts2 = workouts.filter(
Q(name__contains=name)
)
Q(name__contains=name))
duplicates2 = get_duplicates(w.date for w in workouts)
for dd, count in duplicates2.items():
if count > 1:
workouts3 = workouts2.filter(date=dd)
ids = [w.id for w in workouts3]
id, message = join_workouts(r,ids,title=name,
id, message = join_workouts(r, ids, title=name,
parent=workouts3[0],
killparents=True)