reorganized code

src/sh/api.sh

@@ -1,32 +1,58 @@
 MB_BROWSE_STEPS=100
 export MB_BROWSE_STEPS
 
-# Argument: MB Artist ID
-__api_mb_browse_releases() {
+api_mb_artist() {
   $CURL \
     --get \
     --data fmt=json \
-    --data inc=release-groups \
-    --data-urlencode artist="$1" \
+    --data inc="url-rels+artist-rels+aliases" \
     -A "$APP_NAME/$APP_VERSION ($APP_WEBSITE)" \
-    "https://musicbrainz.org/ws/2/release"
+    "https://musicbrainz.org/ws/2/artist/$1"
+}
+api_mb_releasegroup() {
+  $CURL \
+    --get \
+    --data fmt=json \
+    --data inc=artist-credits \
+    -A "$APP_NAME/$APP_VERSION ($APP_WEBSITE)" \
+    "https://musicbrainz.org/ws/2/release-group/$1"
 }
 
-# Argument: MB Artist ID
-__api_mb_browse_release_groups() {
+api_mb_release() {
+  $CURL \
+    --get \
+    --data fmt=json \
+    --data inc="recordings+artist-credits" \
+    -A "$APP_NAME/$APP_VERSION ($APP_WEBSITE)" \
+    "https://musicbrainz.org/ws/2/release/$1"
+}
+
+api_mb_browse_artist_releasegroups() {
   $CURL \
     --get \
     --data fmt=json \
     --data inc=artist-credits \
     --data limit="$MB_BROWSE_STEPS" \
     --data offset="${2:-0}" \
-    --data-urlencode artist="$1" \
+    --data artist="$1" \
     -A "$APP_NAME/$APP_VERSION ($APP_WEBSITE)" \
     "https://musicbrainz.org/ws/2/release-group"
 }
 
+api_mb_browse_releasegroup_releases() {
+  $CURL \
+    --get \
+    --data fmt=json \
+    --data inc=artist-credits \
+    --data limit="$MB_BROWSE_STEPS" \
+    --data offset="${2:-0}" \
+    --data release-group="$1" \
+    -A "$APP_NAME/$APP_VERSION ($APP_WEBSITE)" \
+    "https://musicbrainz.org/ws/2/release"
+}
+
 # Argument: Search string
-__api_mb_search_artists() {
+api_mb_search_artists() {
   $CURL \
     --get \
     --data fmt=json \
@@ -35,34 +61,21 @@ __api_mb_search_artists() {
     "https://musicbrainz.org/ws/2/artist"
 }
 
-# Argument: MB Artist ID
-__api_mb_get_artist() {
-  $CURL \
-    --get \
-    --data fmt=json \
-    --data inc="url-rels+artist-rels+aliases" \
-    -A "$APP_NAME/$APP_VERSION ($APP_WEBSITE)" \
-    "https://musicbrainz.org/ws/2/artist/$1"
-}
-
-# Argument: Discogs id
-__api_discogs_get_artist() {
+api_discogs_artist() {
   $CURL \
     --get \
     -A "$APP_NAME/$APP_VERSION ($APP_WEBSITE)" \
     "https://api.discogs.com/artists/$1"
 }
 
-# Argument: wikidata id
-__api_wikidata_get_sitelinks() {
+api_wikidata_sitelinks() {
   $CURL \
     --get \
     -A "$APP_NAME/$APP_VERSION ($APP_WEBSITE)" \
     "https://www.wikidata.org/w/rest.php/wikibase/v1/entities/items/$1/sitelinks"
 }
 
-# Argument: Wikipedia name (last part of URL)
-__api_wikipedia_en_get_summary() {
+api_wikipedia_en_summary() {
   $CURL \
     --get \
     -A "$APP_NAME/$APP_VERSION ($APP_WEBSITE)" \