@muhammedaksam/easiarr 0.1.7 → 0.1.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@muhammedaksam/easiarr",
-  "version": "0.1.7",
+  "version": "0.1.9",
   "description": "TUI tool for generating docker-compose files for the *arr media ecosystem with 41 apps, TRaSH Guides best practices, VPN routing, and Traefik reverse proxy support",
   "module": "src/index.ts",
   "type": "module",

package/src/api/arr-api.ts

@@ -50,9 +50,9 @@ function getCategoryForApp(appId: AppId): string {
 function getCategoryFieldName(appId: AppId): string {
   switch (appId) {
     case "radarr":
-    case "whisparr":
       return "movieCategory"
     case "sonarr":
+    case "whisparr":
       return "tvCategory"
     case "lidarr":
       return "musicCategory"
@@ -195,4 +195,77 @@ export class ArrApiClient {
       return false
     }
   }
+
+  // Host Config methods - for setting up authentication
+  async getHostConfig(): Promise<HostConfig> {
+    return this.request<HostConfig>("/config/host")
+  }
+
+  async updateHostConfig(username: string, password: string, override = false): Promise<HostConfig | null> {
+    // First get current config to preserve all other settings
+    const currentConfig = await this.getHostConfig()
+
+    // Only update if no password is set OR override is requested
+    if (currentConfig.password && !override) {
+      return null // Skip - password already configured
+    }
+
+    // Update with authentication settings (id must be in body, not URL)
+    const updatedConfig: HostConfig = {
+      ...currentConfig,
+      authenticationMethod: "forms",
+      authenticationRequired: "enabled",
+      username,
+      password,
+      passwordConfirmation: password,
+    }
+
+    // PUT to /config/host with id in body (not /config/host/{id})
+    return this.request<HostConfig>("/config/host", {
+      method: "PUT",
+      body: JSON.stringify(updatedConfig),
+    })
+  }
+}
+
+// Types for Host Config API
+export interface HostConfig {
+  id: number
+  bindAddress: string | null
+  port: number
+  sslPort: number
+  enableSsl: boolean
+  launchBrowser: boolean
+  authenticationMethod: "none" | "basic" | "forms" | "external"
+  authenticationRequired: "enabled" | "disabledForLocalAddresses"
+  analyticsEnabled: boolean
+  username: string | null
+  password: string | null
+  passwordConfirmation: string | null
+  logLevel: string | null
+  logSizeLimit: number
+  consoleLogLevel: string | null
+  branch: string | null
+  apiKey: string | null
+  sslCertPath: string | null
+  sslCertPassword: string | null
+  urlBase: string | null
+  instanceName: string | null
+  applicationUrl: string | null
+  updateAutomatically: boolean
+  updateMechanism: string
+  updateScriptPath: string | null
+  proxyEnabled: boolean
+  proxyType: string
+  proxyHostname: string | null
+  proxyPort: number
+  proxyUsername: string | null
+  proxyPassword: string | null
+  proxyBypassFilter: string | null
+  proxyBypassLocalAddresses: boolean
+  certificateValidation: string
+  backupFolder: string | null
+  backupInterval: number
+  backupRetention: number
+  trustCgnatIpAddresses: boolean
 }

package/src/apps/registry.ts

@@ -109,7 +109,8 @@ export const APPS: Record<AppId, AppDefinition> = {
     image: "lscr.io/linuxserver/bazarr:latest",
     puid: 13013,
     pgid: 13000,
-    volumes: (root) => [`${root}/config/bazarr:/config`, `${root}/data/media:/media`],
+    // TRaSH: Bazarr only needs media access, use /data/media for consistent paths
+    volumes: (root) => [`${root}/config/bazarr:/config`, `${root}/data/media:/data/media`],
     dependsOn: ["sonarr", "radarr"],
     trashGuide: "docs/Bazarr/",
     apiKeyMeta: {
@@ -279,7 +280,8 @@ export const APPS: Record<AppId, AppDefinition> = {
     image: "lscr.io/linuxserver/plex:latest",
     puid: 13010,
     pgid: 13000,
-    volumes: (root) => [`${root}/config/plex:/config`, `${root}/data/media:/media`],
+    // TRaSH: Media servers only need media access, use /data/media for consistent paths
+    volumes: (root) => [`${root}/config/plex:/config`, `${root}/data/media:/data/media`],
     environment: { VERSION: "docker" },
     trashGuide: "docs/Plex/",
     apiKeyMeta: {

package/src/structure/manager.ts

@@ -31,11 +31,13 @@ export async function ensureDirectoryStructure(config: EasiarrConfig): Promise<v
 
     for (const [appId, contentType] of Object.entries(CONTENT_TYPE_MAP)) {
       if (enabledApps.has(appId as AppId)) {
-        // Create this content type in ALL base dirs to follow TRaSH standard
-        // (e.g. data/torrents/movies, data/usenet/movies, data/media/movies)
-        for (const base of BASE_DIRS) {
-          await mkdir(join(dataRoot, base, contentType), { recursive: true })
-        }
+        // TRaSH Structure:
+        // - Torrents: flat categories (data/torrents/movies, etc.)
+        // - Usenet: categories inside complete (data/usenet/complete/movies, etc.)
+        // - Media: flat library folders (data/media/movies, etc.)
+        await mkdir(join(dataRoot, "torrents", contentType), { recursive: true })
+        await mkdir(join(dataRoot, "usenet", "complete", contentType), { recursive: true })
+        await mkdir(join(dataRoot, "media", contentType), { recursive: true })
       }
     }
 
@@ -44,16 +46,16 @@ export async function ensureDirectoryStructure(config: EasiarrConfig): Promise<v
     // Always create 'photos' in media (Personal photos)
     await mkdir(join(dataRoot, "media", "photos"), { recursive: true })
 
-    // Always create 'console' and 'software' in torrents/usenet (Manual DL categories)
+    // TRaSH: Usenet has incomplete/complete structure, torrents do NOT
+    await mkdir(join(dataRoot, "usenet", "incomplete"), { recursive: true })
+    await mkdir(join(dataRoot, "usenet", "complete"), { recursive: true })
+
+    // Manual download categories for both torrent and usenet
     for (const base of ["torrents", "usenet"]) {
       await mkdir(join(dataRoot, base, "console"), { recursive: true })
       await mkdir(join(dataRoot, base, "software"), { recursive: true })
       // Create 'watch' folder for manual .torrent/.nzb drops
       await mkdir(join(dataRoot, base, "watch"), { recursive: true })
-
-      // 'complete' and 'incomplete' default folders
-      await mkdir(join(dataRoot, base, "complete"), { recursive: true })
-      await mkdir(join(dataRoot, base, "incomplete"), { recursive: true })
     }
 
     if (enabledApps.has("prowlarr")) {

package/src/ui/screens/AppConfigurator.ts

@@ -27,17 +27,22 @@ interface ConfigResult {
   message?: string
 }
 
-type Step = "configure" | "qbittorrent" | "sabnzbd" | "done"
+type Step = "credentials" | "configure" | "qbittorrent" | "sabnzbd" | "done"
 
 export class AppConfigurator extends BoxRenderable {
   private config: EasiarrConfig
   private cliRenderer: CliRenderer
   private keyHandler!: (key: KeyEvent) => void
   private results: ConfigResult[] = []
-  private currentStep: Step = "configure"
+  private currentStep: Step = "credentials"
   private contentBox!: BoxRenderable
   private pageContainer!: BoxRenderable
 
+  // Global *arr credentials
+  private globalUsername = "admin"
+  private globalPassword = ""
+  private overrideExisting = false
+
   // Download client credentials
   private qbHost = "qbittorrent"
   private qbPort = 8080
@@ -73,7 +78,8 @@ export class AppConfigurator extends BoxRenderable {
     // Load saved credentials from .env
     this.loadSavedCredentials()
 
-    this.runConfiguration()
+    // Start with credentials prompt
+    this.renderCredentialsPrompt()
   }
 
   private loadSavedCredentials() {
@@ -86,7 +92,11 @@ export class AppConfigurator extends BoxRenderable {
         const [key, ...val] = line.split("=")
         if (key && val.length > 0) {
           const value = val.join("=").trim()
-          if (key.trim() === "QBITTORRENT_PASSWORD") {
+          if (key.trim() === "GLOBAL_USERNAME") {
+            this.globalUsername = value
+          } else if (key.trim() === "GLOBAL_PASSWORD") {
+            this.globalPassword = value
+          } else if (key.trim() === "QBITTORRENT_PASSWORD") {
             this.qbPass = value
           } else if (key.trim() === "SABNZBD_API_KEY") {
             this.sabApiKey = value
@@ -98,6 +108,143 @@ export class AppConfigurator extends BoxRenderable {
     }
   }
 
+  private renderCredentialsPrompt() {
+    this.clear()
+
+    const { container, content } = createPageLayout(this.cliRenderer, {
+      title: "Configure Apps",
+      stepInfo: "Global Credentials",
+      footerHint: "Enter credentials for all *arr apps  Tab Next Field  Enter Continue  Esc Skip",
+    })
+    this.pageContainer = container
+    this.add(container)
+
+    content.add(
+      new TextRenderable(this.cliRenderer, {
+        content: "Set a global username/password for all *arr applications:\n",
+        fg: "#4a9eff",
+      })
+    )
+
+    // Username input
+    content.add(new TextRenderable(this.cliRenderer, { content: "Username:", fg: "#aaaaaa" }))
+    const userInput = new InputRenderable(this.cliRenderer, {
+      id: "global-user-input",
+      width: 30,
+      placeholder: "admin",
+      value: this.globalUsername,
+      focusedBackgroundColor: "#1a1a1a",
+    })
+    content.add(userInput)
+
+    content.add(new BoxRenderable(this.cliRenderer, { width: 1, height: 1 })) // Spacer
+
+    // Password input
+    content.add(new TextRenderable(this.cliRenderer, { content: "Password:", fg: "#aaaaaa" }))
+    const passInput = new InputRenderable(this.cliRenderer, {
+      id: "global-pass-input",
+      width: 30,
+      placeholder: "Enter password",
+      value: this.globalPassword,
+      focusedBackgroundColor: "#1a1a1a",
+    })
+    content.add(passInput)
+
+    content.add(new BoxRenderable(this.cliRenderer, { width: 1, height: 1 })) // Spacer
+
+    // Override toggle
+    const overrideText = new TextRenderable(this.cliRenderer, {
+      id: "override-toggle",
+      content: `[O] Override existing: ${this.overrideExisting ? "Yes" : "No"}`,
+      fg: this.overrideExisting ? "#50fa7b" : "#6272a4",
+    })
+    content.add(overrideText)
+
+    userInput.focus()
+    let focusedInput: InputRenderable | null = userInput
+
+    // Handle key events
+    this.keyHandler = (key: KeyEvent) => {
+      // Skip shortcut keys when an input is focused (allow typing 'o')
+      const inputIsFocused = focusedInput !== null
+
+      if (key.name === "o" && !inputIsFocused) {
+        // Toggle override only when no input is focused
+        this.overrideExisting = !this.overrideExisting
+        overrideText.content = `[O] Override existing: ${this.overrideExisting ? "Yes" : "No"}`
+        overrideText.fg = this.overrideExisting ? "#50fa7b" : "#6272a4"
+      } else if (key.name === "tab") {
+        // Toggle focus between inputs
+        if (focusedInput === userInput) {
+          userInput.blur()
+          passInput.focus()
+          focusedInput = passInput
+        } else {
+          passInput.blur()
+          userInput.focus()
+          focusedInput = userInput
+        }
+      } else if (key.name === "escape") {
+        // Skip credentials setup
+        this.cliRenderer.keyInput.off("keypress", this.keyHandler)
+        userInput.blur()
+        passInput.blur()
+        focusedInput = null
+        this.currentStep = "configure"
+        this.runConfiguration()
+      } else if (key.name === "return") {
+        // Save and continue
+        this.globalUsername = userInput.value || "admin"
+        this.globalPassword = passInput.value
+
+        this.cliRenderer.keyInput.off("keypress", this.keyHandler)
+        userInput.blur()
+        passInput.blur()
+        focusedInput = null
+
+        // Save credentials to .env
+        this.saveGlobalCredentialsToEnv()
+
+        this.currentStep = "configure"
+        this.runConfiguration()
+      }
+    }
+    this.cliRenderer.keyInput.on("keypress", this.keyHandler)
+  }
+
+  private async saveGlobalCredentialsToEnv() {
+    try {
+      const envPath = getComposePath().replace("docker-compose.yml", ".env")
+
+      // Read existing .env if present
+      const currentEnv: Record<string, string> = {}
+      if (existsSync(envPath)) {
+        const content = await readFile(envPath, "utf-8")
+        content.split("\n").forEach((line) => {
+          const [key, ...val] = line.split("=")
+          if (key && val.length > 0) currentEnv[key.trim()] = val.join("=").trim()
+        })
+      }
+
+      // Add global credentials
+      if (this.globalUsername) {
+        currentEnv["GLOBAL_USERNAME"] = this.globalUsername
+      }
+      if (this.globalPassword) {
+        currentEnv["GLOBAL_PASSWORD"] = this.globalPassword
+      }
+
+      // Reconstruct .env content
+      const envContent = Object.entries(currentEnv)
+        .map(([k, v]) => `${k}=${v}`)
+        .join("\n")
+
+      await writeFile(envPath, envContent, "utf-8")
+    } catch {
+      // Ignore errors - not critical
+    }
+  }
+
   private async runConfiguration() {
     // Initialize results for apps that have rootFolder
     for (const appConfig of this.config.apps) {
@@ -184,6 +331,15 @@ export class AppConfigurator extends BoxRenderable {
 
     // Add root folder
     await client.addRootFolder(appDef.rootFolder.path)
+
+    // Set up authentication if credentials provided
+    if (this.globalPassword) {
+      try {
+        await client.updateHostConfig(this.globalUsername, this.globalPassword, this.overrideExisting)
+      } catch {
+        // Ignore auth setup errors - not critical
+      }
+    }
   }
 
   private extractApiKey(appId: AppId): string | null {