Merge pull request #105 from MPEGGroup/misc-fixes

Miscellaneous fixes
MPEGGroup · Oct 3, 2023 · f152df7 · f152df7
2 parents efed51a + 291da8b
commit f152df7
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 14 deletions.
diff --git a/conformance-search/src/components/SearchComponent/SearchComponent.tsx b/conformance-search/src/components/SearchComponent/SearchComponent.tsx
@@ -20,11 +20,14 @@ export default function SearchComponent({
 }) {
     const [loading, setLoading] = useState(false);
     const [open, setOpen] = useState(false);
-    const [filters, { addFilter, removeFilter, updateFilter, resetFilters }] = useFilters();
     const [queryParams, setQueryParams] = useQueryParams();
     const [query, setQuery] = useState("");
     const [ready, setReady] = useState(false);
 
+    // Filters
+    const [filters, { addFilter, removeFilter, updateFilter, resetFilters }] = useFilters();
+    const activeFilters = filters.filter((f) => f.value !== "");
+
     // Load the search state from the URL
     useEffect(() => {
         if (queryParams && !ready) {
@@ -122,7 +125,8 @@ export default function SearchComponent({
                             {open &&
                                 filters.map((filter: Filter, index: number) => (
                                     <div
-                                        key={filter.value}
+                                        // eslint-disable-next-line react/no-array-index-key
+                                        key={`${filter.value || filter.type}-${index}`}
                                         className="flex flex-row items-stretch divide-x-1 overflow-x-scroll px-3"
                                     >
                                         <button
@@ -155,7 +159,7 @@ export default function SearchComponent({
                                     <button
                                         className={clsx(
                                             "my-3 flex cursor-pointer flex-row items-center gap-2",
-                                            filters.length > 0 && "text-blue-400"
+                                            activeFilters.length > 0 && "text-blue-400"
                                         )}
                                         onClick={() => {
                                             if (filters.length === 0) addFilter();
@@ -165,9 +169,11 @@ export default function SearchComponent({
                                     >
                                         <MdFilterAlt className="text-xl" />
                                         <span className="text-xs font-semibold">
-                                            {filters.length === 0
+                                            {activeFilters.length === 0
                                                 ? "Add a filter"
-                                                : `${filters.length} filters active, click here to edit them`}
+                                                : `${activeFilters.length} filter${
+                                                      activeFilters.length > 1 ? "s" : ""
+                                                  } active, click here to edit them`}
                                         </span>
                                     </button>
                                 </div>

diff --git a/conformance-search/src/components/SearchComponent/hooks/useQueryParams.ts b/conformance-search/src/components/SearchComponent/hooks/useQueryParams.ts
@@ -19,6 +19,7 @@ export default function useQueryParams(): [
 
     const encodeFilters = (filters: Filter[]): string => {
         return filters
+            .filter((filter) => filter.value !== "")
             .reduce((acc: string[], filter) => {
                 const { type, value } = filter;
                 return acc.concat([`${type}:${value}`]);
@@ -72,7 +73,8 @@ export default function useQueryParams(): [
 
             // Filters
             rawParams.delete("filters");
-            if (filters && filters.length > 0) rawParams.set("filters", encodeFilters(filters));
+            if (filters && filters.length > 0 && filters.some((filter) => filter.value !== ""))
+                rawParams.set("filters", encodeFilters(filters));
 
             const base = window.location.pathname;
 

diff --git a/src/construct/boxes.py b/src/construct/boxes.py
@@ -27,6 +27,7 @@ class Box:
     containers: list = field(default_factory=list)
     syntax: str = None
     defective: bool = False
+    ambiguous: bool = False
     ref: Box = None
 
     def __hash__(self):
@@ -95,20 +96,30 @@ def get_all_boxes(json_file):
 
 
 def search_box(fourcc, type=None, ref=None):
+    result = None
+    matches = 0
     for value in BOXES.values():
         for _box in value:
             if type is not None:
                 if _box.fourcc == fourcc and _box.type == type:
-                    return _box
+                    result = _box
+                    matches += 1
             else:
                 if _box.fourcc == fourcc:
-                    return _box
-
-    return Box(
-        fourcc=fourcc,
-        defective=True,
-        ref=ref,
-    )
+                    result = _box
+                    matches += 1
+
+    if matches == 1:
+        return result
+    if matches > 1:
+        result.ambiguous = True
+        return result
+    if matches == 0:
+        return Box(
+            fourcc=fourcc,
+            defective=True,
+            ref=ref,
+        )
 
 
 def update_container(_spec, _box):
@@ -189,6 +200,18 @@ def main():
             BOXES[spec] = set()
         BOXES[spec] = BOXES[spec].union(extensions)
 
+    # List ambiguous boxes
+    buffer = []
+    for boxes in BOXES.values():
+        for _box in boxes:
+            if _box.ambiguous and _box.fourcc != "file":
+                buffer.append(_box.fourcc)
+
+    if len(buffer) > 0:
+        logger.error(
+            f"Ambiguous containers found ({len(set(buffer))}): {set(sorted(buffer))}"
+        )
+
     # List defective boxes
     buffer = []
     for boxes in BOXES.values():