From 7ea505e27be99767333b1f1a8b32cbebea580243 Mon Sep 17 00:00:00 2001 From: Dooho Yi Date: Wed, 14 Aug 2024 09:23:25 +0900 Subject: [PATCH] adapt --- .gitignore | 2 ++ .python-version | 1 + __pycache__/octomode.cpython-312.pyc | Bin 0 -> 9397 bytes octomode.py | 26 ++++++++++++++++++++++---- templates/pagedjs.html | 2 +- templates/preview.html | 2 +- 6 files changed, 27 insertions(+), 6 deletions(-) create mode 100644 .python-version create mode 100644 __pycache__/octomode.cpython-312.pyc diff --git a/.gitignore b/.gitignore index 4c49bd7..1408b1c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ .env +.venv + diff --git a/.python-version b/.python-version new file mode 100644 index 0000000..d9506ce --- /dev/null +++ b/.python-version @@ -0,0 +1 @@ +3.12.5 diff --git a/__pycache__/octomode.cpython-312.pyc b/__pycache__/octomode.cpython-312.pyc new file mode 100644 index 0000000000000000000000000000000000000000..398f02b4e6719e4032aee649574992439e47227d GIT binary patch literal 9397 zcmeHMeQX;?cHiYL$t9N(B~c&Nhh@opPa#t|Zd@ z%Ir$E1ky+23|K;Pu#6foi#T^Wpv6hBfU4~Q^&u!ue-y<){9rE z9opB?9I2xon53<9+a7QRH_ME%V{BLFmw4;#vg+1%!U5%qZYT2lBeJ6EZX!n|nfO&X z5)TJdSr>>b1&KVM>h=*5_7BEL7fY+LxEzJ516t+iKunUmEV}Jo!>#2*l-a zQISv^WD z+^dUc5BK^HpY8LXJbDq7&>9a&eZ9IZ5D#9F$8`IUtoF;-)FRu3bElrOJ+rLNO93^Y z^QgREqQ;F^)1fU=OjcT=F||d$76hBHM`T3_49U7Wt2Gm#t-lR|go73I! z@_u|$emvO@<7?rkRKp9Wn9uFb<+?3Xm!|hj*J+-v3E>IvnCQHDCTC+jjVqqodk5|u zNJlcB9Z#)Xr7hK$6PSwn)bSO!=l0m-*!{Y{IR7)>Pkr-cnT|tR+gl6l!v2LOt<}4D z;rp6@IC~+ubRnL(5YJv9i}gy@t)`B{#6rcCEn}}s@BYjVyx)Def1xk)y7#kI@3N

Wa*-sxu|9@jxKJ# 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 YhM7~D*4Gw#Q^y|heK|YBH_%=EA7SlXHvj+t literal 0 HcmV?d00001 diff --git a/octomode.py b/octomode.py index e4af7b2..33b1f36 100755 --- a/octomode.py +++ b/octomode.py @@ -118,12 +118,12 @@ def main(name): @APP.route('//pad/') def pad(name): - url = f"{ APP.config['PAD_URL'] }/{ name }.md" + url = f"{ APP.config['PAD_URL'] }/p/{ name }.md" return render_template('iframe.html', url=url, name=name.strip(), pad_url=APP.config['PAD_URL']) @APP.route('//stylesheet/') def stylesheet(name): - url = f"{ APP.config['PAD_URL'] }/{ name }.css" + url = f"{ APP.config['PAD_URL'] }/p/{ name }.css" return render_template('iframe.html', url=url, name=name.strip(), pad_url=APP.config['PAD_URL']) @APP.route('//html/') @@ -175,7 +175,16 @@ def preview(name): lang = "en" title = "No title" - return render_template('preview.html', name=name.strip(), pad_content=html, lang=lang, title=title) + # only here we need application root to make all the URLs work..... + if APP.config['APPLICATION_ROOT'] == '/': + app_root = '' + elif APP.config['APPLICATION_ROOT'].endswith('/'): + app_root = APP.config['APPLICATION_ROOT'][:-1] + else: + app_root = APP.config['APPLICATION_ROOT'] + urn = f"{ app_root }/{ name }" + + return render_template('preview.html', urn=urn, name=name.strip(), pad_content=html, lang=lang, title=title) @APP.route('//pagedjs.html') def pagedjs(name): @@ -186,7 +195,16 @@ def pagedjs(name): lang = metadata['language'][0] title = metadata['title'][0] - return render_template('pagedjs.html', name=name.strip(), pad_content=html, lang=lang, title=title) + # only here we need application root to make all the URLs work..... + if APP.config['APPLICATION_ROOT'] == '/': + app_root = '' + elif APP.config['APPLICATION_ROOT'].endswith('/'): + app_root = APP.config['APPLICATION_ROOT'][:-1] + else: + app_root = APP.config['APPLICATION_ROOT'] + urn = f"{ app_root }/{ name }" + + return render_template('pagedjs.html', urn=urn, name=name.strip(), pad_content=html, lang=lang, title=title) # ////////////////// diff --git a/templates/pagedjs.html b/templates/pagedjs.html index 4375168..5a630b2 100644 --- a/templates/pagedjs.html +++ b/templates/pagedjs.html @@ -5,7 +5,7 @@ - + {{ title }} diff --git a/templates/preview.html b/templates/preview.html index 4e23ea4..83e79d1 100644 --- a/templates/preview.html +++ b/templates/preview.html @@ -3,7 +3,7 @@ - + {{ title }}