Merge branch 'main' into project-proposal-for-dark-mode

Author: fcoveram

api/api/admin/__init__.py

@@ -1,4 +1,6 @@
 from django.contrib import admin
+from django.contrib.auth.admin import GroupAdmin, UserAdmin
+from django.contrib.auth.models import Group, User
 
 from api.admin.site import openverse_admin
 from api.models import PENDING, Audio, AudioReport, ContentProvider, Image, ImageReport
@@ -9,6 +11,11 @@
 admin.sites.site = openverse_admin
 
 
+# Show User and Group views in the Admin view
+admin.site.register(User, UserAdmin)
+admin.site.register(Group, GroupAdmin)
+
+
 @admin.register(Image)
 class ImageAdmin(admin.ModelAdmin):
     search_fields = ("identifier",)

catalog/dags/providers/provider_api_scripts/cc_mixter.py

@@ -193,7 +193,7 @@ def _get_audio_files(
 
         files = [
             {
-                "url": file["download_url"],
+                "url": file["download_url"].replace(" ", "%20"),
                 "filesize": file["file_rawsize"],
                 "filetype": file["file_format_info"]["default-ext"],
                 "sample_rate": self._get_sample_rate(

catalog/tests/dags/providers/provider_api_scripts/resources/cc_mixter/expected_single_record.json

@@ -30,14 +30,14 @@
     "VBR",
     "instrumental"
   ],
-  "url": "https://ccmixter.org/content/testuser/testuser_-_Test_Music.mp3",
+  "url": "https://ccmixter.org/content/testuser/testuser%20-%20Test_Music.mp3",
   "sample_rate": 44100,
   "filetype": "mp3",
   "filesize": 11150278,
   "duration": 346000,
   "alt_files": [
     {
-      "url": "https://ccmixter.org/content/testuser/testuser_-_Test_Music.flac",
+      "url": "https://ccmixter.org/content/testuser/testuser%20-%20Test_Music.flac",
       "sample_rate": 44000,
       "filetype": "flac",
       "filesize": 111502780,

catalog/tests/dags/providers/provider_api_scripts/resources/cc_mixter/single_item.json

@@ -46,7 +46,7 @@
       "file_order": 0,
       "file_is_remote": 0,
       "file_num_download": 0,
-      "download_url": "https://ccmixter.org/content/testuser/testuser_-_Test_Music.zip",
+      "download_url": "https://ccmixter.org/content/testuser/testuser - Test_Music.zip",
       "local_path": "/var/www/ccmixter/content/testuser/testuser_-_Test_Music.zip",
       "file_rawsize": 11150278
     },
@@ -74,7 +74,7 @@
       "file_order": 0,
       "file_is_remote": 0,
       "file_num_download": 0,
-      "download_url": "https://ccmixter.org/content/testuser/testuser_-_Test_Music.flac",
+      "download_url": "https://ccmixter.org/content/testuser/testuser - Test_Music.flac",
       "local_path": "/var/www/ccmixter/content/testuser/testuser_-_Test_Music.flac",
       "file_rawsize": 111502780
     },
@@ -100,7 +100,7 @@
       "file_order": 0,
       "file_is_remote": 0,
       "file_num_download": 0,
-      "download_url": "https://ccmixter.org/content/testuser/testuser_-_Test_Music.mp3",
+      "download_url": "https://ccmixter.org/content/testuser/testuser - Test_Music.mp3",
       "local_path": "/var/www/ccmixter/content/testuser/testuser_-_Test_Music.mp3",
       "file_rawsize": 11150278
     }

documentation/changelogs/api/2024.03.13.17.10.22.md

@@ -0,0 +1,11 @@
+# 2024.03.13.17.10.22
+
+## New Features
+
+- Update the Additional search views IP
+  ([#3868](https://github.com/WordPress/openverse/pull/3868)) by @obulat
+
+## Internal Improvements
+
+- Enable Users and Groups in the Django Admin UI
+  ([#3899](https://github.com/WordPress/openverse/pull/3899)) by @AetherUnbound

documentation/projects/proposals/additional_search_views/20230424-project_proposal_additional_search_views.md

@@ -5,7 +5,7 @@
 ## Reviewers
 
 - [x] @obulat
-- [ ] @krysal
+- [x] @krysal
 
 ## Project summary