Changeset d6f8304 in OpenWorkouts-current for ow/models

Timestamp:

Feb 11, 2019, 6:55:55 PM (5 years ago)

Author:

Borja Lopez <borja@…>

Branches:

current, feature/docs, master

Children:

02aee97

Parents:

93bbb89

Message:

(#52) - screenshots of the workouts maps were corrupted randomly.

Replaced our screenshot_map shell script that was calling chrome headless
directly with some python code running splinter + selenium webdriver.

Using chromedriver in such environment we can first visit the map site
for the given workout, then wait a bit for it to completely load, then
take the screenshot.

I've also removed all traces of screenshot_map from the code.

File:

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

ow/models/workout.py

@@ -423 +423 @@
         return self.fit_file is not None
 
-    @property
-    def map_screenshot(self):
+    def map_screenshot(self, request):
         """
         Return the static path to the screenshot image of the map for
@@ -432 +431 @@
             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',
-            str(self.owner.uid), str(self.workout_id)) + '.png'
+            current_path, '../static/maps', screenshot_name)
 
         if not os.path.exists(screenshot_path):
             # screenshot does not exist, generate it
-            save_map_screenshot(self)
-
-        # the value returned is relative to the static files served
-        # by the app, so we can use request.static_url() with it
-        static_path = os.path.join('static/maps', str(self.owner.uid),
-                                   str(self.workout_id))
-        return 'ow:' + static_path + '.png'
+            save_map_screenshot(self, request)
+
+        static_path = os.path.join('static/maps', screenshot_name)
+        return request.static_url('ow:' + static_path)