expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2026-02-08 13:18:15 +00:00
Code Issues 18 Projects 3 Activity

bugfix in .url file

Browse Source
This commit is contained in:
Philip Sargent
2025-03-03 00:16:07 +00:00
parent ab8d527163
commit ec3f513308
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/views/editor_helpers.py
View File

@@ -300,8 +300,9 @@ def new_image_form(request, path):
editor = form.cleaned_data["who_are_you"] editor = form.cleaned_data["who_are_you"]
editor = git_string(editor) editor = git_string(editor)
title = form.cleaned_data["header"] title = form.cleaned_data["header"]
referer = request.headers["Referer"].replace("_edit","") # original page being edited referer = request.headers["Referer"] # original
host = request.headers["Host"] host = request.headers["Host"]
print(f"{host=}")
f = request.FILES["file_"] f = request.FILES["file_"]
if not title: if not title:
title = f.name title = f.name
@@ -455,7 +456,7 @@ def save_original_in_expofiles(f, year, photographer, host, handbook_directory,
f.open() # rewind to beginning f.open() # rewind to beginning
content = f.read() content = f.read()
write_binary_file(filepath, content) write_binary_file(filepath, content)
write_url_file(filepath, f.name, handbook_directory, page) write_url_file(filepath, host, handbook_directory, page)
elif isinstance(f, TemporaryUploadedFile): elif isinstance(f, TemporaryUploadedFile):
if filepath.is_file: if filepath.is_file:
print(f"+++++ Out of cheese error\n Destination EXISTS {filepath}") print(f"+++++ Out of cheese error\n Destination EXISTS {filepath}")
@@ -479,11 +480,18 @@ def save_original_in_expofiles(f, year, photographer, host, handbook_directory,
raise TypeError(msg) raise TypeError(msg)
return return
def write_url_file(targetpath, host, handbook_rel_path, page): def write_url_file(targetpath, host, handbook_rel_path, page):
"""
page is the referrer page, which is sort-of what we want,
but troggle URLs are such that this is not the same page we want to be visiting, e.g.
if he referrer is a "_edit" page, then we want to go to the view page, not the edit page.
ALSO ths will be different if the page is a Cave Description Page, and Entrance page pr a Handbook page.
"""
# the ".url" is there, just never visible in Windows Explorer. # the ".url" is there, just never visible in Windows Explorer.
# FIND AND FIX the correct host for this ! # FIND AND FIX the correct host for this !
content = f"[InternetShortcut]\nURL={page}\n\n[TroggleImage]\nURL=http://{host}/{handbook_rel_path}" content = f"[InternetShortcut]\nURL={page}\n\n[TroggleImage]\nURL=http://{host}/{handbook_rel_path}"
content = content.replace("localhost:8000", "expo.survex.com")
print(content) print(content)
filepath = targetpath.with_suffix(".url") filepath = targetpath.with_suffix(".url")
write_files([(filepath, content, "utf8")]) write_files([(filepath, content, "utf8")])