Normalize digital media in Discogs searches

beetsplug/discogs/__init__.py

@@ -81,6 +81,8 @@
     "year": "year",
 }
 
+MEDIA_FORMAT_ALIASES = {"digital media", "web"}
+
 
 def parse_release_date(
     released: str | None, year: int | None
@@ -302,9 +304,17 @@ def get_search_query_with_filters(
             return query, filters
 
         for tag, api_field in self.extra_discogs_field_by_tag.items():
-            most_common, _count = util.plurality(
-                item.get(tag) for item in items
-            )
+            values = (item.get(tag) for item in items)
+
+            if tag == "media":
+                values = (
+                    "File"
+                    if str(value).casefold() in MEDIA_FORMAT_ALIASES
+                    else value
+                    for value in values
+                )
+
+            most_common, _count = util.plurality(values)
             if most_common is None:
                 continue
 

docs/changelog.rst

@@ -26,6 +26,8 @@ Bug fixes
   writes to the item's source file when ``beet convert`` writes the converted
   file, which previously crashed with a :class:`PermissionError` when the source
   file was read-only. :bug:`6954`
+- :doc:`plugins/discogs`: Normalize ``Digital Media`` and ``WEB`` to Discogs'
+  ``File`` format when using ``media`` in ``extra_tags`` search filters.
 
 ..
     For plugin developers

docs/plugins/discogs.rst

@@ -180,6 +180,9 @@ Default
     * ``media``
     * ``year``
 
+    When ``media`` is included, ``Digital Media`` and ``WEB`` are normalized to
+    Discogs' ``File`` format when constructing the search query.
+
     Example:
 
     .. code-block:: yaml

test/plugins/test_discogs.py

@@ -554,6 +554,44 @@ def test_extra_tags_populate_discogs_filters(self):
         assert filters["catno"] == "ABC123"
         config["discogs"]["extra_tags"] = []
 
+    @pytest.mark.parametrize(
+        "media,expected",
+        [("Digital Media", "File"), ("WEB", "File"), ("Vinyl", "Vinyl")],
+    )
+    def test_extra_tags_normalize_media(self, media, expected):
+        plugin = DiscogsPlugin()
+        plugin.config["extra_tags"] = ["media"]
+
+        items = [Item(media=media)]
+
+        _query, filters = plugin.get_search_query_with_filters(
+            "album", items, "Artist", "Album", False
+        )
+
+        assert filters["format"] == expected
+        config["discogs"]["extra_tags"] = []
+
+    def test_extra_tags_normalize_media_before_plurality(self):
+        plugin = DiscogsPlugin()
+        plugin.config["extra_tags"] = ["media"]
+
+        items = [
+            Item(media="Digital Media"),
+            Item(media="Digital Media"),
+            Item(media="WEB"),
+            Item(media="WEB"),
+            Item(media="Vinyl"),
+            Item(media="Vinyl"),
+            Item(media="Vinyl"),
+        ]
+
+        _query, filters = plugin.get_search_query_with_filters(
+            "album", items, "Artist", "Album", False
+        )
+
+        assert filters["format"] == "File"
+        config["discogs"]["extra_tags"] = []
+
 
 class TestDGSearchResponse(DiscogsTestMixin):
     @staticmethod