Merge branch 'beta'

Author: sirrobot01

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,76 @@
+name: Bug Report
+description: 'Report a new bug'
+labels: ['Type: Bug', 'Status: Needs Triage']
+body:
+  - type: checkboxes
+    attributes:
+      label: Is there an existing issue for this?
+      description: Please search to see if an open or closed issue already exists for the bug you encountered. If a bug exists and is closed note that it may only be fixed in an unstable branch.
+      options:
+        - label: I have searched the existing open and closed issues
+          required: true
+  - type: textarea
+    attributes:
+      label: Current Behavior
+      description: A concise description of what you're experiencing.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Expected Behavior
+      description: A concise description of what you expected to happen.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Steps To Reproduce
+      description: Steps to reproduce the behavior.
+      placeholder: |
+        1. In this environment...
+        2. With this config...
+        3. Run '...'
+        4. See error...
+    validations:
+      required: false
+  - type: textarea
+    attributes:
+      label: Environment
+      description: |
+        examples:
+          - **OS**: Ubuntu 20.04
+          - **Version**: v1.0.0
+          - **Docker Install**: Yes
+          - **Browser**: Firefox 90 (If UI related)
+      value: |
+        - OS: 
+        - Version: 
+        - Docker Install: 
+        - Browser:
+      render: markdown
+    validations:
+      required: true
+  - type: dropdown
+    attributes:
+      label: What branch are you running?
+      options:
+        - Main/Latest
+        - Beta
+        - Experimental
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Trace Logs? **Not Optional**
+      description: |
+        Trace Logs 
+        - are **required** for bug reports
+        - are not optional
+    validations:
+      required: true
+  - type: checkboxes
+    attributes:
+      label: Trace Logs have been provided as applicable
+      description: Trace logs are **generally required** and are not optional for all bug reports and contain `trace`. Info logs are invalid for bug reports and do not contain `debug` nor `trace`
+      options:
+        - label: I have read and followed the steps in the wiki link above and provided the required trace logs - the logs contain `trace` - that are relevant and show this issue.
+          required: true

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -0,0 +1,38 @@
+name: Feature Request
+description: 'Suggest an idea for Decypharr'
+labels: ['Type: Feature Request', 'Status: Needs Triage']
+body:
+  - type: checkboxes
+    attributes:
+      label: Is there an existing issue for this?
+      description: Please search to see if an open or closed issue already exists for the feature you are requesting. If a request exists and is closed note that it may only be fixed in an unstable branch.
+      options:
+        - label: I have searched the existing open and closed issues
+          required: true
+  - type: textarea
+    attributes:
+      label: Is your feature request related to a problem? Please describe
+      description: A clear and concise description of what the problem is.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Describe the solution you'd like
+      description: A clear and concise description of what you want to happen.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Describe alternatives you've considered
+      description: A clear and concise description of any alternative solutions or features you've considered.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Anything else?
+      description: |
+        Links? References? Mockups? Anything that will give us more context about the feature you are encountering!
+        
+        Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
+    validations:
+      required: true

Dockerfile

@@ -61,6 +61,8 @@ EXPOSE 8282
 VOLUME ["/app"]
 USER nonroot:nonroot
 
-HEALTHCHECK --interval=3s --retries=10 CMD ["/usr/bin/healthcheck", "--config", "/app"]
+
+# Base healthcheck
+HEALTHCHECK --interval=3s --retries=10 CMD ["/usr/bin/healthcheck", "--config", "/app", "--basic"]
 
 CMD ["/usr/bin/decypharr", "--config", "/app"]

README.md

@@ -6,16 +6,16 @@
 
 ## What is Decypharr?
 
-Decypharr combines the power of QBittorrent with popular Debrid services to enhance your media management. It provides a familiar interface for Sonarr, Radarr, and other \*Arr applications while leveraging the capabilities of Debrid providers.
+Decypharr combines the power of QBittorrent with popular Debrid services to enhance your media management. It provides a familiar interface for Sonarr, Radarr, and other \*Arr applications.
 
 ## Features
 
-- 🔄 Mock Qbittorent API that supports the Arrs (Sonarr, Radarr, Lidarr etc)
-- 🖥️ Full-fledged UI for managing torrents
-- 🛡️ Proxy support for filtering out un-cached Debrid torrents
-- 🔌 Multiple Debrid providers support
-- 📁 WebDAV server support for each debrid provider
-- 🔧 Repair Worker for missing files
+- Mock Qbittorent API that supports the Arrs (Sonarr, Radarr, Lidarr etc)
+- Full-fledged UI for managing torrents
+- Proxy support for filtering out un-cached Debrid torrents
+- Multiple Debrid providers support
+- WebDAV server support for each debrid provider
+- Repair Worker for missing files
 
 ## Supported Debrid Providers
 
