Cutlery/maloja
1
0
Fork 0
mirror of https://github.com/krateng/maloja.git synced 2025-07-09 03:04:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

Removed tuple-version use

Browse Source
This commit is contained in:
krateng 2021-12-26 21:36:36 +01:00
parent af569ae983
commit 83f1956256
6 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
maloja/__pkginfo__.py
View File

@ -6,14 +6,14 @@ try:
import toml import toml
with open("./pyproject.toml") as filed: with open("./pyproject.toml") as filed:
metadata = toml.load(filed)['project'] metadata = toml.load(filed)['project']
VERSIONSTR = metadata['version'] VERSION = metadata['version']
HOMEPAGE = metadata['urls']['homepage'] HOMEPAGE = metadata['urls']['homepage']
except: except:
# package distributrion # package distributrion
from pkg_resources import get_distribution from pkg_resources import get_distribution
pkg = get_distribution('maloja') # also contains a metadata pkg = get_distribution('maloja') # also contains a metadata
VERSIONSTR = pkg.version VERSION = pkg.version
#urls = metadata.metadata('maloja').get_all('Project-URL') #urls = metadata.metadata('maloja').get_all('Project-URL')
#urls = [e.split(', ') for e in urls] #urls = [e.split(', ') for e in urls]
@ -22,7 +22,4 @@ except:
HOMEPAGE = "https://github.com/krateng/maloja" HOMEPAGE = "https://github.com/krateng/maloja"
VERSION = VERSIONSTR.split('.') USER_AGENT = f"Maloja/{VERSION} ( {HOMEPAGE} )"
USER_AGENT = f"Maloja/{VERSIONSTR} ( {HOMEPAGE} )"

3
maloja/apis/native_v1.py
View File

@ -1,6 +1,6 @@
from ..database import * from ..database import *
from ..globalconf import malojaconfig, apikeystore from ..globalconf import malojaconfig, apikeystore
from ..__pkginfo__ import VERSION, VERSIONSTR from ..__pkginfo__ import VERSION
from ..malojauri import uri_to_internal from ..malojauri import uri_to_internal
from .. import utilities from .. import utilities
@ -43,7 +43,6 @@ def server_info():
return { return {
"name":malojaconfig["NAME"], "name":malojaconfig["NAME"],
"version":VERSION, "version":VERSION,
"versionstring":VERSIONSTR,
"db_status":dbstatus "db_status":dbstatus
} }

4
maloja/globalconf.py
View File

@ -3,7 +3,7 @@ from doreah.configuration import Configuration
from doreah.configuration import types as tp from doreah.configuration import types as tp
from doreah.keystore import KeyStore from doreah.keystore import KeyStore
from .__pkginfo__ import VERSIONSTR from .__pkginfo__ import VERSION
@ -275,7 +275,7 @@ data_dir = {
### write down the last ran version ### write down the last ran version
with open(pthj(dir_settings['state'],".lastmalojaversion"),"w") as filed: with open(pthj(dir_settings['state'],".lastmalojaversion"),"w") as filed:
filed.write(VERSIONSTR) filed.write(VERSION)
filed.write("\n") filed.write("\n")

4
maloja/proccontrol/control.py
View File

@ -15,7 +15,7 @@ from .. import globalconf
def print_header_info(): def print_header_info():
print() print()
print("#####") print("#####")
print("Maloja v" + info.VERSIONSTR) print("Maloja v" + info.VERSION)
print(info.HOMEPAGE) print(info.HOMEPAGE)
print("#####") print("#####")
print() print()
@ -120,7 +120,7 @@ def main(*args,**kwargs):
} }
if "version" in kwargs: if "version" in kwargs:
print(info.VERSIONSTR) print(info.VERSION)
else: else:
try: try:
action, *args = args action, *args = args

4
maloja/utilities/maintenance.py
View File

@ -1,4 +1,4 @@
from ..__pkginfo__ import VERSIONSTR from ..__pkginfo__ import VERSION
from ..malojatime import ranges, thisweek, thisyear from ..malojatime import ranges, thisweek, thisyear
from ..globalconf import malojaconfig from ..globalconf import malojaconfig
@ -100,7 +100,7 @@ def send_stats():
"data":json.dumps({ "data":json.dumps({
"name":malojaconfig["NAME"], "name":malojaconfig["NAME"],
"url":malojaconfig["PUBLIC_URL"], "url":malojaconfig["PUBLIC_URL"],
"version":VERSIONSTR, "version":VERSION,
"artists":len(ARTISTS), "artists":len(ARTISTS),
"tracks":len(TRACKS), "tracks":len(TRACKS),
"scrobbles":len(SCROBBLES) "scrobbles":len(SCROBBLES)

2
maloja/web/jinja/admin_overview.jinja
View File

@ -22,7 +22,7 @@
neo.xhttprequest("/apis/mlj_1/serverinfo",{},"GET",json=true).then((response)=>{ neo.xhttprequest("/apis/mlj_1/serverinfo",{},"GET",json=true).then((response)=>{
result = JSON.parse(response.responseText); result = JSON.parse(response.responseText);
thisvers = result.version; thisvers = result.version.split(".");
document.getElementById("latestversion").innerHTML = latestvers.join("."); document.getElementById("latestversion").innerHTML = latestvers.join(".");
document.getElementById("currentversion").innerHTML = thisvers.join("."); document.getElementById("currentversion").innerHTML = thisvers.join(".");