@muhammedaksam/easiarr 1.1.1 → 1.1.3

package/src/ui/screens/TRaSHProfileSetup.ts

@@ -7,9 +7,11 @@ import { BoxRenderable, CliRenderer, TextRenderable, KeyEvent } from "@opentui/c
 import { createPageLayout } from "../components/PageLayout"
 import { EasiarrConfig, AppId } from "../../config/schema"
 import { getApp } from "../../apps/registry"
+import { ArrApiClient } from "../../api/arr-api"
 import { QualityProfileClient } from "../../api/quality-profile-api"
 import { CustomFormatClient, getCFNamesForCategories } from "../../api/custom-format-api"
 import { getPresetsForApp, TRaSHProfilePreset } from "../../data/trash-profiles"
+import { LIDARR_CUSTOM_FORMATS } from "../../data/lidarr-custom-formats"
 import { readEnvSync } from "../../utils/env"
 import { debugLog } from "../../utils/debug"
 
@@ -18,6 +20,7 @@ interface SetupResult {
   appName: string
   profile: string
   cfCount: number
+  namingConfigured: boolean
   status: "pending" | "configuring" | "success" | "error"
   message?: string
 }
@@ -61,12 +64,14 @@ export class TRaSHProfileSetup extends BoxRenderable {
     this.pageContainer = pageContainer
 
     // Get enabled *arr apps that support quality profiles
-    this.availableApps = config.apps.filter((a) => a.enabled && ["radarr", "sonarr"].includes(a.id)).map((a) => a.id)
+    this.availableApps = config.apps
+      .filter((a) => a.enabled && ["radarr", "sonarr", "lidarr"].includes(a.id))
+      .map((a) => a.id)
 
     // Initialize selections
     this.availableApps.forEach((id) => {
       this.selectedApps.set(id, true)
-      const presets = getPresetsForApp(id as "radarr" | "sonarr")
+      const presets = getPresetsForApp(id as "radarr" | "sonarr" | "lidarr")
       if (presets.length > 0) {
         this.selectedProfiles.set(id, presets[0].id)
       }
@@ -134,7 +139,7 @@ export class TRaSHProfileSetup extends BoxRenderable {
   private handleSelectProfilesKeys(key: KeyEvent): void {
     const selectedAppIds = this.availableApps.filter((id) => this.selectedApps.get(id))
     const app = selectedAppIds[this.currentIndex]
-    const presets = getPresetsForApp(app as "radarr" | "sonarr")
+    const presets = getPresetsForApp(app as "radarr" | "sonarr" | "lidarr")
 
     if (key.name === "up") {
       const current = this.selectedProfiles.get(app)
@@ -176,7 +181,7 @@ export class TRaSHProfileSetup extends BoxRenderable {
     for (const appId of selectedAppIds) {
       const appDef = getApp(appId)
       const profileId = this.selectedProfiles.get(appId)
-      const preset = getPresetsForApp(appId as "radarr" | "sonarr").find((p) => p.id === profileId)
+      const preset = getPresetsForApp(appId as "radarr" | "sonarr" | "lidarr").find((p) => p.id === profileId)
 
       if (!appDef || !preset) continue
 
@@ -185,6 +190,7 @@ export class TRaSHProfileSetup extends BoxRenderable {
         appName: appDef.name,
         profile: preset.name,
         cfCount: 0,
+        namingConfigured: false,
         status: "configuring",
       })
       this.refreshContent()
@@ -195,6 +201,7 @@ export class TRaSHProfileSetup extends BoxRenderable {
         if (result) {
           result.status = "success"
           result.cfCount = Object.keys(preset.cfScores).length
+          result.namingConfigured = true
         }
       } catch (error) {
         const result = this.results.find((r) => r.appId === appId)
@@ -219,24 +226,36 @@ export class TRaSHProfileSetup extends BoxRenderable {
     if (!apiKey) throw new Error("API key not found - run Extract API Keys first")
 
     const port = this.config.apps.find((a) => a.id === appId)?.port || appDef.defaultPort
-    const qpClient = new QualityProfileClient("localhost", port, apiKey)
-    const cfClient = new CustomFormatClient("localhost", port, apiKey)
-
-    // Import Custom Formats first
-    const cfCategories = ["unwanted", "misc"]
-    if (preset.id.includes("uhd") || preset.id.includes("2160")) {
-      cfCategories.push("hdr")
-    }
-    if (preset.id.includes("remux")) {
-      cfCategories.push("audio")
+    const apiVersion = appDef.rootFolder?.apiVersion || "v3"
+    const qpClient = new QualityProfileClient("localhost", port, apiKey, apiVersion)
+    const cfClient = new CustomFormatClient("localhost", port, apiKey, apiVersion)
+
+    // Import Custom Formats - Lidarr uses Davo's guide formats, Radarr/Sonarr use TRaSH
+    if (appId === "lidarr") {
+      // Import Lidarr custom formats from Davo's Community Guide
+      await cfClient.importCustomFormats(LIDARR_CUSTOM_FORMATS)
+    } else {
+      // Import TRaSH custom formats for Radarr/Sonarr
+      const cfCategories = ["unwanted", "misc"]
+      if (preset.id.includes("uhd") || preset.id.includes("2160")) {
+        cfCategories.push("hdr")
+      }
+      if (preset.id.includes("remux")) {
+        cfCategories.push("audio")
+      }
+      const cfNames = getCFNamesForCategories(appId as "radarr" | "sonarr", cfCategories)
+      const { cfs } = await CustomFormatClient.fetchTRaSHCustomFormats(appId as "radarr" | "sonarr", cfNames)
+      await cfClient.importCustomFormats(cfs)
     }
 
-    const cfNames = getCFNamesForCategories(appId as "radarr" | "sonarr", cfCategories)
-    const { cfs } = await CustomFormatClient.fetchTRaSHCustomFormats(appId as "radarr" | "sonarr", cfNames)
-    await cfClient.importCustomFormats(cfs)
-
     // Create quality profile
     await qpClient.createTRaSHProfile(preset.name, preset.cutoffQuality, preset.allowedQualities, preset.cfScores)
+
+    // Configure naming scheme (skip for Lidarr - different API structure)
+    if (appId !== "lidarr") {
+      const arrClient = new ArrApiClient("localhost", port, apiKey, apiVersion)
+      await arrClient.configureTRaSHNaming(appId as "radarr" | "sonarr")
+    }
   }
 
   private refreshContent(): void {
@@ -293,7 +312,7 @@ export class TRaSHProfileSetup extends BoxRenderable {
 
     selectedAppIds.forEach((appId, appIdx) => {
       const app = getApp(appId)
-      const presets = getPresetsForApp(appId as "radarr" | "sonarr")
+      const presets = getPresetsForApp(appId as "radarr" | "sonarr" | "lidarr")
       const selectedPresetId = this.selectedProfiles.get(appId)
       const isCurrent = appIdx === this.currentIndex
 
@@ -349,7 +368,7 @@ export class TRaSHProfileSetup extends BoxRenderable {
 
       let content = `${status} ${result.appName}: ${result.profile}`
       if (result.status === "success") {
-        content += ` (${result.cfCount} CF scores)`
+        content += ` (${result.cfCount} CF scores, naming configured)`
       }
       if (result.message) {
         content += ` - ${result.message}`

package/src/utils/url-utils.ts

@@ -0,0 +1,38 @@
+/**
+ * URL Utilities
+ * Functions for generating app URLs based on Traefik configuration
+ */
+
+import type { EasiarrConfig } from "../config/schema"
+import { getLocalIp } from "./env"
+
+/**
+ * Get the local URL for an app (http://LOCAL_IP:PORT)
+ */
+export function getLocalAppUrl(port: number): string {
+  const localIp = getLocalIp()
+  return `http://${localIp}:${port}`
+}
+
+/**
+ * Get the external URL for an app (https://APP.DOMAIN)
+ * Returns null if Traefik is not enabled
+ */
+export function getExternalAppUrl(appId: string, config: EasiarrConfig): string | null {
+  if (!config.traefik?.enabled || !config.traefik.domain) {
+    return null
+  }
+  return `https://${appId}.${config.traefik.domain}`
+}
+
+/**
+ * Get the appropriate applicationUrl based on Traefik status
+ * Returns external URL if Traefik enabled, otherwise local URL
+ */
+export function getApplicationUrl(appId: string, port: number, config: EasiarrConfig): string {
+  const externalUrl = getExternalAppUrl(appId, config)
+  if (externalUrl) {
+    return externalUrl
+  }
+  return getLocalAppUrl(port)
+}