geo-activity-playground 0.33.1__py3-none-any.whl → 0.33.3__py3-none-any.whl

geo_activity_playground/__main__.py

@@ -13,7 +13,7 @@ from geo_activity_playground.core.config import import_old_strava_config
 from geo_activity_playground.explorer.tile_visits import TileVisitAccessor
 from geo_activity_playground.explorer.video import explorer_video_main
 from geo_activity_playground.webui.app import web_ui_main
-from geo_activity_playground.webui.upload.controller import scan_for_activities
+from geo_activity_playground.webui.upload_blueprint import scan_for_activities
 
 logger = logging.getLogger(__name__)
 

geo_activity_playground/webui/app.py

@@ -22,7 +22,7 @@ from .search.blueprint import make_search_blueprint
 from .square_planner.blueprint import make_square_planner_blueprint
 from .summary.blueprint import make_summary_blueprint
 from .tile.blueprint import make_tile_blueprint
-from .upload.blueprint import make_upload_blueprint
+from .upload_blueprint import make_upload_blueprint
 from geo_activity_playground.core.config import Config
 from geo_activity_playground.core.config import ConfigAccessor
 from geo_activity_playground.webui.auth.blueprint import make_auth_blueprint

geo_activity_playground/webui/entry_controller.py

@@ -16,10 +16,10 @@ class EntryController:
         self._config = config
 
     def render(self) -> dict:
-        kind_scale = make_kind_scale(self._repository.meta, self._config)
         result = {"latest_activities": []}
 
         if len(self._repository):
+            kind_scale = make_kind_scale(self._repository.meta, self._config)
             result["distance_last_30_days_plot"] = distance_last_30_days_meta_plot(
                 self._repository.meta, kind_scale
             )

geo_activity_playground/webui/explorer/templates/explorer/index.html.j2

@@ -91,7 +91,7 @@
                     }
                 },
                 onEachFeature: onEachFeature
