diff --git a/internal/feed/newznab.go b/internal/feed/newznab.go index 595addf..18cff4f 100644 --- a/internal/feed/newznab.go +++ b/internal/feed/newznab.go @@ -36,7 +36,7 @@ type NewznabJob struct { JobID int } -func NewNewznabJob(feed *domain.Feed, name string, indexerIdentifier string, log zerolog.Logger, url string, client newznab.Client, repo domain.FeedRepo, cacheRepo domain.FeedCacheRepo, releaseSvc release.Service) *NewznabJob { +func NewNewznabJob(feed *domain.Feed, name string, indexerIdentifier string, log zerolog.Logger, url string, client newznab.Client, repo domain.FeedRepo, cacheRepo domain.FeedCacheRepo, releaseSvc release.Service) FeedJob { return &NewznabJob{ Feed: feed, Name: name, @@ -53,7 +53,7 @@ func NewNewznabJob(feed *domain.Feed, name string, indexerIdentifier string, log func (j *NewznabJob) Run() { ctx := context.Background() - if err := j.process(ctx); err != nil { + if err := j.RunE(ctx); err != nil { j.Log.Err(err).Int("attempts", j.attempts).Msg("newznab process error") j.errors = append(j.errors, err) @@ -63,6 +63,15 @@ func (j *NewznabJob) Run() { j.errors = j.errors[:0] } +func (j *NewznabJob) RunE(ctx context.Context) error { + if err := j.process(ctx); err != nil { + j.Log.Err(err).Msg("newznab process error") + return err + } + + return nil +} + func (j *NewznabJob) process(ctx context.Context) error { // get feed items, err := j.getFeed(ctx) diff --git a/internal/feed/rss.go b/internal/feed/rss.go index 271a043..81b9779 100644 --- a/internal/feed/rss.go +++ b/internal/feed/rss.go @@ -41,7 +41,7 @@ type RSSJob struct { JobID int } -func NewRSSJob(feed *domain.Feed, name string, indexerIdentifier string, log zerolog.Logger, url string, repo domain.FeedRepo, cacheRepo domain.FeedCacheRepo, releaseSvc release.Service, timeout time.Duration) *RSSJob { +func NewRSSJob(feed *domain.Feed, name string, indexerIdentifier string, log zerolog.Logger, url string, repo domain.FeedRepo, cacheRepo domain.FeedCacheRepo, releaseSvc release.Service, timeout time.Duration) FeedJob { return &RSSJob{ Feed: feed, Name: name, @@ -58,15 +58,23 @@ func NewRSSJob(feed *domain.Feed, name string, indexerIdentifier string, log zer func (j *RSSJob) Run() { ctx := context.Background() - if err := j.process(ctx); err != nil { - j.Log.Error().Err(err).Int("attempts", j.attempts).Msg("rss feed process error") + if err := j.RunE(ctx); err != nil { + j.Log.Err(err).Int("attempts", j.attempts).Msg("rss feed process error") j.errors = append(j.errors, err) - return } j.attempts = 0 - j.errors = []error{} + j.errors = j.errors[:0] +} + +func (j *RSSJob) RunE(ctx context.Context) error { + if err := j.process(ctx); err != nil { + j.Log.Err(err).Msg("rss feed process error") + return err + } + + return nil } func (j *RSSJob) process(ctx context.Context) error { diff --git a/internal/feed/service.go b/internal/feed/service.go index 262ec05..e57652d 100644 --- a/internal/feed/service.go +++ b/internal/feed/service.go @@ -36,6 +36,7 @@ type Service interface { DeleteFeedCache(ctx context.Context, id int) error GetLastRunData(ctx context.Context, id int) (string, error) DeleteFeedCacheStale(ctx context.Context) error + ForceRun(ctx context.Context, id int) error Start() error } @@ -310,6 +311,12 @@ func (s *service) start() error { for _, feed := range feeds { feed := feed + + if !feed.Enabled { + s.log.Trace().Msgf("feed disabled, skipping... %s", feed.Name) + continue + } + if err := s.startJob(&feed); err != nil { s.log.Error().Err(err).Msgf("failed to initialize feed job: %s", feed.Name) continue @@ -339,18 +346,7 @@ func (s *service) restartJob(f *domain.Feed) error { return nil } - -func (s *service) startJob(f *domain.Feed) error { - // if it's not enabled we should not start it - if !f.Enabled { - return nil - } - - // get torznab_url from settings - if f.URL == "" { - return errors.New("no URL provided for feed: %s", f.Name) - } - +func newFeedInstance(f *domain.Feed) feedInstance { // cron schedule to run every X minutes fi := feedInstance{ Feed: f, @@ -363,8 +359,12 @@ func (s *service) startJob(f *domain.Feed) error { Timeout: time.Duration(f.Timeout) * time.Second, } + return fi +} + +func (s *service) initializeFeedJob(fi feedInstance) (FeedJob, error) { var err error - var job cron.Job + var job FeedJob switch fi.Implementation { case string(domain.FeedTypeTorznab): @@ -377,15 +377,46 @@ func (s *service) startJob(f *domain.Feed) error { job, err = s.createRSSJob(fi) default: - return errors.New("unsupported feed type: %s", fi.Implementation) + return nil, errors.New("unsupported feed type: %s", fi.Implementation) } if err != nil { s.log.Error().Err(err).Msgf("failed to initialize %s feed", fi.Implementation) - return err + return nil, err } - identifierKey := feedKey{f.ID}.ToString() + return job, nil +} + +func (s *service) startJob(f *domain.Feed) error { + // if it's not enabled we should not start it + if !f.Enabled { + return errors.New("feed %s not enabled", f.Name) + } + + // get url from settings + if f.URL == "" { + return errors.New("no URL provided for feed: %s", f.Name) + } + + fi := newFeedInstance(f) + + job, err := s.initializeFeedJob(fi) + if err != nil { + return errors.Wrap(err, "initialize job %s failed", f.Indexer) + } + + if err := s.scheduleJob(fi, job); err != nil { + return errors.Wrap(err, "schedule job %s failed", f.Indexer) + } + + s.log.Debug().Msgf("successfully started feed: %s", f.Name) + + return nil +} + +func (s *service) scheduleJob(fi feedInstance, job cron.Job) error { + identifierKey := feedKey{fi.Feed.ID}.ToString() // schedule job id, err := s.scheduler.ScheduleJob(job, fi.CronSchedule, identifierKey) @@ -396,12 +427,10 @@ func (s *service) startJob(f *domain.Feed) error { // add to job map s.jobs[identifierKey] = id - s.log.Debug().Msgf("successfully started feed: %s", f.Name) - return nil } -func (s *service) createTorznabJob(f feedInstance) (cron.Job, error) { +func (s *service) createTorznabJob(f feedInstance) (FeedJob, error) { s.log.Debug().Msgf("create torznab job: %s", f.Name) if f.URL == "" { @@ -424,8 +453,8 @@ func (s *service) createTorznabJob(f feedInstance) (cron.Job, error) { return job, nil } -func (s *service) createNewznabJob(f feedInstance) (cron.Job, error) { - s.log.Debug().Msgf("add newznab job: %s", f.Name) +func (s *service) createNewznabJob(f feedInstance) (FeedJob, error) { + s.log.Debug().Msgf("create newznab job: %s", f.Name) if f.URL == "" { return nil, errors.New("newznab feed requires URL") @@ -443,8 +472,8 @@ func (s *service) createNewznabJob(f feedInstance) (cron.Job, error) { return job, nil } -func (s *service) createRSSJob(f feedInstance) (cron.Job, error) { - s.log.Debug().Msgf("add rss job: %s", f.Name) +func (s *service) createRSSJob(f feedInstance) (FeedJob, error) { + s.log.Debug().Msgf("create rss job: %s", f.Name) if f.URL == "" { return nil, errors.New("rss feed requires URL") @@ -507,3 +536,25 @@ func (s *service) GetLastRunData(ctx context.Context, id int) (string, error) { return feed, nil } + +func (s *service) ForceRun(ctx context.Context, id int) error { + feed, err := s.FindByID(ctx, id) + if err != nil { + return err + } + + fi := newFeedInstance(feed) + + job, err := s.initializeFeedJob(fi) + if err != nil { + s.log.Error().Err(err).Msg("failed to initialize feed job") + return err + } + + if err := job.RunE(ctx); err != nil { + s.log.Error().Err(err).Msg("failed to refresh feed") + return err + } + + return nil +} diff --git a/internal/feed/torznab.go b/internal/feed/torznab.go index 524aa2a..d5481d7 100644 --- a/internal/feed/torznab.go +++ b/internal/feed/torznab.go @@ -37,7 +37,12 @@ type TorznabJob struct { JobID int } -func NewTorznabJob(feed *domain.Feed, name string, indexerIdentifier string, log zerolog.Logger, url string, client torznab.Client, repo domain.FeedRepo, cacheRepo domain.FeedCacheRepo, releaseSvc release.Service) *TorznabJob { +type FeedJob interface { + Run() + RunE(ctx context.Context) error +} + +func NewTorznabJob(feed *domain.Feed, name string, indexerIdentifier string, log zerolog.Logger, url string, client torznab.Client, repo domain.FeedRepo, cacheRepo domain.FeedCacheRepo, releaseSvc release.Service) FeedJob { return &TorznabJob{ Feed: feed, Name: name, @@ -54,7 +59,7 @@ func NewTorznabJob(feed *domain.Feed, name string, indexerIdentifier string, log func (j *TorznabJob) Run() { ctx := context.Background() - if err := j.process(ctx); err != nil { + if err := j.RunE(ctx); err != nil { j.Log.Err(err).Int("attempts", j.attempts).Msg("torznab process error") j.errors = append(j.errors, err) @@ -64,6 +69,15 @@ func (j *TorznabJob) Run() { j.errors = j.errors[:0] } +func (j *TorznabJob) RunE(ctx context.Context) error { + if err := j.process(ctx); err != nil { + j.Log.Err(err).Int("attempts", j.attempts).Msg("torznab process error") + return err + } + + return nil +} + func (j *TorznabJob) process(ctx context.Context) error { // get feed items, err := j.getFeed(ctx) diff --git a/internal/http/feed.go b/internal/http/feed.go index 48e0c63..20691d3 100644 --- a/internal/http/feed.go +++ b/internal/http/feed.go @@ -23,6 +23,7 @@ type feedService interface { ToggleEnabled(ctx context.Context, id int, enabled bool) error Test(ctx context.Context, feed *domain.Feed) error GetLastRunData(ctx context.Context, id int) (string, error) + ForceRun(ctx context.Context, id int) error } type feedHandler struct { @@ -48,6 +49,7 @@ func (h feedHandler) Routes(r chi.Router) { r.Delete("/cache", h.deleteCache) r.Patch("/enabled", h.toggleEnabled) r.Get("/latest", h.latestRun) + r.Post("/forcerun", h.forceRun) }) } @@ -122,6 +124,24 @@ func (h feedHandler) update(w http.ResponseWriter, r *http.Request) { h.encoder.StatusResponse(w, http.StatusCreated, data) } +func (h feedHandler) forceRun(w http.ResponseWriter, r *http.Request) { + ctx := r.Context() + feedID := chi.URLParam(r, "feedID") + + id, err := strconv.Atoi(feedID) + if err != nil { + h.encoder.Error(w, err) + return + } + + if err := h.service.ForceRun(ctx, id); err != nil { + h.encoder.Error(w, err) + return + } + + h.encoder.StatusResponse(w, http.StatusNoContent, nil) +} + func (h feedHandler) toggleEnabled(w http.ResponseWriter, r *http.Request) { var ( ctx = r.Context() diff --git a/web/src/api/APIClient.ts b/web/src/api/APIClient.ts index 8f2e94a..d432afa 100644 --- a/web/src/api/APIClient.ts +++ b/web/src/api/APIClient.ts @@ -224,6 +224,7 @@ export const APIClient = { update: (feed: Feed) => appClient.Put(`api/feeds/${feed.id}`, { body: feed }), + forceRun: (id: number) => appClient.Post(`api/feeds/${id}/forcerun`), delete: (id: number) => appClient.Delete(`api/feeds/${id}`), deleteCache: (id: number) => appClient.Delete(`api/feeds/${id}/cache`), test: (feed: Feed) => appClient.Post("api/feeds/test", { diff --git a/web/src/components/modals/index.tsx b/web/src/components/modals/index.tsx index 463cec3..63b2bc3 100644 --- a/web/src/components/modals/index.tsx +++ b/web/src/components/modals/index.tsx @@ -3,7 +3,8 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ -import { FC, Fragment, MutableRefObject } from "react"; + +import { FC, Fragment, MutableRefObject, useState } from "react"; import { Dialog, Transition } from "@headlessui/react"; import { ExclamationTriangleIcon } from "@heroicons/react/24/solid"; @@ -18,13 +19,24 @@ interface ModalLowerProps { isOpen: boolean; isLoading: boolean; toggle: () => void; - deleteAction: () => void; + deleteAction?: () => void; + forceRunAction?: () => void; } interface DeleteModalProps extends ModalUpperProps, ModalLowerProps { buttonRef: MutableRefObject | undefined; } +interface ForceRunModalProps { + isOpen: boolean; + isLoading: boolean; + toggle: () => void; + buttonRef: MutableRefObject | undefined; + forceRunAction: () => void; + title: string; + text: string; +} + const ModalUpper = ({ title, text }: ModalUpperProps) => (
@@ -55,7 +67,7 @@ const ModalLower = ({ isOpen, isLoading, toggle, deleteAction }: ModalLowerProps onClick={(e) => { e.preventDefault(); if (isOpen) { - deleteAction(); + deleteAction?.(); toggle(); } }} @@ -121,3 +133,116 @@ export const DeleteModal: FC = (props: DeleteModalProps) => ( ); + +export const ForceRunModal: FC = (props: ForceRunModalProps) => { + const [inputValue, setInputValue] = useState(""); + const isInputCorrect = inputValue.trim().toLowerCase() === "i understand"; + + // A function to reset the input and handle any necessary cleanup + const resetAndClose = () => { + setInputValue(""); + props.toggle(); + }; + + // The handleClose function will be passed to the onClose prop of the Dialog + const handleClose = () => { + setTimeout(() => { + resetAndClose(); + }, 200); + }; + + const handleForceRun = (e: React.MouseEvent) => { + e.preventDefault(); + if (props.isOpen && isInputCorrect) { + props.forceRunAction(); + props.toggle(); + // Delay the reset of the input until after the transition finishes + setTimeout(() => { + setInputValue(""); + }, 400); + } + }; + + // When the 'Cancel' button is clicked + const handleCancel = (e: React.MouseEvent) => { + e.preventDefault(); + resetAndClose(); + }; + + return ( + + +
+ + + + + +
+ + +
+ setInputValue(e.target.value)} + /> +
+ +
+ {props.isLoading ? ( + + ) : ( + <> + + + + )} +
+
+
+
+
+
+ ); +}; diff --git a/web/src/components/panels/index.tsx b/web/src/components/panels/index.tsx index f88f6ec..b7dc067 100644 --- a/web/src/components/panels/index.tsx +++ b/web/src/components/panels/index.tsx @@ -141,7 +141,7 @@ function SlideOver({ Remove )} -
+
{!!values && extraButtons !== undefined && ( extraButtons(values) )} @@ -154,7 +154,7 @@ function SlideOver({ ? "text-green-500 border-green-500 bg-green-50" : isTestError ? "text-red-500 border-red-500 bg-red-50" - : "border-gray-300 dark:border-gray-600 text-gray-700 dark:text-gray-400 bg-white dark:bg-gray-700 hover:bg-gray-50 focus:border-rose-700 active:bg-rose-700", + : "border-gray-300 dark:border-gray-600 text-gray-700 dark:text-gray-200 bg-white dark:bg-gray-700 hover:bg-gray-50 dark:hover:bg-gray-600 focus:border-rose-700 active:bg-rose-700", isTesting ? "cursor-not-allowed" : "", "mr-2 inline-flex items-center px-4 py-2 border font-medium rounded-md shadow-sm text-sm transition ease-in-out duration-150 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 dark:focus:ring-blue-500" )} diff --git a/web/src/forms/settings/FeedForms.tsx b/web/src/forms/settings/FeedForms.tsx index 52e5d33..9713a01 100644 --- a/web/src/forms/settings/FeedForms.tsx +++ b/web/src/forms/settings/FeedForms.tsx @@ -78,6 +78,8 @@ export function FeedUpdateForm({ isOpen, toggle, feed }: UpdateProps) { setIsSuccessfulTest(false); }, onSuccess: () => { + toast.custom((t) => ); + sleep(1000) .then(() => { setIsTesting(false); diff --git a/web/src/screens/settings/Feed.tsx b/web/src/screens/settings/Feed.tsx index 5b6f5e0..860da0c 100644 --- a/web/src/screens/settings/Feed.tsx +++ b/web/src/screens/settings/Feed.tsx @@ -12,6 +12,7 @@ import { DocumentTextIcon, EllipsisHorizontalIcon, PencilSquareIcon, + ForwardIcon, TrashIcon } from "@heroicons/react/24/outline"; @@ -19,7 +20,7 @@ import { APIClient } from "@api/APIClient"; import { useToggle } from "@hooks/hooks"; import { baseUrl, classNames, IsEmptyDate, simplifyDate } from "@utils"; import Toast from "@components/notifications/Toast"; -import { DeleteModal } from "@components/modals"; +import { DeleteModal, ForceRunModal } from "@components/modals"; import { FeedUpdateForm } from "@forms/settings/FeedForms"; import { EmptySimple } from "@components/emptystates"; import { ImplementationBadges } from "./Indexer"; @@ -230,6 +231,7 @@ const FeedItemDropdown = ({ const [deleteModalIsOpen, toggleDeleteModal] = useToggle(false); const [deleteCacheModalIsOpen, toggleDeleteCacheModal] = useToggle(false); + const [forceRunModalIsOpen, toggleForceRunModal] = useToggle(false); const deleteMutation = useMutation({ mutationFn: (id: number) => APIClient.feeds.delete(id), @@ -248,6 +250,22 @@ const FeedItemDropdown = ({ } }); + const forceRunMutation = useMutation({ + mutationFn: (id: number) => APIClient.feeds.forceRun(id), + onSuccess: () => { + queryClient.invalidateQueries({ queryKey: feedKeys.lists() }); + toast.custom((t) => ); + toggleForceRunModal(); + }, + onError: (error: any) => { + toast.custom((t) => , { + duration: 10000 + }); + toggleForceRunModal(); + } + }); + + return ( + { + forceRunMutation.mutate(feed.id); + toggleForceRunModal(); + }} + title={`Force run feed: ${feed.name}`} + text={`Are you sure you want to force run the ${feed.name} feed? Respecting RSS interval rules is crucial to avoid potential IP bans.`} + />
+ + {({ active }) => ( + + )} +