From 966739e677907e904b5c6d978d6f6d2440eedc3a Mon Sep 17 00:00:00 2001
From: krateng <git.noreply@krateng.ch>
Date: Thu, 28 Dec 2023 01:41:43 +0100
Subject: [PATCH] Clarified setting, close GH-267

---
 maloja/pkg_global/conf.py |  2 +-
 settings.md               | 19 ++++++++++++++-----
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/maloja/pkg_global/conf.py b/maloja/pkg_global/conf.py
index 0d404fd..16b132c 100644
--- a/maloja/pkg_global/conf.py
+++ b/maloja/pkg_global/conf.py
@@ -177,7 +177,7 @@ malojaconfig = Configuration(
 			"name":(tp.String(),												"Name",							"Generic Maloja User")
 		},
 		"Third Party Services":{
-			"metadata_providers":(tp.List(tp.String()),							"Metadata Providers",			['lastfm','spotify','deezer','audiodb','musicbrainz'],	"Which metadata providers should be used in what order. Musicbrainz is rate-limited and should not be used first."),
+			"metadata_providers":(tp.List(tp.String()),							"Metadata Providers",			['lastfm','spotify','deezer','audiodb','musicbrainz'],	"List of which metadata providers should be used in what order. Musicbrainz is rate-limited and should not be used first."),
 			"scrobble_lastfm":(tp.Boolean(),									"Proxy-Scrobble to Last.fm",	False),
 			"lastfm_api_key":(tp.String(),										"Last.fm API Key",				None),
 			"lastfm_api_secret":(tp.String(),									"Last.fm API Secret",			None),
diff --git a/settings.md b/settings.md
index 2038e53..425001b 100644
--- a/settings.md
+++ b/settings.md
@@ -32,14 +32,17 @@ Settings File			| Environment Variable			| Type			| Description
 `cache_expire_negative`	| `MALOJA_CACHE_EXPIRE_NEGATIVE`  | Integer | Days until failed image fetches are reattempted
 `db_max_memory`	| `MALOJA_DB_MAX_MEMORY`  | Integer | RAM Usage in percent at which Maloja should no longer increase its database cache.
 `use_request_cache`	| `MALOJA_USE_REQUEST_CACHE`  | Boolean | Use request-local DB Cache
-`use_global_cache`	| `MALOJA_USE_GLOBAL_CACHE`  | Boolean | Use global DB Cache
+`use_global_cache`	| `MALOJA_USE_GLOBAL_CACHE`  | Boolean | This is vital for Maloja's performance. Do not disable this unless you have a strong reason to.
 **Fluff**
 `scrobbles_gold`	| `MALOJA_SCROBBLES_GOLD`  | Integer | How many scrobbles a track needs to be considered 'Gold' status
 `scrobbles_platinum`	| `MALOJA_SCROBBLES_PLATINUM`  | Integer | How many scrobbles a track needs to be considered 'Platinum' status
 `scrobbles_diamond`	| `MALOJA_SCROBBLES_DIAMOND`  | Integer | How many scrobbles a track needs to be considered 'Diamond' status
+`scrobbles_gold_album`	| `MALOJA_SCROBBLES_GOLD_ALBUM`  | Integer | How many scrobbles an album needs to be considered 'Gold' status
+`scrobbles_platinum_album`	| `MALOJA_SCROBBLES_PLATINUM_ALBUM`  | Integer | How many scrobbles an album needs to be considered 'Platinum' status
+`scrobbles_diamond_album`	| `MALOJA_SCROBBLES_DIAMOND_ALBUM`  | Integer | How many scrobbles an album needs to be considered 'Diamond' status
 `name`	| `MALOJA_NAME`  | String | Name
 **Third Party Services**
-`metadata_providers`	| `MALOJA_METADATA_PROVIDERS`  | List | Which metadata providers should be used in what order. Musicbrainz is rate-limited and should not be used first.
+`metadata_providers`	| `MALOJA_METADATA_PROVIDERS`  | List | List of which metadata providers should be used in what order. Musicbrainz is rate-limited and should not be used first.
 `scrobble_lastfm`	| `MALOJA_SCROBBLE_LASTFM`  | Boolean | Proxy-Scrobble to Last.fm
 `lastfm_api_key`	| `MALOJA_LASTFM_API_KEY`  | String | Last.fm API Key
 `lastfm_api_secret`	| `MALOJA_LASTFM_API_SECRET`  | String | Last.fm API Secret
@@ -55,6 +58,7 @@ Settings File			| Environment Variable			| Type			| Description
 `send_stats`	| `MALOJA_SEND_STATS`  | Boolean | Send Statistics
 `proxy_images`	| `MALOJA_PROXY_IMAGES`  | Boolean | Whether third party images should be downloaded and served directly by Maloja (instead of just linking their URL)
 **Database**
+`album_information_trust`	| `MALOJA_ALBUM_INFORMATION_TRUST`  | Choice | Whether to trust the first album information that is sent with a track or update every time a different album is sent
 `invalid_artists`	| `MALOJA_INVALID_ARTISTS`  | Set | Artists that should be discarded immediately
 `remove_from_title`	| `MALOJA_REMOVE_FROM_TITLE`  | Set | Phrases that should be removed from song titles
 `delimiters_feat`	| `MALOJA_DELIMITERS_FEAT`  | Set | Delimiters used for extra artists, even when in the title field
@@ -62,14 +66,19 @@ Settings File			| Environment Variable			| Type			| Description
 `delimiters_formal`	| `MALOJA_DELIMITERS_FORMAL`  | Set | Delimiters used to tag multiple artists when only one tag field is available
 `filters_remix`	| `MALOJA_FILTERS_REMIX`  | Set | Filters used to recognize the remix artists in the title
 `parse_remix_artists`	| `MALOJA_PARSE_REMIX_ARTISTS`  | Boolean | Parse Remix Artists
+`week_offset`	| `MALOJA_WEEK_OFFSET`  | Integer | Start of the week for the purpose of weekly statistics. 0 = Sunday, 6 = Saturday
+`timezone`	| `MALOJA_TIMEZONE`  | Integer | UTC Offset
 **Web Interface**
-`default_range_charts_artists`	| `MALOJA_DEFAULT_RANGE_CHARTS_ARTISTS`  | Choice | Default Range Artist Charts
-`default_range_charts_tracks`	| `MALOJA_DEFAULT_RANGE_CHARTS_TRACKS`  | Choice | Default Range Track Charts
+`default_range_startpage`	| `MALOJA_DEFAULT_RANGE_STARTPAGE`  | Choice | Default Range for Startpage Stats
 `default_step_pulse`	| `MALOJA_DEFAULT_STEP_PULSE`  | Choice | Default Pulse Step
 `charts_display_tiles`	| `MALOJA_CHARTS_DISPLAY_TILES`  | Boolean | Display Chart Tiles
+`album_showcase`	| `MALOJA_ALBUM_SHOWCASE`  | Boolean | Display a graphical album showcase for artist overview pages instead of a chart list
 `display_art_icons`	| `MALOJA_DISPLAY_ART_ICONS`  | Boolean | Display Album/Artist Icons
+`default_album_artist`	| `MALOJA_DEFAULT_ALBUM_ARTIST`  | String | Default Albumartist
+`use_album_artwork_for_tracks`	| `MALOJA_USE_ALBUM_ARTWORK_FOR_TRACKS`  | Boolean | Use Album Artwork for tracks
+`fancy_placeholder_art`	| `MALOJA_FANCY_PLACEHOLDER_ART`  | Boolean | Use fancy placeholder artwork
+`show_play_number_on_tiles`	| `MALOJA_SHOW_PLAY_NUMBER_ON_TILES`  | Boolean | Show amount of plays on tiles
 `discourage_cpu_heavy_stats`	| `MALOJA_DISCOURAGE_CPU_HEAVY_STATS`  | Boolean | Prevent visitors from mindlessly clicking on CPU-heavy options. Does not actually disable them for malicious actors!
 `use_local_images`	| `MALOJA_USE_LOCAL_IMAGES`  | Boolean | Use Local Images
-`timezone`	| `MALOJA_TIMEZONE`  | Integer | UTC Offset
 `time_format`	| `MALOJA_TIME_FORMAT`  | String | Time Format
 `theme`	| `MALOJA_THEME`  | String | Theme