From f1694793b0b94ba000d7f302409e820d450f1b53 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Thu, 2 Nov 2017 23:10:35 +0100
Subject: [PATCH] unfinished business

Need to create a post_progress view taking progress and job id as a POST
parameter so that we can send the entire url to rowingdata
---
 rowers/tasks.py | 44 +++++++++++++++++++++++++++++++++++++-------
 rowers/views.py |  6 +++---
 2 files changed, 40 insertions(+), 10 deletions(-)

diff --git a/rowers/tasks.py b/rowers/tasks.py
index a1b9bfd5..ce76c584 100644
--- a/rowers/tasks.py
+++ b/rowers/tasks.py
@@ -16,7 +16,9 @@ from matplotlib.backends.backend_agg import FigureCanvas
 #from matplotlib.backends.backend_cairo import FigureCanvasCairo as FigureCanvas
 import matplotlib.pyplot as plt
 
-
+from rowsandall_app.settings import SITE_URL
+from rowsandall_app.settings_dev import SITE_URL as SITE_URL_DEV
+from rowsandall_app.settings import PROGRESS_CACHE_SECRET
 
 import pandas as pd
 
@@ -296,11 +298,17 @@ def handle_sendemailtcx(first_name, last_name, email, tcxfile,debug=False):
 @app.task
 def handle_zip_file(emailfrom, subject, file,debug=False):
     message = "... zip processing ... "
+    if debug:
+        print message
     email = EmailMessage(subject, message,
                          emailfrom,
                          ['workouts@rowsandall.com'])
     email.attach_file(file)
+    if debug:
+        print "attaching"
     res = email.send()
+    if debug:
+        print "sent"
     time.sleep(60)
     return 1
 
@@ -338,12 +346,23 @@ def handle_sendemailcsv(first_name, last_name, email, csvfile,debug=False):
 # Calculate wind and stream corrections for OTW rowing
 
 
-@app.task
+@app.task(bind=True)
 def handle_otwsetpower(f1, boattype, weightvalue,
-                       first_name, last_name, email, workoutid, ps=[
-                           1, 1, 1, 1],
-                       ratio=1.0,
-                       debug=False):
+                       first_name, last_name, email, workoutid,
+                       **kwargs):
+#                       ps=[
+#                           1, 1, 1, 1],
+#                       ratio=1.0,
+#                       debug=False):
+    job = self.request
+    job_id = job.id
+    
+    if 'jobkey' in kwargs:
+        job_id = kwargs.pop('jobkey')
+        
+    kwargs['jobid'] = job_id
+
+
     try:
         rowdata = rdata(f1)
     except IOError:
@@ -377,8 +396,19 @@ def handle_otwsetpower(f1, boattype, weightvalue,
     except KeyError:
         pass
 
+    progressurl = SITE_URL
+    if debug:
+        progressurl = SITE_URL_DEV
+    secret = PROGRESS_CACHE_SECRET
+
+    progressurl += "/rowers/record-progress/"
+    progressurl += str(progress)+"/"+jobid
+    
     rowdata.otw_setpower_silent(skiprows=5, mc=weightvalue, rg=rg,
-                                powermeasured=powermeasured)
+                                powermeasured=powermeasured,
+                                progressurl=progressurl,
+                                secret=secret
+    )
 
     # save data
     rowdata.write_csv(f1, gzip=True)
diff --git a/rowers/views.py b/rowers/views.py
index 752b02bd..1793afb8 100644
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -194,9 +194,9 @@ redis_connection = StrictRedis()
 r = Redis()
 
 # this doesn't yet work on production
-if settings.DEBUG:
-    client = SessionTaskListener(r,['tasks'])
-    client.start()
+#if settings.DEBUG:
+#    client = SessionTaskListener(r,['tasks'])
+#    client.start()
 
 
 rq_registry = StartedJobRegistry(queue.name,connection=redis_connection)