-            }) let explorer_layer_last_age_color = L.geoJSON(explorer_geojson, {
+            }); let explorer_layer_last_age_color = L.geoJSON(explorer_geojson, {
                 style:
                     function (feature) {
                         return {
@@ -99,12 +99,12 @@
                                 0.5
                         }
                     }, onEachFeature: onEachFeature
-            }) let bbox = {{ center.bbox| safe }} if (bbox) {
+            }); let bbox = {{ center.bbox| safe }}; if (bbox) {
                 map.fitBounds(L.geoJSON(bbox).getBounds())
-            } let explorer_square_layer = L.geoJSON(square_geojson, {
+            }; let explorer_square_layer = L.geoJSON(square_geojson, {
                 style: function (feature) { return { color: "blue", fill: false, weight: 2 } }
             }).addTo(map)
-            active_layer = explorer_layer_cluster_color function changeColor(method) {
+            active_layer = explorer_layer_cluster_color; function changeColor(method) {
                 map.removeLayer(active_layer)
                 if (method == "cluster") { active_layer = explorer_layer_cluster_color } else if (method == "first") {
                     active_layer = explorer_layer_first_age_color
@@ -112,7 +112,7 @@
                     active_layer = explorer_layer_last_age_color
                 } map.addLayer(active_layer)
             } function downloadAs(suffix) {
-                bounds = map.getBounds() zoom = "{{ zoom }}"
+                bounds = map.getBounds(); zoom = "{{ zoom }}"
                 window.location.href = `/explorer/${zoom}/${bounds.getNorth()}/${bounds.getEast()}/${bounds.getSouth()}/${bounds.getWest()}/${suffix}`
             } </script>
     </div>

geo_activity_playground/webui/templates/home.html.j2

@@ -58,8 +58,9 @@
 </div>
 {% endfor %}
 {% else %}
-<p>You don't have activities yet. Either put some files into a directory <tt>Activities</tt> or <a
-        href="{{ url_for('settings.strava') }}">set up Strava API</a>.</p>
+<p>You don't have activities yet. Either put some files into a directory <tt>Activities</tt>, <a
+        href="{{ url_for('upload.index') }}">upload activities</a> or <a href="{{ url_for('settings.strava') }}">set up
+        Strava API</a>.</p>
 {% endif %}
 
 {% endblock %}

geo_activity_playground/webui/{upload/controller.py → upload_blueprint.py}

@@ -1,53 +1,51 @@
-import logging
 import os
 import pathlib
 
+from flask import Blueprint
 from flask import flash
 from flask import redirect
+from flask import render_template
 from flask import request
-from flask import Response
 from flask import url_for
-from werkzeug.utils import secure_filename
 
-from geo_activity_playground.core.activities import ActivityRepository
-from geo_activity_playground.core.activities import build_activity_meta
+from ..core.activities import ActivityRepository
+from ..core.activities import build_activity_meta
+from ..explorer.tile_visits import compute_tile_evolution
+from ..explorer.tile_visits import compute_tile_visits_new
+from ..explorer.tile_visits import TileVisitAccessor
 from geo_activity_playground.core.config import Config
 from geo_activity_playground.core.enrichment import enrich_activities
-from geo_activity_playground.explorer.tile_visits import compute_tile_evolution
-from geo_activity_playground.explorer.tile_visits import compute_tile_visits_new
-from geo_activity_playground.explorer.tile_visits import TileVisitAccessor
 from geo_activity_playground.importers.directory import get_file_hash
 from geo_activity_playground.importers.directory import import_from_directory
 from geo_activity_playground.importers.strava_api import import_from_strava_api
 from geo_activity_playground.importers.strava_checkout import (
     import_from_strava_checkout,
 )
+from geo_activity_playground.webui.authenticator import Authenticator
+from geo_activity_playground.webui.authenticator import needs_authentication
 
 
-logger = logging.getLogger(__name__)
-
-
-class UploadController:
-    def __init__(
-        self,
-        repository: ActivityRepository,
-        tile_visit_accessor: TileVisitAccessor,
-        config: Config,
-    ) -> None:
-        self._repository = repository
-        self._tile_visit_accessor = tile_visit_accessor
-        self._config = config
+def make_upload_blueprint(
+    repository: ActivityRepository,
+    tile_visit_accessor: TileVisitAccessor,
+    config: Config,
+    authenticator: Authenticator,
+) -> Blueprint:
+    blueprint = Blueprint("upload", __name__, template_folder="templates")
 
-    def render_form(self) -> dict:
+    @blueprint.route("/")
+    @needs_authentication(authenticator)
+    def index():
+        pathlib.Path("Activities").mkdir(exist_ok=True, parents=True)
         directories = []
         for root, dirs, files in os.walk("Activities"):
             directories.append(root)
         directories.sort()
-        return {
-            "directories": directories,
-        }
+        return render_template("upload/index.html.j2", directories=directories)
 
-    def receive(self) -> Response:
+    @blueprint.route("/receive", methods=["POST"])
+    @needs_authentication(authenticator)
+    def receive():
         # check if the post request has the file part
         if "file" not in request.files:
             flash("No file could be found. Did you select a file?", "warning")
@@ -74,25 +72,34 @@ class UploadController:
             assert target_path.is_relative_to("Activities")
             file.save(target_path)
             scan_for_activities(
-                self._repository,
-                self._tile_visit_accessor,
-                self._config,
+                repository,
+                tile_visit_accessor,
+                config,
                 skip_strava=True,
             )
             activity_id = get_file_hash(target_path)
             flash(f"Activity was saved with ID {activity_id}.", "success")
             return redirect(f"/activity/{activity_id}")
 
-    def execute_reload(self) -> None:
+    @blueprint.route("/refresh")
+    @needs_authentication(authenticator)
+    def reload():
+        return render_template("upload/reload.html.j2")
+
+    @blueprint.route("/execute-reload")
+    @needs_authentication(authenticator)
+    def execute_reload():
         scan_for_activities(
-            self._repository,
-            self._tile_visit_accessor,
-            self._config,
+            repository,
+            tile_visit_accessor,
+            config,
             skip_strava=True,
         )
         flash("Scanned for new activities.", category="success")
         return redirect(url_for("index"))
 
+    return blueprint
+
 
 def scan_for_activities(
     repository: ActivityRepository,

{geo_activity_playground-0.33.1.dist-info → geo_activity_playground-0.33.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: geo-activity-playground
-Version: 0.33.1
+Version: 0.33.3
 Summary: Analysis of geo data activities like rides, runs or hikes.
 License: MIT
 Author: Martin Ueding

{geo_activity_playground-0.33.1.dist-info → geo_activity_playground-0.33.3.dist-info}/RECORD

@@ -1,5 +1,5 @@
 geo_activity_playground/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-geo_activity_playground/__main__.py,sha256=MBZn9K1m3PofiPNTtpsSTVCyB_Gz95TjVP-nb9v_-JE,3989
+geo_activity_playground/__main__.py,sha256=qbKjs7IsJwF2gB3b0lh7tGt6uraPqq5w-xGBIxrgoHI,3988
 geo_activity_playground/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 geo_activity_playground/core/activities.py,sha256=MiQev1L7NnSVnxgbArlT-FpWTESTwnKh7pyT1tcEHqU,6926
 geo_activity_playground/core/config.py,sha256=uqiwk7CgcuGx8JemHSsRKjRwyNT1YTb7V0gX0OJhfaI,5109
@@ -37,7 +37,7 @@ geo_activity_playground/webui/activity/templates/activity/edit.html.j2,sha256=ck
 geo_activity_playground/webui/activity/templates/activity/lines.html.j2,sha256=_ZDg1ruW-9UMJfOudy1-uY_-IcSSaagq7tPCih5Bb8g,1079
 geo_activity_playground/webui/activity/templates/activity/name.html.j2,sha256=tKviMqMouHEGv3xBQVIsJgwj_hjwAsmGVefM3UMqlYg,2437
 geo_activity_playground/webui/activity/templates/activity/show.html.j2,sha256=bEx37UGSTeeJl7gN4fjyOpINFQwZ5Zm-HOKpLqcJGfs,6905
-geo_activity_playground/webui/app.py,sha256=nWbgxRHg0DThi44VFb04OIVwxnqIVmkr3cnO9ucE1Oo,5118
+geo_activity_playground/webui/app.py,sha256=KghChBgJvRZ9Cx7Z5wmqx6X0Q6GH-2hi97eaKEE_Zvc,5118
 geo_activity_playground/webui/auth/blueprint.py,sha256=Lx-ZvMnfHLC1CMre1xPQI3k_pCtQoZvgRhtmafULzoE,812
 geo_activity_playground/webui/auth/templates/auth/index.html.j2,sha256=ILQ5HvTEYc3OrtOAIFt1VrqWorVD70V9DC342znmP70,579
 geo_activity_playground/webui/authenticator.py,sha256=k278OEVuOfAmTGT4F2X4pqSTwwkK_FA87EIhAeysEqc,1416
@@ -50,7 +50,7 @@ geo_activity_playground/webui/eddington/__init__.py,sha256=47DEQpj8HBSa-_TImW-5J
 geo_activity_playground/webui/eddington/blueprint.py,sha256=evIvueLfDWVTxJ9pRguqmZ9-Pybd2WmBRst_-7vX2QA,551
 geo_activity_playground/webui/eddington/controller.py,sha256=ly7JSkSS79kO4CL_xugB62uRuuWKVqOjbN-pheelv94,2910
 geo_activity_playground/webui/eddington/templates/eddington/index.html.j2,sha256=XHKeUymQMS5x00PLOVlg-nSRCz_jHB2pvD8QunULWJ4,1839
-geo_activity_playground/webui/entry_controller.py,sha256=kTEToBtR1T4l30cV3HkCK3KO2hVYfb22BSgcWLdLEXQ,2164
+geo_activity_playground/webui/entry_controller.py,sha256=McxbyouKWHJ3a2R9agPazZoG7VHiFO1RvnkBr08dMH8,2168
 geo_activity_playground/webui/equipment/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 geo_activity_playground/webui/equipment/blueprint.py,sha256=_NIhRJuJNbXpEd_nEPo01AqnUqPgo1vawFn7E3yoeng,636
 geo_activity_playground/webui/equipment/controller.py,sha256=Sx9i2RCK7m4W6FgpDfRMewcH64VBQfUhHJdTSCwMqOU,4079
@@ -58,7 +58,7 @@ geo_activity_playground/webui/equipment/templates/equipment/index.html.j2,sha256
 geo_activity_playground/webui/explorer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 geo_activity_playground/webui/explorer/blueprint.py,sha256=EKnBs8llqT6Wy1uac18dF2epp3TebF9p3iGlSbj6Vl0,2337
 geo_activity_playground/webui/explorer/controller.py,sha256=pIzWh0TpLJgKQZlS325-QT7nA1q9ms7fRqQIp24PNfo,11705
-geo_activity_playground/webui/explorer/templates/explorer/index.html.j2,sha256=PnAL0uDNjnziwbkCOpIWPb7KmS4c1dP-VLxjyXppUYc,6701
+geo_activity_playground/webui/explorer/templates/explorer/index.html.j2,sha256=aGos75uUyjevDWKSyQwVyvuGHIY6qoGASMbgU6k71YU,6707
 geo_activity_playground/webui/heatmap/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 geo_activity_playground/webui/heatmap/blueprint.py,sha256=ZEImDIwT3uiDIKapqCU49llvyqG79n7ZEu1GHgoLZqo,1558
 geo_activity_playground/webui/heatmap/heatmap_controller.py,sha256=Qw9MGW3TFWlG2JkA_r9RHgYq4hvPiJaZeAg5D9lIFC0,7821
@@ -102,18 +102,16 @@ geo_activity_playground/webui/summary/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCe
 geo_activity_playground/webui/summary/blueprint.py,sha256=tfA2aPF19yKwkQOb5lPQBySoQYYhTn49Iuh0SYvsGP8,593
 geo_activity_playground/webui/summary/controller.py,sha256=V3zBLNL_Yc_Ft-ZBaWnlLXhr8VsvTpipPUZ-G9sgUXs,9312
 geo_activity_playground/webui/summary/templates/summary/index.html.j2,sha256=ctOx3Qjx6nRDpUtFf1DlJhK_gtU77Vwx_S6euLz9-W4,5183
-geo_activity_playground/webui/templates/home.html.j2,sha256=JNQxpjDfXhLAJbZ7RaNBNe9u48nbvlEBrnU_Zizt544,2131
+geo_activity_playground/webui/templates/home.html.j2,sha256=IdCqI_LLcYrpUjjCO-tbXR4s05XYrPOateiJ4idF3bo,2202
 geo_activity_playground/webui/templates/page.html.j2,sha256=znTbtD2NALrhmUN_Q-F1ElGlKtecoUv8vOCcUtojrdI,11134
+geo_activity_playground/webui/templates/upload/index.html.j2,sha256=I1Ix8tDS3YBdi-HdaNfjkzYXVVCjfUTe5PFTnap1ydc,775
+geo_activity_playground/webui/templates/upload/reload.html.j2,sha256=YZWX5eDeNyqKJdQAywDBcU8DZBm22rRBbZqFjrFrCvQ,556
 geo_activity_playground/webui/tile/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 geo_activity_playground/webui/tile/blueprint.py,sha256=q0sw_F8L367Df01yjZijikEIglFBgg9lN61sbTAEOKQ,1018
 geo_activity_playground/webui/tile/controller.py,sha256=XjUTbyAMeQET1D3mFtT8r5-xMcMOaELPZWtQ1Xp7Cuw,1428
-geo_activity_playground/webui/upload/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-geo_activity_playground/webui/upload/blueprint.py,sha256=xX9scEmleN_dL03jfhWRh5yI1WsFyhxUFiS_Ul2HWy4,1428
-geo_activity_playground/webui/upload/controller.py,sha256=EvoUnmKBo3QS2TLak7-yVZ16sEDyEB6Nf2MN_scHuhQ,4080
-geo_activity_playground/webui/upload/templates/upload/index.html.j2,sha256=I1Ix8tDS3YBdi-HdaNfjkzYXVVCjfUTe5PFTnap1ydc,775
-geo_activity_playground/webui/upload/templates/upload/reload.html.j2,sha256=YZWX5eDeNyqKJdQAywDBcU8DZBm22rRBbZqFjrFrCvQ,556
-geo_activity_playground-0.33.1.dist-info/LICENSE,sha256=4RpAwKO8bPkfXH2lnpeUW0eLkNWglyG4lbrLDU_MOwY,1070
-geo_activity_playground-0.33.1.dist-info/METADATA,sha256=FUqgwpebm9G0h5Uo8z2KDzxbQxGrzeG1lBd7JKhm_Rc,1612
-geo_activity_playground-0.33.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-geo_activity_playground-0.33.1.dist-info/entry_points.txt,sha256=pbNlLI6IIZIp7nPYCfAtiSiz2oxJSCl7DODD6SPkLKk,81
-geo_activity_playground-0.33.1.dist-info/RECORD,,
+geo_activity_playground/webui/upload_blueprint.py,sha256=topLI9ytDUFkqCc9AlOqDkjhABUwnPJ1tX_7XrBPbxc,4412
+geo_activity_playground-0.33.3.dist-info/LICENSE,sha256=4RpAwKO8bPkfXH2lnpeUW0eLkNWglyG4lbrLDU_MOwY,1070
+geo_activity_playground-0.33.3.dist-info/METADATA,sha256=eUVURIw-QgIO2bQUHVXXrPNf35-v_XEywE9iwQ6mfa8,1612
+geo_activity_playground-0.33.3.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+geo_activity_playground-0.33.3.dist-info/entry_points.txt,sha256=pbNlLI6IIZIp7nPYCfAtiSiz2oxJSCl7DODD6SPkLKk,81
+geo_activity_playground-0.33.3.dist-info/RECORD,,

geo_activity_playground/webui/upload/blueprint.py

@@ -1,44 +0,0 @@
-from flask import Blueprint
-from flask import render_template
-
-from ...core.activities import ActivityRepository
-from ...explorer.tile_visits import TileVisitAccessor
-from .controller import UploadController
-from geo_activity_playground.core.config import Config
-from geo_activity_playground.webui.authenticator import Authenticator
-from geo_activity_playground.webui.authenticator import needs_authentication
-
-
-def make_upload_blueprint(
-    repository: ActivityRepository,
-    tile_visit_accessor: TileVisitAccessor,
-    config: Config,
-    authenticator: Authenticator,
-) -> Blueprint:
-    blueprint = Blueprint("upload", __name__, template_folder="templates")
-
-    upload_controller = UploadController(repository, tile_visit_accessor, config)
-
-    @blueprint.route("/")
-    @needs_authentication(authenticator)
-    def index():
-        return render_template(
-            "upload/index.html.j2", **upload_controller.render_form()
-        )
-
-    @blueprint.route("/receive", methods=["POST"])
-    @needs_authentication(authenticator)
-    def receive():
-        return upload_controller.receive()
-
-    @blueprint.route("/refresh")
-    @needs_authentication(authenticator)
-    def reload():
-        return render_template("upload/reload.html.j2")
-
-    @blueprint.route("/execute-reload")
-    @needs_authentication(authenticator)
-    def execute_reload():
-        return upload_controller.execute_reload()
-
-    return blueprint