ticket #90 attempt 1

devplacepy/cli/jobs.py

@@ -7,12 +7,12 @@ from devplacepy.cli._shared import _audit_cli
 def _remove_zip_artifacts(job):
     import shutil
     from pathlib import Path
-    from devplacepy.config import ZIP_STAGING_DIR
+    from devplacepy.services.jobs.zip_service import STAGING_DIR
 
     local_path = (job.get("result") or {}).get("local_path")
     if local_path:
         Path(local_path).unlink(missing_ok=True)
-    shutil.rmtree(ZIP_STAGING_DIR / job["uid"], ignore_errors=True)
+    shutil.rmtree(STAGING_DIR / job["uid"], ignore_errors=True)
 
 
 def cmd_zips_prune(args):

devplacepy/project_files.py

@@ -685,6 +685,7 @@ def import_from_dir(project_uid: str, src_dir, user: dict, *, skip_names=None) -
 
 
 def export_to_dir(project_uid: str, subpath: str, dest_dir) -> int:
+    _guard_writable(project_uid)
     dest = Path(dest_dir).resolve()
     dest.mkdir(parents=True, exist_ok=True)
     if subpath:

devplacepy/templates/_comment.html

@@ -1,4 +1,4 @@
-{% macro comment_cell(item, depth, parent_author=None) %}
+{% macro comment_cell(item, depth, parent_author=None, parent_url=None) %}
 <div class="comment" style="--comment-depth: {{ depth }};" data-depth="{{ depth }}">
     <div class="comment-votes" role="group" aria-label="Comment votes">
         <form method="POST" action="/votes/comment/{{ item.comment['uid'] }}">
@@ -26,6 +26,7 @@
         {% endif %}
         <div class="comment-actions">
             <button type="button" class="comment-action-btn" data-action="reply"{{ guest_disabled(user) }}><span class="icon">💬</span><span class="label"> Reply</span></button>
+            <button type="button" class="comment-action-btn" data-share="{{ parent_url }}#comment-{{ item.comment['uid'] }}"><span class="icon">&#x1F517;</span><span class="label"> Share</span></button>
             {% if owns(item.comment, user) %}
             <button type="button" class="comment-action-btn" data-action="edit" data-edit-url="/comments/edit/{{ item.comment['uid'] }}"><span class="icon">✏️</span><span class="label"> Edit</span></button>
             <form method="POST" action="/comments/delete/{{ item.comment['uid'] }}" class="inline-form comment-delete-form" data-comment-uid="{{ item.comment['uid'] }}">
@@ -39,21 +40,21 @@
 </div>
 {% endmacro %}
 
-{% macro render_comment(item, depth=0) %}
+{% macro render_comment(item, depth=0, parent_url=None) %}
 {% set max_depth = 2 %}
 {% set visual_depth = depth if depth < max_depth else max_depth %}
-{% call comment_cell(item, visual_depth) %}
+{% call comment_cell(item, visual_depth, parent_url=parent_url) %}
     {% if item.children %}
     {% if depth < max_depth %}
     <div class="comment-replies">
         {% for child in item.children %}
-        {{ render_comment(child, depth + 1) }}
+        {{ render_comment(child, depth + 1, parent_url) }}
         {% endfor %}
     </div>
     {% else %}
     <div class="comment-replies comment-replies-flat">
         {% for child in item.children %}
-        {{ render_comment_flat(child, max_depth, item.author) }}
+        {{ render_comment_flat(child, max_depth, item.author, parent_url) }}
         {% endfor %}
     </div>
     {% endif %}
@@ -61,9 +62,9 @@
 {% endcall %}
 {% endmacro %}
 
-{% macro render_comment_flat(item, depth, parent_author) %}
-{% call comment_cell(item, depth, parent_author) %}{% endcall %}
+{% macro render_comment_flat(item, depth, parent_author, parent_url=None) %}
+{% call comment_cell(item, depth, parent_author, parent_url=parent_url) %}{% endcall %}
 {% for child in item.children %}
-{{ render_comment_flat(child, depth, item.author) }}
+{{ render_comment_flat(child, depth, item.author, parent_url) }}
 {% endfor %}
 {% endmacro %}

devplacepy/templates/_comment_section.html

@@ -3,8 +3,10 @@
 
     {% from "_comment.html" import render_comment with context %}
 
+    {% set parent_url = resolve_object_url(target_type, target_uid) %}
+
     {% for item in comments %}
-    {{ render_comment(item, 0) }}
+    {{ render_comment(item, 0, parent_url) }}
     {% else %}
     <p class="no-comments-msg">No comments yet. Start the discussion.</p>
     {% endfor %}

devplacepy/templating.py

@@ -9,6 +9,7 @@ from devplacepy.cache import TTLCache
 from devplacepy.config import STATIC_VERSION, TEMPLATES_DIR, TEMPLATE_AUTO_RELOAD, PRESENCE_TIMEOUT_SECONDS
 from devplacepy.constants import TOPICS, REACTION_EMOJI
 from devplacepy.database import get_int_setting, get_setting, get_table
+from devplacepy.database.content import resolve_object_url
 from devplacepy.avatar import avatar_url, avatar_seed
 from devplacepy.utils import format_date as _format_date
 from devplacepy.utils import time_ago as _time_ago
@@ -49,6 +50,7 @@ templates.env.globals["is_self"] = is_self
 templates.env.globals["guest_disabled"] = guest_disabled
 templates.env.globals["is_online"] = presence.is_online
 templates.env.globals["presence_timeout"] = PRESENCE_TIMEOUT_SECONDS
+templates.env.globals["resolve_object_url"] = resolve_object_url
 
 from devplacepy.docs_devrant import devrant_endpoints
 

tests/api/forks.py

@@ -16,7 +16,7 @@ def _init_db_fork_jobs():
 @pytest.fixture
 def fork_env(tmp_path, monkeypatch):
     monkeypatch.setattr(
-        "devplacepy.services.jobs.fork_service.FORK_STAGING_DIR", tmp_path / "staging"
+        "devplacepy.services.jobs.fork_service.STAGING_DIR", tmp_path / "staging"
     )
     monkeypatch.setattr("devplacepy.project_files.PROJECT_FILES_DIR", tmp_path / "pf")
     yield tmp_path