improve handling of hidden/merged fields

Author: adamhl8

README.md

@@ -91,13 +91,16 @@ Inspectarr uses [FilterQL](https://github.com/adamhl8/filterql) to filter/transf
 inspectarr radarr 'source == bluray && resolution ^= 1920'
 
 # display media from specific release groups
-inspectarr sonarr 'releaseGroup == AMZN || releaseGroup == NF'
+inspectarr sonarr 'releaseGroup == NTb || releaseGroup == FLUX'
 
 # display media where the title contains 'star wars' (case-insensitive)
 inspectarr sonarr 'title i*= "star wars"'
 
+# display media where the title does *not* contain 'star wars'
+inspectarr sonarr '!title i*= "star wars"'
+
 # display media released after 1990, then sort by title
-inspectarr radarr 'title *= "(1990)" | SORT title'
+inspectarr radarr 'year > 1990 | SORT title'
 
 # display media where monitored is true and where the video codec is x265 (contains '265')
 inspectarr radarr 'monitored && videoCodec *= 265'
@@ -108,11 +111,13 @@ inspectarr radarr 'monitored && videoCodec *= 265'
 **General fields:**
 
 - `title` (alias: `t`) - Media title
+- `year` (alias: `y`) - Release year
 - `monitored` (alias: `m`) - Whether the media is monitored
 - `releaseGroup` (alias: `rg`) - Release group name
 - `source` (alias: `src`) - Media source (bluray, webdl, etc.)
 - `videoCodec` (alias: `vc`) - Video codec (x264, x265, etc.)
-- `audioCodec` (alias: `ac`) - Audio codec with audio channel info
+- `audioCodec` (alias: `ac`) - Audio codec (AAC, EAC3, etc.)
+- `audioChannels` (alias: `ach`) - Audio channels (2, 5.1, etc.)
 - `resolution` (alias: `rs`) - Video resolution
 - `size` (alias: `sz`) - File size
 

assets/demo.gif

@@ -4,7 +4,7 @@ Set Theme "Catppuccin Macchiato"
 Set WindowBar Colorful
 Set FontFamily "JetBrainsMono Nerd Font"
 Set Width 1250
-Set Height 425
+Set Height 400
 Set Padding 25
 
 Set Shell bash

bun.lock

@@ -1,15 +1,17 @@
 import ky from "ky"
 import type { Result } from "ts-explicit-errors"
 import { attempt, err, isErr } from "ts-explicit-errors"
-import type { Entries, JsonPrimitive } from "type-fest"
+import type { Entries } from "type-fest"
 
-import type { JsonifiableMediaData, JsonifiableMediaDataObject, MediaData } from "~/cli/types.ts"
+import type { JsonifiableMediaData, MediaData } from "~/cli/types.ts"
 
 export abstract class ArrClient {
+  public name: string
   readonly #baseUrl: string
   readonly #apiKey: string
 
-  public constructor(baseUrl: string, apiKey: string) {
+  public constructor(name: string, baseUrl: string, apiKey: string) {
+    this.name = name
     this.#baseUrl = baseUrl.endsWith("/") ? baseUrl.slice(0, -1) : baseUrl
     this.#apiKey = apiKey
   }
@@ -40,24 +42,20 @@ export abstract class ArrClient {
 
     const unique = (arr: unknown[] | undefined) => [...new Set(arr)].join(",").trim()
 
-    const normalizedMediaData: JsonifiableMediaData = []
-
-    for (const entry of mediaData) {
-      const mediaDataObject: JsonifiableMediaDataObject = {}
-      for (const [key, value] of Object.entries(entry) as Entries<typeof entry>) {
-        let normalizedValue: JsonPrimitive
-
+    const normalizedMediaData: JsonifiableMediaData = mediaData.map((dataObject) => {
+      const dataObjectEntries = Object.entries(dataObject) as Entries<typeof dataObject>
+      const normalizedDataObjectEntries = dataObjectEntries.map(([key, value]) => {
         if (Array.isArray(value)) {
           const uniqueString = unique(value)
-          normalizedValue = uniqueString || null // empty arrays should be null
-        } else if (typeof value === "string") normalizedValue = value.trim()
-        else if (value === undefined) normalizedValue = null
-        else normalizedValue = value
-
-        mediaDataObject[key] = normalizedValue
-      }
-      normalizedMediaData.push(mediaDataObject)
-    }
+          return [key, uniqueString || null] // empty arrays should be null
+        }
+        if (typeof value === "string") return [key, value.trim()]
+        if (value === undefined) return [key, null]
+        return [key, value]
+      })
+
+      return Object.fromEntries(normalizedDataObjectEntries)
+    })
 
     return normalizedMediaData
   }

demo.tape

@@ -2,13 +2,17 @@ import type { Result } from "ts-explicit-errors"
 import { err, isErr } from "ts-explicit-errors"
 
 import { ArrClient } from "~/arr-client/arr-client.ts"
-import { formatQualifiedValue, formatSize, getRawResolution } from "~/arr-client/utils.ts"
 import type { RadarrMediaData } from "~/cli/radarr.ts"
 import type { paths } from "~/generated/radarr-schema.ts"
+import { formatSize, getRawResolution } from "~/utils.ts"
 
 type RadarrAllMedia = paths["/api/v3/movie"]["get"]["responses"]["200"]["content"]["application/json"][number]
 
 export class RadarrClient extends ArrClient {
+  public constructor(baseUrl: string, apiKey: string) {
+    super("Radarr", baseUrl, apiKey)
+  }
+
   public getAllMedia(): Promise<Result<RadarrAllMedia[]>> {
     return this.makeRequest<RadarrAllMedia[]>("movie")
   }
@@ -25,12 +29,14 @@ export class RadarrClient extends ArrClient {
       const mediaDetails = movieFile?.mediaInfo
 
       data.push({
-        title: formatQualifiedValue(movie.title, movie.year),
+        title: movie.title,
+        year: movie.year,
         monitored: movie.monitored,
         releaseGroup: movieFile?.releaseGroup,
         source: movieFile?.quality?.quality?.source,
         videoCodec: mediaDetails?.videoCodec,
-        audioCodec: formatQualifiedValue(mediaDetails?.audioCodec, mediaDetails?.audioChannels),
+        audioCodec: mediaDetails?.audioCodec,
+        audioChannels: mediaDetails?.audioChannels,
         resolution: mediaDetails?.resolution,
         rawResolution: getRawResolution(mediaDetails?.resolution),
         size: formatSize(movieFile?.size),