@@ -36,14 +36,9 @@ services:
     container_name: decypharr
     ports:
       - "8282:8282" # qBittorrent
-    user: "1000:1000"
     volumes:
       - /mnt/:/mnt
       - ./configs/:/app # config.json must be in this directory
-    environment:
-      - PUID=1000
-      - PGID=1000
-      - UMASK=002
     restart: unless-stopped
 ```
 

cmd/decypharr/main.go

@@ -7,11 +7,10 @@ import (
 	"github.com/sirrobot01/decypharr/internal/logger"
 	"github.com/sirrobot01/decypharr/pkg/qbit"
 	"github.com/sirrobot01/decypharr/pkg/server"
-	"github.com/sirrobot01/decypharr/pkg/service"
+	"github.com/sirrobot01/decypharr/pkg/store"
 	"github.com/sirrobot01/decypharr/pkg/version"
 	"github.com/sirrobot01/decypharr/pkg/web"
 	"github.com/sirrobot01/decypharr/pkg/webdav"
-	"github.com/sirrobot01/decypharr/pkg/worker"
 	"net/http"
 	"os"
 	"runtime"
@@ -62,7 +61,7 @@ func Start(ctx context.Context) error {
 		qb := qbit.New()
 		wd := webdav.New()
 
-		ui := web.New(qb).Routes()
+		ui := web.New().Routes()
 		webdavRoutes := wd.Routes()
 		qbitRoutes := qb.Routes()
 
@@ -76,7 +75,7 @@ func Start(ctx context.Context) error {
 
 		done := make(chan struct{})
 		go func(ctx context.Context) {
-			if err := startServices(ctx, wd, srv); err != nil {
+			if err := startServices(ctx, cancelSvc, wd, srv); err != nil {
 				_log.Error().Err(err).Msg("Error starting services")
 				cancelSvc()
 			}
@@ -95,20 +94,20 @@ func Start(ctx context.Context) error {
 			_log.Info().Msg("Restarting Decypharr...")
 			<-done // wait for them to finish
 			qb.Reset()
-			service.Reset()
+			store.Reset()
 
 			// rebuild svcCtx off the original parent
 			svcCtx, cancelSvc = context.WithCancel(ctx)
 			runtime.GC()
 
 			config.Reload()
-			service.Reset()
+			store.Reset()
 			// loop will restart services automatically
 		}
 	}
 }
 
-func startServices(ctx context.Context, wd *webdav.WebDav, srv *server.Server) error {
+func startServices(ctx context.Context, cancelSvc context.CancelFunc, wd *webdav.WebDav, srv *server.Server) error {
 	var wg sync.WaitGroup
 	errChan := make(chan error)
 
@@ -146,11 +145,7 @@ func startServices(ctx context.Context, wd *webdav.WebDav, srv *server.Server) e
 	})
 
 	safeGo(func() error {
-		return worker.Start(ctx)
-	})
-
-	safeGo(func() error {
-		arr := service.GetService().Arr
+		arr := store.Get().Arr()
 		if arr == nil {
 			return nil
 		}
@@ -159,16 +154,20 @@ func startServices(ctx context.Context, wd *webdav.WebDav, srv *server.Server) e
 
 	if cfg := config.Get(); cfg.Repair.Enabled {
 		safeGo(func() error {
-			r := service.GetService().Repair
-			if r != nil {
-				if err := r.Start(ctx); err != nil {
+			repair := store.Get().Repair()
+			if repair != nil {
+				if err := repair.Start(ctx); err != nil {
 					_log.Error().Err(err).Msg("repair failed")
 				}
 			}
 			return nil
 		})
 	}
 
+	safeGo(func() error {
+		return store.Get().StartQueueSchedule(ctx)
+	})
+
 	go func() {
 		wg.Wait()
 		close(errChan)
@@ -178,7 +177,11 @@ func startServices(ctx context.Context, wd *webdav.WebDav, srv *server.Server) e
 		for err := range errChan {
 			if err != nil {
 				_log.Error().Err(err).Msg("Service error detected")
-				// Don't shut down the whole app
+				// If the error is critical, return it to stop the main loop
+				if ctx.Err() == nil {
+					_log.Error().Msg("Stopping services due to error")
+					cancelSvc() // Cancel the service context to stop all services
+				}
 			}
 		}
 	}()

cmd/healthcheck/main.go

@@ -22,8 +22,14 @@ type HealthStatus struct {
 }
 
 func main() {
-	var configPath string
+	var (
+		configPath   string
+		isBasicCheck bool
+		debug        bool
+	)
 	flag.StringVar(&configPath, "config", "/data", "path to the data folder")
+	flag.BoolVar(&isBasicCheck, "basic", false, "perform basic health check without WebDAV")
+	flag.BoolVar(&debug, "debug", false, "enable debug mode for detailed output")
 	flag.Parse()
 	config.SetConfigPath(configPath)
 	cfg := config.Get()
@@ -63,16 +69,17 @@ func main() {
 		status.WebUI = true
 	}
 
-	// Check WebDAV if enabled
-	if webdavPath != "" {
-		if checkWebDAV(ctx, baseUrl, port, webdavPath) {
+	if isBasicCheck {
+		status.WebDAVService = checkBaseWebdav(ctx, baseUrl, port)
+	} else {
+		// If not a basic check, check WebDAV with debrid path
+		if webdavPath != "" {
+			status.WebDAVService = checkDebridWebDAV(ctx, baseUrl, port, webdavPath)
+		} else {
+			// If no WebDAV path is set, consider it healthy
 			status.WebDAVService = true
 		}
-	} else {
-		// If WebDAV is not enabled, consider it healthy
-		status.WebDAVService = true
 	}
-
 	// Determine overall status
 	// Consider the application healthy if core services are running
 	status.OverallStatus = status.QbitAPI && status.WebUI
@@ -81,7 +88,7 @@ func main() {
 	}
 
 	// Optional: output health status as JSON for logging
-	if os.Getenv("DEBUG") == "true" {
+	if debug {
 		statusJSON, _ := json.MarshalIndent(status, "", "  ")
 		fmt.Println(string(statusJSON))
 	}
@@ -132,7 +139,24 @@ func checkWebUI(ctx context.Context, baseUrl, port string) bool {
 	return resp.StatusCode == http.StatusOK
 }
 
-func checkWebDAV(ctx context.Context, baseUrl, port, path string) bool {
+func checkBaseWebdav(ctx context.Context, baseUrl, port string) bool {
+	url := fmt.Sprintf("http://localhost:%s%swebdav/", port, baseUrl)
+	req, err := http.NewRequestWithContext(ctx, "PROPFIND", url, nil)
+	if err != nil {
+		return false
+	}
+
+	resp, err := http.DefaultClient.Do(req)
+	if err != nil {
+		return false
+	}
+	defer resp.Body.Close()
+
+	return resp.StatusCode == http.StatusMultiStatus ||
+		resp.StatusCode == http.StatusOK
+}
+
+func checkDebridWebDAV(ctx context.Context, baseUrl, port, path string) bool {
 	url := fmt.Sprintf("http://localhost:%s%swebdav/%s", port, baseUrl, path)
 	req, err := http.NewRequestWithContext(ctx, "PROPFIND", url, nil)
 	if err != nil {
@@ -145,5 +169,7 @@ func checkWebDAV(ctx context.Context, baseUrl, port, path string) bool {
 	}
 	defer resp.Body.Close()
 
-	return resp.StatusCode == 207 || resp.StatusCode == http.StatusOK
+	return resp.StatusCode == http.StatusMultiStatus ||
+		resp.StatusCode == http.StatusOK
+
 }

docs/docs/configuration/general.md

@@ -14,7 +14,7 @@ Here are the fundamental configuration options:
   "discord_webhook_url": "",
   "min_file_size": 0,
   "max_file_size": 0,
-  "allowed_file_types": [".mp4", ".mkv", ".avi", ...],
+  "allowed_file_types": ["mp4", "mkv", "avi", ...],
 
 }
 ```
@@ -55,18 +55,18 @@ When enabled, you'll need to provide a username and password to access the Decyp
 
 You can set minimum and maximum file size limits for torrents:
 ```json
-"min_file_size": 0,  // Minimum file size in bytes (0 = no minimum)
-"max_file_size": 0   // Maximum file size in bytes (0 = no maximum)
+"min_file_size": 0,
+"max_file_size": 0
 ```
 
 #### Allowed File Types
 You can restrict the types of files that Decypharr will process by specifying allowed file extensions. This is useful for filtering out unwanted file types.
 
 ```json
 "allowed_file_types": [
-  ".mp4", ".mkv", ".avi", ".mov",
-  ".m4v", ".mpg", ".mpeg", ".wmv",
-  ".m4a", ".mp3", ".flac", ".wav"
+  "mp4", "mkv", "avi", "mov",
+  "m4v", "mpg", "mpeg", "wmv",
+  "m4a", "mp3", "flac", "wav"
 ]
 ```