@muhammedaksam/easiarr 0.1.8 → 0.1.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@muhammedaksam/easiarr",
-  "version": "0.1.8",
+  "version": "0.1.10",
   "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

@@ -86,6 +86,7 @@ export function createQBittorrentConfig(
       { name: "username", value: username },
       { name: "password", value: password },
       { name: categoryField, value: category },
+      { name: "savePath", value: "/data/torrents" },
       { name: "recentMoviePriority", value: 0 },
       { name: "olderMoviePriority", value: 0 },
       { name: "initialState", value: 0 },
@@ -111,6 +112,7 @@ export function createSABnzbdConfig(host: string, port: number, apiKey: string,
       { name: "port", value: port },
       { name: "apiKey", value: apiKey },
       { name: categoryField, value: category },
+      { name: "savePath", value: "/data/usenet" },
       { name: "recentMoviePriority", value: -100 },
       { name: "olderMoviePriority", value: -100 },
     ],
@@ -210,8 +212,8 @@ export class ArrApiClient {
       return null // Skip - password already configured
     }
 
-    // Update with authentication settings
-    const updatedConfig = {
+    // Update with authentication settings (id must be in body, not URL)
+    const updatedConfig: HostConfig = {
       ...currentConfig,
       authenticationMethod: "forms",
       authenticationRequired: "enabled",
@@ -220,7 +222,8 @@ export class ArrApiClient {
       passwordConfirmation: password,
     }
 
-    return this.request<HostConfig>(`/config/host/${currentConfig.id}`, {
+    // PUT to /config/host with id in body (not /config/host/{id})
+    return this.request<HostConfig>("/config/host", {
       method: "PUT",
       body: JSON.stringify(updatedConfig),
     })

package/src/ui/screens/AppConfigurator.ts

@@ -13,7 +13,6 @@ import {
 } from "@opentui/core"
 import { existsSync, readFileSync } from "node:fs"
 import { writeFile, readFile } from "node:fs/promises"
-import { join } from "node:path"
 import { createPageLayout } from "../components/PageLayout"
 import { EasiarrConfig, AppId } from "../../config/schema"
 import { getApp } from "../../apps/registry"
@@ -114,7 +113,7 @@ export class AppConfigurator extends BoxRenderable {
     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",
+      footerHint: "Tab Cycle Fields/Shortcuts  O Override  Enter Continue  Esc Skip",
     })
     this.pageContainer = container
     this.add(container)
@@ -161,23 +160,29 @@ export class AppConfigurator extends BoxRenderable {
     content.add(overrideText)
 
     userInput.focus()
-    let focusedInput = userInput
+    let focusedInput: InputRenderable | null = userInput
 
     // Handle key events
     this.keyHandler = (key: KeyEvent) => {
-      if (key.name === "o" && !userInput.focused && !passInput.focused) {
-        // Toggle override
+      // 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
+        // Cycle focus: username -> password -> no focus (shortcuts work) -> username
         if (focusedInput === userInput) {
           userInput.blur()
           passInput.focus()
           focusedInput = passInput
-        } else {
+        } else if (focusedInput === passInput) {
           passInput.blur()
+          focusedInput = null // No focus state - shortcuts available
+        } else {
+          // No input focused, go back to username
           userInput.focus()
           focusedInput = userInput
         }
@@ -186,6 +191,7 @@ export class AppConfigurator extends BoxRenderable {
         this.cliRenderer.keyInput.off("keypress", this.keyHandler)
         userInput.blur()
         passInput.blur()
+        focusedInput = null
         this.currentStep = "configure"
         this.runConfiguration()
       } else if (key.name === "return") {
@@ -196,6 +202,7 @@ export class AppConfigurator extends BoxRenderable {
         this.cliRenderer.keyInput.off("keypress", this.keyHandler)
         userInput.blur()
         passInput.blur()
+        focusedInput = null
 
         // Save credentials to .env
         this.saveGlobalCredentialsToEnv()
@@ -338,27 +345,25 @@ export class AppConfigurator extends BoxRenderable {
   }
 
   private extractApiKey(appId: AppId): string | null {
-    const appDef = getApp(appId)
-    if (!appDef?.apiKeyMeta) return null
-
-    const volumes = appDef.volumes(this.config.rootDir)
-    if (volumes.length === 0) return null
-
-    const parts = volumes[0].split(":")
-    const hostPath = parts[0]
-    const configFilePath = join(hostPath, appDef.apiKeyMeta.configFile)
+    // Use API keys from .env file (format: API_KEY_APPNAME)
+    try {
+      const envPath = getComposePath().replace("docker-compose.yml", ".env")
+      if (!existsSync(envPath)) return null
 
-    if (!existsSync(configFilePath)) return null
+      const content = readFileSync(envPath, "utf-8")
+      const envKey = `API_KEY_${appId.toUpperCase()}`
 
-    const content = readFileSync(configFilePath, "utf-8")
+      for (const line of content.split("\n")) {
+        const [key, ...val] = line.split("=")
+        if (key?.trim() === envKey && val.length > 0) {
+          return val.join("=").trim()
+        }
+      }
 
-    if (appDef.apiKeyMeta.parser === "regex") {
-      const regex = new RegExp(appDef.apiKeyMeta.selector)
-      const match = regex.exec(content)
-      return match?.[1] || null
+      return null
+    } catch {
+      return null
     }
-
-    return null
   }
 
   private renderConfigProgress() {