2 |
5 |
6 |
--------------------------------------------------------------------------------
/maloja/web/jinja/partials/performance.jinja:
--------------------------------------------------------------------------------
1 | {% import 'snippets/links.jinja' as links %}
2 |
3 | {% set ranges = dbc.get_performance(filterkeys,limitkeys,delimitkeys,specialkeys) %}
4 |
5 | {% set minrank = ranges|map(attribute="rank")|reject("none")|max|default(60) %}
6 | {% set minrank = minrank + 20 %}
7 | {% if minrank < 80 %}{% set minrank = 80 %}{% endif %}
8 |
9 | | {{ thisrange.desc() }} | 15 |16 | {{ links.link_rank(filterkeys,specialkeys,thisrange,rank=t.rank) }} 17 | | 18 |19 | {% set prct = ((minrank+1-t.rank)*100/minrank if t.rank is not none else 0) %} 20 | {{ links.link_rank(filterkeys,specialkeys,thisrange,percent=prct,rank=t.rank) }} 21 | | 22 | 23 | 24 | 25 |
20 | 21 | {% for importsource in thirdparty.services.import %} 22 |
{{ importsource.name }}
23 | 24 | 25 | 26 | {% endfor %} 27 | 28 | {% endblock %} 29 | -------------------------------------------------------------------------------- /maloja/web/jinja/top_albums.jinja: -------------------------------------------------------------------------------- 1 | {% extends "abstracts/base.jinja" %} 2 | {% block title %}Maloja - #1 Albums{% endblock %} 3 | 4 | {% import 'snippets/filterdescription.jinja' as filterdesc %} 5 | 6 | 7 | 8 | {% set entries = dbc.get_top_albums(filterkeys,limitkeys,delimitkeys) %} 9 | {% set repr = entries | find_representative('album','scrobbles') %} 10 | {% set img = "/favicon.png" if repr is none else images.get_album_image(repr.album) %} 11 | 12 | 13 | {% block content %} 14 || 17 | 18 | | 19 |
20 | #1 Albums21 | {{ filterdesc.desc(filterkeys,limitkeys) }} 22 | 23 | 24 | {% include 'snippets/timeselection.jinja' %} 25 | |
26 |
| 17 | 18 | | 19 |
20 | #1 Tracks21 | {{ filterdesc.desc(filterkeys,limitkeys) }} 22 | 23 | 24 | {% include 'snippets/timeselection.jinja' %} 25 | |
26 |
| 17 | 18 | | 19 |
20 | #1 Artists21 | {{ filterdesc.desc(filterkeys,limitkeys) }} 22 | 23 | 24 | {% with artistchart = True %} 25 | {% include 'snippets/timeselection.jinja' %} 26 | {% endwith %} 27 | |
28 |
| 8 | 9 | | 10 |
11 | {{ error_desc | e }}12 | {{ error_full_desc | e }} 13 | 14 | |
15 |
20 | {% if adminmode %} 21 | You are only seeing this information because you are in admin mode: 22 |
23 |
{% autoescape true -%}
24 | {{ traceback }}
25 | {%- endautoescape %}
26 | 27 | If you think this shouldn't have happened, consider 28 | opening an issue 29 | describing the situation. 30 | {% endif %} 31 | 32 | 33 | {% endblock %} 34 | -------------------------------------------------------------------------------- /maloja/web/jinja/wait.jinja: -------------------------------------------------------------------------------- 1 | {% extends "abstracts/base.jinja" %} 2 | {% block title %}Maloja - Please wait...{% endblock %} 3 | 4 | {% block heading %}Rebuilding the database{% endblock %} 5 | 6 | {% block top_info %} 7 | Please wait... 8 | {% endblock %} 9 | 10 | {% block scripts %} 11 | 42 | {% endblock %} 43 | -------------------------------------------------------------------------------- /dev/testing/stresstest.py: -------------------------------------------------------------------------------- 1 | import threading 2 | import subprocess 3 | import time 4 | import requests 5 | import os 6 | 7 | ACTIVE = True 8 | 9 | build_cmd = ["docker","build","-t","maloja",".","-f","Containerfile"] 10 | subprocess.run(build_cmd) 11 | 12 | common_prc = ( 13 | ["docker","run","--rm","-v",f"{os.path.abspath('./testdata')}:/mlj","-e","MALOJA_DATA_DIRECTORY=/mlj"], 14 | ["maloja"] 15 | ) 16 | 17 | servers = [ 18 | {'port': 42010}, 19 | {'port': 42011, 'extraargs':["--memory=1g"]}, 20 | {'port': 42012, 'extraargs':["--memory=500m"]} 21 | ] 22 | for s in servers: 23 | cmd = common_prc[0] + ["-p",f"{s['port']}:42010"] + s.get('extraargs',[]) + common_prc[1] 24 | print(cmd) 25 | t = threading.Thread(target=subprocess.run,args=(cmd,)) 26 | s['thread'] = t 27 | t.daemon = True 28 | t.start() 29 | time.sleep(5) 30 | 31 | time.sleep(5) 32 | while ACTIVE: 33 | time.sleep(1) 34 | try: 35 | for s in servers: 36 | requests.get(f"http://localhost:{s['port']}") 37 | except KeyboardInterrupt: 38 | ACTIVE = False 39 | except Exception: 40 | pass 41 | 42 | for s in servers: 43 | s['thread'].join() 44 | -------------------------------------------------------------------------------- /maloja/web/jinja/partials/charts_artists_tiles.jinja: -------------------------------------------------------------------------------- 1 | {% import 'snippets/links.jinja' as links %} 2 | 3 | 4 | {% if charts is undefined %} 5 | {% set charts = dbc.get_charts_artists(limitkeys) %} 6 | {% endif %} 7 | 8 | {% set charts_14 = charts | fixlength(14) %} 9 | 10 | 11 |
12 | {% if charts_14[0] is none %}
13 | {% include 'icons/nodata.jinja' %}
14 | {% endif %}
15 | {% for entry in charts_14 %}
16 | {% if entry is not none %}
17 | {% set artist = entry.artist %}
18 | {% set rank = entry.rank %}
19 | {% set scrobbles = entry.scrobbles %}
20 |
30 | {% else %}
31 |
32 | {% endif %}
33 | {% endfor %}
34 |
35 |
36 |
--------------------------------------------------------------------------------
/maloja/web/jinja/partials/charts_tracks_tiles.jinja:
--------------------------------------------------------------------------------
1 | {% import 'snippets/links.jinja' as links %}
2 |
3 |
4 | {% if charts is undefined %}
5 | {% set charts = dbc.get_charts_tracks(filterkeys,limitkeys) %}
6 | {% endif %}
7 |
8 | {% set charts_14 = charts | fixlength(14) %}
9 |
10 |
11 |
12 | {% if charts_14[0] is none %}
13 | {% include 'icons/nodata.jinja' %}
14 | {% endif %}
15 | {% for entry in charts_14 %}
16 | {% if entry is not none %}
17 | {% set track = entry.track %}
18 | {% set rank = entry.rank %}
19 | {% set scrobbles = entry.scrobbles %}
20 |
30 | {% else %}
31 |
32 | {% endif %}
33 | {% endfor %}
34 |
35 |
36 |
--------------------------------------------------------------------------------
/maloja/web/jinja/partials/top_albums.jinja:
--------------------------------------------------------------------------------
1 | {% import 'snippets/links.jinja' as links %}
2 | {% import 'snippets/entityrow.jinja' as entityrow %}
3 |
4 | {% set ranges = dbc.get_top_albums(filterkeys,limitkeys,delimitkeys) %}
5 |
6 | {% set maxbar = ranges|map(attribute="scrobbles")|max|default(1) %}
7 | {% if maxbar < 1 %}{% set maxbar = 1 %}{% endif %}
8 |
9 | | {{ thisrange.desc() }} | 16 | 17 | {% if album is none %} 18 |19 | | n/a | 20 |0 | 21 |22 | {% else %} 23 | {{ entityrow.row(album) }} 24 | | {{ links.link_scrobbles([{'album':album,'timerange':thisrange}],amount=e.scrobbles) }} | 25 |{{ links.link_scrobbles([{'album':album,'timerange':thisrange}],percent=e.scrobbles*100/maxbar) }} | 26 | {% endif %} 27 | 28 |
| {{ thisrange.desc() }} | 16 | 17 | {% if track is none %} 18 |19 | | n/a | 20 |0 | 21 |22 | {% else %} 23 | {{ entityrow.row(track) }} 24 | | {{ links.link_scrobbles([{'track':track,'timerange':thisrange}],amount=e.scrobbles) }} | 25 |{{ links.link_scrobbles([{'track':track,'timerange':thisrange}],percent=e.scrobbles*100/maxbar) }} | 26 | {% endif %} 27 | 28 |
12 | {% if charts_14[0] is none %}
13 | {% include 'icons/nodata.jinja' %}
14 | {% endif %}
15 | {% for entry in charts_14 %}
16 | {% if entry is not none %}
17 | {% set album = entry.album %}
18 | {% set rank = entry.rank %}
19 | {% set scrobbles = entry.scrobbles %}
20 |
30 | {% else %}
31 |
32 | {% endif %}
33 | {% endfor %}
34 |
35 |
36 |
--------------------------------------------------------------------------------
/auxiliary/chromium_scrobbler/maloja-scrobbler/settings.html:
--------------------------------------------------------------------------------
1 |
2 |
3 |
4 |
5 |
31 | Server:
32 | 33 |
34 | API key:
35 | 36 |
37 | Tabs: 38 |
41 | Services: 42 |
45 |
46 |
47 |
--------------------------------------------------------------------------------
/maloja/web/jinja/icons/LICENSE-octicons:
--------------------------------------------------------------------------------
1 | MIT License
2 |
3 | Copyright (c) 2022 GitHub Inc.
4 |
5 | Permission is hereby granted, free of charge, to any person obtaining a copy
6 | of this software and associated documentation files (the "Software"), to deal
7 | in the Software without restriction, including without limitation the rights
8 | to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9 | copies of the Software, and to permit persons to whom the Software is
10 | furnished to do so, subject to the following conditions:
11 |
12 | The above copyright notice and this permission notice shall be included in all
13 | copies or substantial portions of the Software.
14 |
15 | THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16 | IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17 | FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18 | AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19 | LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20 | OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21 | SOFTWARE.
22 |
--------------------------------------------------------------------------------
/maloja/web/static/svg/LICENSE:
--------------------------------------------------------------------------------
1 | The MIT License (MIT)
2 |
3 | Copyright (c) 2015-present Ionic (http://ionic.io/)
4 |
5 | Permission is hereby granted, free of charge, to any person obtaining a copy
6 | of this software and associated documentation files (the "Software"), to deal
7 | in the Software without restriction, including without limitation the rights
8 | to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9 | copies of the Software, and to permit persons to whom the Software is
10 | furnished to do so, subject to the following conditions:
11 |
12 | The above copyright notice and this permission notice shall be included in
13 | all copies or substantial portions of the Software.
14 |
15 | THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16 | IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17 | FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18 | AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19 | LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20 | OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
21 | THE SOFTWARE.
22 |
--------------------------------------------------------------------------------
/maloja/web/static/css/startpage.css:
--------------------------------------------------------------------------------
1 | div#startpage {
2 | display: grid;
3 | justify-content: center;
4 |
5 | display: fixed;
6 | grid-column-gap: 25px;
7 | grid-row-gap: 25px;
8 | }
9 |
10 |
11 | @media (min-width: 2201px) {
12 | div#startpage {
13 | grid-template-columns: repeat(6, 14vw);
14 | grid-template-rows: repeat(2, 45vh);
15 | grid-column-gap: 2vw;
16 |
17 | grid-template-areas:
18 | "charts_artists charts_artists charts_tracks charts_tracks charts_albums charts_albums"
19 | "empty1 lastscrobbles lastscrobbles pulse pulse empty2";
20 | }
21 | }
22 |
23 | @media (min-width: 1401px) and (max-width: 2200px) {
24 | div#startpage {
25 | grid-template-columns: repeat(2, 45vw);
26 | grid-template-rows: repeat(3, 45vh);
27 |
28 | grid-template-areas:
29 | "charts_artists lastscrobbles"
30 | "charts_tracks pulse"
31 | "charts_albums empty";
32 | }
33 | }
34 |
35 | @media (max-width: 1400px) {
36 | div#startpage {
37 | grid-template-columns: 90vw;
38 |
39 | grid-template-areas:
40 | "charts_artists"
41 | "charts_tracks"
42 | "charts_albums"
43 | "lastscrobbles"
44 | "pulse";
45 | }
46 |
47 | #start_page_module_featured {
48 | display: none;
49 | }
50 | }
51 |
--------------------------------------------------------------------------------
/maloja/web/jinja/icons/settings.jinja:
--------------------------------------------------------------------------------
1 |
2 | 32 | 33 |
34 | API key:
35 | 36 |
37 | Tabs: 38 |
-
39 |
41 | Services: 42 |
-
43 |
3 |
9 |
10 |
11 |
--------------------------------------------------------------------------------
/maloja/web/jinja/abstracts/admin.jinja:
--------------------------------------------------------------------------------
1 | {% extends "abstracts/base.jinja" %}
2 | {% block title %}Maloja - Backend{% endblock %}
3 |
4 |
5 | {% block content %}
6 |
7 |
8 |
9 |
10 | | 13 | 14 | | 15 |
16 | Admin Panel17 |18 | 19 | {% for tab_url,tab_name in [ 20 | ['overview','Overview'], 21 | ['setup','Server Setup'], 22 | ['settings','Settings'], 23 | ['apikeys','API Keys'], 24 | ['manual','Manual Scrobbling'], 25 | ['albumless','Tracks without Albums'] 26 | 27 | ] %} 28 | {# ['import','Scrobble Import'], 29 | ['issues','Database Maintenance'] 30 | hide for now #} 31 | {% if page=='admin_' + tab_url %} 32 | {{ tab_name }} 33 | {% else %} 34 | {{ tab_name }} 35 | {% endif %} {%- if not loop.last %}|{% endif %} 36 | {% endfor %} 37 | 38 | 39 | 40 | 41 | 42 | |
43 |
| 18 | 19 | | 20 |
21 | {{ malojatime.delimit_desc_p(delimitkeys) }} Pulse22 | {% if filterkeys != {} %} 23 | View Rankings 24 | {% endif %} 25 |26 | {{ filterdesc.desc(filterkeys,limitkeys,prefix='of') }} 27 | 28 | {% include 'snippets/timeselection.jinja' %} 29 | 30 | |
31 |
| {{ thisrange.desc() }} | 14 |15 | {{ links.link_scrobbles([filterkeys,{'timerange':thisrange}],amount=t.scrobbles) }} 16 | | 17 |18 | {% if 'artist' in filterkeys and filterkeys.get('associated') %} 19 | {{ links.link_scrobbles([{'artist':filterkeys.artist,'associated':False,'timerange':thisrange}],percent=t.real_scrobbles*100/maxbar) }} 20 | {%- if t.real_scrobbles != t.scrobbles -%} 21 | {{ links.link_scrobbles([{'artist':filterkeys.artist,'associated':True,'timerange':thisrange}],percent=(t.scrobbles-t.real_scrobbles)*100/maxbar) }} 22 | {%- endif %} 23 | {% else %} 24 | {{ links.link_scrobbles([filterkeys,{'timerange':thisrange}],percent=t.scrobbles*100/maxbar) }} 25 | {% endif %} 26 | | 27 |
| 18 | 19 | | 20 |
21 | {{ malojatime.delimit_desc_p(delimitkeys) }} Performance22 | {% if limitkeys != {} %} 23 | View Pulse 24 | {% endif %} 25 |26 | {{ filterdesc.desc(filterkeys,limitkeys,prefix='of') }} 27 | 28 | {% with artistchart = (filterkeys.get('artist') is not none) %} 29 | {% include 'snippets/timeselection.jinja' %} 30 | {% endwith %} 31 | 32 | |
33 |
9 |
10 | {% if pages > 1 %}
11 | {% if page > 1 %}
12 |
13 | 1 |
14 | {% endif %}
15 |
16 | {% if page > 2 %}
17 | ... |
18 | {% endif %}
19 |
20 | {% if page > 0 %}
21 |
22 | {{ page }} «
23 | {% endif %}
24 |
25 |
26 | {{ page + 1 }}
27 |
28 |
29 | {% if page < pages-1 %}
30 | »
31 | {{ page+2 }}
32 | {% endif %}
33 |
34 | {% if page < pages-3 %}
35 | | ...
36 | {% endif %}
37 |
38 | {% if page < pages-2 %}
39 | |
40 | {{ pages }}
41 | {% endif %}
42 | {% endif %}
43 |
44 |
45 |
46 | {% endmacro %}
47 |
--------------------------------------------------------------------------------
/maloja/thirdparty/deezer.py:
--------------------------------------------------------------------------------
1 | from . import MetadataInterface, RateLimitExceeded
2 |
3 |
4 | class Deezer(MetadataInterface):
5 | name = "Deezer"
6 | identifier = "deezer"
7 |
8 | settings = {
9 | }
10 |
11 | metadata = {
12 | #"trackurl": "https://api.deezer.com/search?q={artist}%20{title}",
13 | "artisturl": "https://api.deezer.com/search?q={artist}",
14 | "albumurl": "https://api.deezer.com/search?q={artist}%20{title}",
15 | "response_type":"json",
16 | #"response_parse_tree_track": ["data",0,"album","cover_medium"],
17 | "response_parse_tree_artist": ["data",0,"artist","picture_medium"],
18 | "response_parse_tree_album": ["data",0,"album","cover_medium"],
19 | "required_settings": [],
20 | "enabled_entity_types": ["artist","album"]
21 | }
22 |
23 | delay = 1
24 |
25 | def get_image_track(self,track):
26 | return None
27 | # we can use the album pic from the track search,
28 | # but should do so via maloja logic
29 |
30 |
31 | def handle_json_result_error(self,result):
32 | if result.get('data') == []:
33 | return True
34 | if result.get('error',{}).get('code',None) == 4:
35 | self.delay += 1
36 | # this is permanent (for the lifetime of the process)
37 | # but that's actually ok
38 | # since hitting the rate limit means we are doing this too fast
39 | # and these requests arent really time sensitive
40 | raise RateLimitExceeded()
41 |
--------------------------------------------------------------------------------
/dev/write_tags.py:
--------------------------------------------------------------------------------
1 | """
2 | Read the changelogs / version metadata and create all git tags
3 | """
4 |
5 | import os
6 | import subprocess as sp
7 | import yaml
8 |
9 | FOLDER = "dev/releases"
10 |
11 | releases = {}
12 | for f in os.listdir(FOLDER):
13 | if f == "branch.yml": continue
14 | #maj,min = (int(i) for i in f.split('.')[:2])
15 |
16 | with open(os.path.join(FOLDER,f)) as fd:
17 | data = yaml.safe_load(fd)
18 |
19 | name = data.pop('minor_release_name')
20 |
21 | for tag in data:
22 | tagtup = tuple(int(i) for i in tag.split('.'))
23 | releases[tagtup] = data[tag]
24 |
25 | # this is a bit dirty, works on our data
26 | if len(tagtup)<3 or tagtup[2] == 0: releases[tagtup]['name'] = name
27 |
28 |
29 | for version in releases:
30 |
31 | info = releases[version]
32 | version = '.'.join(str(v) for v in version)
33 | msg = [
34 | f"Version {version}" + (f" '{info.get('name')}'" if info.get('name') else ''),
35 | *([""] if info.get('notes') else []),
36 | *[f"* {n}" for n in info.get('notes',[])]
37 | ]
38 |
39 |
40 | cmd = [
41 | 'git','tag','--force',
42 | '-a',f'v{version}',
43 | '-m',
44 | '\n'.join(msg),
45 | info['commit']
46 | ]
47 |
48 | try:
49 | prev_tag = sp.check_output(["git","show",f'v{maj}.{min}.{hot}']).decode()
50 | prev_tag_commit = prev_tag.split('\n')[6].split(" ")[1]
51 | except Exception:
52 | pass
53 | else:
54 | assert prev_tag_commit == info['commit']
55 |
56 | print(cmd)
57 | sp.run(cmd)
58 |
--------------------------------------------------------------------------------
/dev/releases/2.12.yml:
--------------------------------------------------------------------------------
1 | minor_release_name: "Tzuyu"
2 | 2.12.0:
3 | commit: "723efcb8ba12f7bda9acc21d81d9930265881c15"
4 | 2.12.1:
5 | commit: "a42ed56d2de47f88f873737f0f1374e99be895bf"
6 | 2.12.2:
7 | commit: "5006ad2bf1a6d5132ed07d28a7f6f0a9a454d5a7"
8 | 2.12.3:
9 | commit: "2a5d9498d1dd7bb6ac62a27d518a87542ec3f344"
10 | 2.12.4:
11 | commit: "06c32e205e95df8d3d1e27876887b7da7aa2bdf4"
12 | 2.12.5:
13 | commit: "c2f8ecc2dfa1ac4febde228fce150e08fb47be38"
14 | 2.12.6:
15 | commit: "a652a22a96ab693a4e7c3271520e6ad79fa025af"
16 | 2.12.7:
17 | commit: "5455abd0d1c9ecc8e000d04257f721babacb18e9"
18 | 2.12.8:
19 | commit: "8ebd27ab76ad2dcaf1dfef0cc171900fa20d5ee5"
20 | 2.12.9:
21 | commit: "49598e914f4e2d7895959bea954238db8a6cee78"
22 | 2.12.10:
23 | commit: "9037403777faa089092cf103181027febf6f0340"
24 | 2.12.12:
25 | commit: "eaaa0f3b53aa102ba1eb709c1803e94752017d86"
26 | 2.12.13:
27 | commit: "c31770a34c96cecc87af78f861819cc49fe98dda"
28 | 2.12.14:
29 | commit: "5157ce825eea9bf7b74123cb02dd28e25c6a0767"
30 | 2.12.15:
31 | commit: "33af60ed2c8c980f17338827a9cb96e7f2fd2572"
32 | 2.12.16:
33 | commit: "26dfdfb569d0beaf4ba8c6c67a9e2295d1362eed"
34 | 2.12.17:
35 | commit: "21012234409c01fec3cb5c506f0b4ba74b735b0b"
36 | 2.12.18:
37 | commit: "59eaa2264aefa6c9ed5f38e8490f77150bcae27b"
38 | 2.12.19:
39 | commit: "8958eb1b547f07d5d063c46cbe59ec57e000ecae"
40 | 2.12.20:
41 | commit: "7774d9a9361db986092e143e1bc397ce7a7524dd"
42 |
--------------------------------------------------------------------------------
/maloja/data_files/config/rules/predefined/krateng_masseffect.tsv:
--------------------------------------------------------------------------------
1 | # NAME: Mass Effect Soundtrack
2 | # DESC: Sets correct artists for the Mass Effect soundtracks
3 |
4 | # 1
5 | fixartists Jack Wall␟Sam Hulick Mass Effect Theme
6 | fixartists Richard Jacques␟Jack Wall␟Sam Hulick Spectre Induction
7 | fixartists Richard Jacques␟Jack Wall␟Sam Hulick The Citadel
8 | fixartists Richard Jacques␟Jack Wall The Thorian
9 | fixartists Richard Jacques␟Jack Wall␟Sam Hulick The Alien Queen
10 | fixartists Jack Wall␟Sam Hulick Breeding Ground
11 | fixartists Jack Wall␟Sam Hulick In Pursuit of Saren
12 | fixartists David Kates␟Jack Wall␟Sam Hulick Infusion
13 | fixartists David Kates␟Jack Wall␟Sam Hulick Final Assault
14 |
15 | # 2
16 | fixartists Jack Wall␟David Kates Thane
17 | fixartists Jack Wall␟Sam Hulick The Normandy Attacked
18 | fixartists Jack Wall␟Brian DiDomenico The Collector Base
19 | fixartists Jack Wall␟Sam Hulick New Worlds
20 |
21 | # 3
22 | fixartists Sascha Dikiciyan␟Cris Velasco The Ardat-Yakshi
23 | fixartists Sascha Dikiciyan␟Cris Velasco Rannoch
24 | fixartists Sascha Dikiciyan␟Cris Velasco I'm Sorry
25 | fixartists Sascha Dikiciyan␟Cris Velasco The Scientists
26 | fixartists Sascha Dikiciyan␟Cris Velasco Aralakh Company
27 | fixartists Sascha Dikiciyan␟Cris Velasco Prothean Beacon
28 | fixartists Sascha Dikiciyan␟Cris Velasco Reaper Chase
29 | fixartists Clint Mansell␟Sam Hulick An End, Once and For All
30 |
--------------------------------------------------------------------------------
/maloja/web/jinja/partials/awards_track.jinja:
--------------------------------------------------------------------------------
1 | {% macro medals(info) %}
2 |
3 |
4 | {% for year in info.medals.gold -%}
5 |
6 | {{ year }}
7 |
8 | {%- endfor %}
9 | {% for year in info.medals.silver -%}
10 |
11 | {{ year }}
12 |
13 | {%- endfor %}
14 | {% for year in info.medals.bronze -%}
15 |
16 | {{ year }}
17 |
18 | {%- endfor %}
19 |
20 | {% if info.medals.gold or info.medals.silver or info.medals.bronze %}
21 |
22 | {% endif %}
23 |
24 | {%- endmacro %}
25 |
26 |
27 |
28 |
29 |
30 |
31 |
32 |
33 | {% macro topweeks(info) %}
34 |
35 | {% set encodedtrack = mlj_uri.uriencode({'track':info.track}) %}
36 |
37 |
38 |
39 | {% if info.topweeks > 0 %}
40 |
41 | 
{{ info.topweeks }}
42 |
43 | {% endif %}
44 |
45 |
46 | {% if info.topweeks > 0 %}
47 |
48 | {% endif %}
49 |
50 | {%- endmacro %}
51 |
52 |
53 |
--------------------------------------------------------------------------------
/maloja/web/jinja/partials/scrobbles.jinja:
--------------------------------------------------------------------------------
1 | {% set scrobbles = dbc.get_scrobbles(filterkeys,limitkeys,amountkeys) %}
2 |
3 | {% set firstindex = amountkeys.page * amountkeys.perpage %}
4 | {% set lastindex = firstindex + amountkeys.perpage %}
5 |
6 | {% import 'snippets/entityrow.jinja' as entityrow %}
7 |
8 |
9 | | {{ malojatime.timestamp_desc(s["time"],short=shortTimeDesc) }} | 13 | {{ entityrow.row(s.track) }} 14 | {% if adminmode %} 15 | 16 |17 | 18 | 19 | 20 | 21 | 22 | 23 | 24 | {% include 'icons/reparse.jinja' %} 25 | 26 | 27 | 28 | 29 | 30 | 31 | 32 | 33 | 34 | 35 | 36 | {% include 'icons/delete.jinja' %} 37 | 38 | 39 | 40 | | 41 | {% endif %} 42 |
| {{ thisrange.desc() }} | 16 | 17 | {% if artist is none %} 18 |19 | | n/a | 20 |0 | 21 |22 | {% else %} 23 | {{ entityrow.row(artist,counting=([] if specialkeys.separate else e.associated_artists)) }} 24 | | {{ links.link_scrobbles([{'artist':artist,'associated':(not specialkeys.separate),'timerange':thisrange}],amount=e.scrobbles) }} | 25 |26 | {{ links.link_scrobbles([{'artist':e['artist'],'associated':False,'timerange':e.range}],percent=e['real_scrobbles']*100/maxbar) }} 27 | {%- if e['real_scrobbles'] != e['scrobbles'] -%} 28 | {{ links.link_scrobbles([{'artist':e['artist'],'associated':True,'timerange':e.range}],percent=(e['scrobbles']-e['real_scrobbles'])*100/maxbar) }} 29 | {%- endif %} 30 | | 31 | {% endif %} 32 | 33 |
|
12 | {% if adminmode %}
13 |
18 | {% else %}
19 |
20 |
21 | {% endif %}
22 | |
23 |
24 | {{ links.links(album.artists) }} 25 | {% if condensed %}{% endif %} 26 | {{ info.album.albumtitle | e }}27 | {%- if condensed -%}{% endif %} 28 | #{{ info.position }} 29 |30 | 31 | 32 | {{ info['scrobbles'] }} Scrobbles 33 | 34 | 35 | 36 | 37 | 38 | 39 | {{ awards.medals(info) }} 40 | {{ awards.topweeks(info) }} 41 | {{ awards.subcerts(info) }} 42 | 43 | |
44 |
| 27 | 28 | | 29 |
30 | Scrobbles31 | {{ filterdesc.desc(filterkeys,limitkeys) }} 32 | 33 | {{ totalscrobbles }} Scrobbles 34 |35 | {% with delimitkeys = {} %} 36 | {% include 'snippets/timeselection.jinja' %} 37 | {% endwith %} 38 | 39 | |
40 |
| 26 | 27 | | 28 |
29 | Track ChartsView #1 Tracks30 | {{ filterdesc.desc(filterkeys,limitkeys) }} 31 | 32 | {% with delimitkeys = {} %} 33 | {% include 'snippets/timeselection.jinja' %} 34 | {% endwith %} 35 | 36 | |
37 |
43 | {% endif %} 44 | 45 | {% with compare=true %} 46 | {% include 'partials/charts_tracks.jinja' %} 47 | {% endwith %} 48 | 49 | {% import 'snippets/pagination.jinja' as pagination %} 50 | {{ pagination.pagination(filterkeys,limitkeys,delimitkeys,amountkeys,pages) }} 51 | 52 | {% endblock %} 53 | -------------------------------------------------------------------------------- /maloja/web/jinja/charts_artists.jinja: -------------------------------------------------------------------------------- 1 | {% extends "abstracts/base.jinja" %} 2 | {% block title %}Maloja - Artist Charts{% endblock %} 3 | 4 | {% import 'snippets/filterdescription.jinja' as filterdesc %} 5 | 6 | {% block scripts %} 7 | 8 | {% endblock %} 9 | 10 | {% set charts = dbc.get_charts_artists(filterkeys,limitkeys,specialkeys) %} 11 | 12 | 13 | 14 | {% set pages = math.ceil(charts.__len__() / amountkeys.perpage) %} 15 | {% if charts[0] is defined %} 16 | {% set topartist = charts[0].artist %} 17 | {% set img = images.get_artist_image(topartist) %} 18 | {% else %} 19 | {% set img = "/favicon.png" %} 20 | {% endif %} 21 | 22 | 23 | 24 | {% block content %} 25 | 26 |
| 29 | 30 | | 31 |
32 | Artist ChartsView #1 Artists33 | {{ filterdesc.desc(filterkeys,limitkeys) }} 34 | 35 | {% with delimitkeys = {}, artistchart=True %} 36 | {% include 'snippets/timeselection.jinja' %} 37 | {% endwith %} 38 | 39 | |
40 |
46 | {% endif %} 47 | 48 | {% with compare=true %} 49 | {% include 'partials/charts_artists.jinja' %} 50 | {% endwith %} 51 | 52 | {% import 'snippets/pagination.jinja' as pagination %} 53 | {{ pagination.pagination(filterkeys,limitkeys,delimitkeys,amountkeys,pages) }} 54 | 55 | {% endblock %} 56 | -------------------------------------------------------------------------------- /maloja/web/jinja/charts_albums.jinja: -------------------------------------------------------------------------------- 1 | {% extends "abstracts/base.jinja" %} 2 | {% block title %}Maloja - Album Charts{% endblock %} 3 | 4 | {% import 'snippets/links.jinja' as links %} 5 | {% import 'snippets/filterdescription.jinja' as filterdesc %} 6 | 7 | {% block scripts %} 8 | 9 | {% endblock %} 10 | 11 | {% set charts = dbc.get_charts_albums(filterkeys,limitkeys,{'only_own_albums':False}) %} 12 | {% set pages = math.ceil(charts.__len__() / amountkeys.perpage) %} 13 | {% if charts[0] is defined %} 14 | {% set topalbum = charts[0].album %} 15 | {% set img = images.get_album_image(topalbum) %} 16 | {% else %} 17 | {% set img = "/favicon.png" %} 18 | {% endif %} 19 | 20 | 21 | {% block content %} 22 | 23 |
| 26 | 27 | | 28 |
29 | Album ChartsView #1 Albums30 | {{ filterdesc.desc(filterkeys,limitkeys) }} 31 | 32 | {% with delimitkeys = {} %} 33 | {% include 'snippets/timeselection.jinja' %} 34 | {% endwith %} 35 | 36 | |
37 |
43 | {% endif %} 44 | 45 | {% with compare=true %} 46 | {% include 'partials/charts_albums.jinja' %} 47 | {% endwith %} 48 | 49 | {% import 'snippets/pagination.jinja' as pagination %} 50 | {{ pagination.pagination(filterkeys,limitkeys,delimitkeys,amountkeys,pages) }} 51 | 52 | {% endblock %} 53 | -------------------------------------------------------------------------------- /maloja/web/static/js/notifications.js: -------------------------------------------------------------------------------- 1 | // JS for feedback to the user whenever any XHTTP action is taken 2 | 3 | const colors = { 4 | 'error': 'red', 5 | 'warning':'#8ACC26', 6 | 'info':'green' 7 | } 8 | 9 | 10 | const notification_template = info => ` 11 |
12 | ${info.title}
13 | ${info.body} 14 | 15 |
16 | `
17 |
18 | function htmlToElement(html) {
19 | template = document.createElement('template');
20 | html = html.trim();
21 | template.innerHTML = html;
22 | return template.content.firstChild;
23 | }
24 |
25 | function notify(title,msg,notification_type='info',reload=false) {
26 | info = {
27 | 'title':title,
28 | 'body':msg,
29 | 'notification_type':notification_type
30 | }
31 |
32 | var element = htmlToElement(notification_template(info));
33 |
34 | document.getElementById('notification_area').append(element);
35 |
36 | setTimeout(function(e){e.remove();},7000,element);
37 | }
38 |
39 | function notifyCallback(request) {
40 | var response = request.response;
41 | var status = request.status;
42 |
43 | if (status == 200) {
44 | if (response.hasOwnProperty('warnings') && response.warnings.length > 0) {
45 | var notification_type = 'warning';
46 | }
47 | else {
48 | var notification_type = 'info';
49 | }
50 |
51 | var title = "Success!";
52 | var msg = response.desc || response;
53 | }
54 | else {
55 | var notification_type = 'error';
56 | var title = "Error: " + response.error.type;
57 | var msg = response.error.desc || "";
58 | }
59 |
60 |
61 | notify(title,msg,notification_type);
62 | }
63 |
--------------------------------------------------------------------------------
/maloja/apis/__init__.py:
--------------------------------------------------------------------------------
1 | from ._apikeys import apikeystore
2 |
3 |
4 | import copy
5 | from bottle import redirect, request, response
6 | from urllib.parse import urlencode
7 |
8 |
9 |
10 | def init_apis(server):
11 |
12 | from . import native_v1
13 | from .audioscrobbler import Audioscrobbler
14 | from .audioscrobbler_legacy import AudioscrobblerLegacy
15 | from .listenbrainz import Listenbrainz
16 |
17 | native_apis = [
18 | native_v1.api
19 | ]
20 | standardized_apis = [
21 | Listenbrainz(),
22 | Audioscrobbler(),
23 | AudioscrobblerLegacy()
24 | ]
25 |
26 | for api in native_apis:
27 | api.mount(server=server,path="apis/"+api.__apipath__)
28 |
29 | for api in standardized_apis:
30 | aliases = api.__aliases__
31 | canonical = aliases[0]
32 | api.nimrodelapi.mount(server=server,path="apis/" + canonical)
33 |
34 | # redirects
35 | for alias in aliases[1:]:
36 | altpath = "/apis/" + alias + "/13 | ${info.body} 14 | 15 |
|
12 | {% if adminmode %}
13 |
18 | {% else %}
19 |
20 |
21 | {% endif %}
22 | |
23 |
24 | {{ links.links(track.artists) }} 25 | {% if condensed %}{% endif %} 26 | {{ info.track.title | e }}27 | {%- if condensed -%}{% endif %} 28 | #{{ info.position }} 29 |30 | {% if info.track.album %} 31 | from {{ links.link(info.track.album) }} 32 | {% endif %} 33 | 34 | 35 | {% if adminmode %}{% endif %} 36 | {{ info['scrobbles'] }} Scrobbles 37 | 38 | 39 | 40 | 41 | 42 | 43 | {{ awards.medals(info) }} 44 | {{ awards.topweeks(info) }} 45 | 46 | 47 | |
48 |
|
8 |
9 |
10 |
11 | |
12 |
13 | Maloja14 |15 | Version {{ pkginfo.VERSION }} 16 | {# {% if adminmode %} 17 | Python {{ platform.sys.version }} 18 | {{ platform.system() }} {{ platform.release() }} ({{ platform.machine() }}) 19 | 20 | {% set pid = psutil.os.getpid() %} 21 | {% set proc = psutil.Process(pid) %} 22 | CPU: 23 | {{ proc.cpu_percent() | int }}% Maloja, 24 | {{ (psutil.getloadavg()[2]/psutil.os.cpu_count() * 100) | int }}% System 25 | 26 | RAM: 27 | {{ (proc.memory_info().rss / (1024*1024)) | int }}MB Maloja ({{ proc.memory_percent() | int }}%), 28 | {{ (psutil.virtual_memory().used / (1024*1024)) | int }}MB System ({{ psutil.virtual_memory().percent | int }}%) 29 | {% endif %} #} 30 | 31 | 32 | 33 | 34 | 35 | 36 | 37 | |
38 |
43 | 44 |
45 |
46 |
47 | 
48 |
49 |
50 | 
51 |
52 | 53 | Maloja is released under the GNU General Public License v3.0. 54 | 55 | {% endblock %} 56 | -------------------------------------------------------------------------------- /maloja/web/static/js/statselect.js: -------------------------------------------------------------------------------- 1 | localStorage = window.localStorage; 2 | 3 | function showStats(identifier,unit) { 4 | // Make all modules disappear 5 | var modules = document.getElementsByClassName("stat_module_" + identifier); 6 | for (var i=0;i
5 |
6 |
7 | {% for entry in dbc.get_charts_albums(filterkeys,limitkeys,{'only_own_albums':True}) %}
8 |
9 | {%- set cert = None -%}
10 | {%- if entry.scrobbles >= settings.scrobbles_gold_album -%}{% set cert = 'gold' %}{%- endif -%}
11 | {%- if entry.scrobbles >= settings.scrobbles_platinum_album -%}{% set cert = 'platinum' %}{%- endif -%}
12 | {%- if entry.scrobbles >= settings.scrobbles_diamond_album -%}{% set cert = 'diamond' %}{%- endif -%}
13 |
14 |
15 |
27 | {% endfor %}
28 |
29 | {% for entry in dbc.get_charts_albums(filterkeys,limitkeys,{'only_own_albums':False}) %}
30 |
31 |
32 | {% if info.artist not in (entry.album.artists or []) %}
33 |
34 | {%- set cert = None -%}
35 | {%- if entry.scrobbles >= settings.scrobbles_gold_album -%}{% set cert = 'gold' %}{%- endif -%}
36 | {%- if entry.scrobbles >= settings.scrobbles_platinum_album -%}{% set cert = 'platinum' %}{%- endif -%}
37 | {%- if entry.scrobbles >= settings.scrobbles_diamond_album -%}{% set cert = 'diamond' %}{%- endif -%}
38 |
39 |
40 |
52 |
53 | {% endif %}
54 | {% endfor %}
55 |
56 |
57 |
--------------------------------------------------------------------------------
/maloja/data_files/state/images/images.info:
--------------------------------------------------------------------------------
1 | In this folder, you can save custom images for artists and tracks in case you
2 | don't like the ones provided by Last.FM, you don't want to use Last.FM or it's
3 | missing some artists / tracks that are important to you.
4 |
5 | For artists, you can use a .jpg, .jpeg, .png or .gif image that is named like
6 | the artist, but with all non-alphanumeric characters removed. You may also chose
7 | the safe route and omit everything but numbers and latin characters (except the
8 | dot separating the name and the extension). You can either capitalize exactly as
9 | the title or use only lower case, but not use arbitrary capizalization. In case
10 | you want to have multiple images of the same format, you may create a folder
11 | named like the artist and add any images inside. So, for example, if your artist
12 | is "Dal★Shabet", all these files would be considered:
13 |
14 | DalShabet.jpg
15 | dalshabet.png
16 | DalShabet/bestimage.jpeg
17 | dalshabet/serri_only.png
18 |
19 | The following files would not be considered:
20 |
21 | Dal★Shabet.png (non-alphanumeric character)
22 | Dalshabet.gif (wrong capitalization)
23 | DalShabet.webm (wrong extension)
24 | DalShabet/SomeoneLikeU_MV.mp4 (wrong extension)
25 | Dal★Shabet/party.png (non-alphanumeric character in folder)
26 |
27 |
28 |
29 | The same concept applies to tracks, however their name consists of all artists
30 | joined by a dash (-), then an underscore (_) and the track title. Artists should
31 | be joined in alphabetical order, but filenames with the wrong order might still
32 | work for a low artist number. Rules as above apply, so if your track was named
33 | "Epic Crossover 파티 협동" and it was performed by HyunA, Dal★Shabet and Taylor
34 | Swift, the following files would be considered:
35 |
36 | DalShabet-HyunA-TaylorSwift_EpicCrossover.jpg
37 | DalShabet-TaylorSwift-HyunA_EpicCrossover파티협동.png
38 | dalshabet-hyuna-taylorswift_epiccrossover/albumcover.png
39 | DalShabet-HyunA-TaylorSwift_EpicCrossover파티협동/dancing.gif
40 |
41 | Not accepted would be:
42 |
43 | DalShabet-HyunA-Taylor Swift_epiccrossover.jpg (wrong capitalization)
44 |
--------------------------------------------------------------------------------
/maloja/web/jinja/partials/info_artist.jinja:
--------------------------------------------------------------------------------
1 | {% import 'snippets/links.jinja' as links %}
2 | {% import 'partials/awards_artist.jinja' as awards with context %}
3 |
4 |
5 | {% set artist = filterkeys.artist %}
6 | {% set info = dbc.artist_info({'artist':artist}) %}
7 | {% set encodedartist = mlj_uri.uriencode({'artist':artist}) %}
8 |
9 | {% set credited = info.get('replace') %}
10 | {% set included = info.get('associated') %}
11 |
12 | {% if credited is not none %}
13 | {% set competes = false %}
14 | {% else %}
15 | {% set credited = artist %}
16 | {% set competes = true %}
17 | {% endif %}
18 |
19 |
20 | | 17 | 18 | 19 | 20 | |
|
22 | {{ links.links(entry.album.artists) }} 23 | {{ links.link(entry.album) }} 24 | |
| Appears on |
| 42 | 43 | 44 | 45 | |
|
47 | {{ links.links(entry.album.artists) }} 48 | {{ links.link(entry.album) }} 49 | |
|
23 | {% if adminmode %}
24 |
29 | {% else %}
30 |
31 |
32 | {% endif %}
33 | |
34 |
35 | {% if condensed %}{% endif %}
36 | {{ info.artist | e }}37 | {%- if condensed -%}{% endif %} 38 | {% if competes and info['scrobbles']>0 %}#{{ info.position }}{% endif %} 39 |40 | {% if competes and included and (not condensed) %} 41 | associated: {{ links.links(included) }} 42 | {% elif not competes %} 43 | Competing under {{ links.link(credited) }} (#{{ info.position }}) 44 | {% endif %} 45 | 46 | 47 | {{ info['scrobbles'] }} Scrobbles 48 | 49 | 50 | 51 | 52 | 53 | {% if competes %} 54 | {{ awards.medals(info) }} 55 | {{ awards.topweeks(info) }} 56 | {% endif %} 57 | {{ awards.subcerts(artist) }} 58 | 59 | 60 | |
61 |
Featured
4 | 5 | {% set featured = dbc.get_featured() %} 6 | 7 | {% set entitytypes = [ 8 | {'identifier':'artist','localisation':"Artist", 'template':"info_artist.jinja", 'filterkeys':{"artist": featured.artist } }, 9 | {'identifier':'track','localisation':"Track", 'template':"info_track.jinja", 'filterkeys':{"track": featured.track } }, 10 | {'identifier':'album','localisation':"Album", 'template':"info_album.jinja", 'filterkeys':{"album": featured.album } } 11 | ] %} 12 | 13 | 14 | {% for t in entitytypes -%} 15 | 16 | {{ t.localisation }} 17 | 18 | {{ "|" if not loop.last }} 19 | {%- endfor %} 20 | 21 |22 | 23 | 24 | {% for t in entitytypes -%} 25 | 34 | {%- endfor %} 35 | 36 | 37 | 38 | 39 | 66 | -------------------------------------------------------------------------------- /maloja/web/jinja/partials/awards_album.jinja: -------------------------------------------------------------------------------- 1 | {% import 'snippets/links.jinja' as links %} 2 | 3 | {% macro medals(info) %} 4 | 5 | 6 | {% for year in info.medals.gold -%} 7 | 8 | {{ year }} 9 | 10 | {%- endfor %} 11 | {% for year in info.medals.silver -%} 12 | 13 | {{ year }} 14 | 15 | {%- endfor %} 16 | {% for year in info.medals.bronze -%} 17 | 18 | {{ year }} 19 | 20 | {%- endfor %} 21 | 22 | {% if info.medals.gold or info.medals.silver or info.medals.bronze %} 23 | 24 | {% endif %} 25 | 26 | {%- endmacro %} 27 | 28 | 29 | 30 | 31 | 32 | 33 | 34 | 35 | {% macro topweeks(info) %} 36 | 37 | {% set encodedalbum = mlj_uri.uriencode({'album':info.album}) %} 38 | 39 | 40 | 41 | {% if info.topweeks > 0 -%} 42 | 43 |
{{ info.topweeks }}
44 | {%- endif %}
45 |
46 |
47 | {% if info.topweeks > 0 %}
48 |
49 | {% endif %}
50 |
51 | {%- endmacro %}
52 |
53 |
54 |
55 | {% macro subcerts(album) %}
56 |
57 |
58 |
59 | {% set charts = dbc.get_charts_tracks({'album':album.album,'timerange':malojatime.alltime()}) %}
60 | {% for e in charts -%}
61 | {%- if e.scrobbles >= settings.scrobbles_gold -%}{% set cert = 'gold' %}{%- endif -%}
62 | {%- if e.scrobbles >= settings.scrobbles_platinum -%}{% set cert = 'platinum' %}{%- endif -%}
63 | {%- if e.scrobbles >= settings.scrobbles_diamond -%}{% set cert = 'diamond' %}{%- endif -%}
64 |
65 | {%- if cert -%}
66 |
67 | {% include 'icons/cert_track.jinja' %}
68 |
69 | {%- endif %}
70 |
71 | {%- endfor %}
72 |
73 | {%- endmacro %}
--------------------------------------------------------------------------------
/dev/releases/3.0.yml:
--------------------------------------------------------------------------------
1 | minor_release_name: "Yeonhee"
2 | 3.0.0:
3 | commit: "f31c95228eb2dc01e661be928ffd881c063377da"
4 | notes:
5 | - "[Architecture] Switched to SQLite for main database"
6 | - "[Architecture] Switched to SQLite for artwork cache"
7 | - "[Feature] Added scrobble deletion from web interface"
8 | 3.0.1:
9 | commit: "700b81217cb585df631d6f069243c56074cd1b71"
10 | notes:
11 | - "[Bugfix] Fixed upgrading imported scrobbles"
12 | 3.0.2:
13 | commit: "4a8221f7a08f679b21c1fb619f03e5f922a1dc2b"
14 | notes:
15 | - "[Logging] Cleaned up output for waitress warnings"
16 | - "[Bugfix] Fixed exception in native API"
17 | 3.0.3:
18 | commit: "1d9247fc724d7410b6e50d2cbfaa8f375d5e70af"
19 | notes:
20 | - "[Documentation] Added descriptions for native API endpoints"
21 | - "[Code Health] Made arguments for native API scrobbling explicit"
22 | - "[Bugfix] Fixed faulty entity type recognition for artists including the string 'artists'"
23 | - "[Bugfix] Fixed OS return codes"
24 | 3.0.4:
25 | commit: "206ebd58ea204e0008f2c9bf72d76dd9918fec53"
26 | notes:
27 | - "[Feature] Enabled dual stack for web server"
28 | - "[Feature] Added better feedback to native API endpoints"
29 | - "[Bugfix] Fixed native API receiving superfluous keywords"
30 | - "[Bugfix] Fixed crash when importing scrobbles with artists with similar names"
31 | 3.0.5:
32 | commit: "fe21894c5ecf3a53c9c5c00453abfc7f41c6a83e"
33 | notes:
34 | - "[Feature] Added notification system for web interface"
35 | - "[Bugfix] Fixed crash when encountering error in Lastfm import"
36 | 3.0.6:
37 | commit: "b3d4cb7a153845d1f5a5eef67a6508754e338f2f"
38 | notes:
39 | - "[Performance] Implemented search in database"
40 | - "[Bugfix] Better parsing of featuring artists"
41 | - "[Bugfix] Fixed buffered output in Docker"
42 | - "[Bugfix] Fixed importing a Spotify file without path"
43 | - "[Bugfix] No longer releasing database lock during scrobble creation"
44 | - "[Distribution] Experimental arm64 image"
45 | 3.0.7:
46 | commit: "62abc319303a6cb6463f7c27b6ef09b76fc67f86"
47 | notes:
48 | - "[Bugix] Improved signal handling"
49 | - "[Bugix] Fixed constant re-caching of all-time stats, significantly increasing page load speed"
50 | - "[Logging] Disabled cache information when cache is not used"
51 | - "[Distribution] Experimental arm/v7 image"
52 |
--------------------------------------------------------------------------------
/Containerfile:
--------------------------------------------------------------------------------
1 | FROM lsiobase/alpine:3.21 AS base
2 |
3 | WORKDIR /usr/src/app
4 |
5 |
6 |
7 | COPY --chown=abc:abc ./requirements.txt ./requirements.txt
8 |
9 | # based on https://github.com/linuxserver/docker-pyload-ng/blob/main/Dockerfile
10 | # everything but the app installation is run in one command so we can purge
11 | # all build dependencies and cache in the same layer
12 | # it may be possible to decrease image size slightly by using build stage and
13 | # copying all site-packages to runtime stage but the image is already pretty small
14 | RUN \
15 | echo "" && \
16 | echo "**** install build packages ****" && \
17 | apk add --no-cache --virtual=build-deps \
18 | gcc \
19 | g++ \
20 | python3-dev \
21 | libxml2-dev \
22 | libxslt-dev \
23 | libffi-dev \
24 | libc-dev \
25 | py3-pip \
26 | linux-headers && \
27 | echo "" && \
28 | echo "**** install runtime packages ****" && \
29 | apk add --no-cache \
30 | python3 \
31 | py3-lxml \
32 | libmagic \
33 | tzdata && \
34 | echo "" && \
35 | echo "**** install pip dependencies ****" && \
36 | python3 -m venv /venv && \
37 | . /venv/bin/activate && \
38 | python3 -m ensurepip && \
39 | pip install -U --no-cache-dir \
40 | pip \
41 | wheel && \
42 | echo "" && \
43 | echo "**** install maloja requirements ****" && \
44 | pip install --no-cache-dir -r requirements.txt && \
45 | echo "" && \
46 | echo "**** cleanup ****" && \
47 | apk del --purge \
48 | build-deps && \
49 | rm -rf \
50 | /tmp/* \
51 | ${HOME}/.cache
52 |
53 | # actual installation in extra layer so we can cache the stuff above
54 |
55 | COPY --chown=abc:abc . .
56 |
57 | RUN \
58 | echo "" && \
59 | echo "**** install maloja ****" && \
60 | apk add --no-cache --virtual=install-deps \
61 | py3-pip && \
62 | python3 -m venv /venv && \
63 | . /venv/bin/activate && \
64 | pip3 install /usr/src/app && \
65 | apk del --purge \
66 | install-deps && \
67 | rm -rf \
68 | /tmp/* \
69 | ${HOME}/.cache
70 |
71 |
72 |
73 | COPY container/root/ /
74 |
75 | ENV \
76 | # Docker-specific configuration
77 | MALOJA_SKIP_SETUP=yes \
78 | MALOJA_CONTAINER=yes \
79 | PYTHONUNBUFFERED=1 \
80 | # Prevents breaking change for previous container that ran maloja as root
81 | # On linux hosts (non-podman rootless) these variables should be set to the
82 | # host user that should own the host folder bound to MALOJA_DATA_DIRECTORY
83 | PUID=0 \
84 | PGID=0
85 |
86 | EXPOSE 42010
87 |
--------------------------------------------------------------------------------
/maloja/web/jinja/partials/charts_tracks.jinja:
--------------------------------------------------------------------------------
1 | {% import 'snippets/links.jinja' as links %}
2 | {% import 'snippets/entityrow.jinja' as entityrow %}
3 |
4 | {% if charts is undefined %}
5 | {% set charts = dbc.get_charts_tracks(filterkeys,limitkeys) %}
6 | {% endif %}
7 | {% if compare %}
8 | {% if compare is true %}
9 | {% set compare = limitkeys.timerange.next(step=-1) %}
10 | {% if compare is none %}{% set compare = False %}{% endif %}
11 | {% endif %}
12 | {% if compare %}
13 | {% set prevtracks = dbc.get_charts_tracks(filterkeys,{'timerange':compare}) %}
14 |
15 | {% set lastranks = {} %}
16 | {% for t in prevtracks %}
17 | {% if lastranks.update({"|".join(t.track.artists)+"||"+t.track.title:t.rank}) %}{% endif %}
18 | {% endfor %}
19 |
20 | {% for t in charts %}
21 | {% if "|".join(t.track.artists)+"||"+t.track.title in lastranks %}
22 | {% if t.update({'last_rank':lastranks["|".join(t.track.artists)+"||"+t.track.title]}) %}{% endif %}
23 | {% endif %}
24 | {% endfor %}
25 | {% endif %}
26 | {% endif %}
27 |
28 | {% set firstindex = amountkeys.page * amountkeys.perpage %}
29 | {% set lastindex = firstindex + amountkeys.perpage %}
30 |
31 |
32 | {% set maxbar = charts[0]['scrobbles'] if charts != [] else 0 %}
33 | | {%if loop.changed(e.scrobbles) %}#{{ e.rank }}{% endif %} | 39 | 40 | {% if compare %} 41 | {% if e.last_rank is undefined %}🆕 | 42 | {% elif e.last_rank < e.rank %}↘ | 43 | {% elif e.last_rank > e.rank %}↗ | 44 | {% elif e.last_rank == e.rank %}➡ | 45 | {% endif %} 46 | {% endif %} 47 | 48 | 49 | {{ entityrow.row(e['track'],adminmode=adminmode) }} 50 | 51 | 52 |{{ links.link_scrobbles([{'track':e.track,'timerange':limitkeys.timerange}],amount=e['scrobbles']) }} | 53 |{{ links.link_scrobbles([{'track':e.track,'timerange':limitkeys.timerange}],percent=e['scrobbles']*100/maxbar) }} | 54 |
| {%if loop.changed(e.scrobbles) %}#{{ e.rank }}{% endif %} | 39 | 40 | {% if compare %} 41 | {% if e.last_rank is undefined %}🆕 | 42 | {% elif e.last_rank < e.rank %}↘ | 43 | {% elif e.last_rank > e.rank %}↗ | 44 | {% elif e.last_rank == e.rank %}➡ | 45 | {% endif %} 46 | {% endif %} 47 | 48 | 49 | {{ entityrow.row(e['album'],adminmode=adminmode) }} 50 | 51 | 52 |{{ links.link_scrobbles([{'album':e.album,'timerange':limitkeys.timerange}],amount=e['scrobbles']) }} | 53 |{{ links.link_scrobbles([{'album':e.album,'timerange':limitkeys.timerange}],percent=e['scrobbles']*100/maxbar) }} | 54 |
Scrobble new discovery
21 | 22 || 25 | Artists: 26 | | 27 | 28 | | 29 |
| 32 | Title: 33 | | 34 | 35 | | 36 |
| 39 | Album artists (Optional): 40 | | 41 | 42 | | 43 |
| 46 | Album (Optional): 47 | | 48 | 49 | | 50 |
| 53 | 54 | Custom Time: 55 | | 56 |57 | 58 | | 59 |
70 | 71 | 72 | Use track artists as album artists fallback 73 | 74 |
75 | 76 | 77 | 78 | 79 | 80 | 81 | 82 | 83 |
Search
84 | 85 | 86 |87 |
Maloja can identify possible problems with consistency or redundancy in your library. After making any changes, you should rebuild your library.
42 | 43 || The current database wasn't built with all current rules in effect. Any problem below might be a false alarm and fixing it could create redundant rules. | 48 |49 | | |
| {{ links.link(issue[0]) }} is a possible duplicate of {{ links.link(issue[1]) }} | 55 |56 | 57 | | 58 |59 | 60 | | 61 |
| {{ links.link(issue[0]) }} sounds like the combination of {{ issue[1].__len__() }} artists: 67 | {{ issue[1]|join(", ") }} 68 | | 69 |70 | 71 | | 72 ||
| Is '{{ issue[0] }}' in '{{ links.link(issue[1]) }}' an artist? | 78 |79 | 80 | | 81 |
| {%if loop.changed(e.scrobbles) %}#{{ e.rank }}{% endif %} | 42 | 43 | {% if compare %} 44 | {% if e.last_rank is undefined %}🆕 | 45 | {% elif e.last_rank < e.rank %}↘ | 46 | {% elif e.last_rank > e.rank %}↗ | 47 | {% elif e.last_rank == e.rank %}➡ | 48 | {% endif %} 49 | {% endif %} 50 | 51 | 52 | {{ entityrow.row(e['artist'],adminmode=adminmode,counting=([] if specialkeys.separate else e.associated_artists)) }} 53 | 54 | 55 |{{ links.link_scrobbles([{'artist':e['artist'],'associated':(not specialkeys.separate),'timerange':limitkeys.timerange}],amount=e['scrobbles']) }} | 56 |57 | {{ links.link_scrobbles([{'artist':e['artist'],'associated':False,'timerange':limitkeys.timerange}],percent=e['real_scrobbles']*100/maxbar) }} 58 | {%- if e['real_scrobbles'] != e['scrobbles'] -%} 59 | {{ links.link_scrobbles([{'artist':e['artist'],'associated':True,'timerange':limitkeys.timerange}],percent=(e['scrobbles']-e['real_scrobbles'])*100/maxbar) }} 60 | {%- endif %} 61 | | 62 |
{{ info.topweeks }}
46 | {%- endif %}
47 |
48 |
49 | {% if info.topweeks > 0 %}
50 |
51 | {% endif %}
52 |
53 | {%- endmacro %}
54 |
55 |
56 |
57 |
58 |
59 |
60 |
61 |
62 |
63 | {% macro subcerts(artist) %}
64 |
65 |
66 |
67 |
68 | {% set albumcharts = dbc.get_charts_albums({'artist':artist,'timerange':malojatime.alltime(),'resolve_ids':True,'only_own_albums':True}) %}
69 | {% for e in albumcharts -%}
70 | {%- if e.scrobbles >= settings.scrobbles_gold_album -%}{% set cert = 'gold' %}{%- endif -%}
71 | {%- if e.scrobbles >= settings.scrobbles_platinum_album -%}{% set cert = 'platinum' %}{%- endif -%}
72 | {%- if e.scrobbles >= settings.scrobbles_diamond_album -%}{% set cert = 'diamond' %}{%- endif -%}
73 |
74 | {%- if cert -%}
75 |
76 | {% include 'icons/cert_album.jinja' %}
77 |
78 | {%- endif %}
79 |
80 | {%- endfor %}
81 |
82 |
83 | {% set charts = dbc.get_charts_tracks({'artist':artist,'timerange':malojatime.alltime()}) %}
84 | {% for e in charts -%}
85 | {%- if e.scrobbles >= settings.scrobbles_gold -%}{% set cert = 'gold' %}{%- endif -%}
86 | {%- if e.scrobbles >= settings.scrobbles_platinum -%}{% set cert = 'platinum' %}{%- endif -%}
87 | {%- if e.scrobbles >= settings.scrobbles_diamond -%}{% set cert = 'diamond' %}{%- endif -%}
88 |
89 | {%- if cert -%}
90 |
91 | {% include 'icons/cert_track.jinja' %}
92 |
93 | {%- endif %}
94 |
95 | {%- endfor %}
96 |
97 |
98 |
99 | {%- endmacro %}
100 |
--------------------------------------------------------------------------------
/auxiliary/chromium_scrobbler/maloja-scrobbler/sitescript.js:
--------------------------------------------------------------------------------
1 | function getxpath(path,type) {
2 | result = document.evaluate(path, this, null, type, null);
3 |
4 | if (type == XPathResult.FIRST_ORDERED_NODE_TYPE) {
5 | return result.singleNodeValue;
6 | }
7 | else if (type == XPathResult.ORDERED_NODE_ITERATOR_TYPE) {
8 | resultarray = [];
9 | while(node = result.iterateNext()) {
10 | resultarray.push(node);
11 | }
12 |
13 | return resultarray;
14 | }
15 | else if (type == XPathResult.STRING_TYPE) {
16 | return result.stringValue;
17 | }
18 |
19 | // if (path.split("/").slice(-1)[0].startsWith("text()") || path.split("/").slice(-1)[0].startsWith("@")) {
20 | // result = document.evaluate(path, this, null, XPathResult.STRING_TYPE, null);
21 | // return result.stringValue;
22 | // }
23 | // else {
24 | // result = document.evaluate(path, this, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null);
25 | // return result.singleNodeValue;
26 | // }
27 |
28 |
29 | }
30 | Node.prototype.xpath = getxpath;
31 |
32 |
33 | bar = document.xpath(maloja_scrobbler_selector_playbar, XPathResult.FIRST_ORDERED_NODE_TYPE);
34 | if (bar == null) {
35 | console.log("[Maloja Scrobbler] Nothing playing right now!");
36 | chrome.runtime.sendMessage({type:"stopPlayback",time:Math.floor(Date.now()),artist:"",title:""});
37 | }
38 | else {
39 | metadata = bar.xpath(maloja_scrobbler_selector_metadata, XPathResult.FIRST_ORDERED_NODE_TYPE);
40 | duration = bar.xpath(maloja_scrobbler_selector_duration, XPathResult.STRING_TYPE);
41 | duration = duration + '';
42 |
43 |
44 | title = metadata.xpath(maloja_scrobbler_selector_title, XPathResult.STRING_TYPE);
45 | if (typeof maloja_scrobbler_selector_artists !== "undefined") {
46 | artistnodes = metadata.xpath(maloja_scrobbler_selector_artists, XPathResult.ORDERED_NODE_ITERATOR_TYPE);
47 | artists = artistnodes.map(x => x.xpath(maloja_scrobbler_selector_artist, XPathResult.STRING_TYPE));
48 | artist = artists.join(";");
49 | }
50 | else {
51 | artist = metadata.xpath(maloja_scrobbler_selector_artist, XPathResult.STRING_TYPE);
52 | }
53 |
54 |
55 | if (typeof duration_needs_split !== "undefined" && duration_needs_split) {
56 | duration = duration.split("/").slice(-1)[0].trim();
57 | }
58 |
59 | if (duration.split(":").length == 2) {
60 | durationSeconds = parseInt(duration.split(":")[0]) * 60 + parseInt(duration.split(":")[1]);
61 | }
62 | else {
63 | durationSeconds = parseInt(duration.split(":")[0]) * 60 * 60 + parseInt(duration.split(":")[1]) * 60 + parseInt(duration.split(":")[2]);
64 | }
65 |
66 |
67 | control = bar.xpath(maloja_scrobbler_selector_control, XPathResult.STRING_TYPE);
68 | try {
69 | label_playing = maloja_scrobbler_label_playing
70 | }
71 | catch {
72 | label_playing = "Pause"
73 | }
74 | try {
75 | label_paused = maloja_scrobbler_label_paused
76 | }
77 | catch {
78 | label_paused = "Play"
79 | }
80 | if (control == label_paused) {
81 | console.log("[Maloja Scrobbler] Not playing right now");
82 | chrome.runtime.sendMessage({type:"stopPlayback",time:Math.floor(Date.now()),artist:artist,title:title});
83 | //stopPlayback()
84 | }
85 | else if (control == label_playing) {
86 | console.log("[Maloja Scrobbler] Playing " + artist + " - " + title + " (" + durationSeconds + " sec)");
87 | chrome.runtime.sendMessage({type:"startPlayback",time:Math.floor(Date.now()),artist:artist,title:title,duration:durationSeconds});
88 | //startPlayback(artist,title,durationSeconds)
89 | }
90 |
91 | }
92 |
--------------------------------------------------------------------------------
/maloja/thirdparty/lastfm.py:
--------------------------------------------------------------------------------
1 | from . import MetadataInterface, ProxyScrobbleInterface, utf
2 | import hashlib
3 | import requests
4 | import xml.etree.ElementTree as ElementTree
5 | from doreah.logging import log
6 |
7 | class LastFM(MetadataInterface, ProxyScrobbleInterface):
8 | name = "LastFM"
9 | identifier = "lastfm"
10 |
11 | settings = {
12 | "apikey":"LASTFM_API_KEY",
13 | "sk":"LASTFM_API_SK",
14 | "secret":"LASTFM_API_SECRET",
15 | "username":"LASTFM_USERNAME",
16 | "password":"LASTFM_PASSWORD"
17 | }
18 |
19 | proxyscrobble = {
20 | "scrobbleurl": "http://ws.audioscrobbler.com/2.0/",
21 | "response_type":"xml",
22 | "required_settings": ["apikey","sk","secret"],
23 | "activated_setting": "SCROBBLE_LASTFM"
24 | }
25 | metadata = {
26 | #"artisturl": "https://ws.audioscrobbler.com/2.0/?method=artist.getinfo&artist={artist}&api_key={apikey}&format=json"
27 | "trackurl": "https://ws.audioscrobbler.com/2.0/?method=track.getinfo&track={title}&artist={artist}&api_key={apikey}&format=json",
28 | "albumurl": "https://ws.audioscrobbler.com/2.0/?method=album.getinfo&api_key={apikey}&artist={artist}&album={title}&format=json",
29 | "response_type":"json",
30 | "response_parse_tree_track": ["track","album","image",-1,"#text"],
31 | # technically just the album artwork, but we use it for now
32 | #"response_parse_tree_artist": ["artist","image",-1,"#text"],
33 | "response_parse_tree_album": ["album","image",-1,"#text"],
34 | "required_settings": ["apikey"],
35 | "enabled_entity_types": ["track","album"]
36 | }
37 |
38 | def get_image_artist(self,artist):
39 | return None
40 | # lastfm still provides that endpoint with data,
41 | # but doesn't provide actual images
42 |
43 |
44 | def proxyscrobble_parse_response(self,data):
45 | return data.attrib.get("status") == "ok" and data.find("scrobbles").attrib.get("ignored") == "0"
46 |
47 | def proxyscrobble_postdata(self,artists,title,timestamp):
48 | return self.query_compose({
49 | "method":"track.scrobble",
50 | "artist[0]":", ".join(artists),
51 | "track[0]":title,
52 | "timestamp":timestamp,
53 | "api_key":self.settings["apikey"],
54 | "sk":self.settings["sk"]
55 | })
56 |
57 | def authorize(self):
58 | if all(self.settings[key] not in [None,"ASK",False] for key in ["username","password","apikey","secret"]):
59 | try:
60 | response = requests.post(
61 | url=self.proxyscrobble['scrobbleurl'],
62 | params=self.query_compose({
63 | "method":"auth.getMobileSession",
64 | "username":self.settings["username"],
65 | "password":self.settings["password"],
66 | "api_key":self.settings["apikey"]
67 | }),
68 | headers={
69 | "User-Agent":self.useragent
70 | }
71 | )
72 |
73 | data = ElementTree.fromstring(response.text)
74 | self.settings["sk"] = data.find("session").findtext("key")
75 | except Exception as e:
76 | log("Error while authenticating with LastFM: " + repr(e))
77 |
78 |
79 | # creates signature and returns full query
80 | def query_compose(self,parameters):
81 | m = hashlib.md5()
82 | keys = sorted(str(k) for k in parameters)
83 | m.update(utf("".join(str(k) + str(parameters[k]) for k in keys)))
84 | m.update(utf(self.settings["secret"]))
85 | sig = m.hexdigest()
86 | return {**parameters,"api_sig":sig}
87 |
88 | def handle_json_result_error(self,result):
89 | if "track" in result and not result.get("track").get('album',{}):
90 | return True
91 |
92 | if "error" in result and result.get("error") == 6:
93 | return True
94 |
--------------------------------------------------------------------------------
/maloja/web/jinja/snippets/timeselection.jinja:
--------------------------------------------------------------------------------
1 |
2 |
3 |
4 | {% set allkeys = [filterkeys,limitkeys,delimitkeys,amountkeys,specialkeys] | combine_dicts %}
5 |
6 |
7 |
8 | {% if limitkeys != {} %}
9 |
10 |
11 | {% set thisrange = limitkeys.timerange %}
12 | {% set prevrange = thisrange.next(-1) %}
13 | {% set nextrange = thisrange.next(1) %}
14 |
15 | {% if prevrange is not none %}
16 | {{ prevrange.desc() }}
17 | «
18 | {% endif %}
19 | {% if prevrange is not none or nextrange is not none %}
20 | {{ thisrange.desc() }}
21 | {% endif %}
22 | {% if nextrange is not none %}
23 | »
24 | {{ nextrange.desc() }}
25 | {% endif %}
26 |
27 |
28 |
29 |
30 |
31 | {% for r in xcurrent %}
32 | {% if r.range == limitkeys.timerange %}
33 | {{ r.localisation }}
34 | {% elif r.heavy and settings['DISCOURAGE_CPU_HEAVY_STATS'] %}
35 | {{ r.localisation }}
36 | {% else %}
37 | {{ r.localisation }}
38 | {% endif %}
39 | {{ "|" if not loop.last }}
40 | {% endfor %}
41 |
42 | {% endif %}
43 |
44 |
45 | {% if delimitkeys != {} %}
46 |
47 | {% for cat in [xdelimiters,xtrails] %}
48 | {% for r in cat %}
49 | {# {% if all(r.keys[k] == allkeys[k] for k in r.keys) %} #}
50 | {% if r.replacekeys | map('compare_key_in_dicts',r.replacekeys,allkeys) | alltrue %}
51 | {{ r.localisation }}
52 | {% elif r.heavy and settings['DISCOURAGE_CPU_HEAVY_STATS'] %}
53 | {{ r.localisation }}
54 | {% else %}
55 | {{ r.localisation }}
56 | {% endif %}
57 | {{ "|" if not loop.last }}
58 | {% endfor %}
59 |
60 | {% endfor %} 61 |
62 |
63 | {% endif %}
64 |
65 |
67 | {% if ('artist' in filterkeys) and (not artistchart) %}
68 | 60 | {% endfor %} 61 |
69 | {% for o in xassociated %}
70 | {% if o.replacekeys | map('compare_key_in_dicts',o.replacekeys,allkeys) | alltrue %}
71 | {{ o.localisation }}
72 | {% else %}
73 | {{ o.localisation }}
74 | {% endif %}
75 | {{ "|" if not loop.last }}
76 | {% endfor %}
77 |
78 |
79 | {% endif %}
80 |
81 | {% if artistchart %}
82 |
83 | {% for o in xseparate %}
84 | {% if o.replacekeys | map('compare_key_in_dicts',o.replacekeys,allkeys) | alltrue %}
85 | {{ o.localisation }}
86 | {% else %}
87 | {{ o.localisation }}
88 | {% endif %}
89 | {{ "|" if not loop.last }}
90 | {% endfor %}
91 |
92 | {% endif %}
93 |
--------------------------------------------------------------------------------