geo-activity-playground 0.33.2__tar.gz → 0.33.3__tar.gz

{geo_activity_playground-0.33.2 → geo_activity_playground-0.33.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: geo-activity-playground
-Version: 0.33.2
+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.2 → geo_activity_playground-0.33.3}/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-0.33.2 → geo_activity_playground-0.33.3}/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-0.33.2 → geo_activity_playground-0.33.3}/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-0.33.2 → geo_activity_playground-0.33.3}/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-0.33.2/geo_activity_playground/webui/upload/controller.py → geo_activity_playground-0.33.3/geo_activity_playground/webui/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.2 → geo_activity_playground-0.33.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "geo-activity-playground"
-version = "0.33.2"
+version = "0.33.3"
 description = "Analysis of geo data activities like rides, runs or hikes."
 authors = ["Martin Ueding <mu@martin-ueding.de>"]
 license = "MIT"

geo_activity_playground-0.33.2/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