Реализация, фаза 1: добавление данных в qbittorrent

2026-06-14 12:10:48 +03:00
parent b1a4a846d6
commit 883148787a
22 changed files with 2352 additions and 86 deletions
@@ -0,0 +1,67 @@
+package main
+
+import (
+	"bytes"
+	"context"
+	"encoding/json"
+	"flag"
+	"fmt"
+	"io"
+	"net/http"
+	"strings"
+	"time"
+)
+
+// runAdd — тонкий CLI-клиент REST API запущенного сервиса (для отладки):
+//
+//	jellybit add <magnet> --context "..." --server http://localhost:8080
+func runAdd(args []string) error {
+	fs := flag.NewFlagSet("add", flag.ContinueOnError)
+	server := fs.String("server", "http://localhost:8080", "адрес запущенного jellybit")
+	contextStr := fs.String("context", "", "контекст для распознавания")
+
+	// stdlib flag прекращает разбор на первом позиционном аргументе, поэтому
+	// magnet (если он идёт первым) вынимаем до Parse — так работают оба
+	// порядка: `add <magnet> --context ...` и `add --context ... <magnet>`.
+	var source string
+	if len(args) > 0 && !strings.HasPrefix(args[0], "-") {
+		source, args = args[0], args[1:]
+	}
+	if err := fs.Parse(args); err != nil {
+		return err
+	}
+	if source == "" {
+		if fs.NArg() < 1 {
+			return fmt.Errorf("usage: jellybit add <magnet> [--context ...] [--server ...]")
+		}
+		source = fs.Arg(0)
+	}
+
+	body, err := json.Marshal(map[string]string{"source": source, "context": *contextStr})
+	if err != nil {
+		return err
+	}
+
+	ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
+	defer cancel()
+
+	endpoint := strings.TrimRight(*server, "/") + "/api/downloads"
+	req, err := http.NewRequestWithContext(ctx, http.MethodPost, endpoint, bytes.NewReader(body))
+	if err != nil {
+		return err
+	}
+	req.Header.Set("Content-Type", "application/json")
+
+	resp, err := http.DefaultClient.Do(req)
+	if err != nil {
+		return fmt.Errorf("call %s: %w", endpoint, err)
+	}
+	defer func() { _ = resp.Body.Close() }()
+
+	respBody, _ := io.ReadAll(io.LimitReader(resp.Body, 1<<16))
+	if resp.StatusCode >= 400 {
+		return fmt.Errorf("server returned %d: %s", resp.StatusCode, strings.TrimSpace(string(respBody)))
+	}
+	fmt.Println(strings.TrimSpace(string(respBody)))
+	return nil
+}
@@ -1,77 +1,38 @@
 // Команда jellybit — связующий сервис qBittorrent ↔ Jellyfin.
