Simplify tag_media_files_as_unintersting() #238

* Update test Signed-off-by: Jono Yang <[email protected]>
aboutcode-org · Aug 3, 2021 · 53b128a · 53b128a
1 parent ced8f38
commit 53b128a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 45 deletions.
diff --git a/scanpipe/pipes/rootfs.py b/scanpipe/pipes/rootfs.py
@@ -384,50 +384,6 @@ def tag_data_files_with_no_clues(project):
 def tag_media_files_as_uninteresting(project):
     """
     Tags CodebaseResources that are media files to be uninteresting.
-
-    `mimes` and `types` are taken from TypeCode:
-    https://github.com/nexB/typecode/blob/main/src/typecode/contenttype.py#L528
     """
-    mimes = (
-        "image",
-        "picture",
-        "audio",
-        "video",
-        "graphic",
-        "sound",
-    )
-
-    types = (
-        "image data",
-        "graphics image",
-        "ms-windows metafont .wmf",
-        "windows enhanced metafile",
-        "png image",
-        "interleaved image",
-        "microsoft asf",
-        "image text",
-        "photoshop image",
-        "shop pro image",
-        "ogg data",
-        "vorbis",
-        "mpeg",
-        "theora",
-        "bitmap",
-        "audio",
-        "video",
-        "sound",
-        "riff",
-        "icon",
-        "pc bitmap",
-        "image data",
-        "netpbm",
-    )
-
-    lookup = Q()
-    for mime_type in mimes:
-        lookup |= Q(mime_type__icontains=mime_type)
-    for file_type in types:
-        lookup |= Q(file_type__icontains=file_type)
-
     qs = project.codebaseresources.no_status()
-    qs.filter(lookup).update(status="ignored-media-file")
+    qs.filter(is_media=True).update(status="ignored-media-file")
diff --git a/scanpipe/tests/test_pipes.py b/scanpipe/tests/test_pipes.py
@@ -1049,19 +1049,29 @@ def test_scanpipe_pipes_rootfs_tag_media_files_as_uninteresting(self):
             rootfs_path="/user/foo.png",
             mime_type="image/png",
             file_type="image/png",
+            is_media=True,
         )
         resource2 = CodebaseResource.objects.create(
             project=p1,
             path="root/user/bar.jpg",
             rootfs_path="/user/bar.jpg",
             mime_type="image/jpeg",
             file_type="JPEG image data",
+            is_media=True,
+        )
+        resource3 = CodebaseResource.objects.create(
+            project=p1,
+            path="root/user/baz.txt",
+            rootfs_path="/user/baz.txt",
+            is_media=False,
         )
         rootfs.tag_media_files_as_uninteresting(p1)
         resource1.refresh_from_db()
         resource2.refresh_from_db()
+        resource3.refresh_from_db()
         self.assertEqual("ignored-media-file", resource1.status)
         self.assertEqual("ignored-media-file", resource2.status)
+        self.assertEqual("", resource3.status)
 
 
 class ScanPipePipesTransactionTest(TransactionTestCase):