forked from retoor/devplacepy
Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
32314fc6d6 |
File diff suppressed because one or more lines are too long
@@ -7,12 +7,12 @@ from devplacepy.cli._shared import _audit_cli
|
|||||||
def _remove_zip_artifacts(job):
|
def _remove_zip_artifacts(job):
|
||||||
import shutil
|
import shutil
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from devplacepy.services.jobs.zip_service import STAGING_DIR
|
from devplacepy.config import ZIP_STAGING_DIR
|
||||||
|
|
||||||
local_path = (job.get("result") or {}).get("local_path")
|
local_path = (job.get("result") or {}).get("local_path")
|
||||||
if local_path:
|
if local_path:
|
||||||
Path(local_path).unlink(missing_ok=True)
|
Path(local_path).unlink(missing_ok=True)
|
||||||
shutil.rmtree(STAGING_DIR / job["uid"], ignore_errors=True)
|
shutil.rmtree(ZIP_STAGING_DIR / job["uid"], ignore_errors=True)
|
||||||
|
|
||||||
|
|
||||||
def cmd_zips_prune(args):
|
def cmd_zips_prune(args):
|
||||||
|
|||||||
@@ -685,7 +685,6 @@ 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:
|
def export_to_dir(project_uid: str, subpath: str, dest_dir) -> int:
|
||||||
_guard_writable(project_uid)
|
|
||||||
dest = Path(dest_dir).resolve()
|
dest = Path(dest_dir).resolve()
|
||||||
dest.mkdir(parents=True, exist_ok=True)
|
dest.mkdir(parents=True, exist_ok=True)
|
||||||
if subpath:
|
if subpath:
|
||||||
|
|||||||
@@ -8,11 +8,6 @@ export class CommentManager {
|
|||||||
this.initCommentReply();
|
this.initCommentReply();
|
||||||
this.initCommentEdit();
|
this.initCommentEdit();
|
||||||
this.initCommentDelete();
|
this.initCommentDelete();
|
||||||
document.addEventListener("paste", (event) => {
|
|
||||||
const textarea = event.target.closest("form textarea[name='body'], form textarea[name='content']");
|
|
||||||
if (!textarea) return;
|
|
||||||
this._onPaste(event, textarea);
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
initCommentDelete() {
|
initCommentDelete() {
|
||||||
@@ -213,41 +208,4 @@ export class CommentManager {
|
|||||||
if (btn) btn.disabled = true;
|
if (btn) btn.disabled = true;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
_onPaste(event, textarea) {
|
|
||||||
const items = event.clipboardData?.items;
|
|
||||||
if (!items) return;
|
|
||||||
for (const item of items) {
|
|
||||||
if (item.kind === "file" && item.type.startsWith("image/")) {
|
|
||||||
event.preventDefault();
|
|
||||||
const file = item.getAsFile();
|
|
||||||
const namedFile = new File([file], file.name || "clipboard.png", { type: file.type });
|
|
||||||
this._uploadImage(namedFile, textarea);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async _uploadImage(file, textarea) {
|
|
||||||
const formData = new FormData();
|
|
||||||
formData.append("file", file, file.name);
|
|
||||||
try {
|
|
||||||
const response = await fetch("/uploads/upload", {
|
|
||||||
method: "POST",
|
|
||||||
headers: {
|
|
||||||
"Accept": "application/json",
|
|
||||||
"X-Requested-With": "fetch",
|
|
||||||
},
|
|
||||||
body: formData,
|
|
||||||
});
|
|
||||||
if (!response.ok) {
|
|
||||||
const data = await response.json().catch(() => ({}));
|
|
||||||
throw new Error(data.error || `Upload failed (${response.status})`);
|
|
||||||
}
|
|
||||||
const result = await response.json();
|
|
||||||
window.TextInput.insertAtCursor(textarea, ``);
|
|
||||||
} catch (err) {
|
|
||||||
Http.notifyError(err.message);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,48 +12,6 @@ export class IssueReporter {
|
|||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
this.submit(form);
|
this.submit(form);
|
||||||
});
|
});
|
||||||
document.addEventListener("paste", (event) => {
|
|
||||||
const textarea = event.target.closest("form[data-issue-create] [name='description']");
|
|
||||||
if (!textarea) return;
|
|
||||||
this._onPaste(event, textarea);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
_onPaste(event, textarea) {
|
|
||||||
const items = event.clipboardData?.items;
|
|
||||||
if (!items) return;
|
|
||||||
for (const item of items) {
|
|
||||||
if (item.kind === "file" && item.type.startsWith("image/")) {
|
|
||||||
event.preventDefault();
|
|
||||||
const file = item.getAsFile();
|
|
||||||
const namedFile = new File([file], file.name || "clipboard.png", { type: file.type });
|
|
||||||
this._uploadImage(namedFile, textarea);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async _uploadImage(file, textarea) {
|
|
||||||
const formData = new FormData();
|
|
||||||
formData.append("file", file, file.name);
|
|
||||||
try {
|
|
||||||
const response = await fetch("/uploads/upload", {
|
|
||||||
method: "POST",
|
|
||||||
headers: {
|
|
||||||
"Accept": "application/json",
|
|
||||||
"X-Requested-With": "fetch",
|
|
||||||
},
|
|
||||||
body: formData,
|
|
||||||
});
|
|
||||||
if (!response.ok) {
|
|
||||||
const data = await response.json().catch(() => ({}));
|
|
||||||
throw new Error(data.error || `Upload failed (${response.status})`);
|
|
||||||
}
|
|
||||||
const result = await response.json();
|
|
||||||
window.TextInput.insertAtCursor(textarea, ``);
|
|
||||||
} catch (err) {
|
|
||||||
Http.notifyError(err.message);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async submit(form) {
|
async submit(form) {
|
||||||
|
|||||||
+1
-1
@@ -16,7 +16,7 @@ def _init_db_fork_jobs():
|
|||||||
@pytest.fixture
|
@pytest.fixture
|
||||||
def fork_env(tmp_path, monkeypatch):
|
def fork_env(tmp_path, monkeypatch):
|
||||||
monkeypatch.setattr(
|
monkeypatch.setattr(
|
||||||
"devplacepy.services.jobs.fork_service.STAGING_DIR", tmp_path / "staging"
|
"devplacepy.services.jobs.fork_service.FORK_STAGING_DIR", tmp_path / "staging"
|
||||||
)
|
)
|
||||||
monkeypatch.setattr("devplacepy.project_files.PROJECT_FILES_DIR", tmp_path / "pf")
|
monkeypatch.setattr("devplacepy.project_files.PROJECT_FILES_DIR", tmp_path / "pf")
|
||||||
yield tmp_path
|
yield tmp_path
|
||||||
|
|||||||
@@ -240,17 +240,3 @@ def test_delete_own_allowed_other_user_forbidden(app_server):
|
|||||||
bob = _session_uploads()
|
bob = _session_uploads()
|
||||||
assert bob.delete(f"{BASE_URL}/uploads/delete/{uid}").status_code == 403
|
assert bob.delete(f"{BASE_URL}/uploads/delete/{uid}").status_code == 403
|
||||||
assert alice.delete(f"{BASE_URL}/uploads/delete/{uid}").status_code == 200
|
assert alice.delete(f"{BASE_URL}/uploads/delete/{uid}").status_code == 200
|
||||||
|
|
||||||
|
|
||||||
def test_paste_image_upload_returns_url(app_server):
|
|
||||||
s = _session_uploads()
|
|
||||||
r = s.post(
|
|
||||||
f"{BASE_URL}/uploads/upload",
|
|
||||||
files={"file": ("clipboard.png", _png_bytes_uploads(), "image/png")},
|
|
||||||
)
|
|
||||||
assert r.status_code == 201, r.text
|
|
||||||
data = r.json()
|
|
||||||
assert "url" in data
|
|
||||||
assert data["url"].startswith("/static/uploads/attachments/")
|
|
||||||
assert data["uid"]
|
|
||||||
assert data["is_image"] is True
|
|
||||||
|
|||||||
@@ -1 +0,0 @@
|
|||||||
python3
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
/usr/bin/python3
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
python3
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
lib
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
home = /usr/bin
|
|
||||||
include-system-site-packages = false
|
|
||||||
version = 3.11.2
|
|
||||||
executable = /usr/bin/python3.11
|
|
||||||
command = /usr/bin/python3 -m venv /workspace/repo/venv
|
|
||||||
Reference in New Issue
Block a user