[plugin.audio.kxmxpxtx.bandcamp] v0.5.2+matrix.1 (#4653)

Author: molzy

plugin.audio.kxmxpxtx.bandcamp/addon.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.audio.kxmxpxtx.bandcamp" name="Bandcamp" version="0.5.1+matrix.1" provider-name="Simon Mollema">
+<addon id="plugin.audio.kxmxpxtx.bandcamp" name="Bandcamp" version="0.5.2+matrix.1" provider-name="Simon Mollema">
     <requires>
         <import addon="xbmc.python" version="3.0.0"/>
         <import addon="script.module.future" version="0.18.2+matrix.1"/>
@@ -15,7 +15,12 @@
         <platform>all</platform>
         <email>xbmc@molzy.com</email>
         <source>https://github.com/molzy/plugin.audio.kxmxpxtx.bandcamp</source>
-        <news>v0.5.1+matrix.1 (2024-08)
+        <news>v0.5.2+matrix.1 (2025-04)
+ - Fixed search function which was broken due to upstream change
+     - Thank you to everyone who reported and contributed a fix!
+ - Extended API timeout, to help those with a large collection or wishlist
+
+v0.5.1+matrix.1 (2024-08)
  - Resolved 403 forbidden error when accessing bandcamp API
 
 v0.5.0+matrix.1 (2023-01)

plugin.audio.kxmxpxtx.bandcamp/resources/lib/bandcamp_api/bandcamp.py

@@ -14,14 +14,21 @@
 from builtins import *
 from html.parser import HTMLParser
 
-USER_AGENT = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/127.0.0.0 Safari/537.36'
-
-def urlopen_ua(url, data=None):
-    return urlopen(Request(url, data=data, headers={'User-Agent': USER_AGENT}), timeout=5)
-
-def req(url, data=None):
+USER_AGENT = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.3'
+
+def urlopen_ua(url, data=None, content_type=None):
+    headers = {'User-Agent': USER_AGENT}
+    if content_type is not None:
+        headers['Content-Type'] = content_type
+    return urlopen(Request(url, data=data, headers=headers), timeout=15)
+
+def req(url, data=None, content_type=None):
+    if isinstance(data, dict):
+        data = json.dumps(data)
+        if content_type is None:
+            content_type = 'application/json'
     body = data.encode() if data else None
-    return urlopen_ua(url, data=body).read().decode()
+    return urlopen_ua(url, data=body, content_type=content_type).read().decode()
 
 class Band:
     def __init__(self, band_id=None, band_name="", band_img=None):
@@ -127,8 +134,7 @@ def get_subgenres(self):
     def get_collection(self, fan_id, count=1000, return_albums=False):
         url = "https://bandcamp.com/api/fancollection/1/collection_items"
         token = self._get_token()
-        body = '{{"fan_id": "{fan_id}", "older_than_token": "{token}", "count":"{count}"}}' \
-            .format(fan_id=fan_id, token=token, count=count)
+        body = {"fan_id": fan_id, "older_than_token": token, "count": count}
         x = req(url, data=body)
         items = json.loads(x)['items']
         bands = {}
@@ -150,8 +156,7 @@ def get_collection(self, fan_id, count=1000, return_albums=False):
     def get_wishlist(self, fan_id, count=1000, return_albums=False):
         url = "https://bandcamp.com/api/fancollection/1/wishlist_items"
         token = self._get_token()
-        body = '{{"fan_id": "{fan_id}", "older_than_token": "{token}", "count":"{count}"}}' \
-            .format(fan_id=fan_id, token=token, count=count)
+        body = {"fan_id": fan_id, "older_than_token": token, "count": count}
         x = req(url, data=body)
         items = json.loads(x)['items']
         bands = {}
@@ -224,7 +229,7 @@ def get_album_by_url(self, url):
 
     def get_band(self, band_id):
         url = "https://bandcamp.com/api/mobile/24/band_details"
-        body = '{{"band_id": "{band_id}"}}'.format(band_id=band_id)
+        body = {"band_id": band_id}
         request = req(url, data=body)
         band_details = json.loads(request)
         band = Band(band_id=band_details['id'], band_name=band_details['name'],
@@ -239,8 +244,9 @@ def get_band(self, band_id):
     def search(self, query):
         if PY2:
             query = query.decode('utf-8')
-        url = "https://bandcamp.com/api/fuzzysearch/1/autocomplete?q={query}".format(query=quote_plus(query))
-        request = req(url)
+        url = "https://bandcamp.com/api/bcsearch_public_api/1/autocomplete_elastic"
+        body = {"full_page": False, "search_filter": "", "search_text": query}
+        request = req(url, data=body)
         results = json.loads(request)['auto']['results']
         items = []
         for result in results: