Increase trigger interval limit (#34)

.github/ISSUE_TEMPLATE/1-bug.yml

@@ -0,0 +1,69 @@
+name: Bug report
+description: File a bug report if something is not working right.
+title: "[BUG]: "
+labels: ["bug"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to improve cleanuperr!
+  - type: checkboxes
+    id: init
+    attributes:
+      label: "Before submitting a bug report, I have:"
+      options:
+        - label: Reviewed the documentation.
+          required: true
+        - label: Ensured I am using the latest version.
+          required: true
+  - type: textarea
+    id: what-happened
+    attributes:
+      label: What is the behavior?
+      description: If applicable, mention what you expected to happen.
+    validations:
+      required: true
+  - type: input
+    id: version
+    attributes:
+      label: Version
+      description: What version of our software are you running?
+      placeholder: e.g. 1.3.0 or latest
+    validations:
+      required: true
+  - type: dropdown
+    id: os
+    attributes:
+      label: Which operating system do you use?
+      multiple: false
+      options:
+        - Windows
+        - Linux
+        - MacOS
+    validations:
+      required: true
+  - type: dropdown
+    id: deployment
+    attributes:
+      label: What type of deployment do you use?
+      multiple: false
+      options:
+        - Docker container
+        - Binary (executable) file
+    validations:
+      required: true
+  - type: textarea
+    id: logs
+    attributes:
+      label: Relevant log output
+      description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
+      render: shell
+  - type: textarea
+    attributes:
+      label: Anything else?
+      description: |
+        Links? References? Anything that will give us more context about the issue 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: false

.github/ISSUE_TEMPLATE/2-feature.yml

@@ -0,0 +1,19 @@
+name: Feature request
+description: File a feature request.
+title: "[FEATURE]: "
+labels: ["enhancement"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to improve cleanuperr!
+  - type: textarea
+    id: description
+    attributes:
+      label: What would you like to see implemented next?
+      description: |
+        Links? References? Anything that will give us more context about your idea!
+
+        Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
+    validations:
+      required: true

.github/ISSUE_TEMPLATE/3-help.yml

@@ -0,0 +1,19 @@
+name: Help request
+description: Ask a question to receive help.
+title: "[HELP]: "
+labels: ["question"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        If you are experiencing unexpected behavior, please consider submitting a bug report instead.
+  - type: textarea
+    id: description
+    attributes:
+      label: How can we help?
+      description: |
+        Links? References? Anything that will give us more context about your question!
+
+        Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
+    validations:
+      required: true

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,2 @@
+blank_issues_enabled: false
+contact_links: []

.github/workflows/deploy.yml

@@ -1,6 +1,10 @@
 on:
-  workflow_dispatch:
   workflow_call:
+  workflow_dispatch:
+  push:
+    paths:
+      - 'chart/**'
+    branches: [ main ]
 
 jobs:
   deploy:

LICENSE

@@ -1,21 +1,674 @@
-MIT License
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
 
-Copyright (c) 2024 Flaminel
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+                            Preamble
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<https://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<https://www.gnu.org/licenses/why-not-lgpl.html>.

README.md

@@ -1,4 +1,4 @@
-# cleanuperr
+# <img width="24px" src="./Logo/256.png" alt="cleanuperr"></img> cleanuperr
 
 cleanuperr is a tool for automating the cleanup of unwanted or blocked files in Sonarr, Radarr, and supported download clients like qBittorrent. It removes incomplete or blocked downloads, updates queues, and enforces blacklists or whitelists to manage file selection. After removing blocked content, cleanuperr can also trigger a search to replace the deleted shows/movies.
 
@@ -8,13 +8,23 @@ The tool supports both qBittorrent's built-in exclusion features and its own blo
 
 Refer to the [Environment variables](#Environment-variables) section for detailed configuration instructions and the [Setup](#Setup) section for an in-depth explanation of the cleanup process.
 
+## Key features
+- Marks unwanted files as skip/unwanted in the download client.
+- Automatically strikes stalled or stuck downloads. 
+- Removes and blocks downloads that reached the maximum number of strikes or are marked as unwanted by the download client or by cleanuperr and triggers a search for removed downloads.
+
 ## Important note
 
-Only the **latest versions** of qBittorrent, Deluge, Sonarr etc. are supported, or earlier versions that have the same API as the latest version.
+Only the **latest versions** of the following apps are supported, or earlier versions that have the same API as the latest version:
+- qBittorrent
+- Deluge
+- Transmission
+- Sonarr
+- Radarr
 
 This tool is actively developed and still a work in progress. Join the Discord server if you want to reach out to me quickly (or just stay updated on new releases) so we can squash those pesky bugs together:
 
-> https://discord.gg/cJYPs9Bt
+> https://discord.gg/sWggpnmGNY
 
 # How it works
 
@@ -28,12 +38,14 @@ This tool is actively developed and still a work in progress. Join the Discord s
 2. **Queue cleaner** will:
    - Run every 5 minutes (or configured cron).
    - Process all items in the *arr queue.
+   - Check each queue item if it is **stalled (download speed is 0)**, **stuck in matadata downloading** or **failed to be imported**.
+     - If it is, the item receives a **strike** and will continue to accumulate strikes every time it meets any of these conditions.
    - Check each queue item if it meets one of the following condition in the download client:
      - **Marked as completed, but 0 bytes have been downloaded** (due to files being blocked by qBittorrent or the **content blocker**).
      - All associated files of are marked as **unwanted/skipped**.
    - If the item **DOES NOT** match the above criteria, it will be skipped.
-   - If the item **DOES** match the criteria:
-     - It will be removed from the *arr's queue.
+   - If the item **DOES** match the criteria or has received the **maximum number of strikes**:
+     - It will be removed from the *arr's queue and blocked.
      - It will be deleted from the download client.
      - A new search will be triggered for the *arr item.
 
@@ -78,24 +90,26 @@ services:
 
       - QUEUECLEANER__ENABLED=true
       - QUEUECLEANER__RUNSEQUENTIALLY=true
+      - QUEUECLEANER__IMPORT_FAILED_MAX_STRIKES=5
+      - QUEUECLEANER__STALLED_MAX_STRIKES=5
 
       - CONTENTBLOCKER__ENABLED=true
       - CONTENTBLOCKER__BLACKLIST__ENABLED=true
       - CONTENTBLOCKER__BLACKLIST__PATH=https://raw.githubusercontent.com/flmorg/cleanuperr/refs/heads/main/blacklist
       # OR
       # - CONTENTBLOCKER__WHITELIST__ENABLED=true
-      # - CONTENTBLOCKER__BLACKLIST__PATH=https://raw.githubusercontent.com/flmorg/cleanuperr/refs/heads/main/whitelist
+      # - CONTENTBLOCKER__WHITELIST__PATH=https://raw.githubusercontent.com/flmorg/cleanuperr/refs/heads/main/whitelist
 
-      - QBITTORRENT__ENABLED=true
+      - DOWNLOAD_CLIENT=qBittorrent
       - QBITTORRENT__URL=http://localhost:8080
       - QBITTORRENT__USERNAME=user
       - QBITTORRENT__PASSWORD=pass
       # OR
-      # - DELUGE__ENABLED=true
+      # - DOWNLOAD_CLIENT=deluge
       # - DELUGE__URL=http://localhost:8112
       # - DELUGE__PASSWORD=testing
       # OR
-      # - TRANSMISSION__ENABLED=true
+      # - DOWNLOAD_CLIENT=transmission
       # - TRANSMISSION__URL=http://localhost:9091
       # - TRANSMISSION__USERNAME=test
       # - TRANSMISSION__PASSWORD=testing
@@ -125,40 +139,40 @@ services:
 | LOGGING__FILE__PATH | No | Directory where to save the log files | empty |
 | LOGGING__ENHANCED | No | Enhance logs whenever possible<br>A more detailed description is provided [here](variables.md#LOGGING__ENHANCED) | true |
 |||||
-| TRIGGERS__QUEUECLEANER | Yes if queue cleaner is enabled | [Quartz cron trigger](https://www.quartz-scheduler.org/documentation/quartz-2.3.0/tutorials/crontrigger.html) | 0 0/5 * * * ? |
-| TRIGGERS__CONTENTBLOCKER | Yes if content blocker is enabled | [Quartz cron trigger](https://www.quartz-scheduler.org/documentation/quartz-2.3.0/tutorials/crontrigger.html) | 0 0/5 * * * ? |
+| TRIGGERS__QUEUECLEANER | Yes if queue cleaner is enabled | [Quartz cron trigger](https://www.quartz-scheduler.org/documentation/quartz-2.3.0/tutorials/crontrigger.html)<br>Can be a max of 6h interval<br>**Is ignored if `QUEUECLEANER__RUNSEQUENTIALLY=true` and `CONTENTBLOCKER__ENABLED=true`** | 0 0/5 * * * ? |
+| TRIGGERS__CONTENTBLOCKER | Yes if content blocker is enabled | [Quartz cron trigger](https://www.quartz-scheduler.org/documentation/quartz-2.3.0/tutorials/crontrigger.html)<br>Can be a max of 6h interval | 0 0/5 * * * ? |
 |||||
 | QUEUECLEANER__ENABLED | No | Enable or disable the queue cleaner | true |
 | QUEUECLEANER__RUNSEQUENTIALLY | No | If set to true, the queue cleaner will run after the content blocker instead of running in parallel, streamlining the cleaning process | true |
+| QUEUECLEANER__IMPORT_FAILED_MAX_STRIKES | No | After how many strikes should a failed import be removed<br>0 means never | 0 |
+| QUEUECLEANER__STALLED_MAX_STRIKES | No | After how many strikes should a stalled download be removed<br>0 means never | 0 |
 |||||
 | CONTENTBLOCKER__ENABLED | No | Enable or disable the content blocker | false |
 | CONTENTBLOCKER__BLACKLIST__ENABLED | Yes if content blocker is enabled and whitelist is not enabled | Enable or disable the blacklist | false |
-| CONTENTBLOCKER__BLACKLIST__PATH | Yes if blacklist is enabled | Path to the blacklist (local file or url); Needs to be json compatible | empty |
+| CONTENTBLOCKER__BLACKLIST__PATH | Yes if blacklist is enabled | Path to the blacklist (local file or url)<br>Needs to be json compatible | empty |
 | CONTENTBLOCKER__WHITELIST__ENABLED | Yes if content blocker is enabled and blacklist is not enabled | Enable or disable the whitelist | false |
-| CONTENTBLOCKER__BLACKLIST__PATH | Yes if whitelist is enabled | Path to the whitelist (local file or url); Needs to be json compatible | empty |
+| CONTENTBLOCKER__WHITELIST__PATH | Yes if whitelist is enabled | Path to the whitelist (local file or url)<br>Needs to be json compatible | empty |
 |||||
-| QBITTORRENT__ENABLED | No | Enable or disable qBittorrent | true |
+| DOWNLOAD_CLIENT | No | Download client that is used by *arrs<br>Can be `qbittorrent`, `deluge` or `transmission` | `qbittorrent` |
 | QBITTORRENT__URL | No | qBittorrent instance url | http://localhost:8112 |
 | QBITTORRENT__USERNAME | No | qBittorrent user | empty |
 | QBITTORRENT__PASSWORD | No | qBittorrent password | empty |
 |||||
-| DELUGE__ENABLED | No | Enable or disable Deluge | false |
 | DELUGE__URL | No | Deluge instance url | http://localhost:8080 |
 | DELUGE__PASSWORD | No | Deluge password | empty |
 |||||
-| TRANSMISSION__ENABLED | No | Enable or disable Transmission | true |
 | TRANSMISSION__URL | No | Transmission instance url | http://localhost:9091 |
 | TRANSMISSION__USERNAME | No | Transmission user | empty |
 | TRANSMISSION__PASSWORD | No | Transmission password | empty |
 |||||
 | SONARR__ENABLED | No | Enable or disable Sonarr cleanup  | true |
 | SONARR__SEARCHTYPE | No | What to search for after removing a queue item<br>Can be `Episode`, `Season` or `Series` | `Episode` |
-| SONARR__INSTANCES__0__URL | Yes | First Sonarr instance url | http://localhost:8989 |
-| SONARR__INSTANCES__0__APIKEY | Yes | First Sonarr instance API key | empty |
+| SONARR__INSTANCES__0__URL | No | First Sonarr instance url | http://localhost:8989 |
+| SONARR__INSTANCES__0__APIKEY | No | First Sonarr instance API key | empty |
 |||||
 | RADARR__ENABLED | No | Enable or disable Radarr cleanup  | false |
-| RADARR__INSTANCES__0__URL | Yes | First Radarr instance url | http://localhost:8989 |
-| RADARR__INSTANCES__0__APIKEY | Yes | First Radarr instance API key | empty |
+| RADARR__INSTANCES__0__URL | No | First Radarr instance url | http://localhost:8989 |
+| RADARR__INSTANCES__0__APIKEY | No | First Radarr instance API key | empty |
 
 #
 ### To be noted
@@ -190,4 +204,16 @@ SONARR__INSTANCES__<NUMBER>__APIKEY
 
 ### Run as a Windows Service
 
-Check out this stackoverflow answer on how to do it: https://stackoverflow.com/a/15719678
+Check out this stackoverflow answer on how to do it: https://stackoverflow.com/a/15719678
+
+# Credits
+Special thanks for inspiration go to:
+- [ThijmenGThN/swaparr](https://github.com/ThijmenGThN/swaparr)
+- [ManiMatter/decluttarr](https://github.com/ManiMatter/decluttarr)
+- [PaeyMoopy/sonarr-radarr-queue-cleaner](https://github.com/PaeyMoopy/sonarr-radarr-queue-cleaner)
+- [Sonarr](https://github.com/Sonarr/Sonarr) & [Radarr](https://github.com/Radarr/Radarr) for the logo
+
+# Buy me a coffee
+If I made your life just a tiny bit easier, consider buying me a coffee!
+
+<a href="https://buymeacoffee.com/flaminel" target="_blank"><img src="https://www.buymeacoffee.com/assets/img/custom_images/orange_img.png" alt="Buy Me A Coffee" style="height: 41px !important;width: 174px !important;box-shadow: 0px 3px 2px 0px rgba(190, 190, 190, 0.5) !important;-webkit-box-shadow: 0px 3px 2px 0px rgba(190, 190, 190, 0.5) !important;" ></a>

chart/values.yaml

@@ -0,0 +1,115 @@
+deployment:
+  replicas: 1
+  strategy:
+    type: RollingUpdate
+    maxSurge: 1
+    maxUnavailable: 0
+  containers:
+    - name: qbit
+      image:
+        repository: ghcr.io/flmorg/cleanuperr
+        tag: latest
+      env:
+        - name: LOGGING__LOGLEVEL
+          value: Information
+        - name: LOGGING__FILE__ENABLED
+          value: "true"
+        - name: LOGGING__FILE__PATH
+          value: /var/logs
+        - name: LOGGING__ENHANCED
+          value: "true"
+        - name: TRIGGERS__QUEUECLEANER
+          value: 0 0/5 * * * ?
+        - name: TRIGGERS__CONTENTBLOCKER
+          value: 0 0/5 * * * ?
+        - name: QUEUECLEANER__ENABLED
+          value: "true"
+        - name: QUEUECLEANER__RUNSEQUENTIALLY
+          value: "true"
+        - name: QUEUECLEANER__IMPORT_FAILED_MAX_STRIKES
+          value: "3"
+        - name: QUEUECLEANER__STALLED_MAX_STRIKES
+          value: "3"
+        - name: CONTENTBLOCKER__ENABLED
+          value: "true"
+        - name: CONTENTBLOCKER__BLACKLIST__ENABLED
+          value: "true"
+        - name: CONTENTBLOCKER__BLACKLIST__PATH
+          value: https://raw.githubusercontent.com/flmorg/cleanuperr/refs/heads/main/blacklist
+        - name: DOWNLOAD_CLIENT
+          value: qbittorrent
+        - name: QBITTORRENT__URL
+          value: http://service.qbittorrent-videos.svc.cluster.local
+        - name: SONARR__ENABLED
+          value: "true"
+        - name: SONARR__SEARCHTYPE
+          value: Episode
+        - name: SONARR__INSTANCES__0__URL
+          value: http://service.sonarr-low-res.svc.cluster.local
+        - name: SONARR__INSTANCES__1__URL
+          value: http://service.sonarr-high-res.svc.cluster.local
+        - name: RADARR__ENABLED
+          value: "true"
+        - name: RADARR__INSTANCES__0__URL
+          value: http://service.radarr-low-res.svc.cluster.local
+        - name: RADARR__INSTANCES__1__URL
+          value: http://service.radarr-high-res.svc.cluster.local
+      envFromSecret:
+        - secretName: qbit-auth
+          envs:
+            - name: QBITTORRENT__USERNAME
+              key: QBIT_USER
+            - name: QBITTORRENT__PASSWORD
+              key: QBIT_PASS
+        - secretName: sonarr-auth
+          envs:
+            - name: SONARR__INSTANCES__0__APIKEY
+              key: SNRL_API_KEY
+            - name: SONARR__INSTANCES__1__APIKEY
+              key: SNRH_API_KEY
+        - secretName: radarr-auth
+          envs:
+            - name: RADARR__INSTANCES__0__APIKEY
+              key: RDRL_API_KEY
+            - name: RADARR__INSTANCES__1__APIKEY
+              key: RDRH_API_KEY
+      resources:
+        requests:
+          cpu: 0m
+          memory: 0Mi
+        limits:
+          cpu: 1000m
+          memory: 1000Mi
+      volumeMounts:
+        - name: storage
+          mountPath: /var/logs
+          subPath: cleanuperr/logs
+  volumes:
+    - name: storage
+      type: pvc
+      typeName: storage-pvc
+
+pvcs:
+  - name: storage-pvc
+    storageClassName: local-path-persistent
+    accessModes:
+      - ReadWriteOnce
+    size: 1Gi
+    volumeMode: Filesystem
+
+vaultSecrets:
+  - name: qbit-auth
+    path: secrets/qbittorrent
+    templates:
+      QBIT_USER: "{% .Secrets.username %}"
+      QBIT_PASS: "{% .Secrets.password %}"
+  - name: radarr-auth
+    path: secrets/radarr
+    templates:
+      RDRL_API_KEY: "{% .Secrets.low_api_key %}"
+      RDRH_API_KEY: "{% .Secrets.high_api_key %}"
+  - name: sonarr-auth
+    path: secrets/sonarr
+    templates:
+      SNRL_API_KEY: "{% .Secrets.low_api_key %}"
+      SNRH_API_KEY: "{% .Secrets.high_api_key %}"

code/Common/Common.csproj

@@ -1,13 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="Serilog" Version="4.1.0" />
+      <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.0" />
+      <PackageReference Include="Serilog" Version="4.2.0" />
     </ItemGroup>
 
 </Project>

code/Common/Configuration/Arr/ArrConfig.cs

@@ -1,4 +1,4 @@
-namespace Common.Configuration.Arr;
+namespace Common.Configuration.Arr;
 
 public abstract record ArrConfig
 {

code/Common/Configuration/DownloadClient/DelugeConfig.cs

@@ -4,19 +4,12 @@ public sealed record DelugeConfig : IConfig
 {
     public const string SectionName = "Deluge";
     
-    public required bool Enabled { get; init; }
-    
     public Uri? Url { get; init; }
     
     public string? Password { get; init; }
     
     public void Validate()
     {
-        if (!Enabled)
-        {
-            return;
-        }
-
         if (Url is null)
         {
             throw new ArgumentNullException(nameof(Url));

code/Common/Configuration/DownloadClient/QBitConfig.cs

@@ -4,8 +4,6 @@ public sealed class QBitConfig : IConfig
 {
     public const string SectionName = "qBittorrent";
     
-    public required bool Enabled { get; init; }
-    
     public Uri? Url { get; init; }
     
     public string? Username { get; init; }
@@ -14,11 +12,6 @@ public sealed class QBitConfig : IConfig
     
     public void Validate()
     {
-        if (!Enabled)
-        {
-            return;
-        }
-
         if (Url is null)
         {
             throw new ArgumentNullException(nameof(Url));

code/Common/Configuration/DownloadClient/TransmissionConfig.cs

@@ -1,11 +1,9 @@
 namespace Common.Configuration.DownloadClient;
 
-public record TransmissionConfig
+public record TransmissionConfig : IConfig
 {
     public const string SectionName = "Transmission";
     
-    public required bool Enabled { get; init; }
-    
     public Uri? Url { get; init; }
     
     public string? Username { get; init; }
@@ -14,11 +12,6 @@ public record TransmissionConfig
     
     public void Validate()
     {
-        if (!Enabled)
-        {
-            return;
-        }
-
         if (Url is null)
         {
             throw new ArgumentNullException(nameof(Url));

code/Common/Configuration/EnvironmentVariables.cs

@@ -0,0 +1,6 @@
+namespace Common.Configuration;
+
+public static class EnvironmentVariables
+{
+    public const string DownloadClient = "DOWNLOAD_CLIENT";
+}

code/Common/Configuration/QueueCleaner/QueueCleanerConfig.cs

@@ -1,4 +1,6 @@
-namespace Common.Configuration.QueueCleaner;
+using Microsoft.Extensions.Configuration;
+
+namespace Common.Configuration.QueueCleaner;
 
 public sealed record QueueCleanerConfig : IJobConfig
 {
@@ -7,6 +9,12 @@ public sealed record QueueCleanerConfig : IJobConfig
     public required bool Enabled { get; init; }
     
     public required bool RunSequentially { get; init; }
+    
+    [ConfigurationKeyName("IMPORT_FAILED_MAX_STRIKES")]
+    public ushort ImportFailedMaxStrikes { get; init; }
+    
+    [ConfigurationKeyName("STALLED_MAX_STRIKES")]
+    public ushort StalledMaxStrikes { get; init; }
 
     public void Validate()
     {

code/Common/Helpers/Constants.cs

@@ -0,0 +1,7 @@
+namespace Common.Helpers;
+
+public static class Constants
+{
+    public static readonly TimeSpan TriggerMaxLimit  = TimeSpan.FromHours(6);
+    public static readonly TimeSpan CacheLimitBuffer = TimeSpan.FromHours(2);
+}

code/Common/Helpers/StaticConfiguration.cs

@@ -0,0 +1,6 @@
+namespace Common.Helpers;
+
+public static class StaticConfiguration
+{
+    public static TimeSpan TriggerValue { get; set; } = TimeSpan.Zero;
+}

code/Domain/Domain.csproj

@@ -1,13 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+      <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\Common\Common.csproj" />
     </ItemGroup>
 
 </Project>

code/Domain/Enums/DownloadClient.cs

@@ -0,0 +1,8 @@
+namespace Domain.Enums;
+
+public enum DownloadClient
+{
+    QBittorrent,
+    Deluge,
+    Transmission
+}

code/Domain/Enums/StrikeType.cs

@@ -0,0 +1,7 @@
+namespace Domain.Enums;
+
+public enum StrikeType
+{
+    Stalled,
+    ImportFailed
+}

code/Domain/Models/Arr/Queue/QueueListResponse.cs

@@ -1,4 +1,4 @@
-namespace Domain.Arr.Queue;
+namespace Domain.Models.Arr.Queue;
 
 public record QueueListResponse
 {

code/Domain/Models/Arr/Queue/QueueRecord.cs

@@ -1,4 +1,4 @@
-namespace Domain.Arr.Queue;
+namespace Domain.Models.Arr.Queue;
 
 public record QueueRecord
 {

code/Domain/Models/Arr/SonarrSearchItem.cs

@@ -1,9 +1,13 @@
-namespace Domain.Models.Arr;
+using Common.Configuration.Arr;
+
+namespace Domain.Models.Arr;
 
 public sealed class SonarrSearchItem : SearchItem
 {
     public long SeriesId { get; set; }
     
+    public SonarrSearchType SearchType { get; set; }
+    
     public override bool Equals(object? obj)
     {
         if (obj is not SonarrSearchItem other)

code/Domain/Models/Deluge/Response/DelugeMinimalStatus.cs

@@ -1,6 +0,0 @@
-namespace Domain.Models.Deluge.Response;
-
-public sealed record DelugeMinimalStatus
-{
-    public string? Hash { get; set; }
-}

code/Domain/Models/Deluge/Response/TorrentStatus.cs

@@ -0,0 +1,12 @@
+namespace Domain.Models.Deluge.Response;
+
+public sealed record TorrentStatus
+{
+    public string? Hash { get; set; }
+    
+    public string? State { get; set; }
+    
+    public string? Name { get; set; }
+    
+    public ulong Eta { get; set; }
+}

code/Domain/Models/Sonarr/SonarrCommand.cs

@@ -1,4 +1,6 @@
-namespace Domain.Models.Sonarr;
+using Common.Configuration.Arr;
+
+namespace Domain.Models.Sonarr;
 
 public sealed record SonarrCommand
 {
@@ -9,4 +11,6 @@ public sealed record SonarrCommand
     public long? SeasonNumber { get; set; }
     
     public List<long>? EpisodeIds { get; set; }
+    
+    public SonarrSearchType SearchType { get; set; }
 }

code/Executable/DependencyInjection/ConfigurationDI.cs

@@ -3,6 +3,8 @@ using Common.Configuration.Arr;
 using Common.Configuration.ContentBlocker;
 using Common.Configuration.DownloadClient;
 using Common.Configuration.Logging;
+using Common.Configuration.QueueCleaner;
+using Domain.Enums;
 
 namespace Executable.DependencyInjection;
 
@@ -10,6 +12,7 @@ public static class ConfigurationDI
 {
     public static IServiceCollection AddConfiguration(this IServiceCollection services, IConfiguration configuration) =>
         services
+            .Configure<QueueCleanerConfig>(configuration.GetSection(QueueCleanerConfig.SectionName))
             .Configure<ContentBlockerConfig>(configuration.GetSection(ContentBlockerConfig.SectionName))
             .Configure<QBitConfig>(configuration.GetSection(QBitConfig.SectionName))
             .Configure<DelugeConfig>(configuration.GetSection(DelugeConfig.SectionName))

code/Executable/DependencyInjection/LoggingDI.cs

@@ -52,6 +52,7 @@ public static class LoggingDI
         Log.Logger = logConfig
             .MinimumLevel.Is(level)
             .MinimumLevel.Override("Microsoft.Hosting.Lifetime", LogEventLevel.Information)
+            .MinimumLevel.Override("Microsoft.Extensions.Http", LogEventLevel.Warning)
             .MinimumLevel.Override("Quartz", LogEventLevel.Warning)
             .MinimumLevel.Override("System.Net.Http.HttpClient", LogEventLevel.Error)
             .WriteTo.Console(new ExpressionTemplate(consoleOutputTemplate.Replace("PAD", padding.ToString())))

code/Executable/DependencyInjection/MainDI.cs

@@ -19,6 +19,7 @@ public static class MainDI
             .AddLogging(builder => builder.ClearProviders().AddConsole())
             .AddHttpClients()
             .AddConfiguration(configuration)
+            .AddMemoryCache()
             .AddServices()
             .AddQuartzServices(configuration);
     

code/Executable/DependencyInjection/QuartzDI.cs

@@ -1,11 +1,13 @@
 using Common.Configuration;
 using Common.Configuration.ContentBlocker;
 using Common.Configuration.QueueCleaner;
+using Common.Helpers;
 using Executable.Jobs;
 using Infrastructure.Verticals.ContentBlocker;
 using Infrastructure.Verticals.Jobs;
 using Infrastructure.Verticals.QueueCleaner;
 using Quartz;
+using Quartz.Spi;
 
 namespace Executable.DependencyInjection;
 
@@ -94,7 +96,26 @@ public static class QuartzDI
         {
             return;
         }
+        
+        IOperableTrigger triggerObj = (IOperableTrigger)TriggerBuilder.Create()
+            .WithIdentity("ExampleTrigger")
+            .StartNow()
+            .WithCronSchedule(trigger)
+            .Build();
 
+        IReadOnlyList<DateTimeOffset> nextFireTimes = TriggerUtils.ComputeFireTimes(triggerObj, null, 2);
+        TimeSpan triggerValue = nextFireTimes[1] - nextFireTimes[0];
+        
+        if (triggerValue > Constants.TriggerMaxLimit)
+        {
+            throw new Exception($"{trigger} should have a fire time of maximum 1 hour");
+        }
+
+        if (triggerValue > StaticConfiguration.TriggerValue)
+        {
+            StaticConfiguration.TriggerValue = triggerValue;
+        }
+        
         q.AddTrigger(opts =>
         {
             opts.ForJob(typeName)

code/Executable/DependencyInjection/ServicesDI.cs

@@ -1,10 +1,10 @@
-using Executable.Jobs;
-using Infrastructure.Verticals.Arr;
+using Infrastructure.Verticals.Arr;
 using Infrastructure.Verticals.ContentBlocker;
 using Infrastructure.Verticals.DownloadClient;
 using Infrastructure.Verticals.DownloadClient.Deluge;
 using Infrastructure.Verticals.DownloadClient.QBittorrent;
 using Infrastructure.Verticals.DownloadClient.Transmission;
+using Infrastructure.Verticals.ItemStriker;
 using Infrastructure.Verticals.QueueCleaner;
 
 namespace Executable.DependencyInjection;
@@ -23,5 +23,6 @@ public static class ServicesDI
             .AddTransient<TransmissionService>()
             .AddTransient<ArrQueueIterator>()
             .AddTransient<DownloadServiceFactory>()
-            .AddSingleton<BlocklistProvider>();
+            .AddSingleton<BlocklistProvider>()
+            .AddSingleton<Striker>();
 }

code/Executable/Executable.csproj

@@ -2,22 +2,23 @@
 
     <PropertyGroup>
         <AssemblyName>cleanuperr</AssemblyName>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
+        <Version Condition="'$(Version)' == ''">0.0.1</Version>
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
         <UserSecretsId>dotnet-Executable-6108b2ba-f035-47bc-addf-aaf5e20da4b8</UserSecretsId>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
-        <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.1" />
+        <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Http" Version="9.0.0" />
         <PackageReference Include="Quartz" Version="3.13.1" />
         <PackageReference Include="Quartz.Extensions.DependencyInjection" Version="3.13.1" />
         <PackageReference Include="Quartz.Extensions.Hosting" Version="3.13.1" />
-        <PackageReference Include="Serilog" Version="4.1.0" />
+        <PackageReference Include="Serilog" Version="4.2.0" />
         <PackageReference Include="Serilog.Expressions" Version="5.0.0" />
-        <PackageReference Include="Serilog.Extensions.Hosting" Version="8.0.0" />
-        <PackageReference Include="Serilog.Settings.Configuration" Version="8.0.4" />
+        <PackageReference Include="Serilog.Extensions.Hosting" Version="9.0.0" />
+        <PackageReference Include="Serilog.Settings.Configuration" Version="9.0.0" />
         <PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
         <PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
     </ItemGroup>

code/Executable/Jobs/GenericJob.cs

@@ -11,7 +11,6 @@ public sealed class GenericJob<T> : IJob
     private readonly ILogger<GenericJob<T>> _logger;
     private readonly T _handler;
 
-
     public GenericJob(ILogger<GenericJob<T>> logger, T handler)
     {
         _logger = logger;

code/Executable/Program.cs

@@ -1,3 +1,4 @@
+using System.Reflection;
 using Executable.DependencyInjection;
 
 var builder = Host.CreateApplicationBuilder(args);
@@ -7,4 +8,14 @@ builder.Logging.AddLogging(builder.Configuration);
 
 var host = builder.Build();
 
+var logger = host.Services.GetRequiredService<ILogger<Program>>();
+
+var version = Assembly.GetExecutingAssembly().GetName().Version;
+
+logger.LogInformation(
+    version is null
+        ? "cleanuperr version not detected"
+        : $"cleanuperr v{version.Major}.{version.Minor}.{version.Build}"
+);
+
 host.Run();

code/Executable/appsettings.Development.json

@@ -24,21 +24,21 @@
   },
   "QueueCleaner": {
     "Enabled": true,
-    "RunSequentially": true
+    "RunSequentially": true,
+    "IMPORT_FAILED_MAX_STRIKES": 5,
+    "STALLED_MAX_STRIKES": 5
   },
+  "DOWNLOAD_CLIENT": "qbittorrent",
   "qBittorrent": {
-    "Enabled": true,
     "Url": "http://localhost:8080",
     "Username": "test",
     "Password": "testing"
   },
   "Deluge": {
-    "Enabled": false,
     "Url": "http://localhost:8112",
     "Password": "testing"
   },
   "Transmission": {
-    "Enabled": false,
     "Url": "http://localhost:9091",
     "Username": "test",
     "Password": "testing"

code/Executable/appsettings.json

@@ -24,21 +24,21 @@
   },
   "QueueCleaner": {
     "Enabled": true,
-    "RunSequentially": true
+    "RunSequentially": true,
+    "IMPORT_FAILED_MAX_STRIKES": 5,
+    "STALLED_MAX_STRIKES": 5
   },
+  "DOWNLOAD_CLIENT": "qbittorrent",
   "qBittorrent": {
-    "Enabled": true,
     "Url": "http://localhost:8080",
     "Username": "",
     "Password": ""
   },
   "Deluge": {
-    "Enabled": false,
     "Url": "http://localhost:8112",
     "Password": "testing"
   },
   "Transmission": {
-    "Enabled": false,
     "Url": "http://localhost:9091",
     "Username": "test",
     "Password": "testing"

code/Infrastructure/Infrastructure.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
     </PropertyGroup>
@@ -13,7 +13,8 @@
 
     <ItemGroup>
       <PackageReference Include="FLM.Transmission" Version="1.0.0" />
-      <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
+      <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="9.0.0" />
+      <PackageReference Include="Microsoft.Extensions.Http" Version="9.0.0" />
       <PackageReference Include="QBittorrent.Client" Version="1.9.24285.1" />
       <PackageReference Include="Quartz" Version="3.13.1" />
     </ItemGroup>

code/Infrastructure/Verticals/Arr/ArrClient.cs

@@ -1,8 +1,10 @@
-using Common.Configuration;
-using Common.Configuration.Arr;
+using Common.Configuration.Arr;
 using Common.Configuration.Logging;
-using Domain.Arr.Queue;
+using Common.Configuration.QueueCleaner;
+using Domain.Enums;
 using Domain.Models.Arr;
+using Domain.Models.Arr.Queue;
+using Infrastructure.Verticals.ItemStriker;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Newtonsoft.Json;
@@ -14,17 +16,28 @@ public abstract class ArrClient
     protected readonly ILogger<ArrClient> _logger;
     protected readonly HttpClient _httpClient;
     protected readonly LoggingConfig _loggingConfig;
+    protected readonly QueueCleanerConfig _queueCleanerConfig;
+    protected readonly Striker _striker;
     
-    protected ArrClient(ILogger<ArrClient> logger, IHttpClientFactory httpClientFactory, IOptions<LoggingConfig> loggingConfig)
+    protected ArrClient(
+        ILogger<ArrClient> logger,
+        IHttpClientFactory httpClientFactory,
+        IOptions<LoggingConfig> loggingConfig,
+        IOptions<QueueCleanerConfig> queueCleanerConfig,
+        Striker striker
+    )
     {
         _logger = logger;
+        _striker = striker;
         _httpClient = httpClientFactory.CreateClient();
         _loggingConfig = loggingConfig.Value;
+        _queueCleanerConfig = queueCleanerConfig.Value;
+        _striker = striker;
     }
 
     public virtual async Task<QueueListResponse> GetQueueItemsAsync(ArrInstance arrInstance, int page)
     {
-        Uri uri = new(arrInstance.Url, $"/api/v3/queue?page={page}&pageSize=200&sortKey=timeleft");
+        Uri uri = new(arrInstance.Url, GetQueueUrlPath(page));
 
         using HttpRequestMessage request = new(HttpMethod.Get, uri);
         SetApiKey(request, arrInstance.ApiKey);
@@ -52,6 +65,28 @@ public abstract class ArrClient
         return queueResponse;
     }
 
+    public virtual bool ShouldRemoveFromQueue(QueueRecord record)
+    {
+        bool hasWarn() => record.TrackedDownloadStatus
+            .Equals("warning", StringComparison.InvariantCultureIgnoreCase);
+        bool isImportBlocked() => record.TrackedDownloadState
+            .Equals("importBlocked", StringComparison.InvariantCultureIgnoreCase);
+        bool isImportPending() => record.TrackedDownloadState
+            .Equals("importPending", StringComparison.InvariantCultureIgnoreCase);
+
+        if (hasWarn() && (isImportBlocked() || isImportPending()))
+        {
+            return _striker.StrikeAndCheckLimit(
+                record.DownloadId,
+                record.Title,
+                _queueCleanerConfig.ImportFailedMaxStrikes,
+                StrikeType.ImportFailed
+            );
+        }
+
+        return false;
+    }
+    
     public virtual async Task DeleteQueueItemAsync(ArrInstance arrInstance, QueueRecord queueRecord)
     {
         Uri uri = new(arrInstance.Url, $"/api/v3/queue/{queueRecord.Id}?removeFromClient=true&blocklist=true&skipRedownload=true&changeCategory=false");
@@ -76,6 +111,25 @@ public abstract class ArrClient
 
     public abstract Task RefreshItemsAsync(ArrInstance arrInstance, ArrConfig config, HashSet<SearchItem>? items);
 
+    public virtual bool IsRecordValid(QueueRecord record)
+    {
+        if (string.IsNullOrEmpty(record.DownloadId))
+        {
+            _logger.LogDebug("skip | download id is null for {title}", record.Title);
+            return false;
+        }
+
+        if (record.DownloadId.Equals(record.Title, StringComparison.InvariantCultureIgnoreCase))
+        {
+            _logger.LogDebug("skip | item is not ready yet | {title}", record.Title);
+            return false;
+        }
+
+        return true;
+    }
+    
+    protected abstract string GetQueueUrlPath(int page);
+    
     protected virtual void SetApiKey(HttpRequestMessage request, string apiKey)
     {
         request.Headers.Add("x-api-key", apiKey);

code/Infrastructure/Verticals/Arr/ArrQueueIterator.cs

@@ -1,6 +1,6 @@
 using Common.Configuration;
 using Common.Configuration.Arr;
-using Domain.Arr.Queue;
+using Domain.Models.Arr.Queue;
 using Microsoft.Extensions.Logging;
 
 namespace Infrastructure.Verticals.Arr;

code/Infrastructure/Verticals/Arr/RadarrClient.cs

@@ -1,8 +1,12 @@
 using System.Text;
 using Common.Configuration.Arr;
 using Common.Configuration.Logging;
+using Common.Configuration.QueueCleaner;
 using Domain.Models.Arr;
+using Domain.Models.Arr.Queue;
 using Domain.Models.Radarr;
+using Infrastructure.Verticals.ItemStriker;
+using Microsoft.Extensions.Caching.Memory;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Newtonsoft.Json;
@@ -14,11 +18,18 @@ public sealed class RadarrClient : ArrClient
     public RadarrClient(
         ILogger<ArrClient> logger,
         IHttpClientFactory httpClientFactory,
-        IOptions<LoggingConfig> loggingConfig
-    ) : base(logger, httpClientFactory, loggingConfig)
+        IOptions<LoggingConfig> loggingConfig,
+        IOptions<QueueCleanerConfig> queueCleanerConfig,
+        Striker striker
+    ) : base(logger, httpClientFactory, loggingConfig, queueCleanerConfig, striker)
     {
     }
 
+    protected override string GetQueueUrlPath(int page)
+    {
+        return $"/api/v3/queue?page={page}&pageSize=200&includeUnknownMovieItems=true&includeMovie=true";
+    }
+
     public override async Task RefreshItemsAsync(ArrInstance arrInstance, ArrConfig config, HashSet<SearchItem>? items)
     {
         if (items?.Count is null or 0)
@@ -59,6 +70,17 @@ public sealed class RadarrClient : ArrClient
         }
     }
 
+    public override bool IsRecordValid(QueueRecord record)
+    {
+        if (record.MovieId is 0)
+        {
+            _logger.LogDebug("skip | item information missing | {title}", record.Title);
+            return false;
+        }
+        
+        return base.IsRecordValid(record);
+    }
+
     private static string GetSearchLog(Uri instanceUrl, RadarrCommand command, bool success, string? logContext)
     {
         string status = success ? "triggered" : "failed";

code/Infrastructure/Verticals/Arr/SonarrClient.cs

@@ -1,8 +1,12 @@
 using System.Text;
 using Common.Configuration.Arr;
 using Common.Configuration.Logging;
+using Common.Configuration.QueueCleaner;
 using Domain.Models.Arr;
+using Domain.Models.Arr.Queue;
 using Domain.Models.Sonarr;
+using Infrastructure.Verticals.ItemStriker;
+using Microsoft.Extensions.Caching.Memory;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Newtonsoft.Json;
@@ -14,10 +18,17 @@ public sealed class SonarrClient : ArrClient
     public SonarrClient(
         ILogger<SonarrClient> logger,
         IHttpClientFactory httpClientFactory,
-        IOptions<LoggingConfig> loggingConfig
-    ) : base(logger, httpClientFactory, loggingConfig)
+        IOptions<LoggingConfig> loggingConfig,
+        IOptions<QueueCleanerConfig> queueCleanerConfig,
+        Striker striker
+    ) : base(logger, httpClientFactory, loggingConfig, queueCleanerConfig, striker)
     {
     }
+    
+    protected override string GetQueueUrlPath(int page)
+    {
+        return $"/api/v3/queue?page={page}&pageSize=200&includeUnknownSeriesItems=true&includeSeries=true";
+    }
 
     public override async Task RefreshItemsAsync(ArrInstance arrInstance, ArrConfig config, HashSet<SearchItem>? items)
     {
@@ -26,11 +37,9 @@ public sealed class SonarrClient : ArrClient
             return;
         }
 
-        SonarrConfig sonarrConfig = (SonarrConfig)config;
-        
         Uri uri = new(arrInstance.Url, "/api/v3/command");
         
-        foreach (SonarrCommand command in GetSearchCommands(sonarrConfig.SearchType, items))
+        foreach (SonarrCommand command in GetSearchCommands(items.Cast<SonarrSearchItem>().ToHashSet()))
         {
             using HttpRequestMessage request = new(HttpMethod.Post, uri);
             request.Content = new StringContent(
@@ -41,22 +50,33 @@ public sealed class SonarrClient : ArrClient
             SetApiKey(request, arrInstance.ApiKey);
 
             using HttpResponseMessage response = await _httpClient.SendAsync(request);
-            string? logContext = await ComputeCommandLogContextAsync(arrInstance, command, sonarrConfig.SearchType);
+            string? logContext = await ComputeCommandLogContextAsync(arrInstance, command, command.SearchType);
 
             try
             {
                 response.EnsureSuccessStatusCode();
             
-                _logger.LogInformation("{log}", GetSearchLog(sonarrConfig.SearchType, arrInstance.Url, command, true, logContext));
+                _logger.LogInformation("{log}", GetSearchLog(command.SearchType, arrInstance.Url, command, true, logContext));
             }
             catch
             {
-                _logger.LogError("{log}", GetSearchLog(sonarrConfig.SearchType, arrInstance.Url, command, false, logContext));
+                _logger.LogError("{log}", GetSearchLog(command.SearchType, arrInstance.Url, command, false, logContext));
                 throw;
             }
         }
     }
 
+    public override bool IsRecordValid(QueueRecord record)
+    {
+        if (record.EpisodeId is 0 || record.SeriesId is 0)
+        {
+            _logger.LogDebug("skip | item information missing | {title}", record.Title);
+            return false;
+        }
+
+        return base.IsRecordValid(record);
+    }
+
     private static string GetSearchLog(
         SonarrSearchType searchType,
         Uri instanceUrl,
@@ -191,7 +211,7 @@ public sealed class SonarrClient : ArrClient
         return JsonConvert.DeserializeObject<Series>(responseBody);
     }
 
-    private List<SonarrCommand> GetSearchCommands(SonarrSearchType searchType, HashSet<SearchItem> items)
+    private List<SonarrCommand> GetSearchCommands(HashSet<SonarrSearchItem> items)
     {
         const string episodeSearch = "EpisodeSearch";
         const string seasonSearch = "SeasonSearch";
@@ -199,13 +219,13 @@ public sealed class SonarrClient : ArrClient
         
         List<SonarrCommand> commands = new();
 
-        foreach (SearchItem item in items)
+        foreach (SonarrSearchItem item in items)
         {
-            SonarrCommand command = searchType is SonarrSearchType.Episode
+            SonarrCommand command = item.SearchType is SonarrSearchType.Episode
                 ? commands.FirstOrDefault() ?? new() { Name = episodeSearch, EpisodeIds = new() }
                 : new();
             
-            switch (searchType)
+            switch (item.SearchType)
             {
                 case SonarrSearchType.Episode when command.EpisodeIds is null:
                     command.EpisodeIds = [item.Id];
@@ -227,15 +247,16 @@ public sealed class SonarrClient : ArrClient
                     break;
                 
                 default:
-                    throw new ArgumentOutOfRangeException(nameof(searchType), searchType, null);
+                    throw new ArgumentOutOfRangeException(nameof(item.SearchType), item.SearchType, null);
             }
 
-            if (searchType is SonarrSearchType.Episode && commands.Count > 0)
+            if (item.SearchType is SonarrSearchType.Episode && commands.Count > 0)
             {
                 // only one command will be generated for episodes search
                 continue;
             }
             
+            command.SearchType = item.SearchType;
             commands.Add(command);
         }
         

code/Infrastructure/Verticals/ContentBlocker/ContentBlocker.cs

@@ -1,7 +1,7 @@
 using Common.Configuration;
 using Common.Configuration.Arr;
-using Domain.Arr.Queue;
 using Domain.Enums;
+using Domain.Models.Arr.Queue;
 using Infrastructure.Verticals.Arr;
 using Infrastructure.Verticals.DownloadClient;
 using Infrastructure.Verticals.Jobs;
@@ -58,12 +58,4 @@ public sealed class ContentBlocker : GenericHandler
             }
         });
     }
-    
-    private ArrClient GetClient(InstanceType type) =>
-        type switch
-        {
-            InstanceType.Sonarr => _sonarrClient,
-            InstanceType.Radarr => _radarrClient,
-            _ => throw new NotImplementedException($"instance type {type} is not yet supported")
-        };
 }

code/Infrastructure/Verticals/DownloadClient/Deluge/DelugeService.cs

@@ -1,43 +1,46 @@
-using Common.Configuration;
 using Common.Configuration.DownloadClient;
+using Common.Configuration.QueueCleaner;
 using Domain.Models.Deluge.Response;
 using Infrastructure.Verticals.ContentBlocker;
+using Infrastructure.Verticals.ItemStriker;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 
 namespace Infrastructure.Verticals.DownloadClient.Deluge;
 
-public sealed class DelugeService : IDownloadService
+public sealed class DelugeService : DownloadServiceBase
 {
-    private readonly ILogger<DelugeService> _logger;
     private readonly DelugeClient _client;
-    private readonly FilenameEvaluator _filenameEvaluator;
     
     public DelugeService(
         ILogger<DelugeService> logger,
         IOptions<DelugeConfig> config,
         IHttpClientFactory httpClientFactory,
-        FilenameEvaluator filenameEvaluator
-    )
+        IOptions<QueueCleanerConfig> queueCleanerConfig,
+        FilenameEvaluator filenameEvaluator,
+        Striker striker
+    ) : base(logger, queueCleanerConfig, filenameEvaluator, striker)
     {
-        _logger = logger;
+        config.Value.Validate();
         _client = new (config, httpClientFactory);
-        _filenameEvaluator = filenameEvaluator;
     }
     
-    public async Task LoginAsync()
+    public override async Task LoginAsync()
     {
         await _client.LoginAsync();
     }
 
-    public async Task<bool> ShouldRemoveFromArrQueueAsync(string hash)
+    public override async Task<bool> ShouldRemoveFromArrQueueAsync(string hash)
     {
         hash = hash.ToLowerInvariant();
         
         DelugeContents? contents = null;
+
+        TorrentStatus? status = await GetTorrentStatus(hash);
         
-        if (!await HasMinimalStatus(hash))
+        if (status?.Hash is null)
         {
+            _logger.LogDebug("failed to find torrent {hash} in the download client", hash);
             return false;
         }
 
@@ -50,13 +53,7 @@ public sealed class DelugeService : IDownloadService
             _logger.LogDebug(exception, "failed to find torrent {hash} in the download client", hash);
         }
 
-        // if no files found, torrent might be stuck in Downloading metadata
-        if (contents?.Contents?.Count is null or 0)
-        {
-            return false;
-        }
-
-        bool shouldRemove = true;
+        bool shouldRemove = contents?.Contents?.Count > 0;
         
         ProcessFiles(contents.Contents, (_, file) =>
         {
@@ -66,15 +63,18 @@ public sealed class DelugeService : IDownloadService
             }
         });
 
-        return shouldRemove;
+        return shouldRemove || IsItemStuckAndShouldRemove(status);
     }
 
-    public async Task BlockUnwantedFilesAsync(string hash)
+    public override async Task BlockUnwantedFilesAsync(string hash)
     {
         hash = hash.ToLowerInvariant();
 
-        if (!await HasMinimalStatus(hash))
+        TorrentStatus? status = await GetTorrentStatus(hash);
+        
+        if (status?.Hash is null)
         {
+            _logger.LogDebug("failed to find torrent {hash} in the download client", hash);
             return;
         }
         
@@ -125,22 +125,29 @@ public sealed class DelugeService : IDownloadService
 
         await _client.ChangeFilesPriority(hash, sortedPriorities);
     }
-
-    private async Task<bool> HasMinimalStatus(string hash)
+    
+    private bool IsItemStuckAndShouldRemove(TorrentStatus status)
     {
-        DelugeMinimalStatus? status = await _client.SendRequest<DelugeMinimalStatus?>(
-            "web.get_torrent_status",
-            hash,
-            new[] { "hash" }
-        );
-
-        if (status?.Hash is null)
+        if (status.State is null || !status.State.Equals("Downloading", StringComparison.InvariantCultureIgnoreCase))
         {
-            _logger.LogDebug("failed to find torrent {hash} in the download client", hash);
             return false;
         }
 
-        return true;
+        if (status.Eta > 0)
+        {
+            return false;
+        }
+
+        return StrikeAndCheckLimit(status.Hash!, status.Name!);
+    }
+
+    private async Task<TorrentStatus?> GetTorrentStatus(string hash)
+    {
+        return await _client.SendRequest<TorrentStatus?>(
+            "web.get_torrent_status",
+            hash,
+            new[] { "hash", "state", "name", "eta" }
+        );
     }
     
     private static void ProcessFiles(Dictionary<string, DelugeFileOrDirectory> contents, Action<string, DelugeFileOrDirectory> processFile)
@@ -160,7 +167,7 @@ public sealed class DelugeService : IDownloadService
         }
     }
 
-    public void Dispose()
+    public override void Dispose()
     {
     }
 }

code/Infrastructure/Verticals/DownloadClient/DownloadServiceBase.cs

@@ -0,0 +1,42 @@
+using Common.Configuration.QueueCleaner;
+using Domain.Enums;
+using Infrastructure.Verticals.ContentBlocker;
+using Infrastructure.Verticals.ItemStriker;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+
+namespace Infrastructure.Verticals.DownloadClient;
+
+public abstract class DownloadServiceBase : IDownloadService
+{
+    protected readonly ILogger<DownloadServiceBase> _logger;
+    protected readonly QueueCleanerConfig _queueCleanerConfig;
+    protected readonly FilenameEvaluator _filenameEvaluator;
+    protected readonly Striker _striker;
+    
+    protected DownloadServiceBase(
+        ILogger<DownloadServiceBase> logger,
+        IOptions<QueueCleanerConfig> queueCleanerConfig,
+        FilenameEvaluator filenameEvaluator,
+        Striker striker
+    )
+    {
+        _logger = logger;
+        _queueCleanerConfig = queueCleanerConfig.Value;
+        _filenameEvaluator = filenameEvaluator;
+        _striker = striker;
+    }
+
+    public abstract void Dispose();
+
+    public abstract Task LoginAsync();
+
+    public abstract Task<bool> ShouldRemoveFromArrQueueAsync(string hash);
+
+    public abstract Task BlockUnwantedFilesAsync(string hash);
+
+    protected bool StrikeAndCheckLimit(string hash, string itemName)
+    {
+        return _striker.StrikeAndCheckLimit(hash, itemName, _queueCleanerConfig.StalledMaxStrikes, StrikeType.Stalled);
+    }
+}

code/Infrastructure/Verticals/DownloadClient/DownloadServiceFactory.cs

@@ -3,6 +3,7 @@ using Common.Configuration.DownloadClient;
 using Infrastructure.Verticals.DownloadClient.Deluge;
 using Infrastructure.Verticals.DownloadClient.QBittorrent;
 using Infrastructure.Verticals.DownloadClient.Transmission;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 
@@ -10,57 +11,25 @@ namespace Infrastructure.Verticals.DownloadClient;
 
 public sealed class DownloadServiceFactory
 {
-    private readonly QBitConfig _qBitConfig;
-    private readonly DelugeConfig _delugeConfig;
-    private readonly TransmissionConfig _transmissionConfig;
     private readonly IServiceProvider _serviceProvider;
+    private readonly Domain.Enums.DownloadClient _downloadClient;
     
-    public DownloadServiceFactory(
-        IOptions<QBitConfig> qBitConfig,
-        IOptions<DelugeConfig> delugeConfig,
-        IOptions<TransmissionConfig> transmissionConfig,
-        IServiceProvider serviceProvider)
+    public DownloadServiceFactory(IServiceProvider serviceProvider, IConfiguration configuration)
     {
-        _qBitConfig = qBitConfig.Value;
-        _delugeConfig = delugeConfig.Value;
-        _transmissionConfig = transmissionConfig.Value;
         _serviceProvider = serviceProvider;
-        
-        _qBitConfig.Validate();
-        _delugeConfig.Validate();
-        _transmissionConfig.Validate();
-
-        int enabledCount = new[] { _qBitConfig.Enabled, _delugeConfig.Enabled, _transmissionConfig.Enabled }
-            .Count(enabled => enabled);
-
-        if (enabledCount > 1)
-        {
-            throw new Exception("only one download client can be enabled");
-        }
-
-        if (enabledCount == 0)
-        {
-            throw new Exception("no download client is enabled");
-        }
+        _downloadClient = (Domain.Enums.DownloadClient)Enum.Parse(
+            typeof(Domain.Enums.DownloadClient),
+            configuration[EnvironmentVariables.DownloadClient] ?? Domain.Enums.DownloadClient.QBittorrent.ToString(),
+            true
+        );
     }
 
-    public IDownloadService CreateDownloadClient()
-    {
-        if (_qBitConfig.Enabled)
+    public IDownloadService CreateDownloadClient() =>
+        _downloadClient switch
         {
-            return _serviceProvider.GetRequiredService<QBitService>();
-        }
-
-        if (_delugeConfig.Enabled)
-        {
-            return _serviceProvider.GetRequiredService<DelugeService>();
-        }
-
-        if (_transmissionConfig.Enabled)
-        {
-            return _serviceProvider.GetRequiredService<TransmissionService>();
-        }
-
-        throw new NotSupportedException();
-    }
+            Domain.Enums.DownloadClient.QBittorrent => _serviceProvider.GetRequiredService<QBitService>(),
+            Domain.Enums.DownloadClient.Deluge => _serviceProvider.GetRequiredService<DelugeService>(),
+            Domain.Enums.DownloadClient.Transmission => _serviceProvider.GetRequiredService<TransmissionService>(),
+            _ => throw new ArgumentOutOfRangeException()
+        };
 }

code/Infrastructure/Verticals/DownloadClient/QBittorrent/QBitService.cs

@@ -1,32 +1,32 @@
-using Common.Configuration;
-using Common.Configuration.DownloadClient;
+using Common.Configuration.DownloadClient;
+using Common.Configuration.QueueCleaner;
 using Infrastructure.Verticals.ContentBlocker;
+using Infrastructure.Verticals.ItemStriker;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using QBittorrent.Client;
 
 namespace Infrastructure.Verticals.DownloadClient.QBittorrent;
 
-public sealed class QBitService : IDownloadService
+public sealed class QBitService : DownloadServiceBase
 {
-    private readonly ILogger<QBitService> _logger;
     private readonly QBitConfig _config;
     private readonly QBittorrentClient _client;
-    private readonly FilenameEvaluator _filenameEvaluator;
 
     public QBitService(
         ILogger<QBitService> logger,
         IOptions<QBitConfig> config,
-        FilenameEvaluator filenameEvaluator
-    )
+        IOptions<QueueCleanerConfig> queueCleanerConfig,
+        FilenameEvaluator filenameEvaluator,
+        Striker striker
+    ) : base(logger, queueCleanerConfig, filenameEvaluator, striker)
     {
-        _logger = logger;
         _config = config.Value;
+        _config.Validate();
         _client = new(_config.Url);
-        _filenameEvaluator = filenameEvaluator;
     }
 
-    public async Task LoginAsync()
+    public override async Task LoginAsync()
     {
         if (string.IsNullOrEmpty(_config.Username) && string.IsNullOrEmpty(_config.Password))
         {
@@ -36,13 +36,14 @@ public sealed class QBitService : IDownloadService
         await _client.LoginAsync(_config.Username, _config.Password);
     }
 
-    public async Task<bool> ShouldRemoveFromArrQueueAsync(string hash)
+    public override async Task<bool> ShouldRemoveFromArrQueueAsync(string hash)
     {
         TorrentInfo? torrent = (await _client.GetTorrentListAsync(new TorrentListQuery { Hashes = [hash] }))
             .FirstOrDefault();
 
         if (torrent is null)
         {
+            _logger.LogDebug("failed to find torrent {hash} in the download client", hash);
             return false;
         }
 
@@ -54,17 +55,16 @@ public sealed class QBitService : IDownloadService
 
         IReadOnlyList<TorrentContent>? files = await _client.GetTorrentContentsAsync(hash);
 
-        // if no files found, torrent might be stuck in Downloading metadata
-        if (files?.Count is null or 0)
+        // if all files are marked as skip
+        if (files?.Count is > 0 && files.All(x => x.Priority is TorrentContentPriority.Skip))
         {
-            return false;
+            return true;
         }
 
-        // if all files are marked as skip
-        return files.All(x => x.Priority is TorrentContentPriority.Skip);
+        return IsItemStuckAndShouldRemove(torrent);
     }
 
-    public async Task BlockUnwantedFilesAsync(string hash)
+    public override async Task BlockUnwantedFilesAsync(string hash)
     {
         IReadOnlyList<TorrentContent>? files = await _client.GetTorrentContentsAsync(hash);
 
@@ -90,8 +90,20 @@ public sealed class QBitService : IDownloadService
         }
     }
 
-    public void Dispose()
+    public override void Dispose()
     {
         _client.Dispose();
     }
+    
+    private bool IsItemStuckAndShouldRemove(TorrentInfo torrent)
+    {
+        if (torrent.State is not TorrentState.StalledDownload and not TorrentState.FetchingMetadata
+            and not TorrentState.ForcedFetchingMetadata)
+        {
+            // ignore other states
+            return false;
+        }
+
+        return StrikeAndCheckLimit(torrent.Hash, torrent.Name);
+    }
 }

code/Infrastructure/Verticals/DownloadClient/Transmission/TransmissionService.cs

@@ -1,6 +1,7 @@
-using Common.Configuration;
-using Common.Configuration.DownloadClient;
+using Common.Configuration.DownloadClient;
+using Common.Configuration.QueueCleaner;
 using Infrastructure.Verticals.ContentBlocker;
+using Infrastructure.Verticals.ItemStriker;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Transmission.API.RPC;
@@ -9,65 +10,66 @@ using Transmission.API.RPC.Entity;
 
 namespace Infrastructure.Verticals.DownloadClient.Transmission;
 
-public sealed class TransmissionService : IDownloadService
+public sealed class TransmissionService : DownloadServiceBase
 {
-    private readonly ILogger<TransmissionService> _logger;
     private readonly TransmissionConfig _config;
     private readonly Client _client;
-    private readonly FilenameEvaluator _filenameEvaluator;
     private TorrentInfo[]? _torrentsCache;
 
     public TransmissionService(
         ILogger<TransmissionService> logger,
         IOptions<TransmissionConfig> config,
-        FilenameEvaluator filenameEvaluator
-    )
+        IOptions<QueueCleanerConfig> queueCleanerConfig,
+        FilenameEvaluator filenameEvaluator,
+        Striker striker
+    ) : base(logger, queueCleanerConfig, filenameEvaluator, striker)
     {
-        _logger = logger;
         _config = config.Value;
+        _config.Validate();
         _client = new(
             new Uri(_config.Url, "/transmission/rpc").ToString(),
             login: _config.Username,
             password: _config.Password
         );
-        _filenameEvaluator = filenameEvaluator;
     }
 
-    public async Task LoginAsync()
+    public override async Task LoginAsync()
     {
         await _client.GetSessionInformationAsync();
     }
 
-    public async Task<bool> ShouldRemoveFromArrQueueAsync(string hash)
+    public override async Task<bool> ShouldRemoveFromArrQueueAsync(string hash)
     {
         TorrentInfo? torrent = await GetTorrentAsync(hash);
 
-        // if no files found, torrent might be stuck in Downloading metadata
-        if (torrent?.FileStats?.Length is null or 0)
+        if (torrent is null)
         {
+            _logger.LogDebug("failed to find torrent {hash} in the download client", hash);
             return false;
         }
+        
+        bool shouldRemove = torrent.FileStats?.Length > 0;
 
         foreach (TransmissionTorrentFileStats? stats in torrent.FileStats ?? [])
         {
             if (!stats.Wanted.HasValue)
             {
                 // if any files stats are missing, do not remove
-                return false;
+                shouldRemove = false;
             }
             
             if (stats.Wanted.HasValue && stats.Wanted.Value)
             {
                 // if any files are wanted, do not remove
-                return false;
+                shouldRemove = false;
             }
         }
 
         // remove if all files are unwanted
-        return true;
+        return shouldRemove || IsItemStuckAndShouldRemove(torrent);
     }
 
-    public async Task BlockUnwantedFilesAsync(string hash)
+    public override async Task BlockUnwantedFilesAsync(string hash)
     {
         TorrentInfo? torrent = await GetTorrentAsync(hash);
 
@@ -107,10 +109,26 @@ public sealed class TransmissionService : IDownloadService
             FilesUnwanted = unwantedFiles.ToArray(),
         });
     }
-    
-    public void Dispose()
+
+    public override void Dispose()
     {
     }
+    
+    private bool IsItemStuckAndShouldRemove(TorrentInfo torrent)
+    {
+        if (torrent.Status is not 4)
+        {
+            // not in downloading state
+            return false;
+        }
+
+        if (torrent.Eta > 0)
+        {
+            return false;
+        }
+
+        return StrikeAndCheckLimit(torrent.HashString!, torrent.Name!);
+    }
 
     private async Task<TorrentInfo?> GetTorrentAsync(string hash)
     {
@@ -119,7 +137,15 @@ public sealed class TransmissionService : IDownloadService
         
         if (_torrentsCache is null || torrent is null)
         {
-            string[] fields = [TorrentFields.FILES, TorrentFields.FILE_STATS, TorrentFields.HASH_STRING, TorrentFields.ID];
+            string[] fields = [
+                TorrentFields.FILES,
+                TorrentFields.FILE_STATS,
+                TorrentFields.HASH_STRING,
+                TorrentFields.ID,
+                TorrentFields.ETA,
+                TorrentFields.NAME,
+                TorrentFields.STATUS
+            ];
             
             // refresh cache
             _torrentsCache = (await _client.TorrentGetAsync(fields))

code/Infrastructure/Verticals/ItemStriker/Striker.cs

@@ -0,0 +1,58 @@
+using Common.Helpers;
+using Domain.Enums;
+using Microsoft.Extensions.Caching.Memory;
+using Microsoft.Extensions.Logging;
+
+namespace Infrastructure.Verticals.ItemStriker;
+
+public class Striker
+{
+    private readonly ILogger<Striker> _logger;
+    private readonly IMemoryCache _cache;
+    private readonly MemoryCacheEntryOptions _cacheOptions;
+
+    public Striker(ILogger<Striker> logger, IMemoryCache cache)
+    {
+        _logger = logger;
+        _cache = cache;
+        _cacheOptions = new MemoryCacheEntryOptions()
+            .SetSlidingExpiration(StaticConfiguration.TriggerValue + Constants.CacheLimitBuffer);
+    }
+    
+    public bool StrikeAndCheckLimit(string hash, string itemName, ushort maxStrikes, StrikeType strikeType)
+    {
+        if (maxStrikes is 0)
+        {
+            return false;
+        }
+        
+        string key = $"{strikeType.ToString()}_{hash}";
+        
+        if (!_cache.TryGetValue(key, out int? strikeCount))
+        {
+            strikeCount = 1;
+        }
+        else
+        {
+            ++strikeCount;
+        }
+        
+        _logger.LogDebug("item on strike number {strike} | reason {reason} | {name}", strikeCount, strikeType.ToString(), itemName);
+        _cache.Set(key, strikeCount, _cacheOptions);
+        
+        if (strikeCount < maxStrikes)
+        {
+            return false;
+        }
+
+        if (strikeCount > maxStrikes)
+        {
+            _logger.LogWarning("blocked item keeps coming back | {name}", itemName);
+            _logger.LogWarning("be sure to enable \"Reject Blocklisted Torrent Hashes While Grabbing\" on your indexers to reject blocked items");
+        }
+
+        _logger.LogInformation("removing item with max strikes | reason {reason} | {name}", strikeType.ToString(), itemName);
+
+        return true;
+    }
+}

code/Infrastructure/Verticals/Jobs/GenericHandler.cs

@@ -1,10 +1,11 @@
 using Common.Configuration.Arr;
-using Domain.Arr.Queue;
 using Domain.Enums;
 using Domain.Models.Arr;
+using Domain.Models.Arr.Queue;
 using Infrastructure.Verticals.Arr;
 using Infrastructure.Verticals.DownloadClient;
 using Microsoft.Extensions.Logging;
+using Newtonsoft.Json;
 
 namespace Infrastructure.Verticals.Jobs;
 
@@ -88,18 +89,27 @@ public abstract class GenericHandler : IDisposable
             _ => throw new NotImplementedException($"instance type {type} is not yet supported")
         };
     
-    protected SearchItem GetRecordSearchItem(InstanceType type, QueueRecord record) =>
-        type switch
+    protected SearchItem GetRecordSearchItem(InstanceType type, QueueRecord record, bool isPack = false)
+    {
+        return type switch
         {
-            InstanceType.Sonarr when _sonarrConfig.SearchType is SonarrSearchType.Episode => new SonarrSearchItem
+            InstanceType.Sonarr when _sonarrConfig.SearchType is SonarrSearchType.Episode && !isPack => new SonarrSearchItem
             {
                 Id = record.EpisodeId,
-                SeriesId = record.SeriesId
+                SeriesId = record.SeriesId,
+                SearchType = SonarrSearchType.Episode
+            },
+            InstanceType.Sonarr when _sonarrConfig.SearchType is SonarrSearchType.Episode && isPack => new SonarrSearchItem
+            {
+                Id = record.SeasonNumber,
+                SeriesId = record.SeriesId,
+                SearchType = SonarrSearchType.Season
             },
             InstanceType.Sonarr when _sonarrConfig.SearchType is SonarrSearchType.Season => new SonarrSearchItem
             {
                 Id = record.SeasonNumber,
-                SeriesId = record.SeriesId
+                SeriesId = record.SeriesId,
+                SearchType = SonarrSearchType.Series
             },
             InstanceType.Sonarr when _sonarrConfig.SearchType is SonarrSearchType.Series => new SonarrSearchItem
             {
@@ -111,4 +121,5 @@ public abstract class GenericHandler : IDisposable
             },
             _ => throw new NotImplementedException($"instance type {type} is not yet supported")
         };
+    }
 }

code/Infrastructure/Verticals/QueueCleaner/QueueCleaner.cs

@@ -1,8 +1,8 @@
-using Common.Configuration;
 using Common.Configuration.Arr;
-using Domain.Arr.Queue;
+using Common.Configuration.QueueCleaner;
 using Domain.Enums;
 using Domain.Models.Arr;
+using Domain.Models.Arr.Queue;
 using Infrastructure.Verticals.Arr;
 using Infrastructure.Verticals.DownloadClient;
 using Infrastructure.Verticals.Jobs;
@@ -29,34 +29,45 @@ public sealed class QueueCleaner : GenericHandler
     {
         HashSet<SearchItem> itemsToBeRefreshed = [];
         ArrClient arrClient = GetClient(instanceType);
+        ArrConfig arrConfig = GetConfig(instanceType);
 
         await _arrArrQueueIterator.Iterate(arrClient, instance, async items =>
         {
-            foreach (QueueRecord record in items)
+            var groups = items
+                .GroupBy(x => x.DownloadId)
+                .ToList();
+            
+            foreach (var group in groups)
             {
+                if (group.Any(x => !arrClient.IsRecordValid(x)))
+                {
+                    continue;
+                }
+                
+                QueueRecord record = group.First();
+                
                 if (record.Protocol is not "torrent")
                 {
                     continue;
                 }
 
-                if (string.IsNullOrEmpty(record.DownloadId))
+                if (!arrClient.IsRecordValid(record))
                 {
-                    _logger.LogDebug("skip | download id is null for {title}", record.Title);
                     continue;
                 }
 
-                if (!await _downloadService.ShouldRemoveFromArrQueueAsync(record.DownloadId))
+                if (!arrClient.ShouldRemoveFromQueue(record) && !await _downloadService.ShouldRemoveFromArrQueueAsync(record.DownloadId))
                 {
                     _logger.LogInformation("skip | {title}", record.Title);
                     continue;
                 }
-
-                itemsToBeRefreshed.Add(GetRecordSearchItem(instanceType, record));
+                
+                itemsToBeRefreshed.Add(GetRecordSearchItem(instanceType, record, group.Count() > 1));
 
                 await arrClient.DeleteQueueItemAsync(instance, record);
             }
         });
         
-        await arrClient.RefreshItemsAsync(instance, GetConfig(instanceType), itemsToBeRefreshed);
+        await arrClient.RefreshItemsAsync(instance, arrConfig, itemsToBeRefreshed);
     }
 }

code/test/data/nginx/sonarr.xml

@@ -44,6 +44,17 @@
       <pubDate>Sat, 24 Sep 2022 22:02:13 -0300</pubDate>
     </item>
 
+    <item>
+      <title>Top.Gear.S23E03.720p.x265.HDTV.HEVC.-.YSTEAM</title>
+      <description>Test</description>
+      <size>4138858110</size>
+      <link>magnet:?xt=urn:btih:cf92cf859b110af0ad3d94b846e006828417b193&amp;dn=TPG.2303.720p.x265.yourserie.com.mkv</link>
+      <guid isPermaLink="false">
+        174674a88c8947f6f5057ac3f81efde384ed216c2de43564ec450f2cb4677554
+      </guid>
+      <pubDate>Sat, 24 Sep 2022 22:02:13 -0300</pubDate>
+    </item>
+
     <item>
       <title>Top.Gear.S23E01.720p.x265.HDTV.HEVC.-.YSTEAM</title>
       <description>Test</description>
@@ -65,5 +76,16 @@
       </guid>
       <pubDate>Sat, 24 Sep 2022 22:02:13 -0300</pubDate>
     </item>
+
+    <item>
+      <title>Sherlock.S01.1080p.BluRay.DD5.1.x264-DON</title>
+      <description>Test</description>
+      <size>4138858110</size>
+      <link>http://nginx/custom/sonarr_bad_pack.torrent</link>
+      <guid isPermaLink="false">
+        174674a88c8947f6f9057ac3f82efde384ed216cade43564ec45gf2cb4677554
+      </guid>
+      <pubDate>Sat, 24 Sep 2022 22:02:13 -0300</pubDate>
+    </item>
   </channel>
 </rss>

code/test/data/nginx/sonarr_bad_pack.torrent

@@ -0,0 +1 @@
+d8:announce28:http://tracker:6969/announce10:created by26:Enhanced-CTorrent/dnh3.3.213:creation datei1734129464e4:infod5:filesld6:lengthi7e4:pathl47:Sherlock.S01E01.1080p.BluRay.DD5.1.x264-DON.mkveed6:lengthi7e4:pathl47:Sherlock.S01E02.1080p.BluRay.DD5.1.x264-DON.mkveed6:lengthi7e4:pathl47:Sherlock.S01E03.1080p.BluRay.DD5.1.x264-DON.mkveee4:name40:Sherlock.S01.1080p.BluRay.DD5.1.x264-DON12:piece lengthi262144e6:pieces20:/<2F><>r<04><><EFBFBD><EFBFBD>lY<1A><><EFBFBD><EFBFBD>|<7C>7ee

code/test/data/qbittorrent-bad/config/qBittorrent/BT_backup/fa800a7d7c443a2c3561d1f8f393c089036dade1.torrent

@@ -0,0 +1 @@
+d10:created by26:Enhanced-CTorrent/dnh3.3.213:creation datei1734129464e4:infod5:filesld6:lengthi7e4:pathl47:Sherlock.S01E01.1080p.BluRay.DD5.1.x264-DON.mkveed6:lengthi7e4:pathl47:Sherlock.S01E02.1080p.BluRay.DD5.1.x264-DON.mkveed6:lengthi7e4:pathl47:Sherlock.S01E03.1080p.BluRay.DD5.1.x264-DON.mkveee4:name40:Sherlock.S01.1080p.BluRay.DD5.1.x264-DON12:piece lengthi262144e6:pieces20:/<2F><>r<04><><EFBFBD><EFBFBD>lY<1A><><EFBFBD><EFBFBD>|<7C>7ee

code/test/data/qbittorrent-bad/config/qBittorrent/BT_backup/queue

@@ -1,5 +1 @@
-2b2ec156461d77bc48b8fe4d62cede50dcdff8e0
-a4a1d1dd1db25763caa8f5e4d25ad72ef304094b
-b72541215214be2a1d96ef6b29ca1305f5e5e1f6
-59ab2bc053430fe53e06a93e2eadb7acb6a6bf2c
 11cece7f8721c484126b66f609d52738ff1bbf1e

code/test/data/qbittorrent-bad/config/qBittorrent/qBittorrent-data.conf

@@ -1,2 +1,2 @@
 [Stats]
-AllStats=@Variant(\0\0\0\x1c\0\0\0\x2\0\0\0\x12\0\x41\0l\0l\0t\0i\0m\0\x65\0\x44\0L\0\0\0\x4\0\0\0\0\0\x61\xc0\xdf\0\0\0\x12\0\x41\0l\0l\0t\0i\0m\0\x65\0U\0L\0\0\0\x4\0\0\0\0\0\x9b\xf9\x8a)
+AllStats=@Variant(\0\0\0\x1c\0\0\0\x2\0\0\0\x12\0\x41\0l\0l\0t\0i\0m\0\x65\0U\0L\0\0\0\x4\0\0\0\0\0\x9dm\x4\0\0\0\x12\0\x41\0l\0l\0t\0i\0m\0\x65\0\x44\0L\0\0\0\x4\0\0\0\0\0\x62_.)

code/test/data/qbittorrent-bad/downloads/Sherlock.S01.1080p.BluRay.DD5.1.x264-DON/Sherlock.S01E01.1080p.BluRay.DD5.1.x264-DON.mkv

@@ -0,0 +1 @@
+episode

code/test/data/qbittorrent-bad/downloads/Sherlock.S01.1080p.BluRay.DD5.1.x264-DON/Sherlock.S01E02.1080p.BluRay.DD5.1.x264-DON.mkv

@@ -0,0 +1 @@
+episode

code/test/data/qbittorrent-bad/downloads/Sherlock.S01.1080p.BluRay.DD5.1.x264-DON/Sherlock.S01E03.1080p.BluRay.DD5.1.x264-DON.mkv

@@ -0,0 +1 @@
+episode

code/test/data/qbittorrent-bad/downloads/sonarr_bad_pack.torrent

@@ -0,0 +1 @@
+d8:announce28:http://tracker:6969/announce10:created by26:Enhanced-CTorrent/dnh3.3.213:creation datei1734129464e4:infod5:filesld6:lengthi7e4:pathl47:Sherlock.S01E01.1080p.BluRay.DD5.1.x264-DON.mkveed6:lengthi7e4:pathl47:Sherlock.S01E02.1080p.BluRay.DD5.1.x264-DON.mkveed6:lengthi7e4:pathl47:Sherlock.S01E03.1080p.BluRay.DD5.1.x264-DON.mkveee4:name40:Sherlock.S01.1080p.BluRay.DD5.1.x264-DON12:piece lengthi262144e6:pieces20:/<2F><>r<04><><EFBFBD><EFBFBD>lY<1A><><EFBFBD><EFBFBD>|<7C>7ee

code/test/data/sonarr/config/Sentry/07ADDC43B5669C4F6DB64F2EF2B23B3FEEDFE865/.session

@@ -0,0 +1 @@
+{"update":{"sid":"4ee000d424144e078e7f3ef208e30647","did":"1df9f2cc-17dc-4130-9753-9b694f82f1b5","init":true,"started":"2024-12-13T22:41:57.8197572+00:00","timestamp":"2024-12-13T22:41:57.8202577+00:00","seq":0,"duration":0,"errors":0,"attrs":{"release":"4.0.10.2544-main","environment":"main"}}}

code/test/data/sonarr/config/sonarr.pid

@@ -1 +1 @@
-146
+144

code/test/docker-compose.yml

@@ -172,7 +172,7 @@ services:
     container_name: cleanuperr
     environment:
       - LOGGING__LOGLEVEL=Debug
-      - LOGGING__FILE__ENABLED=false
+      - LOGGING__FILE__ENABLED=true
       - LOGGING__FILE__PATH=/var/logs
       - LOGGING__ENHANCED=true
 
@@ -181,24 +181,24 @@ services:
 
       - QUEUECLEANER__ENABLED=true
       - QUEUECLEANER__RUNSEQUENTIALLY=true
+      - QUEUECLEANER__IMPORT_FAILED_MAX_STRIKES=5
+      - QUEUECLEANER__STALLED_MAX_STRIKES=5
 
       - CONTENTBLOCKER__ENABLED=true
       - CONTENTBLOCKER__BLACKLIST__ENABLED=true
       - CONTENTBLOCKER__BLACKLIST__PATH=https://raw.githubusercontent.com/flmorg/cleanuperr/refs/heads/main/blacklist
       # OR
       # - CONTENTBLOCKER__WHITELIST__ENABLED=true
-      # - CONTENTBLOCKER__BLACKLIST__PATH=https://raw.githubusercontent.com/flmorg/cleanuperr/refs/heads/main/whitelist
+      # - CONTENTBLOCKER__WHITELIST__PATH=https://raw.githubusercontent.com/flmorg/cleanuperr/refs/heads/main/whitelist
 
-      - QBITTORRENT__ENABLED=true
+      - DOWNLOAD_CLIENT=qbittorrent
       - QBITTORRENT__URL=http://qbittorrent:8080
       - QBITTORRENT__USERNAME=test
       - QBITTORRENT__PASSWORD=testing
       # OR
-      # - DELUGE__ENABLED=true
       # - DELUGE__URL=http://localhost:8112
       # - DELUGE__PASSWORD=testing
       # OR
-      # - TRANSMISSION__ENABLED=true
       # - TRANSMISSION__URL=http://localhost:9091
       # - TRANSMISSION__USERNAME=test
       # - TRANSMISSION__PASSWORD=testing