From de6d74440396e3c548da5c8480d3558adc60380d Mon Sep 17 00:00:00 2001
From: doubaniux <goodsir@vivaldi.net>
Date: Sat, 17 Dec 2022 22:09:49 +0100
Subject: [PATCH 1/3] add missing scrape api supports

---
 music/management/commands/fix-album-cover.py | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/music/management/commands/fix-album-cover.py b/music/management/commands/fix-album-cover.py
index 9b9f4d3e..8cd40fdc 100644
--- a/music/management/commands/fix-album-cover.py
+++ b/music/management/commands/fix-album-cover.py
@@ -100,8 +100,12 @@ class DoubanPatcherMixin:
                 get(url, 60)
             else:
                 error = error + '\nScraperAPI: '
-                # get(f'http://api.scraperapi.com?api_key={settings.SCRAPERAPI_KEY}&url={url}', 60)
-                get(f'http://api.scrapestack.com/scrape?access_key={settings.SCRAPESTACK_KEY}&url={url}', 60)
+
+                if settings.SCRAPESTACK_KEY is not None:
+                    dl_url = f'http://api.scrapestack.com/scrape?access_key={settings.SCRAPESTACK_KEY}&url={url}'
+                elif settings.SCRAPERAPI_KEY is not None:
+                    dl_url = f'http://api.scraperapi.com?api_key={settings.SCRAPERAPI_KEY}&url={url}'
+                get(dl_url, 60)
             check_content()
 
         wayback_cdx()
@@ -121,9 +125,11 @@ class DoubanPatcherMixin:
         ext = None
 
         dl_url = url
+
         if settings.SCRAPESTACK_KEY is not None:
             dl_url = f'http://api.scrapestack.com/scrape?access_key={settings.SCRAPESTACK_KEY}&url={url}'
-            # f'http://api.scraperapi.com?api_key={settings.SCRAPERAPI_KEY}&url={url}'
+        elif settings.SCRAPERAPI_KEY is not None:
+            dl_url = f'http://api.scraperapi.com?api_key={settings.SCRAPERAPI_KEY}&url={url}'
 
         try:
             img_response = requests.get(dl_url, timeout=90)

From 3fe25b88fac630ef5bbe3d7edd48dafe0a25a156 Mon Sep 17 00:00:00 2001
From: doubaniux <goodsir@vivaldi.net>
Date: Sat, 17 Dec 2022 22:25:25 +0100
Subject: [PATCH 2/3] update gitignore

---
 .gitignore | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index bbbed5da..e545bc47 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,7 +26,8 @@ migrations/
 /log
 log
 
-# conf folder for neodb
+# conf folders
+/conf
 /neodb
 
 # typesense folder

From 1e00c51337279be38f978ca13eb6568159c21388 Mon Sep 17 00:00:00 2001
From: doubaniux <goodsir@vivaldi.net>
Date: Mon, 19 Dec 2022 14:07:33 +0100
Subject: [PATCH 3/3] minor-ui-improvements

---
 common/static/sass/_Modal.sass             |  1 +
 common/templates/common/search_result.html | 16 ++++++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/common/static/sass/_Modal.sass b/common/static/sass/_Modal.sass
index dda313d5..de31c14b 100644
--- a/common/static/sass/_Modal.sass
+++ b/common/static/sass/_Modal.sass
@@ -14,6 +14,7 @@
     display: none
     position: fixed
     width: 500px
+    max-width: 100vw
     top: 50%
     left: 50%
     transform: translate(-50%, -50%)
diff --git a/common/templates/common/search_result.html b/common/templates/common/search_result.html
index f8f8708b..d3fc5417 100644
--- a/common/templates/common/search_result.html
+++ b/common/templates/common/search_result.html
@@ -54,6 +54,22 @@
                                     {% if request.GET.q and user.is_authenticated %}
                                     <li class="entity-list__entity" hx-get="{% url 'common:external_search' %}?q={{ request.GET.q }}&c={{ request.GET.c }}&page={% if pagination.current_page %}{{ pagination.current_page }}{% else %}1{% endif %}" hx-trigger="load" hx-swap="outerHTML">
                                     {% trans '正在实时搜索站外条目' %}
+                                    <div id="spinner">
+                                        <div class="spinner">
+                                            <div></div>
+                                            <div></div>
+                                            <div></div>
+                                            <div></div>
+                                            <div></div>
+                                            <div></div>
+                                            <div></div>
+                                            <div></div>
+                                            <div></div>
+                                            <div></div>
+                                            <div></div>
+                                            <div></div>
+                                        </div>
+                                    </div>
                                     </li>
                                     {% endif %}
                                 </ul>