Changeset b3374f6 in OpenWorkouts-current for ow/models/workout.py

Timestamp:

Feb 12, 2019, 5:55:33 PM (5 years ago)

Author:

Borja Lopez <borja@…>

Branches:

current, feature/docs, master

Children:

c999b73e

Parents:

f713dbc

Message:

(#52) - Make map screenshot generation async and non-blocker of the dashboard
and user profile pages:

• workout.map_screenshot is a property again, returns a string with the static path (suitable for use with request.static_url()) for the map screenshot file if exists, none otherwise

• added a couple of helpers to build the proper screenshot name and full path on the filesystem

• added a view to generate the map if needed, returning the full static url to the screenshot file in a json-encoded stream

• added a new js ow tool that looks for workouts that still don't have a map screenshot, calling the view to generate that screenshot and updating the map screenshot when the file is ready

• modified the dashboard and user profile templates, so a dummy/placeholder image is shown when no map screenshot is yet ready, plus setup and calls for the js tool that generates the maps.

File:

• ow/models/workout.py (modified) (3 diffs)

ow/models/workout.py

@@ -14 +14 @@
     create_blob,
     mps_to_kmph,
-    save_map_screenshot,
     timedelta_to_hms
 )
@@ -423 +422 @@
         return self.fit_file is not None
 
-    def map_screenshot(self, request):
+    @property
+    def map_screenshot_name(self):
+        return os.path.join(
+            str(self.owner.uid), str(self.workout_id) + '.png')
+
+    @property
+    def map_screenshot_path(self):
+        current_path = os.path.abspath(os.path.dirname(__file__))
+        return os.path.join(
+            current_path, '../static/maps', self.map_screenshot_name)
+
+    @property
+    def map_screenshot(self):
         """
         Return the static path to the screenshot image of the map for
@@ -431 +442 @@
             return None
 
-        screenshot_name = os.path.join(
-            str(self.owner.uid), str(self.workout_id) + '.png')
-        current_path = os.path.abspath(os.path.dirname(__file__))
-        screenshot_path = os.path.join(
-            current_path, '../static/maps', screenshot_name)
-
-        if not os.path.exists(screenshot_path):
-            # screenshot does not exist, generate it
-            save_map_screenshot(self, request)
-
-        static_path = os.path.join('static/maps', screenshot_name)
-        return request.static_url('ow:' + static_path)
+        if not os.path.exists(self.map_screenshot_path):
+            return None
+
+        static_path = os.path.join('static/maps', self.map_screenshot_name)
+        # return a string we can use with request.static_url
+        return 'ow:' + static_path