+//
+// Подкоманды:
+//
+//	jellybit [serve] --config <path>   запустить сервис (по умолчанию)
+//	jellybit add <magnet> [--context]  добавить загрузку через REST API сервиса
 package main

 import (
-	"context"
-	"errors"
-	"flag"
-	"net/http"
 	"os"
-	"os/signal"
-	"syscall"
-	"time"
-
-	"git.vakhrushev.me/av/jellybit/internal/config"
-	"git.vakhrushev.me/av/jellybit/internal/httpapi"
-	"git.vakhrushev.me/av/jellybit/internal/logging"
-	"git.vakhrushev.me/av/jellybit/internal/store"
+	"strings"
 )

 func main() {
-	if err := run(); err != nil {
+	args := os.Args[1:]
+
+	// Первый позиционный аргумент (не флаг) — подкоманда. Без него (и при
+	// `--config ...`, как в Dockerfile ENTRYPOINT) запускаем сервис.
+	cmd := "serve"
+	if len(args) > 0 && !strings.HasPrefix(args[0], "-") {
+		cmd, args = args[0], args[1:]
+	}
+
+	var err error
+	switch cmd {
+	case "serve":
+		err = runServe(args)
+	case "add":
+		err = runAdd(args)
+	default:
+		_, _ = os.Stderr.WriteString("unknown command: " + cmd + "\n")
+		os.Exit(2)
+	}
+	if err != nil {
 		_, _ = os.Stderr.WriteString("fatal: " + err.Error() + "\n")
 		os.Exit(1)
 	}
 }
-
-func run() error {
-	configPath := flag.String("config", "/data/config.toml", "путь к config.toml")
-	flag.Parse()
-
-	cfg, err := config.Load(*configPath)
-	if err != nil {
-		return err
-	}
-
-	logger := logging.New(cfg.Log.Level, cfg.Log.Format)
-	logger.Info("starting jellybit", "config", *configPath)
-
-	st, err := store.Open(cfg.Storage.DBPath)
-	if err != nil {
-		return err
-	}
-	defer func() { _ = st.Close() }()
-	logger.Info("database ready", "path", cfg.Storage.DBPath)
-
-	srv := &http.Server{
-		Addr:              cfg.HTTP.Listen,
-		Handler:           httpapi.NewRouter(logger),
-		ReadHeaderTimeout: 10 * time.Second,
-	}
-
-	ctx, stop := signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM)
-	defer stop()
-
-	errCh := make(chan error, 1)
-	go func() {
-		logger.Info("http server listening", "addr", cfg.HTTP.Listen)
-		if err := srv.ListenAndServe(); err != nil && !errors.Is(err, http.ErrServerClosed) {
-			errCh <- err
-		}
-	}()
-
-	select {
-	case err := <-errCh:
-		return err
-	case <-ctx.Done():
-		logger.Info("shutdown signal received")
-	}
-
-	shutdownCtx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
-	defer cancel()
-	if err := srv.Shutdown(shutdownCtx); err != nil {
-		return err
-	}
-	logger.Info("stopped")
-	return nil
-}
@@ -0,0 +1,111 @@
+package main
+
+import (
+	"context"
+	"errors"
+	"flag"
+	"fmt"
+	"net/http"
+	"os/signal"
+	"syscall"
+	"time"
+
+	"git.vakhrushev.me/av/jellybit/internal/config"
+	"git.vakhrushev.me/av/jellybit/internal/httpapi"
+	"git.vakhrushev.me/av/jellybit/internal/ingest"
+	"git.vakhrushev.me/av/jellybit/internal/logging"
+	"git.vakhrushev.me/av/jellybit/internal/qbt"
+	"git.vakhrushev.me/av/jellybit/internal/store"
+	"git.vakhrushev.me/av/jellybit/internal/worker"
+)
+
+// runServe запускает сервис: конфиг → хранилище → клиент qBittorrent →
+// воркер (фоном) → HTTP-сервер; останавливается по SIGINT/SIGTERM.
+func runServe(args []string) error {
+	fs := flag.NewFlagSet("serve", flag.ContinueOnError)
+	configPath := fs.String("config", "/data/config.toml", "путь к config.toml")
+	if err := fs.Parse(args); err != nil {
+		return err
+	}
+
+	cfg, err := config.Load(*configPath)
+	if err != nil {
+		return err
+	}
+
+	logger := logging.New(cfg.Log.Level, cfg.Log.Format)
+	logger.Info("starting jellybit", "config", *configPath)
+
+	st, err := store.Open(cfg.Storage.DBPath)
+	if err != nil {
+		return err
+	}
+	defer func() { _ = st.Close() }()
+	logger.Info("database ready", "path", cfg.Storage.DBPath)
+
+	qb, err := qbt.New(qbt.Config{
+		URL:      cfg.QBittorrent.URL,
+		Username: cfg.QBittorrent.Username,
+		Password: cfg.QBittorrent.Password,
+	})
+	if err != nil {
+		return err
+	}
+
+	ingestor := ingest.New(st, qb, ingest.Config{
+		Category: cfg.QBittorrent.Category,
+		SavePath: cfg.QBittorrent.SavePath,
+	}, logger)
+
+	wrk := worker.New(st, qb, worker.Config{
+		Category:      cfg.QBittorrent.Category,
+		SavePath:      cfg.QBittorrent.SavePath,
+		PollInterval:  cfg.Worker.PollInterval.Std(),
+		StuckAfter:    cfg.Worker.StuckAfter.Std(),
+		MagnetTimeout: cfg.Worker.MagnetTimeout.Std(),
+	}, logger)
+
+	router, err := httpapi.NewRouter(httpapi.Deps{
+		Logger:    logger,
+		Ingestor:  ingestor,
+		Commander: wrk,
+		Reader:    st,
+	})
+	if err != nil {
+		return err
+	}
+
+	ctx, stop := signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM)
+	defer stop()
+
+	go wrk.Run(ctx)
+
+	srv := &http.Server{
+		Addr:              cfg.HTTP.Listen,
+		Handler:           router,
+		ReadHeaderTimeout: 10 * time.Second,
+	}
+
+	errCh := make(chan error, 1)
+	go func() {
+		logger.Info("http server listening", "addr", cfg.HTTP.Listen)
+		if err := srv.ListenAndServe(); err != nil && !errors.Is(err, http.ErrServerClosed) {
+			errCh <- err
+		}
+	}()
+
+	select {
+	case err := <-errCh:
+		return err
+	case <-ctx.Done():
+		logger.Info("shutdown signal received")
+	}
+
+	shutdownCtx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+	defer cancel()
+	if err := srv.Shutdown(shutdownCtx); err != nil {
+		return fmt.Errorf("http shutdown: %w", err)
+	}
+	logger.Info("stopped")
+	return nil
+}