Adjusted structure to be closer to albula

2019-12-04 20:41:53 +01:00 · 2019-12-04 20:41:53 +01:00 · fd0033e1c0
parent c74cb7010f
commit fd0033e1c0
36 changed files with 38 additions and 33 deletions
--- a/maloja/init.py
+++ b/maloja/init.py
@ -7,7 +7,7 @@ author = {
 	"email":"maloja@krateng.dev",
 	"github": "krateng"
 }
-version = 2,0,3
+version = 2,0,4
 versionstr = ".".join(str(n) for n in version)


@ -23,6 +23,7 @@ requires = [
 resources = [
 	"web/*/*",
 	"web/*",
+	"static/*/*",
 	"data_files/*/*",
 	"data_files/.doreah"
 ]
--- a/maloja/server.py
+++ b/maloja/server.py
@ -45,8 +45,9 @@ MAIN_PORT = settings.get_settings("WEB_PORT")
 HOST = settings.get_settings("HOST")
 THREADS = 12
 BaseRequest.MEMFILE_MAX = 15 * 1024 * 1024
-WEBFOLDER = pkg_resources.resource_filename(__name__,"web")

+WEBFOLDER = pkg_resources.resource_filename(__name__,"web")
+STATICFOLDER = pkg_resources.resource_filename(__name__,"static")

 webserver = Bottle()

@ -56,8 +57,8 @@ def generate_css():
 	import lesscpy
 	from io import StringIO
 	less = ""
-	for f in os.listdir(pthjoin(WEBFOLDER,"less")):
-		with open(pthjoin(WEBFOLDER,"less",f),"r") as lessf:
+	for f in os.listdir(pthjoin(STATICFOLDER,"less")):
+		with open(pthjoin(STATICFOLDER,"less",f),"r") as lessf:
 			less += lessf.read()

 	css = lesscpy.compile(StringIO(less),minify=True)
@ -153,27 +154,30 @@ def static_image(pth):
 	return response


-@webserver.route("/css/style.css")
+@webserver.route("/style.css")
 def get_css():
 	response.content_type = 'text/css'
 	return css

-#@webserver.route("/<name:re:.*\\.html>")
-@webserver.route("/<name:re:.*\\.js>")
-@webserver.route("/<name:re:.*\\.less>")
-@webserver.route("/<name:re:.*\\.png>")
-@webserver.route("/<name:re:.*\\.jpeg>")
-@webserver.route("/<name:re:.*\\.ico>")
-@webserver.route("/<name:re:.*\\.txt>")
-def static(name):
-	response = static_file(name,root=WEBFOLDER)
+
+@webserver.route("/<name>.<ext>")
+def static(name,ext):
+	assert ext in ["txt","ico","jpeg","jpg","png","less","js"]
+	response = static_file(ext + "/" + name + "." + ext,root=STATICFOLDER)
+	response.set_header("Cache-Control", "public, max-age=3600")
+	return response
+
+@webserver.route("/media/<name>.<ext>")
+def static(name,ext):
+	assert ext in ["ico","jpeg","jpg","png"]
+	response = static_file(ext + "/" + name + "." + ext,root=STATICFOLDER)
 	response.set_header("Cache-Control", "public, max-age=3600")
 	return response


@webserver.route("/<name>")
 def static_html(name):
-	linkheaders = ["</css/style.css>; rel=preload; as=style"]
+	linkheaders = ["</style.css>; rel=preload; as=style"]
 	keys = remove_identical(FormsDict.decode(request.query))

 	pyhp_file = os.path.exists(pthjoin(WEBFOLDER,name + ".pyhp"))
--- a/maloja/static/ico/favicon.ico
+++ b/maloja/static/ico/favicon.ico
--- a/maloja/web/javascript/cookies.js
+++ b/maloja/web/javascript/cookies.js
--- a/maloja/web/javascript/datechange.js
+++ b/maloja/web/javascript/datechange.js
--- a/maloja/web/javascript/neopolitan.js
+++ b/maloja/web/javascript/neopolitan.js
--- a/maloja/web/javascript/rangeselect.js
+++ b/maloja/web/javascript/rangeselect.js
--- a/maloja/web/javascript/search.js
+++ b/maloja/web/javascript/search.js
--- a/maloja/web/javascript/upload.js
+++ b/maloja/web/javascript/upload.js
--- a/maloja/static/less/grisons.less
+++ b/maloja/static/less/grisons.less
--- a/maloja/static/less/grisonsfont.less
+++ b/maloja/static/less/grisonsfont.less
--- a/maloja/static/less/maloja.less
+++ b/maloja/static/less/maloja.less
--- a/maloja/static/png/chartpos_bronze.png
+++ b/maloja/static/png/chartpos_bronze.png
--- a/maloja/static/png/chartpos_gold.png
+++ b/maloja/static/png/chartpos_gold.png
--- a/maloja/static/png/chartpos_normal.png
+++ b/maloja/static/png/chartpos_normal.png
--- a/maloja/static/png/chartpos_silver.png
+++ b/maloja/static/png/chartpos_silver.png
--- a/maloja/static/png/favicon.png
+++ b/maloja/static/png/favicon.png
--- a/maloja/static/png/record_diamond.png
+++ b/maloja/static/png/record_diamond.png
--- a/maloja/static/png/record_gold.png
+++ b/maloja/static/png/record_gold.png
--- a/maloja/static/png/record_gold_original.png
+++ b/maloja/static/png/record_gold_original.png
--- a/maloja/static/png/record_platinum.png
+++ b/maloja/static/png/record_platinum.png
--- a/maloja/static/png/star.png
+++ b/maloja/static/png/star.png
--- a/maloja/static/png/star_alt.png
+++ b/maloja/static/png/star_alt.png
--- a/maloja/static/txt/robots.txt
+++ b/maloja/static/txt/robots.txt
--- a/maloja/web/admin.pyhp
+++ b/maloja/web/admin.pyhp
@ -5,7 +5,7 @@
 	<head>
 		<meta charset="UTF-8" />
 		<title>Maloja</title>
-		<script src="javascript/cookies.js"></script>
+		<script src="/cookies.js"></script>

 		<pyhp include="common/header.html" />

--- a/maloja/web/artist.html
+++ b/maloja/web/artist.html
@ -4,8 +4,8 @@
 	<head>
 		<meta charset="UTF-8" />
 		<title>Maloja - KEY_ARTISTNAME</title>
-		<script src="javascript/cookies.js"></script>
-		<script src="javascript/rangeselect.js"></script>
+		<script src="/cookies.js"></script>
+		<script src="/rangeselect.js"></script>
 	</head>

 	<body>
--- a/maloja/web/artist.pyhp
+++ b/maloja/web/artist.pyhp
@ -37,7 +37,7 @@
 		<title>Maloja - <pyhp echo="artist" /></title>

 		<pyhp include="common/header.html" />
-		<script src="javascript/rangeselect.js"></script>
+		<script src="/rangeselect.js"></script>
 	</head>

 	<body>
--- a/maloja/web/charts_artists.html
+++ b/maloja/web/charts_artists.html
@ -4,7 +4,7 @@
 	<head>
 		<meta charset="UTF-8" />
 		<title>Maloja - Artist Charts</title>
-		<script src="javascript/datechange.js" async></script>
+		<script src="/datechange.js" async></script>
 	</head>

 	<body>
--- a/maloja/web/common/header.html
+++ b/maloja/web/common/header.html
@ -5,7 +5,7 @@
 <link rel="stylesheet" href="/css/maloja.css" />
 <link rel="stylesheet" href="/css/grisons.css" />
 <script src="//cdnjs.cloudflare.com/ajax/libs/less.js/3.9.0/less.min.js" ></script> -->
-<link rel="stylesheet" href="/css/style.css" />
-<script src="/javascript/search.js" async></script>
-<script src="/javascript/neopolitan.js"></script>
-<script src="/javascript/upload.js"></script>
+<link rel="stylesheet" href="/style.css" />
+<script src="/search.js" async></script>
+<script src="/neopolitan.js"></script>
+<script src="/upload.js"></script>
--- a/maloja/web/issues.html
+++ b/maloja/web/issues.html
@ -4,7 +4,7 @@
 	<head>
 		<meta charset="UTF-8" />
 		<title>Maloja - Issues</title>
-		<script src="javascript/cookies.js"></script>
+		<script src="/cookies.js"></script>
 	</head>

 	<body>
--- a/maloja/web/manual.html
+++ b/maloja/web/manual.html
@ -4,7 +4,7 @@
 	<head>
 		<meta charset="UTF-8" />
 		<title>Maloja</title>
-		<script src="javascript/cookies.js"></script>
+		<script src="/cookies.js"></script>

 		<script>
 			function keyDetect(event) {
--- a/maloja/web/proxy.html
+++ b/maloja/web/proxy.html
@ -4,7 +4,7 @@
 	<head>
 		<meta charset="UTF-8" />
 		<title>Maloja - Proxyscrobble</title>
-		<script src="javascript/cookies.js"></script>
+		<script src="/cookies.js"></script>

 		<script>
 			window.addEventListener("load",function(){
--- a/maloja/web/setup.html
+++ b/maloja/web/setup.html
@ -4,7 +4,7 @@
 	<head>
 		<meta charset="UTF-8" />
 		<title>Maloja - Setup</title>
-		<script src="javascript/cookies.js"></script>
+		<script src="/cookies.js"></script>

 		<script>

--- a/maloja/web/start.html
+++ b/maloja/web/start.html
@ -8,8 +8,8 @@
 		<script>document.addEventListener('DOMContentLoaded',function() {
 			KEY_JS_INIT_RANGES
 		})</script>
-		<script src="javascript/cookies.js"></script>
-		<script src="javascript/rangeselect.js"></script>
+		<script src="/cookies.js"></script>
+		<script src="/rangeselect.js"></script>
 	</head>


--- a/maloja/web/track.html
+++ b/maloja/web/track.html
@ -4,8 +4,8 @@
 	<head>
 		<meta charset="UTF-8" />
 		<title>Maloja - KEY_TRACKTITLE</title>
-		<script src="javascript/cookies.js" ></script>
-		<script src="javascript/rangeselect.js"></script>
+		<script src="/cookies.js" ></script>
+		<script src="/rangeselect.js"></script>
 	</head>

 	<body>
--- a/maloja/web/track.pyhp
+++ b/maloja/web/track.pyhp
@ -18,7 +18,7 @@
 		<title>Maloja - <pyhp echo="track['title']" /></title>

 		<pyhp include="common/header.html" />
-		<script src="javascript/rangeselect.js"></script>
+		<script src="/rangeselect.js"></script>
 		<script>
 			function scrobble(encodedtrack,apikey) {
 				neo.xhttprequest('/api/newscrobble?' + encodedtrack + "key=" + apikey).then(response=>{window.location.reload()});