Added a bit more logging for Tracked Downloads.

fixes #2082

COPYRIGHT.md

@@ -0,0 +1,11 @@
+Copyright (C)  
+2014-2017 Mark McDowall, Keivan Beigi, Taloth Saldono and contributors  
+2010-2014 Mark McDowall, Keivan Beigi and contributors  
+
+_Please refer to the git commit log for details on all contributors and their respective contributions._
+
+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 can find a copy of the GNU General Public License in the LICENSE.md file and <http://www.gnu.org/licenses/>.

LICENSE.md

@@ -0,0 +1,675 @@
+### GNU GENERAL PUBLIC LICENSE
+
+Version 3, 29 June 2007
+
+Copyright (C) 2007 Free Software Foundation, Inc.
+<http://fsf.org/>
+
+Everyone is permitted to copy and distribute verbatim copies of this
+license document, but changing it is not allowed.
+
+### Preamble
+
+The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+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 <http://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 <http://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 <http://www.gnu.org/philosophy/why-not-lgpl.html>.

gulp/copy.js

@@ -25,7 +25,7 @@ gulp.task('copyHtml', function () {
 });
 
 gulp.task('copyContent', function () {
-  return gulp.src([paths.src.content + '**/*.*', '!**/*.less'])
+  return gulp.src([paths.src.content + '**/*.*', '!**/*.less', '!**/*.css'])
     .pipe(gulp.dest(paths.dest.content))
     .pipe(livereload());
 });

gulp/less.js

@@ -5,7 +5,7 @@ var postcss = require('gulp-postcss');
 var sourcemaps = require('gulp-sourcemaps');
 var autoprefixer = require('autoprefixer-core');
 var livereload = require('gulp-livereload');
-
+var cleancss = require('gulp-clean-css');
 var print = require('gulp-print');
 var paths = require('./paths');
 var errorHandler = require('./errorHandler');
@@ -16,6 +16,10 @@ gulp.task('less', function() {
         paths.src.content + 'bootstrap.less',
         paths.src.content + 'theme.less',
         paths.src.content + 'overrides.less',
+        paths.src.content + 'bootstrap.toggle-switch.css',
+        paths.src.content + 'fullcalendar.css',
+        paths.src.content + 'Messenger/messenger.css',
+        paths.src.content + 'Messenger/messenger.flat.css',
         paths.src.root + 'Series/series.less',
         paths.src.root + 'Activity/activity.less',
         paths.src.root + 'AddSeries/addSeries.less',
@@ -33,12 +37,13 @@ gulp.task('less', function() {
         .pipe(sourcemaps.init())
         .pipe(less({
             dumpLineNumbers : 'false',
-            compress        : true,
-            yuicompress     : true,
+            compress        : false,
+            yuicompress     : false,
             ieCompat        : true,
             strictImports   : true
         }))
         .pipe(postcss([ autoprefixer({ browsers: ['last 2 versions'] }) ]))
+        .pipe(cleancss())
         .on('error', errorHandler.onError)
         .pipe(sourcemaps.write(paths.dest.content))
         .pipe(gulp.dest(paths.dest.content))

package.json

@@ -20,6 +20,7 @@
     "del": "1.2.0",
     "gulp": "3.9.0",
     "gulp-cached": "1.1.0",
+    "gulp-clean-css": "^3.0.4",
     "gulp-concat": "2.6.0",
     "gulp-declare": "0.3.0",
     "gulp-handlebars": "3.0.1",

src/NzbDrone.Api/Authentication/EnableAuthInNancy.cs

@@ -33,12 +33,12 @@ namespace NzbDrone.Api.Authentication
         {
             if (_configFileProvider.AuthenticationMethod == AuthenticationType.Forms)
             {
-                RegisterFormsAuth(pipelines);                
+                RegisterFormsAuth(pipelines);
             }
 
             else if (_configFileProvider.AuthenticationMethod == AuthenticationType.Basic)
             {
-                pipelines.EnableBasicAuthentication(new BasicAuthenticationConfiguration(_authenticationService, "Sonarr"));                
+                pipelines.EnableBasicAuthentication(new BasicAuthenticationConfiguration(_authenticationService, "Sonarr"));
             }
 
             pipelines.BeforeRequest.AddItemToEndOfPipeline((Func<NancyContext, Response>) RequiresAuthentication);
@@ -64,10 +64,13 @@ namespace NzbDrone.Api.Authentication
                     new DefaultHmacProvider(new PassphraseKeyGenerator(_configService.HmacPassphrase, Encoding.ASCII.GetBytes(_configService.HmacSalt)))
                 );
 
+            FormsAuthentication.FormsAuthenticationCookieName = "_ncfa_sonarr";
+
             FormsAuthentication.Enable(pipelines, new FormsAuthenticationConfiguration
             {
                 RedirectUrl = _configFileProvider.UrlBase + "/login",
                 UserMapper = _authenticationService,
+                Path = _configFileProvider.UrlBase,
                 CryptographyConfiguration = cryptographyConfiguration
             });
         }

src/NzbDrone.Api/EpisodeFiles/EpisodeFileModule.cs

@@ -1,16 +1,13 @@
 using System.Collections.Generic;
-using System.IO;
-using NLog;
-using NzbDrone.Api.REST;
-using NzbDrone.Common.Disk;
-using NzbDrone.Common.Extensions;
 using NzbDrone.Core.Datastore.Events;
 using NzbDrone.Core.MediaFiles;
 using NzbDrone.Core.MediaFiles.Events;
 using NzbDrone.Core.Messaging.Events;
 using NzbDrone.Core.Tv;
 using NzbDrone.Core.DecisionEngine;
+using NzbDrone.Core.Exceptions;
 using NzbDrone.SignalR;
+using HttpStatusCode = System.Net.HttpStatusCode;
 
 namespace NzbDrone.Api.EpisodeFiles
 {
@@ -18,27 +15,21 @@ namespace NzbDrone.Api.EpisodeFiles
                                  IHandle<EpisodeFileAddedEvent>
     {
         private readonly IMediaFileService _mediaFileService;
-        private readonly IDiskProvider _diskProvider;
-        private readonly IRecycleBinProvider _recycleBinProvider;
+        private readonly IDeleteMediaFiles _mediaFileDeletionService;
         private readonly ISeriesService _seriesService;
         private readonly IQualityUpgradableSpecification _qualityUpgradableSpecification;
-        private readonly Logger _logger;
 
         public EpisodeFileModule(IBroadcastSignalRMessage signalRBroadcaster,
                              IMediaFileService mediaFileService,
-                             IDiskProvider diskProvider,
-                             IRecycleBinProvider recycleBinProvider,
+                             IDeleteMediaFiles mediaFileDeletionService,
                              ISeriesService seriesService,
-                             IQualityUpgradableSpecification qualityUpgradableSpecification,
-                             Logger logger)
+                             IQualityUpgradableSpecification qualityUpgradableSpecification)
             : base(signalRBroadcaster)
         {
             _mediaFileService = mediaFileService;
-            _diskProvider = diskProvider;
-            _recycleBinProvider = recycleBinProvider;
+            _mediaFileDeletionService = mediaFileDeletionService;
             _seriesService = seriesService;
             _qualityUpgradableSpecification = qualityUpgradableSpecification;
-            _logger = logger;
             GetResourceById = GetEpisodeFile;
             GetResourceAll = GetEpisodeFiles;
             UpdateResource = SetQuality;
@@ -77,13 +68,15 @@ namespace NzbDrone.Api.EpisodeFiles
         private void DeleteEpisodeFile(int id)
         {
             var episodeFile = _mediaFileService.Get(id);
-            var series = _seriesService.GetSeries(episodeFile.SeriesId);
-            var fullPath = Path.Combine(series.Path, episodeFile.RelativePath);
-            var subfolder = _diskProvider.GetParentFolder(series.Path).GetRelativePath(_diskProvider.GetParentFolder(fullPath));
 
-            _logger.Info("Deleting episode file: {0}", fullPath);
-            _recycleBinProvider.DeleteFile(fullPath, subfolder);
-            _mediaFileService.Delete(episodeFile, DeleteMediaFileReason.Manual);
+            if (episodeFile == null)
+            {
+                throw new NzbDroneClientException(HttpStatusCode.NotFound, "Episode file not found");
+            }
+
+            var series = _seriesService.GetSeries(episodeFile.SeriesId);
+
+            _mediaFileDeletionService.DeleteEpisodeFile(series, episodeFile);
         }
 
         public void Handle(EpisodeFileAddedEvent message)

src/NzbDrone.Api/Episodes/EpisodeModuleWithSignalR.cs

@@ -14,7 +14,7 @@ namespace NzbDrone.Api.Episodes
 {
     public abstract class EpisodeModuleWithSignalR : NzbDroneRestModuleWithSignalR<EpisodeResource, Episode>,
         IHandle<EpisodeGrabbedEvent>,
-        IHandle<EpisodeDownloadedEvent>
+        IHandle<EpisodeImportedEvent>
     {
         protected readonly IEpisodeService _episodeService;
         protected readonly ISeriesService _seriesService;
@@ -115,9 +115,14 @@ namespace NzbDrone.Api.Episodes
             }
         }
 
-        public void Handle(EpisodeDownloadedEvent message)
+        public void Handle(EpisodeImportedEvent message)
         {
-            foreach (var episode in message.Episode.Episodes)
+            if (!message.NewDownload)
+            {
+                return;
+            }
+
+            foreach (var episode in message.EpisodeInfo.Episodes)
             {
                 BroadcastResourceChange(ModelAction.Updated, episode.Id);
             }

src/NzbDrone.Api/Extensions/Pipelines/UrlBasePipeline.cs

@@ -0,0 +1,46 @@
+using System;
+using Nancy;
+using Nancy.Bootstrapper;
+using Nancy.Responses;
+using NzbDrone.Common.Extensions;
+using NzbDrone.Core.Configuration;
+
+namespace NzbDrone.Api.Extensions.Pipelines
+{
+    public class UrlBasePipeline : IRegisterNancyPipeline
+    {
+        private readonly string _urlBase;
+
+        public UrlBasePipeline(IConfigFileProvider configFileProvider)
+        {
+            _urlBase = configFileProvider.UrlBase;
+        }
+
+        public int Order => 99;
+
+        public void Register(IPipelines pipelines)
+        {
+            if (_urlBase.IsNotNullOrWhiteSpace())
+            {
+                pipelines.BeforeRequest.AddItemToStartOfPipeline((Func<NancyContext, Response>) Handle);
+            }
+        }
+
+        private Response Handle(NancyContext context)
+        {
+            var basePath = context.Request.Url.BasePath;
+
+            if (basePath.IsNullOrWhiteSpace())
+            {
+                return new RedirectResponse($"{_urlBase}{context.Request.Path}{context.Request.Url.Query}");
+            }
+
+            if (_urlBase != basePath)
+            {
+                return new NotFoundResponse();
+            }
+
+            return null;
+        }
+    }
+}

src/NzbDrone.Api/Frontend/Mappers/IndexHtmlMapper.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Text.RegularExpressions;
 using Nancy;
@@ -17,7 +17,7 @@ namespace NzbDrone.Api.Frontend.Mappers
         private readonly IAnalyticsService _analyticsService;
         private readonly Func<ICacheBreakerProvider> _cacheBreakProviderFactory;
         private readonly string _indexPath;
-        private static readonly Regex ReplaceRegex = new Regex(@"(?:(?<attribute>href|src)=\"")(?<path>.*?(?<extension>css|js|png|ico|ics))(?:\"")(?:\s(?<nohash>data-no-hash))?", RegexOptions.Compiled | RegexOptions.IgnoreCase);
+        private static readonly Regex ReplaceRegex = new Regex(@"(?:(?<attribute>href|src)=\"")(?<path>.*?(?<extension>css|js|png|ico|ics|svg))(?:\"")(?:\s(?<nohash>data-no-hash))?", RegexOptions.Compiled | RegexOptions.IgnoreCase);
 
         private static string API_KEY;
         private static string URL_BASE;

src/NzbDrone.Api/Frontend/StaticResourceModule.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using Nancy.Responses;
@@ -38,20 +38,6 @@ namespace NzbDrone.Api.Frontend
                 return new NotFoundResponse();
             }
 
-            //Redirect to the subfolder if the request went to the base URL
-            if (path.Equals("/"))
-            {
-                var urlBase = _configFileProvider.UrlBase;
-
-                if (!string.IsNullOrEmpty(urlBase))
-                {
-                    if (Request.Url.BasePath != urlBase)
-                    {
-                        return new RedirectResponse(urlBase  + "/");
-                    }
-                }
-            }
-
             var mapper = _requestMappers.SingleOrDefault(m => m.CanHandle(path));
 
             if (mapper != null)

src/NzbDrone.Api/Indexers/ReleaseModule.cs

@@ -53,7 +53,7 @@ namespace NzbDrone.Api.Indexers
 
         private Response DownloadRelease(ReleaseResource release)
         {
-            var remoteEpisode = _remoteEpisodeCache.Find(release.Guid);
+            var remoteEpisode = _remoteEpisodeCache.Find(GetCacheKey(release));
 
             if (remoteEpisode == null)
             {
@@ -68,7 +68,7 @@ namespace NzbDrone.Api.Indexers
             }
             catch (ReleaseDownloadException ex)
             {
-                _logger.Error(ex);
+                _logger.Error(ex, ex.Message);
                 throw new NzbDroneClientException(HttpStatusCode.Conflict, "Getting release from indexer failed");
             }
 
@@ -113,8 +113,14 @@ namespace NzbDrone.Api.Indexers
 
         protected override ReleaseResource MapDecision(DownloadDecision decision, int initialWeight)
         {
-            _remoteEpisodeCache.Set(decision.RemoteEpisode.Release.Guid, decision.RemoteEpisode, TimeSpan.FromMinutes(30));
-           return base.MapDecision(decision, initialWeight);
+            var resource = base.MapDecision(decision, initialWeight);
+            _remoteEpisodeCache.Set(GetCacheKey(resource), decision.RemoteEpisode, TimeSpan.FromMinutes(30));
+            return resource;
+        }
+
+        private string GetCacheKey(ReleaseResource resource)
+        {
+            return string.Concat(resource.IndexerId, "_", resource.Guid);
         }
     }
 }

src/NzbDrone.Api/Indexers/ReleaseResource.cs

@@ -166,9 +166,9 @@ namespace NzbDrone.Api.Indexers
             model.DownloadProtocol = resource.DownloadProtocol;
             model.TvdbId = resource.TvdbId;
             model.TvRageId = resource.TvRageId;
-            model.PublishDate = resource.PublishDate;
+            model.PublishDate = resource.PublishDate.ToUniversalTime();
 
             return model;
         }
     }
-}
+}

src/NzbDrone.Api/NzbDrone.Api.csproj

@@ -106,6 +106,7 @@
     <Compile Include="Commands\CommandResource.cs" />
     <Compile Include="Extensions\AccessControlHeaders.cs" />
     <Compile Include="Extensions\Pipelines\CorsPipeline.cs" />
+    <Compile Include="Extensions\Pipelines\UrlBasePipeline.cs" />
     <Compile Include="Extensions\Pipelines\RequestLoggingPipeline.cs" />
     <Compile Include="Frontend\Mappers\LoginHtmlMapper.cs" />
     <Compile Include="Frontend\Mappers\RobotsTxtMapper.cs" />

src/NzbDrone.Common.Test/ExtensionTests/UrlExtensionsFixture.cs

@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using FluentAssertions;
+using NUnit.Framework;
+using NzbDrone.Common.Extensions;
+
+namespace NzbDrone.Common.Test.ExtensionTests
+{
+    [TestFixture]
+    public class UrlExtensionsFixture
+    {
+        [TestCase("http://my.local/url")]
+        [TestCase("https://my.local/url")]
+        public void should_report_as_valid_url(string url)
+        {
+            url.IsValidUrl().Should().BeTrue();
+        }
+
+        [TestCase("")]
+        [TestCase(" http://my.local/url")]
+        [TestCase("http://my.local/url ")]
+        public void should_report_as_invalid_url(string url)
+        {
+            url.IsValidUrl().Should().BeFalse();
+        }
+    }
+}

src/NzbDrone.Common.Test/Http/HttpClientFixture.cs

@@ -61,7 +61,7 @@ namespace NzbDrone.Common.Test.Http
 
             response.Content.Should().NotBeNullOrWhiteSpace();
         }
-        
+
         [Test]
         public void should_execute_https_get()
         {
@@ -144,6 +144,38 @@ namespace NzbDrone.Common.Test.Http
             ExceptionVerification.ExpectedErrors(0);
         }
 
+        [Test]
+        public void should_follow_redirects_to_https()
+        {
+            if (typeof(TDispatcher) == typeof(ManagedHttpDispatcher) && PlatformInfo.IsMono)
+            {
+                Assert.Ignore("Will fail on tls1.2 via managed dispatcher, ignore.");
+            }
+
+            var request = new HttpRequestBuilder($"http://{_httpBinHost}/redirect-to")
+                .AddQueryParam("url", $"https://sonarr.tv/")
+                .Build();
+            request.AllowAutoRedirect = true;
+
+            var response = Subject.Get(request);
+
+            response.StatusCode.Should().Be(HttpStatusCode.OK);
+            response.Content.Should().Contain("Sonarr");
+
+            ExceptionVerification.ExpectedErrors(0);
+        }
+
+        [Test]
+        public void should_throw_on_too_many_redirects()
+        {
+            var request = new HttpRequest($"http://{_httpBinHost}/redirect/4");
+            request.AllowAutoRedirect = true;
+
+            Assert.Throws<WebException>(() => Subject.Get(request));
+
+            ExceptionVerification.ExpectedErrors(0);
+        }
+
         [Test]
         public void should_send_user_agent()
         {
@@ -407,4 +439,4 @@ namespace NzbDrone.Common.Test.Http
         public string Url { get; set; }
         public string Data { get; set; }
     }
-}
+}

src/NzbDrone.Common.Test/Http/HttpUriFixture.cs

@@ -7,6 +7,13 @@ namespace NzbDrone.Common.Test.Http
 {
     public class HttpUriFixture : TestBase
     {
+        [TestCase("abc://my_host.com:8080/root/api/")]
+        public void should_parse(string uri)
+        {
+            var newUri = new HttpUri(uri);
+            newUri.FullUri.Should().Be(uri);
+        }
+
         [TestCase("", "", "")]
         [TestCase("/", "", "/")]
         [TestCase("base", "", "base")]
@@ -77,7 +84,7 @@ namespace NzbDrone.Common.Test.Http
         public void should_combine_relative_path(string basePath, string relativePath, string expected)
         {
             var newUri = new HttpUri(basePath).CombinePath(relativePath);
-            
+
             newUri.FullUri.Should().Be(expected);
         }
     }

src/NzbDrone.Common.Test/NzbDrone.Common.Test.csproj

@@ -80,6 +80,7 @@
     <Compile Include="ExtensionTests\IEnumerableExtensionTests\ExceptByFixture.cs" />
     <Compile Include="ExtensionTests\IEnumerableExtensionTests\IntersectByFixture.cs" />
     <Compile Include="ExtensionTests\Int64ExtensionFixture.cs" />
+    <Compile Include="ExtensionTests\UrlExtensionsFixture.cs" />
     <Compile Include="HashUtilFixture.cs" />
     <Compile Include="Http\HttpClientFixture.cs" />
     <Compile Include="Http\HttpHeaderFixture.cs" />

src/NzbDrone.Common.Test/PathExtensionFixture.cs

@@ -86,7 +86,7 @@ namespace NzbDrone.Common.Test
         {
             first.AsOsAgnostic().PathEquals(second.AsOsAgnostic()).Should().BeFalse();
         }
-        
+
         [Test]
         public void should_return_false_when_not_a_child()
         {
@@ -113,6 +113,7 @@ namespace NzbDrone.Common.Test
         [TestCase(@"C:\Test\", @"C:\Test\mydir")]
         [TestCase(@"C:\Test\", @"C:\Test\mydir\")]
         [TestCase(@"C:\Test", @"C:\Test\30.Rock.S01E01.Pilot.avi")]
+        [TestCase(@"C:\", @"C:\Test\30.Rock.S01E01.Pilot.avi")]
         public void path_should_be_parent(string parentPath, string childPath)
         {
             parentPath.AsOsAgnostic().IsParentPath(childPath.AsOsAgnostic()).Should().BeTrue();

src/NzbDrone.Common/Disk/DiskTransferService.cs

@@ -223,7 +223,7 @@ namespace NzbDrone.Common.Disk
                     _diskProvider.MoveFile(sourcePath, tempPath, true);
                     try
                     {
-                        ClearTargetPath(targetPath, overwrite);
+                        ClearTargetPath(sourcePath, targetPath, overwrite);
 
                         _diskProvider.MoveFile(tempPath, targetPath);
 
@@ -253,7 +253,7 @@ namespace NzbDrone.Common.Disk
                 throw new IOException(string.Format("Destination cannot be a child of the source [{0}] => [{1}]", sourcePath, targetPath));
             }
 
-            ClearTargetPath(targetPath, overwrite);
+            ClearTargetPath(sourcePath, targetPath, overwrite);
 
             if (mode.HasFlag(TransferMode.HardLink))
             {
@@ -330,7 +330,7 @@ namespace NzbDrone.Common.Disk
             return TransferMode.None;
         }
 
-        private void ClearTargetPath(string targetPath, bool overwrite)
+        private void ClearTargetPath(string sourcePath, string targetPath, bool overwrite)
         {
             if (_diskProvider.FileExists(targetPath))
             {
@@ -340,7 +340,7 @@ namespace NzbDrone.Common.Disk
                 }
                 else
                 {
-                    throw new IOException(string.Format("Destination already exists [{0}]", targetPath));
+                    throw new IOException(string.Format("Destination already exists. [{0}] to [{1}]", sourcePath, targetPath));
                 }
             }
         }
@@ -590,7 +590,7 @@ namespace NzbDrone.Common.Disk
 
         private bool ShouldIgnore(FileInfo file)
         {
-            if (file.Name.StartsWith(".nfs"))
+            if (file.Name.StartsWith(".nfs") || file.Name == "debug.log" || file.Name.EndsWith(".socket"))
             {
                 _logger.Trace("Ignoring file {0}", file.FullName);
                 return true;

src/NzbDrone.Common/Disk/DriveInfoMount.cs

@@ -1,4 +1,5 @@
-using System.IO;
+using System.Collections.Generic;
+using System.IO;
 using NzbDrone.Common.Extensions;
 
 namespace NzbDrone.Common.Disk
@@ -8,10 +9,11 @@ namespace NzbDrone.Common.Disk
         private readonly DriveInfo _driveInfo;
         private readonly DriveType _driveType;
 
-        public DriveInfoMount(DriveInfo driveInfo, DriveType driveType = DriveType.Unknown)
+        public DriveInfoMount(DriveInfo driveInfo, DriveType driveType = DriveType.Unknown, MountOptions mountOptions = null)
         {
             _driveInfo = driveInfo;
             _driveType = driveType;
+            MountOptions = mountOptions;
         }
 
         public long AvailableFreeSpace => _driveInfo.AvailableFreeSpace;
@@ -33,6 +35,8 @@ namespace NzbDrone.Common.Disk
 
         public bool IsReady => _driveInfo.IsReady;
 
+        public MountOptions MountOptions { get; private set; }
+
         public string Name => _driveInfo.Name;
 
         public string RootDirectory => _driveInfo.RootDirectory.FullName;

src/NzbDrone.Common/Disk/IMount.cs

@@ -1,3 +1,4 @@
+using System.Collections.Generic;
 using System.IO;
 
 namespace NzbDrone.Common.Disk
@@ -8,6 +9,7 @@ namespace NzbDrone.Common.Disk
         string DriveFormat { get; }
         DriveType DriveType { get; }
         bool IsReady { get; }
+        MountOptions MountOptions { get; }
         string Name { get; }
         string RootDirectory { get; }
         long TotalFreeSpace { get; }

src/NzbDrone.Common/Disk/MountOptions.cs

@@ -0,0 +1,16 @@
+using System.Collections.Generic;
+
+namespace NzbDrone.Common.Disk
+{
+    public class MountOptions
+    {
+        private readonly Dictionary<string, string> _options;
+
+        public MountOptions(Dictionary<string, string> options)
+        {
+            _options = options;
+        }
+
+        public bool IsReadOnly => _options.ContainsKey("ro");
+    }
+}

src/NzbDrone.Common/EnvironmentInfo/AppFolderFactory.cs

@@ -3,6 +3,7 @@ using System.Security.AccessControl;
 using System.Security.Principal;
 using NLog;
 using NzbDrone.Common.Disk;
+using NzbDrone.Common.Exceptions;
 using NzbDrone.Common.Instrumentation;
 
 namespace NzbDrone.Common.EnvironmentInfo
@@ -33,6 +34,11 @@ namespace NzbDrone.Common.EnvironmentInfo
             {
                 SetPermissions();
             }
+
+            if (!_diskProvider.FolderWritable(_appFolderInfo.AppDataFolder))
+            {
+                throw new SonarrStartupException("AppFolder {0} is not writable", _appFolderInfo.AppDataFolder);
+            }
         }
 
         private void SetPermissions()

src/NzbDrone.Common/Exceptions/SonarrStartupException.cs

@@ -0,0 +1,44 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace NzbDrone.Common.Exceptions
+{
+    public class SonarrStartupException : NzbDroneException
+    {
+        public SonarrStartupException(string message, params object[] args)
+            : base("Sonarr failed to start: " + string.Format(message, args))
+        {
+
+        }
+
+        public SonarrStartupException(string message)
+            : base("Sonarr failed to start: " + message)
+        {
+
+        }
+
+        public SonarrStartupException()
+            : base("Sonarr failed to start")
+        {
+
+        }
+
+        public SonarrStartupException(Exception innerException, string message, params object[] args)
+            : base("Sonarr failed to start: " + string.Format(message, args), innerException)
+        {
+        }
+
+        public SonarrStartupException(Exception innerException, string message)
+            : base("Sonarr failed to start: " + message, innerException)
+        {
+        }
+
+        public SonarrStartupException(Exception innerException)
+            : base("Sonarr failed to start: " + innerException.Message)
+        {
+
+        }
+    }
+}

src/NzbDrone.Common/Extensions/ExceptionExtensions.cs

@@ -0,0 +1,55 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace NzbDrone.Common.Extensions
+{
+    public static class ExceptionExtensions
+    {
+        public static T WithData<T>(this T ex, string key, string value) where T : Exception
+        {
+            ex.AddData(key, value);
+
+            return ex;
+        }
+        public static T WithData<T>(this T ex, string key, int value) where T : Exception
+        {
+            ex.AddData(key, value.ToString());
+
+            return ex;
+        }
+
+        public static T WithData<T>(this T ex, string key, Http.HttpUri value) where T : Exception
+        {
+            ex.AddData(key, value.ToString());
+
+            return ex;
+        }
+
+
+        public static T WithData<T>(this T ex, Http.HttpResponse response, int maxSampleLength = 512) where T : Exception
+        {
+            if (response == null || response.Content == null) return ex;
+
+            var contentSample = response.Content.Substring(0, Math.Min(response.Content.Length, 512));
+
+            if (response.Headers != null)
+            {
+                ex.AddData("ContentType", response.Headers.ContentType ?? string.Empty);
+            }
+            ex.AddData("ContentLength", response.Content.Length.ToString());
+            ex.AddData("ContentSample", contentSample);
+
+            return ex;
+        }
+
+
+        private static void AddData(this Exception ex, string key, string value)
+        {
+            if (value.IsNullOrWhiteSpace()) return;
+
+            ex.Data[key] = value;
+        }
+    }
+}

src/NzbDrone.Common/Extensions/PathExtensions.cs

@@ -80,11 +80,11 @@ namespace NzbDrone.Common.Extensions
 
         public static bool IsParentPath(this string parentPath, string childPath)
         {
-            if (parentPath != "/")
+            if (parentPath != "/" && !parentPath.EndsWith(":\\"))
             {
                 parentPath = parentPath.TrimEnd(Path.DirectorySeparatorChar);
             }
-            if (childPath != "/")
+            if (childPath != "/" && !parentPath.EndsWith(":\\"))
             {
                 childPath = childPath.TrimEnd(Path.DirectorySeparatorChar);
             }
@@ -276,4 +276,4 @@ namespace NzbDrone.Common.Extensions
             return Path.Combine(appFolderInfo.StartUpFolder, NLOG_CONFIG_FILE);
         }
     }
-}
+}

src/NzbDrone.Common/Extensions/StringExtensions.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 using System.Text;
@@ -63,6 +64,11 @@ namespace NzbDrone.Common.Extensions
             return text;
         }
 
+        public static string Join(this IEnumerable<string> values, string separator)
+        {
+            return string.Join(separator, values);
+        }
+
         public static string CleanSpaces(this string text)
         {
             return CollapseSpace.Replace(text, " ").Trim();
@@ -78,6 +84,16 @@ namespace NzbDrone.Common.Extensions
             return !string.IsNullOrWhiteSpace(text);
         }
 
+        public static bool StartsWithIgnoreCase(this string text, string startsWith)
+        {
+            return text.StartsWith(startsWith, StringComparison.InvariantCultureIgnoreCase);
+        }
+
+        public static bool EqualsIgnoreCase(this string text, string equals)
+        {
+            return text.Equals(equals, StringComparison.InvariantCultureIgnoreCase);
+        }
+
         public static bool ContainsIgnoreCase(this string text, string contains)
         {
             return text.IndexOf(contains, StringComparison.InvariantCultureIgnoreCase) > -1;
@@ -118,4 +134,4 @@ namespace NzbDrone.Common.Extensions
             return Encoding.ASCII.GetString(new [] { byteResult });
         }
     }
-}
+}

src/NzbDrone.Common/Extensions/UrlExtensions.cs

@@ -11,6 +11,11 @@ namespace NzbDrone.Common.Extensions
                 return false;
             }
 
+            if (path.StartsWith(" ") || path.EndsWith(" "))
+            {
+                return false;
+            }
+
             Uri uri;
             if (!Uri.TryCreate(path, UriKind.Absolute, out uri))
             {

src/NzbDrone.Common/Http/Dispatchers/CurlHttpDispatcher.cs

@@ -38,7 +38,7 @@ namespace NzbDrone.Common.Http.Dispatchers
                 _caBundleFilePath = _caBundleFileName;
             }
         }
-        
+
         public CurlHttpDispatcher(IHttpProxySettingsProvider proxySettingsProvider, IUserAgentBuilder userAgentBuilder, Logger logger)
         {
             _proxySettingsProvider = proxySettingsProvider;
@@ -107,7 +107,7 @@ namespace NzbDrone.Common.Http.Dispatchers
                             throw new NotSupportedException($"HttpCurl method {request.Method} not supported");
                     }
                     curlEasy.UserAgent = _userAgentBuilder.GetUserAgent(request.UseSimplifiedUserAgent);
-                    curlEasy.FollowLocation = request.AllowAutoRedirect;
+                    curlEasy.FollowLocation = false;
 
                     if (request.RequestTimeout != TimeSpan.Zero)
                     {

src/NzbDrone.Common/Http/Dispatchers/ManagedHttpDispatcher.cs

@@ -32,7 +32,7 @@ namespace NzbDrone.Common.Http.Dispatchers
             webRequest.Method = request.Method.ToString();
             webRequest.UserAgent = _userAgentBuilder.GetUserAgent(request.UseSimplifiedUserAgent);
             webRequest.KeepAlive = request.ConnectionKeepAlive;
-            webRequest.AllowAutoRedirect = request.AllowAutoRedirect;
+            webRequest.AllowAutoRedirect = false;
             webRequest.CookieContainer = cookies;
 
             if (request.RequestTimeout != TimeSpan.Zero)
@@ -73,7 +73,19 @@ namespace NzbDrone.Common.Http.Dispatchers
 
                 if (httpWebResponse == null)
                 {
-                    throw;
+                    // The default messages for WebException on mono are pretty horrible.
+                    if (e.Status == WebExceptionStatus.NameResolutionFailure)
+                    {
+                        throw new WebException($"DNS Name Resolution Failure: '{webRequest.RequestUri.Host}'", e.Status);
+                    }
+                    else if (OsInfo.IsNotWindows)
+                    {
+                        throw new WebException($"{e.Message}: '{webRequest.RequestUri}'", e.Status);
+                    }
+                    else
+                    {
+                        throw;
+                    }
                 }
             }
 
@@ -83,7 +95,14 @@ namespace NzbDrone.Common.Http.Dispatchers
             {
                 if (responseStream != null)
                 {
-                    data = responseStream.ToBytes();
+                    try
+                    {
+                        data = responseStream.ToBytes();
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new WebException("Failed to read complete http response", ex, WebExceptionStatus.ReceiveFailure, httpWebResponse);
+                    }
                 }
             }
 

src/NzbDrone.Common/Http/HttpClient.cs

@@ -7,6 +7,7 @@ using System.Net;
 using NLog;
 using NzbDrone.Common.Cache;
 using NzbDrone.Common.EnvironmentInfo;
+using NzbDrone.Common.Extensions;
 using NzbDrone.Common.Http.Dispatchers;
 using NzbDrone.Common.TPL;
 
@@ -50,6 +51,57 @@ namespace NzbDrone.Common.Http
         }
 
         public HttpResponse Execute(HttpRequest request)
+        {
+            var autoRedirectCount = 0;
+            var autoRedirectChain = new List<string>();
+            autoRedirectChain.Add(request.Url.ToString());
+
+            var response = ExecuteRequest(request);
+
+            while (response.StatusCode == HttpStatusCode.Moved ||
+                   response.StatusCode == HttpStatusCode.MovedPermanently ||
+                   response.StatusCode == HttpStatusCode.Found)
+            {
+                if (request.AllowAutoRedirect)
+                {
+                    request.Url += new HttpUri(response.Headers.GetSingleValue("Location"));
+                    autoRedirectChain.Add(request.Url.ToString());
+
+                    _logger.Trace("Redirected to {0}", request.Url);
+
+                    autoRedirectCount++;
+                    if (autoRedirectCount > 3)
+                    {
+                        throw new WebException($"Too many automatic redirections were attempted for {autoRedirectChain.Join(" -> ")}", WebExceptionStatus.ProtocolError);
+                    }
+
+                    response = ExecuteRequest(request);
+                }
+                else if (!RuntimeInfo.IsProduction)
+                {
+                    _logger.Error("Server requested a redirect to [{0}]. Update the request URL to avoid this redirect.", response.Headers["Location"]);
+                    break;
+                }
+            }
+
+            if (!request.SuppressHttpError && response.HasHttpError)
+            {
+                _logger.Warn("HTTP Error - {0}", response);
+
+                if ((int)response.StatusCode == 429)
+                {
+                    throw new TooManyRequestsException(request, response);
+                }
+                else
+                {
+                    throw new HttpException(request, response);
+                }
+            }
+
+            return response;
+        }
+
+        private HttpResponse ExecuteRequest(HttpRequest request)
         {
             foreach (var interceptor in _requestInterceptors)
             {
@@ -85,28 +137,6 @@ namespace NzbDrone.Common.Http
                 _logger.Trace("Response content ({0} bytes): {1}", response.ResponseData.Length, response.Content);
             }
 
-            if (!RuntimeInfo.IsProduction &&
-                (response.StatusCode == HttpStatusCode.Moved ||
-                 response.StatusCode == HttpStatusCode.MovedPermanently ||
-                 response.StatusCode == HttpStatusCode.Found))
-            {
-                _logger.Error("Server requested a redirect to [{0}]. Update the request URL to avoid this redirect.", response.Headers["Location"]);
-            }
-
-            if (!request.SuppressHttpError && response.HasHttpError)
-            {
-                _logger.Warn("HTTP Error - {0}", response);
-
-                if ((int)response.StatusCode == 429)
-                {
-                    throw new TooManyRequestsException(request, response);
-                }
-                else
-                {
-                    throw new HttpException(request, response);
-                }
-            }
-
             return response;
         }
 
@@ -217,4 +247,4 @@ namespace NzbDrone.Common.Http
             return new HttpResponse<T>(response);
         }
     }
-}
+}

src/NzbDrone.Common/Http/HttpHeader.cs

@@ -37,7 +37,7 @@ namespace NzbDrone.Common.Http
             }
             if (values.Length > 1)
             {
-                throw new ApplicationException(string.Format("Expected {0} to occur only once.", key));
+                throw new ApplicationException($"Expected {key} to occur only once, but was {values.Join("|")}.");
             }
 
             return values[0];
@@ -54,7 +54,7 @@ namespace NzbDrone.Common.Http
             return converter(value);
         }
         protected void SetSingleValue(string key, string value)
-        {            
+        {
             if (value == null)
             {
                 Remove(key);
@@ -175,4 +175,4 @@ namespace NzbDrone.Common.Http
                           .ToList();
         }
     }
-}
+}

src/NzbDrone.Common/Http/HttpMethod.cs

@@ -1,13 +1,14 @@
-namespace NzbDrone.Common.Http
+namespace NzbDrone.Common.Http
 {
     public enum HttpMethod
     {
         GET,
-        PUT,
         POST,
-        HEAD,
+        PUT,
         DELETE,
+        HEAD,
+        OPTIONS,
         PATCH,
-        OPTIONS
+        MERGE
     }
 }

src/NzbDrone.Common/Http/HttpUri.cs

@@ -8,7 +8,7 @@ namespace NzbDrone.Common.Http
 {
     public class HttpUri : IEquatable<HttpUri>
     {
-        private static readonly Regex RegexUri = new Regex(@"^(?:(?<scheme>[a-z]+):)?(?://(?<host>[-A-Z0-9.]+)(?::(?<port>[0-9]{1,5}))?)?(?<path>(?:(?:(?<=^)|/)[^/?#\r\n]+)+/?|/)?(?:\?(?<query>[^#\r\n]*))?(?:\#(?<fragment>.*))?$", RegexOptions.Compiled | RegexOptions.IgnoreCase);
+        private static readonly Regex RegexUri = new Regex(@"^(?:(?<scheme>[a-z]+):)?(?://(?<host>[-_A-Z0-9.]+)(?::(?<port>[0-9]{1,5}))?)?(?<path>(?:(?:(?<=^)|/)[^/?#\r\n]+)+/?|/)?(?:\?(?<query>[^#\r\n]*))?(?:\#(?<fragment>.*))?$", RegexOptions.Compiled | RegexOptions.IgnoreCase);
 
         private readonly string _uri;
         public string FullUri => _uri;
@@ -168,7 +168,7 @@ namespace NzbDrone.Common.Http
             {
                 return basePath.Substring(0, baseSlashIndex) + "/" + relativePath;
             }
-            
+
             return relativePath;
         }
 
@@ -263,7 +263,7 @@ namespace NzbDrone.Common.Http
             {
                 return new HttpUri(baseUrl.Scheme, baseUrl.Host, baseUrl.Port, CombineRelativePath(baseUrl.Path, relativeUrl.Path), relativeUrl.Query, relativeUrl.Fragment);
             }
-            
+
             return new HttpUri(baseUrl.Scheme, baseUrl.Host, baseUrl.Port, baseUrl.Path, relativeUrl.Query, relativeUrl.Fragment);
         }
     }

src/NzbDrone.Common/Instrumentation/CleansingJsonVisitor.cs

@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Newtonsoft.Json.Linq;
+using NzbDrone.Common.Serializer;
+
+namespace NzbDrone.Common.Instrumentation
+{
+    public class CleansingJsonVisitor : JsonVisitor
+    {
+        public override void Visit(JArray json)
+        {
+            for (var i = 0; i < json.Count; i++)
+            {
+                if (json[i].Type == JTokenType.String)
+                {
+                    var text = json[i].Value<string>();
+                    json[i] = new JValue(CleanseLogMessage.Cleanse(text));
+                }
+            }
+            foreach (JToken token in json)
+            {
+                Visit(token);
+            }
+        }
+
+        public override void Visit(JProperty property)
+        {
+            if (property.Value.Type == JTokenType.String)
+            {
+                property.Value = CleanseValue(property.Value as JValue);
+            }
+            else
+            {
+                base.Visit(property);
+            }
+        }
+
+        private JValue CleanseValue(JValue value)
+        {
+            var text = value.Value<string>();
+            var cleansed = CleanseLogMessage.Cleanse(text);
+            return new JValue(cleansed);
+        }
+    }
+}

src/NzbDrone.Common/Instrumentation/Extensions/LoggerExtensions.cs

@@ -1,4 +1,5 @@
 using NLog;
+using NLog.Fluent;
 
 namespace NzbDrone.Common.Instrumentation.Extensions
 {

src/NzbDrone.Common/Instrumentation/Extensions/SentryLoggerExtensions.cs

@@ -0,0 +1,58 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using NLog;
+using NLog.Fluent;
+
+namespace NzbDrone.Common.Instrumentation.Extensions
+{
+    public static class SentryLoggerExtensions
+    {
+        public static readonly Logger SentryLogger = LogManager.GetLogger("Sentry");
+
+        public static LogBuilder SentryFingerprint(this LogBuilder logBuilder, params string[] fingerprint)
+        {
+            return logBuilder.Property("Sentry", fingerprint);
+        }
+
+        public static LogBuilder WriteSentryDebug(this LogBuilder logBuilder, params string[] fingerprint)
+        {
+            return LogSentryMessage(logBuilder, LogLevel.Debug, fingerprint);
+        }
+
+        public static LogBuilder WriteSentryInfo(this LogBuilder logBuilder, params string[] fingerprint)
+        {
+            return LogSentryMessage(logBuilder, LogLevel.Info, fingerprint);
+        }
+
+        public static LogBuilder WriteSentryWarn(this LogBuilder logBuilder, params string[] fingerprint)
+        {
+            return LogSentryMessage(logBuilder, LogLevel.Warn, fingerprint);
+        }
+
+        public static LogBuilder WriteSentryError(this LogBuilder logBuilder, params string[] fingerprint)
+        {
+            return LogSentryMessage(logBuilder, LogLevel.Error, fingerprint);
+        }
+
+        private static LogBuilder LogSentryMessage(LogBuilder logBuilder, LogLevel level, string[] fingerprint)
+        {
+            SentryLogger.Log(level)
+                        .CopyLogEvent(logBuilder.LogEventInfo)
+                        .SentryFingerprint(fingerprint)
+                        .Write();
+
+            return logBuilder.Property("Sentry", null);
+        }
+
+        private static LogBuilder CopyLogEvent(this LogBuilder logBuilder, LogEventInfo logEvent)
+        {
+            return logBuilder.LoggerName(logEvent.LoggerName)
+                             .TimeStamp(logEvent.TimeStamp)
+                             .Message(logEvent.Message, logEvent.Parameters)
+                             .Properties((Dictionary<object, object>)logEvent.Properties)
+                             .Exception(logEvent.Exception);
+        }
+    }
+}

src/NzbDrone.Common/Instrumentation/NzbDroneLogger.cs

@@ -99,7 +99,7 @@ namespace NzbDrone.Common.Instrumentation
             else
             {
                 dsn = RuntimeInfo.IsProduction
-                    ? "https://3e8a38b1a4df4de8b0453a724f5a1139:5a708dd75c724b32ae5128b6a895650f@sentry.sonarr.tv/8"
+                    ? "https://a013727b8d224e719894e1e13ff4966b:c95ca1f9ca02418d829db10c2938baf4@sentry.sonarr.tv/8"
                     : "https://4ee3580e01d8407c96a7430fbc953512:5f2d07227a0b4fde99dea07041a3ff93@sentry.sonarr.tv/10";
             }
 
@@ -109,9 +109,13 @@ namespace NzbDrone.Common.Instrumentation
                 Layout = "${message}"
             };
 
-            var loggingRule = new LoggingRule("*", updateClient ? LogLevel.Trace : LogLevel.Error, target);
+            var loggingRule = new LoggingRule("*", updateClient ? LogLevel.Trace : LogLevel.Warn, target);
             LogManager.Configuration.AddTarget("sentryTarget", target);
             LogManager.Configuration.LoggingRules.Add(loggingRule);
+
+            // Events logged to Sentry go only to Sentry.
+            var loggingRuleSentry = new LoggingRule("Sentry", LogLevel.Debug, target) { Final = true };
+            LogManager.Configuration.LoggingRules.Insert(0, loggingRuleSentry);
         }
 
         private static void RegisterDebugger()

src/NzbDrone.Common/Instrumentation/Sentry/SentryPacketCleanser.cs

@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Newtonsoft.Json.Linq;
+
+namespace NzbDrone.Common.Instrumentation.Sentry
+{
+    public class SentryPacketCleanser
+    {
+        public void CleansePacket(SonarrSentryPacket packet)
+        {
+            packet.Message = CleanseLogMessage.Cleanse(packet.Message);
+
+            if (packet.Fingerprint != null)
+            {
+                for (var i = 0; i < packet.Fingerprint.Length; i++)
+                {
+                    packet.Fingerprint[i] = CleanseLogMessage.Cleanse(packet.Fingerprint[i]);
+                }
+            }
+
+            if (packet.Extra != null)
+            {
+                var target = JObject.FromObject(packet.Extra);
+                new CleansingJsonVisitor().Visit(target);
+                packet.Extra = target;
+            }
+        }
+    }
+}

src/NzbDrone.Common/Instrumentation/Sentry/SentryTarget.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net;
@@ -71,6 +72,11 @@ namespace NzbDrone.Common.Instrumentation.Sentry
 
         private static List<string> GetFingerPrint(LogEventInfo logEvent)
         {
+            if (logEvent.Properties.ContainsKey("Sentry"))
+            {
+                return ((string[])logEvent.Properties["Sentry"]).ToList();
+            }
+
             var fingerPrint = new List<string>
             {
                 logEvent.Level.Ordinal.ToString(),
@@ -94,13 +100,33 @@ namespace NzbDrone.Common.Instrumentation.Sentry
             return fingerPrint;
         }
 
+        private bool IsSentryMessage(LogEventInfo logEvent)
+        {
+            if (logEvent.Properties.ContainsKey("Sentry"))
+            {
+                return logEvent.Properties["Sentry"] != null;
+            }
+
+            if (logEvent.Level >= LogLevel.Error && logEvent.Exception != null)
+            {
+                return true;
+            }
+
+            return false;
+        }
+
 
         protected override void Write(LogEventInfo logEvent)
         {
+            if (_unauthorized)
+            {
+                return;
+            }
+
             try
             {
                 // don't report non-critical events without exceptions
-                if (logEvent.Exception == null || _unauthorized)
+                if (!IsSentryMessage(logEvent))
                 {
                     return;
                 }
@@ -112,8 +138,16 @@ namespace NzbDrone.Common.Instrumentation.Sentry
                 }
 
                 var extras = logEvent.Properties.ToDictionary(x => x.Key.ToString(), x => x.Value.ToString());
+                extras.Remove("Sentry");
                 _client.Logger = logEvent.LoggerName;
 
+                if (logEvent.Exception != null)
+                {
+                    foreach (DictionaryEntry data in logEvent.Exception.Data)
+                    {
+                        extras.Add(data.Key.ToString(), data.Value.ToString());
+                    }
+                }
 
                 var sentryMessage = new SentryMessage(logEvent.Message, logEvent.Parameters);
 
@@ -135,11 +169,16 @@ namespace NzbDrone.Common.Instrumentation.Sentry
                     sentryEvent.Fingerprint.Add(logEvent.Exception.GetType().FullName);
                 }
 
+                if (logEvent.Properties.ContainsKey("Sentry"))
+                {
+                    sentryEvent.Fingerprint.Clear();
+                    Array.ForEach((string[])logEvent.Properties["Sentry"], sentryEvent.Fingerprint.Add);
+                }
+
                 var osName = Environment.GetEnvironmentVariable("OS_NAME");
                 var osVersion = Environment.GetEnvironmentVariable("OS_VERSION");
                 var runTimeVersion = Environment.GetEnvironmentVariable("RUNTIME_VERSION");
 
-
                 sentryEvent.Tags.Add("os_name", osName);
                 sentryEvent.Tags.Add("os_version", $"{osName} {osVersion}");
                 sentryEvent.Tags.Add("runtime_version", $"{PlatformInfo.PlatformName} {runTimeVersion}");

src/NzbDrone.Common/Instrumentation/Sentry/SonarrJsonPacketFactory.cs

@@ -6,6 +6,13 @@ namespace NzbDrone.Common.Instrumentation.Sentry
 {
     public class SonarrJsonPacketFactory : IJsonPacketFactory
     {
+        private readonly SentryPacketCleanser _cleanser;
+
+        public SonarrJsonPacketFactory()
+        {
+            _cleanser = new SentryPacketCleanser();
+        }
+
         private static string ShortenPath(string path)
         {
 
@@ -37,6 +44,8 @@ namespace NzbDrone.Common.Instrumentation.Sentry
                         frame.Filename = ShortenPath(frame.Filename);
                     }
                 }
+
+                _cleanser.CleansePacket(packet);
             }
             catch (Exception)
             {
@@ -46,7 +55,6 @@ namespace NzbDrone.Common.Instrumentation.Sentry
             return packet;
         }
 
-
         [Obsolete]
         public JsonPacket Create(string project, SentryMessage message, ErrorLevel level = ErrorLevel.Info, IDictionary<string, string> tags = null,
             string[] fingerprint = null, object extra = null)
@@ -61,4 +69,4 @@ namespace NzbDrone.Common.Instrumentation.Sentry
             throw new NotImplementedException();
         }
     }
-}
+}

src/NzbDrone.Common/NzbDrone.Common.csproj

@@ -46,16 +46,14 @@
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
       <HintPath>..\packages\NLog.4.4.3\lib\net40\NLog.dll</HintPath>
     </Reference>
-    <Reference Include="Org.Mentalis, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\DotNet4.SocksProxy.1.3.2.0\lib\net40\Org.Mentalis.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Org.Mentalis, Version=1.0.0.1, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\DotNet4.SocksProxy.1.3.4.0\lib\net40\Org.Mentalis.dll</HintPath>
     </Reference>
     <Reference Include="SharpRaven, Version=2.2.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\SharpRaven.2.2.0\lib\net40\SharpRaven.dll</HintPath>
     </Reference>
-    <Reference Include="SocksWebProxy, Version=1.3.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\DotNet4.SocksProxy.1.3.2.0\lib\net40\SocksWebProxy.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="SocksWebProxy, Version=1.3.4.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\DotNet4.SocksProxy.1.3.4.0\lib\net40\SocksWebProxy.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
@@ -87,12 +85,14 @@
     <Compile Include="Disk\FileSystemLookupService.cs" />
     <Compile Include="Disk\DriveInfoMount.cs" />
     <Compile Include="Disk\IMount.cs" />
+    <Compile Include="Disk\MountOptions.cs" />
     <Compile Include="Disk\RelativeFileSystemModel.cs" />
     <Compile Include="Disk\FileSystemModel.cs" />
     <Compile Include="Disk\FileSystemResult.cs" />
     <Compile Include="EnvironmentInfo\IOsVersionAdapter.cs" />
     <Compile Include="EnvironmentInfo\IPlatformInfo.cs" />
     <Compile Include="EnvironmentInfo\OsVersionModel.cs" />
+    <Compile Include="Exceptions\SonarrStartupException.cs" />
     <Compile Include="Extensions\DictionaryExtensions.cs" />
     <Compile Include="Disk\OsPath.cs" />
     <Compile Include="Disk\DiskProviderBase.cs" />
@@ -136,6 +136,7 @@
     <Compile Include="Extensions\Base64Extensions.cs" />
     <Compile Include="Extensions\DateTimeExtensions.cs" />
     <Compile Include="Crypto\HashConverter.cs" />
+    <Compile Include="Extensions\ExceptionExtensions.cs" />
     <Compile Include="Extensions\Int64Extensions.cs" />
     <Compile Include="Extensions\ObjectExtensions.cs" />
     <Compile Include="Extensions\StreamExtensions.cs" />
@@ -175,12 +176,15 @@
     <Compile Include="Extensions\IEnumerableExtensions.cs" />
     <Compile Include="Http\UserAgentBuilder.cs" />
     <Compile Include="Instrumentation\CleanseLogMessage.cs" />
-    <Compile Include="Instrumentation\Extensions\LoggerProgressExtensions.cs" />
+    <Compile Include="Instrumentation\CleansingJsonVisitor.cs" />
+    <Compile Include="Instrumentation\Extensions\LoggerExtensions.cs" />
+    <Compile Include="Instrumentation\Extensions\SentryLoggerExtensions.cs" />
     <Compile Include="Instrumentation\GlobalExceptionHandlers.cs" />
     <Compile Include="Instrumentation\LogEventExtensions.cs" />
     <Compile Include="Instrumentation\NzbDroneFileTarget.cs" />
     <Compile Include="Instrumentation\NzbDroneLogger.cs" />
     <Compile Include="Instrumentation\Sentry\SentryDebounce.cs" />
+    <Compile Include="Instrumentation\Sentry\SentryPacketCleanser.cs" />
     <Compile Include="Instrumentation\Sentry\SentryTarget.cs" />
     <Compile Include="Instrumentation\Sentry\MachineNameUserFactory.cs" />
     <Compile Include="Instrumentation\Sentry\SonarrJsonPacketFactory.cs" />
@@ -205,6 +209,7 @@
     <Compile Include="Serializer\HttpUriConverter.cs" />
     <Compile Include="Serializer\IntConverter.cs" />
     <Compile Include="Serializer\Json.cs" />
+    <Compile Include="Serializer\JsonVisitor.cs" />
     <Compile Include="ServiceFactory.cs" />
     <Compile Include="ServiceProvider.cs" />
     <Compile Include="Extensions\StringExtensions.cs" />

src/NzbDrone.Common/Processes/PidFileProvider.cs

@@ -2,6 +2,7 @@
 using System.IO;
 using NLog;
 using NzbDrone.Common.EnvironmentInfo;
+using NzbDrone.Common.Exceptions;
 
 namespace NzbDrone.Common.Processes
 {
@@ -38,7 +39,7 @@ namespace NzbDrone.Common.Processes
             catch (Exception ex)
             {
                 _logger.Error(ex, "Unable to write PID file {0}", filename);
-                throw;
+                throw new SonarrStartupException(ex, "Unable to write PID file {0}", filename);
             }
         }
     }

src/NzbDrone.Common/Processes/ProcessProvider.cs

@@ -8,6 +8,7 @@ using System.IO;
 using System.Linq;
 using NLog;
 using NzbDrone.Common.EnvironmentInfo;
+using NzbDrone.Common.Extensions;
 using NzbDrone.Common.Model;
 
 namespace NzbDrone.Common.Processes
@@ -129,7 +130,25 @@ namespace NzbDrone.Common.Processes
             {
                 foreach (DictionaryEntry environmentVariable in environmentVariables)
                 {
-                    startInfo.EnvironmentVariables.Add(environmentVariable.Key.ToString(), environmentVariable.Value.ToString());
+                    try
+                    {
+                        _logger.Trace("Setting environment variable '{0}' to '{1}'", environmentVariable.Key, environmentVariable.Value);
+                        startInfo.EnvironmentVariables.Add(environmentVariable.Key.ToString(), environmentVariable.Value.ToString());
+                    }
+                    catch (Exception e)
+                    {
+                        if (environmentVariable.Value == null)
+                        {
+                            _logger.Error(e, "Unable to set environment variable '{0}', value is null", environmentVariable.Key);
+                        }
+
+                        else
+                        {
+                            _logger.Error(e, "Unable to set environment variable '{0}'", environmentVariable.Key);
+                        }
+
+                        throw;
+                    }
                 }
             }
 

src/NzbDrone.Common/Reflection/ReflectionExtensions.cs

@@ -60,6 +60,11 @@ namespace NzbDrone.Common.Reflection
             return (T)attribute;
         }
 
+        public static T[] GetAttributes<T>(this MemberInfo member) where T : Attribute
+        {
+            return member.GetCustomAttributes(typeof(T), false).OfType<T>().ToArray();
+        }
+
         public static Type FindTypeByName(this Assembly assembly, string name)
         {
             return assembly.GetTypes().SingleOrDefault(c => c.Name.Equals(name, StringComparison.InvariantCultureIgnoreCase));
@@ -70,4 +75,4 @@ namespace NzbDrone.Common.Reflection
             return type.GetCustomAttributes(typeof(TAttribute), true).Any();
         }
     }
-}
+}

src/NzbDrone.Common/Security/SecurityProtocolPolicy.cs

@@ -1,6 +1,8 @@
 using System;
 using System.Net;
 using NLog;
+using NzbDrone.Common.EnvironmentInfo;
+using NzbDrone.Common.Extensions;
 using NzbDrone.Common.Instrumentation;
 
 namespace NzbDrone.Common.Security
@@ -14,6 +16,17 @@ namespace NzbDrone.Common.Security
 
         public static void Register()
         {
+            if (OsInfo.IsNotWindows)
+            {
+                // This was never meant to be used on mono, and will cause issues with mono 5 and higher if btls is enabled.
+                // Instead, force TLS provider to legacy for now due to conflict between btls and mediainfo, unless the user explicitly specified it.
+                if (Environment.GetEnvironmentVariable("MONO_TLS_PROVIDER").IsNullOrWhiteSpace())
+                {
+                    Environment.SetEnvironmentVariable("MONO_TLS_PROVIDER", "legacy");
+                }
+                return;
+            }
+
             try
             {
                 // TODO: In v3 we should drop support for SSL3 because its very insecure. Only leaving it enabled because some people might rely on it.

src/NzbDrone.Common/Serializer/JsonVisitor.cs

@@ -0,0 +1,95 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Newtonsoft.Json.Linq;
+
+namespace NzbDrone.Common.Serializer
+{
+
+    public class JsonVisitor
+    {
+        protected void Dispatch(JToken json)
+        {
+            switch (json.Type)
+            {
+                case JTokenType.Object:
+                    Visit(json as JObject);
+                    break;
+
+                case JTokenType.Array:
+                    Visit(json as JArray);
+                    break;
+
+                case JTokenType.Raw:
+                    Visit(json as JRaw);
+                    break;
+
+                case JTokenType.Constructor:
+                    Visit(json as JConstructor);
+                    break;
+
+                case JTokenType.Property:
+                    Visit(json as JProperty);
+                    break;
+
+                case JTokenType.Comment:
+                case JTokenType.Integer:
+                case JTokenType.Float:
+                case JTokenType.String:
+                case JTokenType.Boolean:
+                case JTokenType.Null:
+                case JTokenType.Undefined:
+                case JTokenType.Date:
+                case JTokenType.Bytes:
+                case JTokenType.Guid:
+                case JTokenType.Uri:
+                case JTokenType.TimeSpan:
+                    Visit(json as JValue);
+                    break;
+
+                default:
+                    break;
+            }
+        }
+
+        public virtual void Visit(JToken json)
+        {
+            Dispatch(json);
+        }
+
+        public virtual void Visit(JContainer json)
+        {
+            Dispatch(json);
+        }
+
+        public virtual void Visit(JArray json)
+        {
+            foreach (JToken token in json)
+            {
+                Visit(token);
+            }
+        }
+        public virtual void Visit(JConstructor json)
+        {
+        }
+
+        public virtual void Visit(JObject json)
+        {
+            foreach (JProperty property in json.Properties())
+            {
+                Visit(property);
+            }
+        }
+
+        public virtual void Visit(JProperty property)
+        {
+            Visit(property.Value);
+        }
+
+        public virtual void Visit(JValue value)
+        {
+
+        }
+    }
+}

src/NzbDrone.Common/packages.config

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="DotNet4.SocksProxy" version="1.3.2.0" targetFramework="net40" />
+  <package id="DotNet4.SocksProxy" version="1.3.4.0" targetFramework="net40" />
   <package id="ICSharpCode.SharpZipLib.Patched" version="0.86.5" targetFramework="net40" />
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net40" />
   <package id="NLog" version="4.4.3" targetFramework="net40" />

src/NzbDrone.Console/ConsoleApp.cs

@@ -2,6 +2,7 @@
 using System.Net.Sockets;
 using NLog;
 using NzbDrone.Common.EnvironmentInfo;
+using NzbDrone.Common.Exceptions;
 using NzbDrone.Common.Instrumentation;
 using NzbDrone.Host;
 
@@ -11,6 +12,14 @@ namespace NzbDrone.Console
     {
         private static readonly Logger Logger = NzbDroneLogger.GetLogger(typeof(ConsoleApp));
 
+        private enum ExitCodes : int
+        {
+            Normal = 0,
+            UnknownFailure = 1,
+            RecoverableFailure = 2,
+            NonRecoverableFailure = 3
+        }
+
         public static void Main(string[] args)
         {
             try
@@ -19,30 +28,61 @@ namespace NzbDrone.Console
                 NzbDroneLogger.Register(startupArgs, false, true);
                 Bootstrap.Start(startupArgs, new ConsoleAlerts());
             }
-            catch (SocketException exception)
+            catch (SonarrStartupException ex)
             {
                 System.Console.WriteLine("");
                 System.Console.WriteLine("");
-                Logger.Fatal(exception.Message + ". This can happen if another instance of Sonarr is already running another application is using the same port (default: 8989) or the user has insufficient permissions");
-                System.Console.WriteLine("Press enter to exit...");
-                System.Console.ReadLine();
-                Environment.Exit(1);
+                Logger.Fatal(ex, "EPIC FAIL!");
+                Exit(ExitCodes.NonRecoverableFailure);
             }
-            catch (Exception e)
+            catch (SocketException ex)
             {
                 System.Console.WriteLine("");
                 System.Console.WriteLine("");
-                Logger.Fatal(e, "EPIC FAIL!");
-                System.Console.WriteLine("Press enter to exit...");
-                System.Console.ReadLine();
-                Environment.Exit(1);
+                Logger.Fatal(ex.Message + ". This can happen if another instance of Sonarr is already running another application is using the same port (default: 8989) or the user has insufficient permissions");
+                Exit(ExitCodes.RecoverableFailure);
+            }
+            catch (Exception ex)
+            {
+                System.Console.WriteLine("");
+                System.Console.WriteLine("");
+                Logger.Fatal(ex, "EPIC FAIL!");
+                Exit(ExitCodes.UnknownFailure);
             }
 
             Logger.Info("Exiting main.");
 
+            Exit(ExitCodes.Normal);
+        }
+
+        private static void Exit(ExitCodes exitCode)
+        {
+            LogManager.Flush();
+
+            if (exitCode != ExitCodes.Normal)
+            {
+                System.Console.WriteLine("Press enter to exit...");
+
+                System.Threading.Thread.Sleep(1000);
+
+                if (exitCode == ExitCodes.NonRecoverableFailure)
+                {
+                    System.Console.WriteLine("Non-recoverable failure, waiting for user intervention...");
+                    for (int i = 0; i < 3600; i++)
+                    {
+                        System.Threading.Thread.Sleep(1000);
+
+                        if (System.Console.KeyAvailable) break;
+                    }
+                }
+
+                // Please note that ReadLine silently succeeds if there is no console, KeyAvailable does not.
+                System.Console.ReadLine();
+            }
+
             //Need this to terminate on mono (thanks nlog)
             LogManager.Configuration = null;
-            Environment.Exit(0);
+            Environment.Exit((int)exitCode);
         }
     }
 }

src/NzbDrone.Core.Test/DataAugmentation/Scene/SceneMappingServiceFixture.cs

@@ -20,11 +20,14 @@ namespace NzbDrone.Core.Test.DataAugmentation.Scene
 
         private Mock<ISceneMappingProvider> _provider1;
         private Mock<ISceneMappingProvider> _provider2;
-            
+
         [SetUp]
         public void Setup()
         {
-            _fakeMappings = Builder<SceneMapping>.CreateListOfSize(5).BuildListOfNew();
+            _fakeMappings = Builder<SceneMapping>.CreateListOfSize(5)
+                                                 .All()
+                                                 .With(v => v.FilterRegex = null)
+                                                 .BuildListOfNew();
 
             _fakeMappings[0].SearchTerm = "Words";
             _fakeMappings[1].SearchTerm = "That";
@@ -193,7 +196,7 @@ namespace NzbDrone.Core.Test.DataAugmentation.Scene
             Mocker.GetMock<ISceneMappingRepository>().Setup(c => c.All()).Returns(mappings);
 
             var tvdbId = Subject.FindTvdbId(parseTitle);
-            var seasonNumber = Subject.GetSceneSeasonNumber(parseTitle);
+            var seasonNumber = Subject.GetSceneSeasonNumber(parseTitle, null);
 
             tvdbId.Should().Be(100);
             seasonNumber.Should().Be(expectedSeasonNumber);
@@ -314,6 +317,49 @@ namespace NzbDrone.Core.Test.DataAugmentation.Scene
             Subject.GetSceneNames(100, new List<int> { 4 }, new List<int> { 4 }).Should().BeEmpty();
         }
 
+        [Test]
+        public void should_filter_by_regex()
+        {
+            var mappings = new List<SceneMapping>
+            {
+                new SceneMapping { Title = "Amareto", ParseTerm = "amareto", SearchTerm = "Amareto", TvdbId = 100 },
+                new SceneMapping { Title = "Amareto", ParseTerm = "amareto", SearchTerm = "Amareto", TvdbId = 101, FilterRegex="-Viva$" }
+            };
+
+            Mocker.GetMock<ISceneMappingRepository>().Setup(c => c.All()).Returns(mappings);
+
+            Subject.FindTvdbId("Amareto", "Amareto.S01E01.720p.WEB-DL-Viva").Should().Be(101);
+            Subject.FindTvdbId("Amareto", "Amareto.S01E01.720p.WEB-DL-DMO").Should().Be(100);
+        }
+
+        [Test]
+        public void should_throw_if_multiple_mappings()
+        {
+            var mappings = new List<SceneMapping>
+            {
+                new SceneMapping { Title = "Amareto", ParseTerm = "amareto", SearchTerm = "Amareto", TvdbId = 100 },
+                new SceneMapping { Title = "Amareto", ParseTerm = "amareto", SearchTerm = "Amareto", TvdbId = 101 }
+            };
+
+            Mocker.GetMock<ISceneMappingRepository>().Setup(c => c.All()).Returns(mappings);
+
+            Assert.Throws<InvalidSceneMappingException>(() => Subject.FindTvdbId("Amareto", "Amareto.S01E01.720p.WEB-DL-Viva"));
+        }
+
+        [Test]
+        public void should_not_throw_if_multiple_mappings_with_same_tvdbid()
+        {
+            var mappings = new List<SceneMapping>
+            {
+                new SceneMapping { Title = "Amareto", ParseTerm = "amareto", SearchTerm = "Amareto", TvdbId = 100 },
+                new SceneMapping { Title = "Amareto", ParseTerm = "amareto", SearchTerm = "Amareto", TvdbId = 100 }
+            };
+
+            Mocker.GetMock<ISceneMappingRepository>().Setup(c => c.All()).Returns(mappings);
+
+            Subject.FindTvdbId("Amareto", "Amareto.S01E01.720p.WEB-DL-Viva").Should().Be(100);
+        }
+
         private void AssertNoUpdate()
         {
             _provider1.Verify(c => c.GetSceneMappings(), Times.Once());

src/NzbDrone.Core.Test/DataAugmentation/SceneNumbering/XemServiceFixture.cs

@@ -5,6 +5,7 @@ using FizzWare.NBuilder;
 using FluentAssertions;
 using Moq;
 using NUnit.Framework;
+using NzbDrone.Common.Extensions;
 using NzbDrone.Core.DataAugmentation.Xem;
 using NzbDrone.Core.DataAugmentation.Xem.Model;
 using NzbDrone.Core.Test.Framework;
@@ -98,7 +99,6 @@ namespace NzbDrone.Core.Test.DataAugmentation.SceneNumbering
             });
         }
 
-
         [Test]
         public void should_not_fetch_scenenumbering_if_not_listed()
         {
@@ -308,5 +308,19 @@ namespace NzbDrone.Core.Test.DataAugmentation.SceneNumbering
             episode.SceneSeasonNumber.Should().NotHaveValue();
             episode.SceneEpisodeNumber.Should().NotHaveValue();
         }
+
+        [Test]
+        public void should_skip_mapping_when_scene_information_is_all_zero()
+        {
+            GivenTvdbMappings();
+
+            AddTvdbMapping(0, 0, 0, 8, 3, 1); // 3x01 -> 3x01
+            AddTvdbMapping(0, 0, 0, 9, 3, 2); // 3x02 -> 3x02
+
+            Subject.Handle(new SeriesUpdatedEvent(_series));
+
+            Mocker.GetMock<IEpisodeService>()
+                  .Verify(v => v.UpdateEpisodes(It.Is<List<Episode>>(e => e.Any(c => c.SceneAbsoluteEpisodeNumber == 0 && c.SceneSeasonNumber == 0 && c.SceneEpisodeNumber == 0))), Times.Never());
+        }
     }
 }

src/NzbDrone.Core.Test/DecisionEngineTests/BlockedIndexerSpecificationFixture.cs

@@ -0,0 +1,54 @@
+using System;
+using System.Collections.Generic;
+using FluentAssertions;
+using NUnit.Framework;
+using NzbDrone.Core.DecisionEngine;
+using NzbDrone.Core.DecisionEngine.Specifications;
+using NzbDrone.Core.Indexers;
+using NzbDrone.Core.Parser.Model;
+using NzbDrone.Core.Test.Framework;
+
+namespace NzbDrone.Core.Test.DecisionEngineTests
+{
+    [TestFixture]
+
+    public class BlockedIndexerSpecificationFixture : CoreTest<BlockedIndexerSpecification>
+    {
+        private RemoteEpisode _remoteEpisode;
+
+        [SetUp]
+        public void Setup()
+        {
+            _remoteEpisode = new RemoteEpisode
+            {
+                Release = new ReleaseInfo { IndexerId = 1 }
+            };
+
+            Mocker.GetMock<IIndexerStatusService>()
+                  .Setup(v => v.GetBlockedProviders())
+                  .Returns(new List<IndexerStatus>());
+        }
+
+        private void WithBlockedIndexer()
+        {
+            Mocker.GetMock<IIndexerStatusService>()
+                  .Setup(v => v.GetBlockedProviders())
+                  .Returns(new List<IndexerStatus> { new IndexerStatus { ProviderId = 1, DisabledTill = DateTime.UtcNow } });
+        }
+
+        [Test]
+        public void should_return_true_if_no_blocked_indexer()
+        {
+            Subject.IsSatisfiedBy(_remoteEpisode, null).Accepted.Should().BeTrue();
+        }
+
+        [Test]
+        public void should_return_false_if_blocked_indexer()
+        {
+            WithBlockedIndexer();
+
+            Subject.IsSatisfiedBy(_remoteEpisode, null).Accepted.Should().BeFalse();
+            Subject.Type.Should().Be(RejectionType.Temporary);
+        }
+    }
+}

src/NzbDrone.Core.Test/DecisionEngineTests/DownloadDecisionMakerFixture.cs

@@ -28,6 +28,8 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
         private Mock<IDecisionEngineSpecification> _fail2;
         private Mock<IDecisionEngineSpecification> _fail3;
 
+        private Mock<IDecisionEngineSpecification> _failDelayed1;
+
         [SetUp]
         public void Setup()
         {
@@ -39,14 +41,19 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
             _fail2 = new Mock<IDecisionEngineSpecification>();
             _fail3 = new Mock<IDecisionEngineSpecification>();
 
+            _failDelayed1 = new Mock<IDecisionEngineSpecification>();
+
             _pass1.Setup(c => c.IsSatisfiedBy(It.IsAny<RemoteEpisode>(), null)).Returns(Decision.Accept);
             _pass2.Setup(c => c.IsSatisfiedBy(It.IsAny<RemoteEpisode>(), null)).Returns(Decision.Accept);
             _pass3.Setup(c => c.IsSatisfiedBy(It.IsAny<RemoteEpisode>(), null)).Returns(Decision.Accept);
-            
+
             _fail1.Setup(c => c.IsSatisfiedBy(It.IsAny<RemoteEpisode>(), null)).Returns(Decision.Reject("fail1"));
             _fail2.Setup(c => c.IsSatisfiedBy(It.IsAny<RemoteEpisode>(), null)).Returns(Decision.Reject("fail2"));
             _fail3.Setup(c => c.IsSatisfiedBy(It.IsAny<RemoteEpisode>(), null)).Returns(Decision.Reject("fail3"));
 
+            _failDelayed1.Setup(c => c.IsSatisfiedBy(It.IsAny<RemoteEpisode>(), null)).Returns(Decision.Reject("failDelayed1"));
+            _failDelayed1.SetupGet(c => c.Priority).Returns(SpecificationPriority.Disk);
+
             _reports = new List<ReleaseInfo> { new ReleaseInfo { Title = "The.Office.S03E115.DVDRip.XviD-OSiTV" } };
             _remoteEpisode = new RemoteEpisode {
                 Series = new Series(),
@@ -78,6 +85,25 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
             _pass3.Verify(c => c.IsSatisfiedBy(_remoteEpisode, null), Times.Once());
         }
 
+        [Test]
+        public void should_call_delayed_specifications_if_non_delayed_passed()
+        {
+            GivenSpecifications(_pass1, _failDelayed1);
+
+            Subject.GetRssDecision(_reports).ToList();
+            _failDelayed1.Verify(c => c.IsSatisfiedBy(_remoteEpisode, null), Times.Once());
+        }
+
+        [Test]
+        public void should_not_call_delayed_specifications_if_non_delayed_failed()
+        {
+            GivenSpecifications(_fail1, _failDelayed1);
+
+            Subject.GetRssDecision(_reports).ToList();
+
+            _failDelayed1.Verify(c => c.IsSatisfiedBy(_remoteEpisode, null), Times.Never());
+        }
+
         [Test]
         public void should_return_rejected_if_single_specs_fail()
         {
@@ -214,10 +240,10 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
 
             var criteria = new SeasonSearchCriteria { Episodes = episodes.Take(1).ToList(), SeasonNumber = 1 };
 
-            var reports = episodes.Select(v => 
-                new ReleaseInfo() 
-                { 
-                    Title = string.Format("{0}.S{1:00}E{2:00}.720p.WEB-DL-DRONE", series.Title, v.SceneSeasonNumber, v.SceneEpisodeNumber) 
+            var reports = episodes.Select(v =>
+                new ReleaseInfo()
+                {
+                    Title = string.Format("{0}.S{1:00}E{2:00}.720p.WEB-DL-DRONE", series.Title, v.SceneSeasonNumber, v.SceneEpisodeNumber)
                 }).ToList();
 
             Mocker.GetMock<IParsingService>()
@@ -289,4 +315,4 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
             ExceptionVerification.ExpectedErrors(1);
         }
     }
-}
+}

src/NzbDrone.Core.Test/DecisionEngineTests/MonitoredEpisodeSpecificationFixture.cs

@@ -137,5 +137,17 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
             WithFirstEpisodeUnmonitored();
             _monitoredEpisodeSpecification.IsSatisfiedBy(_parseResultSingle, new SingleEpisodeSearchCriteria{ MonitoredEpisodesOnly = true}).Accepted.Should().BeFalse();
         }
+
+        [Test]
+        public void should_return_false_if_all_episodes_are_not_monitored_for_season_pack_release()
+        {
+            WithSecondEpisodeUnmonitored();
+            _parseResultMulti.ParsedEpisodeInfo = new ParsedEpisodeInfo
+                                                  {
+                                                    FullSeason = true
+                                                  };
+
+            _monitoredEpisodeSpecification.IsSatisfiedBy(_parseResultMulti, null).Accepted.Should().BeFalse();
+        }
     }
 }

src/NzbDrone.Core.Test/DecisionEngineTests/RawDiskSpecificationFixture.cs

@@ -19,7 +19,11 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
         {
             _remoteEpisode = new RemoteEpisode
             {
-                Release = new ReleaseInfo() { DownloadProtocol = DownloadProtocol.Torrent }
+                Release = new ReleaseInfo
+                          {
+                              Title = "Series.title.s01e01",
+                              DownloadProtocol = DownloadProtocol.Torrent
+                          }
             };
         }
 
@@ -29,7 +33,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
         }
         
         [Test]
-        public void should_return_true_if_no_container_specified()
+        public void should_return_true_if_no_container_specified_and_does_not_match_disc_release_pattern()
         {
             Subject.IsSatisfiedBy(_remoteEpisode, null).Accepted.Should().BeTrue();
         }
@@ -69,5 +73,15 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
             Subject.IsSatisfiedBy(_remoteEpisode, null).Accepted.Should().BeFalse();
         }
 
+        [TestCase("How the Earth Was Made S02 Disc 1 1080i Blu-ray DTS-HD MA 2.0 AVC-TrollHD")]
+        [TestCase("The Universe S03 Disc 1 1080p Blu-ray LPCM 2.0 AVC-TrollHD")]
+        [TestCase("HELL ON WHEELS S02 1080P FULL BLURAY AVC DTS-HD MA 5 1")]
+        [TestCase("Game.of.Thrones.S06.2016.DISC.3.BluRay.1080p.AVC.Atmos.TrueHD7.1-MTeam")]
+        [TestCase("Game of Thrones S05 Disc 1 BluRay 1080p AVC Atmos TrueHD 7 1-MTeam")]
+        public void should_return_false_if_matches_disc_format(string title)
+        {
+            _remoteEpisode.Release.Title = title;
+            Subject.IsSatisfiedBy(_remoteEpisode, null).Accepted.Should().BeFalse();
+        }
     }
 }

src/NzbDrone.Core.Test/DecisionEngineTests/RssSync/DeletedEpisodeFileSpecificationFixture.cs

@@ -0,0 +1,139 @@
+using System;
+using System.Collections.Generic;
+using FizzWare.NBuilder;
+using FluentAssertions;
+using NUnit.Framework;
+using NzbDrone.Core.Configuration;
+using NzbDrone.Core.DecisionEngine.Specifications.RssSync;
+using NzbDrone.Core.IndexerSearch.Definitions;
+using NzbDrone.Core.MediaFiles;
+using NzbDrone.Core.Parser.Model;
+using NzbDrone.Core.Profiles;
+using NzbDrone.Core.Qualities;
+using NzbDrone.Core.Tv;
+using NzbDrone.Core.DecisionEngine;
+
+using NzbDrone.Core.Test.Framework;
+using NzbDrone.Common.Disk;
+using Moq;
+using NzbDrone.Test.Common;
+using System.IO;
+
+namespace NzbDrone.Core.Test.DecisionEngineTests.RssSync
+{
+    [TestFixture]
+    public class DeletedEpisodeFileSpecificationFixture : CoreTest<DeletedEpisodeFileSpecification>
+    {
+        private RemoteEpisode _parseResultMulti;
+        private RemoteEpisode _parseResultSingle;
+        private EpisodeFile _firstFile;
+        private EpisodeFile _secondFile;
+
+        [SetUp]
+        public void Setup()
+        {
+            _firstFile = new EpisodeFile
+            {
+                Id = 1,
+                RelativePath = "My.Series.S01E01.mkv",
+                Quality = new QualityModel(Quality.Bluray1080p, new Revision(version: 1)),
+                DateAdded = DateTime.Now
+            };
+            _secondFile = new EpisodeFile
+            {
+                Id = 2,
+                RelativePath = "My.Series.S01E02.mkv",
+                Quality = new QualityModel(Quality.Bluray1080p, new Revision(version: 1)),
+                DateAdded = DateTime.Now
+            };
+
+            var singleEpisodeList = new List<Episode> { new Episode { EpisodeFile = _firstFile, EpisodeFileId = 1 } };
+            var doubleEpisodeList = new List<Episode> {
+                new Episode { EpisodeFile = _firstFile, EpisodeFileId = 1 },
+                new Episode { EpisodeFile = _secondFile, EpisodeFileId = 2 }
+            };
+
+            var fakeSeries = Builder<Series>.CreateNew()
+                         .With(c => c.Profile = new Profile { Cutoff = Quality.Bluray1080p })
+                         .With(c => c.Path = @"C:\Series\My.Series".AsOsAgnostic())
+                         .Build();
+
+            _parseResultMulti = new RemoteEpisode
+            {
+                Series = fakeSeries,
+                ParsedEpisodeInfo = new ParsedEpisodeInfo { Quality = new QualityModel(Quality.DVD, new Revision(version: 2)) },
+                Episodes = doubleEpisodeList
+            };
+
+            _parseResultSingle = new RemoteEpisode
+            {
+                Series = fakeSeries,
+                ParsedEpisodeInfo = new ParsedEpisodeInfo { Quality = new QualityModel(Quality.DVD, new Revision(version: 2)) },
+                Episodes = singleEpisodeList
+            };
+
+            GivenUnmonitorDeletedEpisodes(true);
+        }
+
+        private void GivenUnmonitorDeletedEpisodes(bool enabled)
+        {
+            Mocker.GetMock<IConfigService>()
+                  .SetupGet(v => v.AutoUnmonitorPreviouslyDownloadedEpisodes)
+                  .Returns(enabled);
+        }
+
+        private void WithExistingFile(EpisodeFile episodeFile)
+        {
+            var path = Path.Combine(@"C:\Series\My.Series".AsOsAgnostic(), episodeFile.RelativePath);
+
+            Mocker.GetMock<IDiskProvider>()
+                  .Setup(v => v.FileExists(path))
+                  .Returns(true);
+        }
+
+        [Test]
+        public void should_return_true_when_unmonitor_deleted_episdes_is_off()
+        {
+            GivenUnmonitorDeletedEpisodes(false);
+
+            Subject.IsSatisfiedBy(_parseResultSingle, null).Accepted.Should().BeTrue();
+        }
+
+        [Test]
+        public void should_return_true_when_searching()
+        {
+            Subject.IsSatisfiedBy(_parseResultSingle, new SeasonSearchCriteria()).Accepted.Should().BeTrue();
+        }
+
+        [Test]
+        public void should_return_true_if_file_exists()
+        {
+            WithExistingFile(_firstFile);
+
+            Subject.IsSatisfiedBy(_parseResultSingle, null).Accepted.Should().BeTrue();
+        }
+
+        [Test]
+        public void should_return_false_if_file_is_missing()
+        {
+            Subject.IsSatisfiedBy(_parseResultSingle, null).Accepted.Should().BeFalse();
+        }
+
+        [Test]
+        public void should_return_true_if_both_of_multiple_episode_exist()
+        {
+            WithExistingFile(_firstFile);
+            WithExistingFile(_secondFile);
+
+            Subject.IsSatisfiedBy(_parseResultMulti, null).Accepted.Should().BeTrue();
+        }
+
+        [Test]
+        public void should_return_false_if_one_of_multiple_episode_is_missing()
+        {
+            WithExistingFile(_firstFile);
+
+            Subject.IsSatisfiedBy(_parseResultMulti, null).Accepted.Should().BeFalse();
+        }
+    }
+}

src/NzbDrone.Core.Test/DecisionEngineTests/Search/TorrentSeedingSpecificationFixture.cs

@@ -0,0 +1,111 @@
+using FizzWare.NBuilder;
+using FluentAssertions;
+using Moq;
+using NUnit.Framework;
+using NzbDrone.Core.Datastore;
+using NzbDrone.Core.DecisionEngine.Specifications.Search;
+using NzbDrone.Core.Indexers;
+using NzbDrone.Core.Indexers.TorrentRss;
+using NzbDrone.Core.IndexerSearch.Definitions;
+using NzbDrone.Core.Parser.Model;
+using NzbDrone.Core.Tv;
+using NzbDrone.Test.Common;
+
+namespace NzbDrone.Core.Test.DecisionEngineTests.Search
+{
+    [TestFixture]
+    public class TorrentSeedingSpecificationFixture : TestBase<TorrentSeedingSpecification>
+    {
+        private Series _series;
+        private RemoteEpisode _remoteEpisode;
+        private IndexerDefinition _indexerDefinition;
+
+        [SetUp]
+        public void Setup()
+        {
+            _series = Builder<Series>.CreateNew().With(s => s.Id = 1).Build();
+
+            _remoteEpisode = new RemoteEpisode
+            {
+                Series = _series,
+                Release = new TorrentInfo
+                {
+                    IndexerId = 1,
+                    Title = "Series.Title.S01.720p.BluRay.X264-RlsGrp",
+                    Seeders = 0
+                }
+            };
+
+            _indexerDefinition = new IndexerDefinition
+            {
+                Settings = new TorrentRssIndexerSettings { MinimumSeeders = 5 }
+            };
+
+            Mocker.GetMock<IIndexerFactory>()
+                  .Setup(v => v.Get(1))
+                  .Returns(_indexerDefinition);
+
+        }
+
+        private void GivenReleaseSeeders(int? seeders)
+        {
+            (_remoteEpisode.Release as TorrentInfo).Seeders = seeders;
+        }
+
+        [Test]
+        public void should_return_true_if_not_torrent()
+        {
+            _remoteEpisode.Release = new ReleaseInfo
+            {
+                IndexerId = 1,
+                Title = "Series.Title.S01.720p.BluRay.X264-RlsGrp"
+            };
+
+            Subject.IsSatisfiedBy(_remoteEpisode, null).Accepted.Should().BeTrue();
+        }
+
+        [Test]
+        public void should_return_true_if_indexer_not_specified()
+        {
+            _remoteEpisode.Release.IndexerId = 0;
+
+            Subject.IsSatisfiedBy(_remoteEpisode, null).Accepted.Should().BeTrue();
+        }
+
+        [Test]
+        public void should_return_true_if_indexer_no_longer_exists()
+        {
+            Mocker.GetMock<IIndexerFactory>()
+                  .Setup(v => v.Get(It.IsAny<int>()))
+                  .Callback<int>(i => { throw new ModelNotFoundException(typeof(IndexerDefinition), i); });
+
+            Subject.IsSatisfiedBy(_remoteEpisode, null).Accepted.Should().BeTrue();
+        }
+
+        [Test]
+        public void should_return_true_if_seeds_unknown()
+        {
+            GivenReleaseSeeders(null);
+
+            Subject.IsSatisfiedBy(_remoteEpisode, null).Accepted.Should().BeTrue();
+        }
+
+        [TestCase(5)]
+        [TestCase(6)]
+        public void should_return_true_if_seeds_above_or_equal_to_limit(int seeders)
+        {
+            GivenReleaseSeeders(seeders);
+
+            Subject.IsSatisfiedBy(_remoteEpisode, null).Accepted.Should().BeTrue();
+        }
+
+        [TestCase(0)]
+        [TestCase(4)]
+        public void should_return_false_if_seeds_belove_limit(int seeders)
+        {
+            GivenReleaseSeeders(seeders);
+
+            Subject.IsSatisfiedBy(_remoteEpisode, null).Accepted.Should().BeFalse();
+        }
+    }
+}

src/NzbDrone.Core.Test/Download/DownloadApprovedReportsTests/DownloadApprovedFixture.cs

@@ -6,7 +6,9 @@ using Moq;
 using NUnit.Framework;
 using NzbDrone.Core.DecisionEngine;
 using NzbDrone.Core.Download;
+using NzbDrone.Core.Download.Clients;
 using NzbDrone.Core.Download.Pending;
+using NzbDrone.Core.Indexers;
 using NzbDrone.Core.Parser.Model;
 using NzbDrone.Core.Profiles;
 using NzbDrone.Core.Qualities;
@@ -35,7 +37,7 @@ namespace NzbDrone.Core.Test.Download.DownloadApprovedReportsTests
                             .Build();
         }
 
-        private RemoteEpisode GetRemoteEpisode(List<Episode> episodes, QualityModel quality)
+        private RemoteEpisode GetRemoteEpisode(List<Episode> episodes, QualityModel quality, DownloadProtocol downloadProtocol = DownloadProtocol.Usenet)
         {
             var remoteEpisode = new RemoteEpisode();
             remoteEpisode.ParsedEpisodeInfo = new ParsedEpisodeInfo();
@@ -45,6 +47,7 @@ namespace NzbDrone.Core.Test.Download.DownloadApprovedReportsTests
             remoteEpisode.Episodes.AddRange(episodes);
 
             remoteEpisode.Release = new ReleaseInfo();
+            remoteEpisode.Release.DownloadProtocol = downloadProtocol;
             remoteEpisode.Release.PublishDate = DateTime.UtcNow;
 
             remoteEpisode.Series = Builder<Series>.CreateNew()
@@ -192,7 +195,6 @@ namespace NzbDrone.Core.Test.Download.DownloadApprovedReportsTests
 
             var decisions = new List<DownloadDecision>();
             decisions.Add(new DownloadDecision(remoteEpisode, new Rejection("Failure!", RejectionType.Temporary)));
-            decisions.Add(new DownloadDecision(remoteEpisode));
 
             Subject.ProcessDecisions(decisions);
             Mocker.GetMock<IDownloadService>().Verify(v => v.DownloadReport(It.IsAny<RemoteEpisode>()), Times.Never());
@@ -209,7 +211,7 @@ namespace NzbDrone.Core.Test.Download.DownloadApprovedReportsTests
             decisions.Add(new DownloadDecision(remoteEpisode, new Rejection("Failure!", RejectionType.Temporary)));
 
             Subject.ProcessDecisions(decisions);
-            Mocker.GetMock<IPendingReleaseService>().Verify(v => v.Add(It.IsAny<DownloadDecision>()), Times.Never());
+            Mocker.GetMock<IPendingReleaseService>().Verify(v => v.Add(It.IsAny<DownloadDecision>(), It.IsAny<PendingReleaseReason>()), Times.Never());
         }
 
         [Test]
@@ -223,7 +225,43 @@ namespace NzbDrone.Core.Test.Download.DownloadApprovedReportsTests
             decisions.Add(new DownloadDecision(remoteEpisode, new Rejection("Failure!", RejectionType.Temporary)));
 
             Subject.ProcessDecisions(decisions);
-            Mocker.GetMock<IPendingReleaseService>().Verify(v => v.Add(It.IsAny<DownloadDecision>()), Times.Exactly(2));
+            Mocker.GetMock<IPendingReleaseService>().Verify(v => v.Add(It.IsAny<DownloadDecision>(), It.IsAny<PendingReleaseReason>()), Times.Exactly(2));
+        }
+
+        [Test]
+        public void should_add_to_failed_if_already_failed_for_that_protocol()
+        {
+            var episodes = new List<Episode> { GetEpisode(1) };
+            var remoteEpisode = GetRemoteEpisode(episodes, new QualityModel(Quality.HDTV720p));
+
+            var decisions = new List<DownloadDecision>();
+            decisions.Add(new DownloadDecision(remoteEpisode));
+            decisions.Add(new DownloadDecision(remoteEpisode));
+
+            Mocker.GetMock<IDownloadService>().Setup(s => s.DownloadReport(It.IsAny<RemoteEpisode>()))
+                  .Throws(new DownloadClientUnavailableException("Download client failed"));
+
+            Subject.ProcessDecisions(decisions);
+            Mocker.GetMock<IDownloadService>().Verify(v => v.DownloadReport(It.IsAny<RemoteEpisode>()), Times.Once());
+        }
+
+        [Test]
+        public void should_not_add_to_failed_if_failed_for_a_different_protocol()
+        {
+            var episodes = new List<Episode> { GetEpisode(1) };
+            var remoteEpisode = GetRemoteEpisode(episodes, new QualityModel(Quality.HDTV720p), DownloadProtocol.Usenet);
+            var remoteEpisode2 = GetRemoteEpisode(episodes, new QualityModel(Quality.HDTV720p), DownloadProtocol.Torrent);
+
+            var decisions = new List<DownloadDecision>();
+            decisions.Add(new DownloadDecision(remoteEpisode));
+            decisions.Add(new DownloadDecision(remoteEpisode2));
+
+            Mocker.GetMock<IDownloadService>().Setup(s => s.DownloadReport(It.Is<RemoteEpisode>(r => r.Release.DownloadProtocol == DownloadProtocol.Usenet)))
+                  .Throws(new DownloadClientUnavailableException("Download client failed"));
+
+            Subject.ProcessDecisions(decisions);
+            Mocker.GetMock<IDownloadService>().Verify(v => v.DownloadReport(It.Is<RemoteEpisode>(r => r.Release.DownloadProtocol == DownloadProtocol.Usenet)), Times.Once());
+            Mocker.GetMock<IDownloadService>().Verify(v => v.DownloadReport(It.Is<RemoteEpisode>(r => r.Release.DownloadProtocol == DownloadProtocol.Torrent)), Times.Once());
         }
     }
 }

src/NzbDrone.Core.Test/Download/DownloadClientStatusServiceFixture.cs

@@ -0,0 +1,156 @@
+using System;
+using System.Linq;
+using FluentAssertions;
+using Moq;
+using NUnit.Framework;
+using NzbDrone.Core.Download;
+using NzbDrone.Core.Test.Framework;
+
+namespace NzbDrone.Core.Test.Download
+{
+    public class DownloadClientStatusServiceFixture : CoreTest<DownloadClientStatusService>
+    {
+        private DateTime _epoch;
+
+        [SetUp]
+        public void SetUp()
+        {
+            _epoch = DateTime.UtcNow;
+        }
+
+        private DownloadClientStatus WithStatus(DownloadClientStatus status)
+        {
+            Mocker.GetMock<IDownloadClientStatusRepository>()
+                .Setup(v => v.FindByProviderId(1))
+                .Returns(status);
+
+            Mocker.GetMock<IDownloadClientStatusRepository>()
+                .Setup(v => v.All())
+                .Returns(new[] { status });
+
+            return status;
+        }
+
+        private void VerifyUpdate()
+        {
+            Mocker.GetMock<IDownloadClientStatusRepository>()
+                .Verify(v => v.Upsert(It.IsAny<DownloadClientStatus>()), Times.Once());
+        }
+
+        private void VerifyNoUpdate()
+        {
+            Mocker.GetMock<IDownloadClientStatusRepository>()
+                .Verify(v => v.Upsert(It.IsAny<DownloadClientStatus>()), Times.Never());
+        }
+
+        [Test]
+        public void should_not_consider_blocked_within_5_minutes_since_initial_failure()
+        {
+            WithStatus(new DownloadClientStatus
+            {
+                InitialFailure = _epoch - TimeSpan.FromMinutes(4),
+                MostRecentFailure = _epoch - TimeSpan.FromSeconds(4),
+                EscalationLevel = 3
+            });
+
+            Subject.RecordFailure(1);
+
+            VerifyUpdate();
+
+            var status = Subject.GetBlockedProviders().FirstOrDefault();
+            status.Should().BeNull();
+        }
+
+        [Test]
+        public void should_consider_blocked_after_5_minutes_since_initial_failure()
+        {
+            WithStatus(new DownloadClientStatus
+            {
+                InitialFailure = _epoch - TimeSpan.FromMinutes(6),
+                MostRecentFailure = _epoch - TimeSpan.FromSeconds(120),
+                EscalationLevel = 3
+            });
+
+            Subject.RecordFailure(1);
+
+            VerifyUpdate();
+
+            var status = Subject.GetBlockedProviders().FirstOrDefault();
+            status.Should().NotBeNull();
+        }
+
+        [Test]
+        public void should_not_escalate_further_till_after_5_minutes_since_initial_failure()
+        {
+            var origStatus = WithStatus(new DownloadClientStatus
+            {
+                InitialFailure = _epoch - TimeSpan.FromMinutes(4),
+                MostRecentFailure = _epoch - TimeSpan.FromSeconds(4),
+                EscalationLevel = 3
+            });
+
+            Subject.RecordFailure(1);
+            Subject.RecordFailure(1);
+            Subject.RecordFailure(1);
+            Subject.RecordFailure(1);
+            Subject.RecordFailure(1);
+            Subject.RecordFailure(1);
+            Subject.RecordFailure(1);
+
+            var status = Subject.GetBlockedProviders().FirstOrDefault();
+            status.Should().BeNull();
+
+            origStatus.EscalationLevel.Should().Be(3);
+        }
+
+        [Test]
+        public void should_escalate_further_after_5_minutes_since_initial_failure()
+        {
+            WithStatus(new DownloadClientStatus
+            {
+                InitialFailure = _epoch - TimeSpan.FromMinutes(6),
+                MostRecentFailure = _epoch - TimeSpan.FromSeconds(120),
+                EscalationLevel = 3
+            });
+
+            Subject.RecordFailure(1);
+            Subject.RecordFailure(1);
+            Subject.RecordFailure(1);
+            Subject.RecordFailure(1);
+            Subject.RecordFailure(1);
+            Subject.RecordFailure(1);
+            Subject.RecordFailure(1);
+
+            var status = Subject.GetBlockedProviders().FirstOrDefault();
+            status.Should().NotBeNull();
+
+            status.EscalationLevel.Should().BeGreaterThan(3);
+        }
+
+        [Test]
+        public void should_not_escalate_beyond_3_hours()
+        {
+            WithStatus(new DownloadClientStatus
+            {
+                InitialFailure = _epoch - TimeSpan.FromMinutes(6),
+                MostRecentFailure = _epoch - TimeSpan.FromSeconds(120),
+                EscalationLevel = 3
+            });
+
+            Subject.RecordFailure(1);
+            Subject.RecordFailure(1);
+            Subject.RecordFailure(1);
+            Subject.RecordFailure(1);
+            Subject.RecordFailure(1);
+            Subject.RecordFailure(1);
+            Subject.RecordFailure(1);
+            Subject.RecordFailure(1);
+            Subject.RecordFailure(1);
+
+            var status = Subject.GetBlockedProviders().FirstOrDefault();
+            status.Should().NotBeNull();
+            status.DisabledTill.Should().HaveValue();
+            status.DisabledTill.Should().NotBeAfter(_epoch + TimeSpan.FromHours(3.1));
+        }
+    }
+}

src/NzbDrone.Core.Test/Download/DownloadClientTests/Blackhole/ScanWatchFolderFixture.cs

@@ -1,15 +1,17 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Threading;
 using FluentAssertions;
 using Moq;
 using NUnit.Framework;
 using NzbDrone.Common.Disk;
 using NzbDrone.Core.Download;
-using NzbDrone.Test.Common;
-using System.Threading;
-using NzbDrone.Core.Test.Framework;
 using NzbDrone.Core.Download.Clients.Blackhole;
+using NzbDrone.Core.MediaFiles;
+using NzbDrone.Core.Test.Framework;
+using NzbDrone.Test.Common;
 
 namespace NzbDrone.Core.Test.Download.DownloadClientTests.Blackhole
 {
@@ -18,7 +20,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.Blackhole
     {
         protected readonly string _title = "Droned.S01E01.Pilot.1080p.WEB-DL-DRONE";
         protected string _completedDownloadFolder = @"c:\blackhole\completed".AsOsAgnostic();
-        
+
         protected void GivenCompletedItem()
         {
             var targetDir = Path.Combine(_completedDownloadFolder, _title);
@@ -33,6 +35,9 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.Blackhole
             Mocker.GetMock<IDiskProvider>()
                 .Setup(c => c.GetFileSize(It.IsAny<string>()))
                 .Returns(1000000);
+
+            Mocker.GetMock<IDiskScanService>().Setup(c => c.FilterFiles(It.IsAny<string>(), It.IsAny<IEnumerable<string>>()))
+                  .Returns<string, IEnumerable<string>>((b, s) => s.ToList());
         }
 
         protected void GivenChangedItem()
@@ -43,7 +48,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.Blackhole
                 .Setup(c => c.GetFileSize(It.IsAny<string>()))
                 .Returns(currentSize + 1);
         }
-        
+
         private void VerifySingleItem(DownloadItemStatus status)
         {
             var items = Subject.GetItems(_completedDownloadFolder, TimeSpan.FromMilliseconds(50)).ToList();

src/NzbDrone.Core.Test/Download/DownloadClientTests/Blackhole/TorrentBlackholeFixture.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Net;
@@ -10,6 +11,7 @@ using NzbDrone.Common.Http;
 using NzbDrone.Core.Download;
 using NzbDrone.Core.Download.Clients.Blackhole;
 using NzbDrone.Core.Exceptions;
+using NzbDrone.Core.MediaFiles;
 using NzbDrone.Core.MediaFiles.TorrentInfo;
 using NzbDrone.Core.Parser.Model;
 using NzbDrone.Test.Common;
@@ -48,6 +50,9 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.Blackhole
             Mocker.GetMock<ITorrentFileInfoReader>()
                 .Setup(c => c.GetHashFromTorrentFile(It.IsAny<byte[]>()))
                 .Returns("myhash");
+
+            Mocker.GetMock<IDiskScanService>().Setup(c => c.FilterFiles(It.IsAny<string>(), It.IsAny<IEnumerable<string>>()))
+                  .Returns<string, IEnumerable<string>>((b, s) => s.ToList());
         }
 
         protected void GivenFailedDownload()
@@ -99,6 +104,9 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.Blackhole
             var result = Subject.GetItems().Single();
 
             VerifyCompleted(result);
+
+            result.CanBeRemoved.Should().BeFalse();
+            result.CanMoveFiles.Should().BeFalse();
         }
 
         [Test]

src/NzbDrone.Core.Test/Download/DownloadClientTests/Blackhole/UsenetBlackholeFixture.cs

@@ -1,5 +1,6 @@
 
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Net;
@@ -10,6 +11,7 @@ using NzbDrone.Common.Disk;
 using NzbDrone.Common.Http;
 using NzbDrone.Core.Download;
 using NzbDrone.Core.Download.Clients.Blackhole;
+using NzbDrone.Core.MediaFiles;
 using NzbDrone.Test.Common;
 
 namespace NzbDrone.Core.Test.Download.DownloadClientTests.Blackhole
@@ -41,6 +43,9 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.Blackhole
             Mocker.GetMock<IDiskProvider>()
                 .Setup(c => c.OpenWriteStream(It.IsAny<string>()))
                 .Returns(() => new FileStream(GetTempFilePath(), FileMode.Create));
+
+            Mocker.GetMock<IDiskScanService>().Setup(c => c.FilterFiles(It.IsAny<string>(), It.IsAny<IEnumerable<string>>()))
+                  .Returns<string, IEnumerable<string>>((b, s) => s.ToList());
         }
 
         protected void GivenFailedDownload()
@@ -77,6 +82,9 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.Blackhole
             var result = Subject.GetItems().Single();
 
             VerifyCompleted(result);
+
+            result.CanBeRemoved.Should().BeTrue();
+            result.CanMoveFiles.Should().BeTrue();
         }
 
         [Test]

src/NzbDrone.Core.Test/Download/DownloadClientTests/DelugeTests/DelugeFixture.cs

@@ -19,6 +19,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DelugeTests
         protected DelugeTorrent _downloading;
         protected DelugeTorrent _failed;
         protected DelugeTorrent _completed;
+        protected DelugeTorrent _seeding;
 
         [SetUp]
         public void Setup()
@@ -75,7 +76,11 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DelugeTests
                         Size = 1000,
                         BytesDownloaded = 1000,
                         Progress = 100.0,
-                        DownloadPath = "somepath"
+                        DownloadPath = "somepath",
+                        IsAutoManaged = true,
+                        StopAtRatio = true,
+                        StopRatio = 1.0,
+                        Ratio = 1.5
                     };
 
             Mocker.GetMock<ITorrentFileInfoReader>()
@@ -114,7 +119,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DelugeTests
                 .Returns("CBC2F069FE8BB2F544EAE707D75BCD3DE9DCF951".ToLower())
                 .Callback(PrepareClientToReturnQueuedItem);
         }
-        
+
         protected virtual void GivenTorrents(List<DelugeTorrent> torrents)
         {
             if (torrents == null)
@@ -129,7 +134,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DelugeTests
 
         protected void PrepareClientToReturnQueuedItem()
         {
-            GivenTorrents(new List<DelugeTorrent> 
+            GivenTorrents(new List<DelugeTorrent>
                 {
                     _queued
                 });
@@ -137,7 +142,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DelugeTests
 
         protected void PrepareClientToReturnDownloadingItem()
         {
-            GivenTorrents(new List<DelugeTorrent> 
+            GivenTorrents(new List<DelugeTorrent>
                 {
                     _downloading
                 });
@@ -145,7 +150,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DelugeTests
 
         protected void PrepareClientToReturnFailedItem()
         {
-            GivenTorrents(new List<DelugeTorrent> 
+            GivenTorrents(new List<DelugeTorrent>
                 {
                     _failed
                 });
@@ -189,6 +194,9 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DelugeTests
             PrepareClientToReturnCompletedItem();
             var item = Subject.GetItems().Single();
             VerifyCompleted(item);
+
+            item.CanBeRemoved.Should().BeTrue();
+            item.CanMoveFiles.Should().BeTrue();
         }
 
         [Test]
@@ -248,11 +256,11 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DelugeTests
             item.Status.Should().Be(expectedItemStatus);
         }
 
-        [TestCase(DelugeTorrentStatus.Paused, DownloadItemStatus.Completed, true)]
-        [TestCase(DelugeTorrentStatus.Checking, DownloadItemStatus.Downloading, true)]
-        [TestCase(DelugeTorrentStatus.Queued, DownloadItemStatus.Completed, true)]
-        [TestCase(DelugeTorrentStatus.Seeding, DownloadItemStatus.Completed, true)]
-        public void GetItems_should_return_completed_item_as_downloadItemStatus(string apiStatus, DownloadItemStatus expectedItemStatus, bool expectedReadOnly)
+        [TestCase(DelugeTorrentStatus.Paused, DownloadItemStatus.Completed)]
+        [TestCase(DelugeTorrentStatus.Checking, DownloadItemStatus.Downloading)]
+        [TestCase(DelugeTorrentStatus.Queued, DownloadItemStatus.Completed)]
+        [TestCase(DelugeTorrentStatus.Seeding, DownloadItemStatus.Completed)]
+        public void GetItems_should_return_completed_item_as_downloadItemStatus(string apiStatus, DownloadItemStatus expectedItemStatus)
         {
             _completed.State = apiStatus;
 
@@ -261,24 +269,25 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DelugeTests
             var item = Subject.GetItems().Single();
 
             item.Status.Should().Be(expectedItemStatus);
-            item.IsReadOnly.Should().Be(expectedReadOnly);
         }
 
-        [Test]
-        public void GetItems_should_check_share_ratio_for_readonly()
+        [TestCase(0.5, false)]
+        [TestCase(1.01, true)]
+        public void GetItems_should_check_share_ratio_for_moveFiles_and_remove(double ratio, bool canBeRemoved)
         {
             _completed.State = DelugeTorrentStatus.Paused;
             _completed.IsAutoManaged = true;
             _completed.StopAtRatio = true;
             _completed.StopRatio = 1.0;
-            _completed.Ratio = 1.01;
+            _completed.Ratio = ratio;
 
             PrepareClientToReturnCompletedItem();
 
             var item = Subject.GetItems().Single();
 
             item.Status.Should().Be(DownloadItemStatus.Completed);
-            item.IsReadOnly.Should().BeFalse();
+            item.CanMoveFiles.Should().Be(canBeRemoved);
+            item.CanBeRemoved.Should().Be(canBeRemoved);
         }
 
         [Test]

src/NzbDrone.Core.Test/Download/DownloadClientTests/DownloadStationTests/TorrentDownloadStationFixture.cs

@@ -576,11 +576,11 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
             items.Should().OnlyContain(v => !v.OutputPath.IsEmpty);
         }
 
-        [TestCase(DownloadStationTaskStatus.Downloading, DownloadItemStatus.Downloading, true)]
-        [TestCase(DownloadStationTaskStatus.Finished, DownloadItemStatus.Completed, false)]
-        [TestCase(DownloadStationTaskStatus.Seeding, DownloadItemStatus.Completed, true)]
-        [TestCase(DownloadStationTaskStatus.Waiting, DownloadItemStatus.Queued, true)]
-        public void GetItems_should_return_readonly_expected(DownloadStationTaskStatus apiStatus, DownloadItemStatus expectedItemStatus, bool readOnlyExpected)
+        [TestCase(DownloadStationTaskStatus.Downloading, false, false)]
+        [TestCase(DownloadStationTaskStatus.Finished, true, true)]
+        [TestCase(DownloadStationTaskStatus.Seeding,  true, false)]
+        [TestCase(DownloadStationTaskStatus.Waiting, false, false)]
+        public void GetItems_should_return_canBeMoved_and_canBeDeleted_as_expected(DownloadStationTaskStatus apiStatus, bool canMoveFilesExpected, bool canBeRemovedExpected)
         {
             GivenSerialNumber();
             GivenSharedFolder();
@@ -592,7 +592,11 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
             var items = Subject.GetItems();
 
             items.Should().HaveCount(1);
-            items.First().IsReadOnly.Should().Be(readOnlyExpected);
+
+            var item = items.First();
+
+            item.CanBeRemoved.Should().Be(canBeRemovedExpected);
+            item.CanMoveFiles.Should().Be(canMoveFilesExpected);
         }
 
         [TestCase(DownloadStationTaskStatus.Downloading, DownloadItemStatus.Downloading)]

src/NzbDrone.Core.Test/Download/DownloadClientTests/DownloadStationTests/UsenetDownloadStationFixture.cs

@@ -408,24 +408,6 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
             items.Should().OnlyContain(v => !v.OutputPath.IsEmpty);
         }
 
-        [TestCase(DownloadStationTaskStatus.Downloading, DownloadItemStatus.Downloading, true)]
-        [TestCase(DownloadStationTaskStatus.Finished, DownloadItemStatus.Completed, false)]
-        [TestCase(DownloadStationTaskStatus.Waiting, DownloadItemStatus.Queued, true)]
-        public void GetItems_should_return_readonly_expected(DownloadStationTaskStatus apiStatus, DownloadItemStatus expectedItemStatus, bool readOnlyExpected)
-        {
-            GivenSerialNumber();
-            GivenSharedFolder();
-
-            _queued.Status = apiStatus;
-
-            GivenTasks(new List<DownloadStationTask>() { _queued });
-
-            var items = Subject.GetItems();
-
-            items.Should().HaveCount(1);
-            items.First().IsReadOnly.Should().Be(readOnlyExpected);
-        }
-
         [TestCase(DownloadStationTaskStatus.Downloading, DownloadItemStatus.Downloading)]
         [TestCase(DownloadStationTaskStatus.Error, DownloadItemStatus.Failed)]
         [TestCase(DownloadStationTaskStatus.Extracting, DownloadItemStatus.Downloading)]

src/NzbDrone.Core.Test/Download/DownloadClientTests/HadoukenTests/HadoukenFixture.cs

@@ -190,6 +190,9 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.HadoukenTests
             PrepareClientToReturnCompletedItem();
             var item = Subject.GetItems().Single();
             VerifyCompleted(item);
+
+            item.CanBeRemoved.Should().BeTrue();
+            item.CanMoveFiles.Should().BeTrue();
         }
 
         [Test]
@@ -298,7 +301,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.HadoukenTests
                .Returns("hash");
 
             var result = Subject.Download(remoteEpisode);
-            
+
             Assert.IsFalse(result.Any(c => char.IsLower(c)));
         }
 

src/NzbDrone.Core.Test/Download/DownloadClientTests/NzbVortexTests/NzbVortexFixture.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Linq;
 using System.Collections.Generic;
 using FluentAssertions;
@@ -103,10 +103,13 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.NzbVortexTests
         public void queued_item_should_have_required_properties()
         {
             GivenQueue(_queued);
-            
+
             var result = Subject.GetItems().Single();
 
             VerifyQueued(result);
+
+            result.CanBeRemoved.Should().BeTrue();
+            result.CanMoveFiles.Should().BeTrue();
         }
 
         [Test]
@@ -118,6 +121,9 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.NzbVortexTests
             var result = Subject.GetItems().Single();
 
             VerifyPaused(result);
+
+            result.CanBeRemoved.Should().BeTrue();
+            result.CanMoveFiles.Should().BeTrue();
         }
 
         [Test]
@@ -129,6 +135,9 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.NzbVortexTests
             var result = Subject.GetItems().Single();
 
             VerifyDownloading(result);
+
+            result.CanBeRemoved.Should().BeTrue();
+            result.CanMoveFiles.Should().BeTrue();
         }
 
         [Test]
@@ -139,6 +148,9 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.NzbVortexTests
             var result = Subject.GetItems().Single();
 
             VerifyCompleted(result);
+
+            result.CanBeRemoved.Should().BeTrue();
+            result.CanMoveFiles.Should().BeTrue();
         }
 
         [Test]
@@ -149,6 +161,9 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.NzbVortexTests
             var result = Subject.GetItems().Single();
 
             VerifyFailed(result);
+
+            result.CanBeRemoved.Should().BeTrue();
+            result.CanMoveFiles.Should().BeTrue();
         }
 
         [Test]

src/NzbDrone.Core.Test/Download/DownloadClientTests/NzbgetTests/NzbgetFixture.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Linq;
 using System.Collections.Generic;
 using FluentAssertions;
@@ -19,6 +19,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.NzbgetTests
         private NzbgetQueueItem _queued;
         private NzbgetHistoryItem _failed;
         private NzbgetHistoryItem _completed;
+        private Dictionary<string, string> _configItems;
 
         [SetUp]
         public void Setup()
@@ -80,13 +81,18 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.NzbgetTests
                     DownloadRate = 7000000
                 });
 
-            var configItems = new Dictionary<string, string>();
-            configItems.Add("Category1.Name", "tv");
-            configItems.Add("Category1.DestDir", @"/remote/mount/tv");
+
+            Mocker.GetMock<INzbgetProxy>()
+                .Setup(v => v.GetVersion(It.IsAny<NzbgetSettings>()))
+                .Returns("14.0");
+
+            _configItems = new Dictionary<string, string>();
+            _configItems.Add("Category1.Name", "tv");
+            _configItems.Add("Category1.DestDir", @"/remote/mount/tv");
 
             Mocker.GetMock<INzbgetProxy>()
                 .Setup(v => v.GetConfig(It.IsAny<NzbgetSettings>()))
-                .Returns(configItems);
+                .Returns(_configItems);
         }
 
         protected void GivenFailedDownload()
@@ -163,10 +169,13 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.NzbgetTests
 
             GivenQueue(_queued);
             GivenHistory(null);
-            
+
             var result = Subject.GetItems().Single();
 
             VerifyQueued(result);
+
+            result.CanBeRemoved.Should().BeTrue();
+            result.CanMoveFiles.Should().BeTrue();
         }
 
         [Test]
@@ -180,6 +189,9 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.NzbgetTests
             var result = Subject.GetItems().Single();
 
             VerifyPaused(result);
+
+            result.CanBeRemoved.Should().BeTrue();
+            result.CanMoveFiles.Should().BeTrue();
         }
 
         [Test]
@@ -193,6 +205,25 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.NzbgetTests
             var result = Subject.GetItems().Single();
 
             VerifyDownloading(result);
+
+            result.CanBeRemoved.Should().BeTrue();
+            result.CanMoveFiles.Should().BeTrue();
+        }
+
+        [Test]
+        public void post_processing_item_should_have_required_properties()
+        {
+            _queued.ActiveDownloads = 1;
+
+            GivenQueue(_queued);
+            GivenHistory(null);
+
+            _queued.RemainingSizeLo = 0;
+
+            var result = Subject.GetItems().Single();
+
+            result.CanBeRemoved.Should().BeTrue();
+            result.CanMoveFiles.Should().BeTrue();
         }
 
         [Test]
@@ -204,6 +235,9 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.NzbgetTests
             var result = Subject.GetItems().Single();
 
             VerifyCompleted(result);
+
+            result.CanBeRemoved.Should().BeTrue();
+            result.CanMoveFiles.Should().BeTrue();
         }
 
         [Test]
@@ -386,5 +420,18 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.NzbgetTests
 
             error.IsValid.Should().Be(expected);
         }
+
+        [TestCase("0", false)]
+        [TestCase("1", true)]
+        [TestCase(" 7", false)]
+        [TestCase("5000000", false)]
+        public void should_test_keephistory(string keephistory, bool expected)
+        {
+            _configItems["KeepHistory"] = keephistory;
+
+            var error = Subject.Test();
+
+            error.IsValid.Should().Be(expected);
+        }
     }
 }

src/NzbDrone.Core.Test/Download/DownloadClientTests/QBittorrentTests/QBittorrentFixture.cs

@@ -89,6 +89,12 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.QBittorrentTests
                 });
         }
 
+        protected void GivenHighPriority()
+        {
+            Subject.Definition.Settings.As<QBittorrentSettings>().OlderTvPriority = (int)QBittorrentPriority.First;
+            Subject.Definition.Settings.As<QBittorrentSettings>().RecentTvPriority = (int)QBittorrentPriority.First;
+        }
+
         protected void GivenMaxRatio(float maxRatio, bool removeOnMaxRatio = true)
         {
             Mocker.GetMock<IQBittorrentProxy>()
@@ -265,6 +271,39 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.QBittorrentTests
             id.Should().Be(expectedHash);
         }
 
+        [Test]
+        public void Download_should_set_top_priority()
+        {
+            GivenHighPriority();
+            GivenSuccessfulDownload();
+
+            var remoteEpisode = CreateRemoteEpisode();
+
+            var id = Subject.Download(remoteEpisode);
+
+            Mocker.GetMock<IQBittorrentProxy>()
+                  .Verify(v => v.MoveTorrentToTopInQueue(It.IsAny<string>(), It.IsAny<QBittorrentSettings>()), Times.Once());
+        }
+
+        [Test]
+        public void Download_should_not_fail_if_top_priority_not_available()
+        {
+            GivenHighPriority();
+            GivenSuccessfulDownload();
+
+            Mocker.GetMock<IQBittorrentProxy>()
+                  .Setup(v => v.MoveTorrentToTopInQueue(It.IsAny<string>(), It.IsAny<QBittorrentSettings>()))
+                  .Throws(new HttpException(new HttpResponse(new HttpRequest("http://me.local/"), new HttpHeader(), new byte[0], System.Net.HttpStatusCode.Forbidden)));
+
+            var remoteEpisode = CreateRemoteEpisode();
+
+            var id = Subject.Download(remoteEpisode);
+
+            id.Should().NotBeNullOrEmpty();
+
+            ExceptionVerification.ExpectedWarns(1);
+        }
+
         [Test]
         public void should_return_status_with_outputdirs()
         {
@@ -311,7 +350,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.QBittorrentTests
         }
 
         [Test]
-        public void should_be_read_only_if_max_ratio_not_reached()
+        public void should_not_be_removable_and_should_not_allow_move_files_if_max_ratio_not_reached()
         {
             GivenMaxRatio(1.0f);
 
@@ -330,11 +369,12 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.QBittorrentTests
             GivenTorrents(new List<QBittorrentTorrent> { torrent });
 
             var item = Subject.GetItems().Single();
-            item.IsReadOnly.Should().BeTrue();
+            item.CanBeRemoved.Should().BeFalse();
+            item.CanMoveFiles.Should().BeFalse();
         }
 
         [Test]
-        public void should_be_read_only_if_max_ratio_reached_and_not_paused()
+        public void should_not_be_removable_and_should_not_allow_move_files_if_max_ratio_reached_and_not_paused()
         {
             GivenMaxRatio(1.0f);
 
@@ -353,11 +393,12 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.QBittorrentTests
             GivenTorrents(new List<QBittorrentTorrent> { torrent });
 
             var item = Subject.GetItems().Single();
-            item.IsReadOnly.Should().BeTrue();
+            item.CanBeRemoved.Should().BeFalse();
+            item.CanMoveFiles.Should().BeFalse();
         }
 
         [Test]
-        public void should_be_read_only_if_max_ratio_is_not_set()
+        public void should_not_be_removable_and_should_not_allow_move_files_if_max_ratio_is_not_set()
         {
             GivenMaxRatio(1.0f, false);
 
@@ -376,11 +417,12 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.QBittorrentTests
             GivenTorrents(new List<QBittorrentTorrent> { torrent });
 
             var item = Subject.GetItems().Single();
-            item.IsReadOnly.Should().BeTrue();
+            item.CanBeRemoved.Should().BeFalse();
+            item.CanMoveFiles.Should().BeFalse();
         }
 
         [Test]
-        public void should_not_be_read_only_if_max_ratio_reached_and_paused()
+        public void should_be_removable_and_should_allow_move_files_if_max_ratio_reached_and_paused()
         {
             GivenMaxRatio(1.0f);
 
@@ -399,7 +441,8 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.QBittorrentTests
             GivenTorrents(new List<QBittorrentTorrent> { torrent });
 
             var item = Subject.GetItems().Single();
-            item.IsReadOnly.Should().BeFalse();
+            item.CanBeRemoved.Should().BeTrue();
+            item.CanMoveFiles.Should().BeTrue();
         }
 
         [Test]

src/NzbDrone.Core.Test/Download/DownloadClientTests/SabnzbdTests/SabnzbdFixture.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Linq;
 using System.Collections.Generic;
 using FizzWare.NBuilder;
@@ -191,7 +191,10 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.SabnzbdTests
             var result = Subject.GetItems().Single();
 
             VerifyQueued(result);
+
             result.RemainingTime.Should().NotBe(TimeSpan.Zero);
+            result.CanBeRemoved.Should().BeTrue();
+            result.CanMoveFiles.Should().BeTrue();
         }
 
         [TestCase(SabnzbdDownloadStatus.Paused)]
@@ -205,6 +208,9 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.SabnzbdTests
             var result = Subject.GetItems().Single();
 
             VerifyPaused(result);
+
+            result.CanBeRemoved.Should().BeTrue();
+            result.CanMoveFiles.Should().BeTrue();
         }
 
         [TestCase(SabnzbdDownloadStatus.Checking)]
@@ -227,7 +233,10 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.SabnzbdTests
             var result = Subject.GetItems().Single();
 
             VerifyDownloading(result);
+
             result.RemainingTime.Should().NotBe(TimeSpan.Zero);
+            result.CanBeRemoved.Should().BeTrue();
+            result.CanMoveFiles.Should().BeTrue();
         }
 
         [Test]
@@ -239,6 +248,9 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.SabnzbdTests
             var result = Subject.GetItems().Single();
 
             VerifyCompleted(result);
+
+            result.CanBeRemoved.Should().BeTrue();
+            result.CanMoveFiles.Should().BeTrue();
         }
 
         [Test]
@@ -252,6 +264,9 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.SabnzbdTests
             var result = Subject.GetItems().Single();
 
             VerifyFailed(result);
+
+            result.CanBeRemoved.Should().BeTrue();
+            result.CanMoveFiles.Should().BeTrue();
         }
 
         [Test]

src/NzbDrone.Core.Test/Download/DownloadClientTests/TransmissionTests/TransmissionFixture.cs

@@ -41,6 +41,9 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.TransmissionTests
             PrepareClientToReturnCompletedItem();
             var item = Subject.GetItems().Single();
             VerifyCompleted(item);
+
+            item.CanBeRemoved.Should().BeTrue();
+            item.CanMoveFiles.Should().BeTrue();
         }
 
         [Test]
@@ -145,8 +148,8 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.TransmissionTests
         [TestCase(TransmissionTorrentStatus.Check, DownloadItemStatus.Downloading)]
         [TestCase(TransmissionTorrentStatus.Queued, DownloadItemStatus.Queued)]
         [TestCase(TransmissionTorrentStatus.Downloading, DownloadItemStatus.Downloading)]
-        [TestCase(TransmissionTorrentStatus.SeedingWait, DownloadItemStatus.Completed)]
-        [TestCase(TransmissionTorrentStatus.Seeding, DownloadItemStatus.Completed)]
+        [TestCase(TransmissionTorrentStatus.SeedingWait, DownloadItemStatus.Downloading)]
+        [TestCase(TransmissionTorrentStatus.Seeding, DownloadItemStatus.Downloading)]
         public void GetItems_should_return_queued_item_as_downloadItemStatus(TransmissionTorrentStatus apiStatus, DownloadItemStatus expectedItemStatus)
         {
             _queued.Status = apiStatus;
@@ -160,7 +163,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.TransmissionTests
 
         [TestCase(TransmissionTorrentStatus.Queued, DownloadItemStatus.Queued)]
         [TestCase(TransmissionTorrentStatus.Downloading, DownloadItemStatus.Downloading)]
-        [TestCase(TransmissionTorrentStatus.Seeding, DownloadItemStatus.Completed)]
+        [TestCase(TransmissionTorrentStatus.Seeding, DownloadItemStatus.Downloading)]
         public void GetItems_should_return_downloading_item_as_downloadItemStatus(TransmissionTorrentStatus apiStatus, DownloadItemStatus expectedItemStatus)
         {
             _downloading.Status = apiStatus;
@@ -172,13 +175,13 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.TransmissionTests
             item.Status.Should().Be(expectedItemStatus);
         }
 
-        [TestCase(TransmissionTorrentStatus.Stopped, DownloadItemStatus.Completed, false)]
-        [TestCase(TransmissionTorrentStatus.CheckWait, DownloadItemStatus.Downloading, true)]
-        [TestCase(TransmissionTorrentStatus.Check, DownloadItemStatus.Downloading, true)]
-        [TestCase(TransmissionTorrentStatus.Queued, DownloadItemStatus.Completed, true)]
-        [TestCase(TransmissionTorrentStatus.SeedingWait, DownloadItemStatus.Completed, true)]
-        [TestCase(TransmissionTorrentStatus.Seeding, DownloadItemStatus.Completed, true)]
-        public void GetItems_should_return_completed_item_as_downloadItemStatus(TransmissionTorrentStatus apiStatus, DownloadItemStatus expectedItemStatus, bool expectedReadOnly)
+        [TestCase(TransmissionTorrentStatus.Stopped, DownloadItemStatus.Completed, true)]
+        [TestCase(TransmissionTorrentStatus.CheckWait, DownloadItemStatus.Downloading, false)]
+        [TestCase(TransmissionTorrentStatus.Check, DownloadItemStatus.Downloading, false)]
+        [TestCase(TransmissionTorrentStatus.Queued, DownloadItemStatus.Completed, false)]
+        [TestCase(TransmissionTorrentStatus.SeedingWait, DownloadItemStatus.Completed, false)]
+        [TestCase(TransmissionTorrentStatus.Seeding, DownloadItemStatus.Completed, false)]
+        public void GetItems_should_return_completed_item_as_downloadItemStatus(TransmissionTorrentStatus apiStatus, DownloadItemStatus expectedItemStatus, bool expectedValue)
         {
             _completed.Status = apiStatus;
 
@@ -187,7 +190,8 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.TransmissionTests
             var item = Subject.GetItems().Single();
 
             item.Status.Should().Be(expectedItemStatus);
-            item.IsReadOnly.Should().Be(expectedReadOnly);
+            item.CanBeRemoved.Should().Be(expectedValue);
+            item.CanMoveFiles.Should().Be(expectedValue);
         }
 
         [Test]

src/NzbDrone.Core.Test/Download/DownloadClientTests/UTorrentTests/UTorrentFixture.cs

@@ -222,6 +222,9 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.UTorrentTests
             PrepareClientToReturnCompletedItem();
             var item = Subject.GetItems().Single();
             VerifyCompleted(item);
+
+            item.CanBeRemoved.Should().BeTrue();
+            item.CanMoveFiles.Should().BeTrue();
         }
 
         [Test]
@@ -292,12 +295,12 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.UTorrentTests
             item.Status.Should().Be(expectedItemStatus);
         }
 
-        [TestCase(UTorrentTorrentStatus.Loaded | UTorrentTorrentStatus.Checking, DownloadItemStatus.Queued, false)]
-        [TestCase(UTorrentTorrentStatus.Loaded | UTorrentTorrentStatus.Checked, DownloadItemStatus.Completed, false)]
-        [TestCase(UTorrentTorrentStatus.Loaded | UTorrentTorrentStatus.Checked | UTorrentTorrentStatus.Queued, DownloadItemStatus.Completed, true)]
-        [TestCase(UTorrentTorrentStatus.Loaded | UTorrentTorrentStatus.Checked | UTorrentTorrentStatus.Started, DownloadItemStatus.Completed, true)]
-        [TestCase(UTorrentTorrentStatus.Loaded | UTorrentTorrentStatus.Checked | UTorrentTorrentStatus.Queued | UTorrentTorrentStatus.Paused, DownloadItemStatus.Completed, true)]
-        public void GetItems_should_return_completed_item_as_downloadItemStatus(UTorrentTorrentStatus apiStatus, DownloadItemStatus expectedItemStatus, bool expectedReadOnly)
+        [TestCase(UTorrentTorrentStatus.Loaded | UTorrentTorrentStatus.Checking, DownloadItemStatus.Queued, true)]
+        [TestCase(UTorrentTorrentStatus.Loaded | UTorrentTorrentStatus.Checked, DownloadItemStatus.Completed, true)]
+        [TestCase(UTorrentTorrentStatus.Loaded | UTorrentTorrentStatus.Checked | UTorrentTorrentStatus.Queued, DownloadItemStatus.Completed, false)]
+        [TestCase(UTorrentTorrentStatus.Loaded | UTorrentTorrentStatus.Checked | UTorrentTorrentStatus.Started, DownloadItemStatus.Completed, false)]
+        [TestCase(UTorrentTorrentStatus.Loaded | UTorrentTorrentStatus.Checked | UTorrentTorrentStatus.Queued | UTorrentTorrentStatus.Paused, DownloadItemStatus.Completed, false)]
+        public void GetItems_should_return_completed_item_as_downloadItemStatus(UTorrentTorrentStatus apiStatus, DownloadItemStatus expectedItemStatus, bool expectedValue)
         {
             _completed.Status = apiStatus;
 
@@ -306,7 +309,8 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.UTorrentTests
             var item = Subject.GetItems().Single();
 
             item.Status.Should().Be(expectedItemStatus);
-            item.IsReadOnly.Should().Be(expectedReadOnly);
+            item.CanBeRemoved.Should().Be(expectedValue);
+            item.CanMoveFiles.Should().Be(expectedValue);
         }
 
         [Test]

src/NzbDrone.Core.Test/Download/DownloadClientTests/VuzeTests/VuzeFixture.cs

@@ -13,6 +13,13 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.VuzeTests
     [TestFixture]
     public class VuzeFixture : TransmissionFixtureBase<Vuze>
     {
+        [SetUp]
+        public void Setup_Vuze()
+        {
+            // Vuze never sets isFinished.
+            _completed.IsFinished = false;
+        }
+
         [Test]
         public void queued_item_should_have_required_properties()
         {
@@ -43,6 +50,9 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.VuzeTests
             PrepareClientToReturnCompletedItem();
             var item = Subject.GetItems().Single();
             VerifyCompleted(item);
+
+            item.CanBeRemoved.Should().BeTrue();
+            item.CanMoveFiles.Should().BeTrue();
         }
 
         [Test]
@@ -147,8 +157,8 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.VuzeTests
         [TestCase(TransmissionTorrentStatus.Check, DownloadItemStatus.Downloading)]
         [TestCase(TransmissionTorrentStatus.Queued, DownloadItemStatus.Queued)]
         [TestCase(TransmissionTorrentStatus.Downloading, DownloadItemStatus.Downloading)]
-        [TestCase(TransmissionTorrentStatus.SeedingWait, DownloadItemStatus.Completed)]
-        [TestCase(TransmissionTorrentStatus.Seeding, DownloadItemStatus.Completed)]
+        [TestCase(TransmissionTorrentStatus.SeedingWait, DownloadItemStatus.Downloading)]
+        [TestCase(TransmissionTorrentStatus.Seeding, DownloadItemStatus.Downloading)]
         public void GetItems_should_return_queued_item_as_downloadItemStatus(TransmissionTorrentStatus apiStatus, DownloadItemStatus expectedItemStatus)
         {
             _queued.Status = apiStatus;
@@ -162,7 +172,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.VuzeTests
 
         [TestCase(TransmissionTorrentStatus.Queued, DownloadItemStatus.Queued)]
         [TestCase(TransmissionTorrentStatus.Downloading, DownloadItemStatus.Downloading)]
-        [TestCase(TransmissionTorrentStatus.Seeding, DownloadItemStatus.Completed)]
+        [TestCase(TransmissionTorrentStatus.Seeding, DownloadItemStatus.Downloading)]
         public void GetItems_should_return_downloading_item_as_downloadItemStatus(TransmissionTorrentStatus apiStatus, DownloadItemStatus expectedItemStatus)
         {
             _downloading.Status = apiStatus;
@@ -174,13 +184,13 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.VuzeTests
             item.Status.Should().Be(expectedItemStatus);
         }
 
-        [TestCase(TransmissionTorrentStatus.Stopped, DownloadItemStatus.Completed, false)]
-        [TestCase(TransmissionTorrentStatus.CheckWait, DownloadItemStatus.Downloading, true)]
-        [TestCase(TransmissionTorrentStatus.Check, DownloadItemStatus.Downloading, true)]
-        [TestCase(TransmissionTorrentStatus.Queued, DownloadItemStatus.Completed, true)]
-        [TestCase(TransmissionTorrentStatus.SeedingWait, DownloadItemStatus.Completed, true)]
-        [TestCase(TransmissionTorrentStatus.Seeding, DownloadItemStatus.Completed, true)]
-        public void GetItems_should_return_completed_item_as_downloadItemStatus(TransmissionTorrentStatus apiStatus, DownloadItemStatus expectedItemStatus, bool expectedReadOnly)
+        [TestCase(TransmissionTorrentStatus.Stopped, DownloadItemStatus.Completed, true)]
+        [TestCase(TransmissionTorrentStatus.CheckWait, DownloadItemStatus.Downloading, false)]
+        [TestCase(TransmissionTorrentStatus.Check, DownloadItemStatus.Downloading, false)]
+        [TestCase(TransmissionTorrentStatus.Queued, DownloadItemStatus.Queued, false)]
+        [TestCase(TransmissionTorrentStatus.SeedingWait, DownloadItemStatus.Completed, false)]
+        [TestCase(TransmissionTorrentStatus.Seeding, DownloadItemStatus.Completed, false)]
+        public void GetItems_should_return_completed_item_as_downloadItemStatus(TransmissionTorrentStatus apiStatus, DownloadItemStatus expectedItemStatus, bool expectedValue)
         {
             _completed.Status = apiStatus;
 
@@ -189,7 +199,8 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.VuzeTests
             var item = Subject.GetItems().Single();
 
             item.Status.Should().Be(expectedItemStatus);
-            item.IsReadOnly.Should().Be(expectedReadOnly);
+            item.CanBeRemoved.Should().Be(expectedValue);
+            item.CanMoveFiles.Should().Be(expectedValue);
         }
 
         [Test]
@@ -294,7 +305,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.VuzeTests
         }
 
         [Test]
-        public void should_have_correct_output_directory()
+        public void should_have_correct_output_directory_for_multifile_torrents()
         {
             WindowsOnly();
 
@@ -311,5 +322,25 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.VuzeTests
             items.First().OutputPath.Should().Be(@"C:\Downloads\" + _title);
         }
 
+        [Test]
+        public void should_have_correct_output_directory_for_singlefile_torrents()
+        {
+            WindowsOnly();
+
+            var fileName = _title + ".mkv";
+            _downloading.Name = fileName;
+            _downloading.DownloadDir = @"C:/Downloads";
+
+            GivenTorrents(new List<TransmissionTorrent>
+                {
+                    _downloading
+                });
+
+            var items = Subject.GetItems().ToList();
+
+            items.Should().HaveCount(1);
+            items.First().OutputPath.Should().Be(@"C:\Downloads\" + fileName);
+        }
+
     }
-}
+}

src/NzbDrone.Core.Test/Download/Pending/PendingReleaseServiceTests/AddFixture.cs

@@ -102,7 +102,7 @@ namespace NzbDrone.Core.Test.Download.Pending.PendingReleaseServiceTests
         [Test]
         public void should_add()
         {
-            Subject.Add(_temporarilyRejected);
+            Subject.Add(_temporarilyRejected, PendingReleaseReason.Delay);
 
             VerifyInsert();
         }
@@ -112,7 +112,7 @@ namespace NzbDrone.Core.Test.Download.Pending.PendingReleaseServiceTests
         {
             GivenHeldRelease(_release.Title, _release.Indexer, _release.PublishDate);
 
-            Subject.Add(_temporarilyRejected);
+            Subject.Add(_temporarilyRejected, PendingReleaseReason.Delay);
 
             VerifyNoInsert();
         }
@@ -122,7 +122,7 @@ namespace NzbDrone.Core.Test.Download.Pending.PendingReleaseServiceTests
         {
             GivenHeldRelease(_release.Title + "-RP", _release.Indexer, _release.PublishDate);
 
-            Subject.Add(_temporarilyRejected);
+            Subject.Add(_temporarilyRejected, PendingReleaseReason.Delay);
 
             VerifyInsert();
         }
@@ -132,7 +132,7 @@ namespace NzbDrone.Core.Test.Download.Pending.PendingReleaseServiceTests
         {
             GivenHeldRelease(_release.Title, "AnotherIndexer", _release.PublishDate);
 
-            Subject.Add(_temporarilyRejected);
+            Subject.Add(_temporarilyRejected, PendingReleaseReason.Delay);
 
             VerifyInsert();
         }
@@ -142,7 +142,7 @@ namespace NzbDrone.Core.Test.Download.Pending.PendingReleaseServiceTests
         {
             GivenHeldRelease(_release.Title, _release.Indexer, _release.PublishDate.AddHours(1));
 
-            Subject.Add(_temporarilyRejected);
+            Subject.Add(_temporarilyRejected, PendingReleaseReason.Delay);
 
             VerifyInsert();
         }

src/NzbDrone.Core.Test/Download/Pending/PendingReleaseServiceTests/PendingReleaseServiceFixture.cs

@@ -27,7 +27,7 @@ namespace NzbDrone.Core.Test.Download.Pending.PendingReleaseServiceTests
         public void should_not_ignore_pending_items_from_available_indexer()
         {
             Mocker.GetMock<IIndexerStatusService>()
-                .Setup(v => v.GetBlockedIndexers())
+                .Setup(v => v.GetBlockedProviders())
                 .Returns(new List<IndexerStatus>());
 
             GivenPendingRelease();
@@ -43,8 +43,8 @@ namespace NzbDrone.Core.Test.Download.Pending.PendingReleaseServiceTests
         public void should_ignore_pending_items_from_unavailable_indexer()
         {
             Mocker.GetMock<IIndexerStatusService>()
-                .Setup(v => v.GetBlockedIndexers())
-                .Returns(new List<IndexerStatus> { new IndexerStatus { IndexerId = 1, DisabledTill = DateTime.UtcNow.AddHours(2) } });
+                .Setup(v => v.GetBlockedProviders())
+                .Returns(new List<IndexerStatus> { new IndexerStatus { ProviderId = 1, DisabledTill = DateTime.UtcNow.AddHours(2) } });
 
             GivenPendingRelease();
 

src/NzbDrone.Core.Test/Files/Indexers/Torznab/torznab_animetosho.xml

@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:newznab="http://www.newznab.com/DTD/2010/feeds/attributes/" xmlns:torznab="http://torznab.com/schemas/2015/feed">
+  <channel>
+    <atom:link href="https://localhost/feed/rssx" rel="self" type="application/rss+xml" />
+    <title>Anime Tosho</title>
+    <link>https://localhost/</link>
+    <description>Latest releases feed</description>
+    <language>en-gb</language>
+    <ttl>30</ttl>
+    <lastBuildDate>Wed, 17 May 2017 20:36:06 +0000</lastBuildDate>
+    <newznab:response offset="0"/>
+    <item>
+      <title>[finFAGs]_Frame_Arms_Girl_07_(1280x720_TV_AAC)_[1262B6F7].mkv</title>
+      <pubDate>Wed, 17 May 2017 20:36:06 +0000</pubDate>
+      <guid isPermaLink="true">https://localhost/view/123451</guid>
+      <category>Anime</category>
+      <description><![CDATA[<strong>Total Size</strong>: 301.8 MB<br />]]></description>
+      <link>https://localhost/view/finfags-_frame_arms_girl_07_-1280x720_tv_aac-_-1262b6f7-mkv.123451</link>
+      <comments>https://localhost/view/finfags-_frame_arms_girl_07_-1280x720_tv_aac-_-1262b6f7-mkv.123451</comments>
+      <enclosure url="http://storage.localhost/torrents/123451.torrent" type="application/x-bittorrent" length="0" />
+      <source url="http://www.tokyotosho.info/details.php?id=123451">TokyoTosho</source>
+
+      <newznab:attr name="category" value="5070" />
+      <newznab:attr name="category" value="100001" />
+      <newznab:attr name="files" value="1" />
+      <newznab:attr name="size" value="316477946" />
+
+      <torznab:attr name="files" value="1" />
+      <torznab:attr name="size" value="316477946" />
+      <torznab:attr name="category" value="5070" />
+      <torznab:attr name="category" value="100001" />
+      <torznab:attr name="infohash" value="2d69a861bef5a9f2cdf791b7328e37b7953205e1" />
+      <torznab:attr name="magneturl" value="magnet:?xt=urn:btih:VU2QYN66WU7FTPXSG3TFDRXW6KTEBPBF" />
+    </item>
+    <item>
+      <title>[HorribleSubs] Frame Arms Girl - 07 [720p].mkv</title>
+      <pubDate>Mon, 15 May 2017 19:15:56 +0000</pubDate>
+      <guid isPermaLink="true">https://localhost/view/123452</guid>
+      <category>Anime</category>
+      <description><![CDATA[<strong>Total Size</strong>: 452.0 MB<br />]]></description>
+      <link>https://localhost/view/horriblesubs-frame-arms-girl-07-720p-mkv.123452</link>
+      <comments>https://localhost/view/horriblesubs-frame-arms-girl-07-720p-mkv.123452</comments>
+      <enclosure url="http://storage.localhost/torrents/123452.torrent" type="application/x-bittorrent" length="0" />
+      <enclosure url="http://storage.localhost/nzb/123452.nzb" type="application/x-nzb" length="0" />
+      <source url="http://www.tokyotosho.info/details.php?id=123452">TokyoTosho</source>
+
+      <newznab:attr name="category" value="5070" />
+      <newznab:attr name="category" value="100001" />
+      <newznab:attr name="files" value="1" />
+      <newznab:attr name="size" value="473987489" />
+
+      <torznab:attr name="files" value="1" />
+      <torznab:attr name="size" value="473987489" />
+      <torznab:attr name="category" value="5070" />
+      <torznab:attr name="category" value="100001" />
+      <torznab:attr name="infohash" value="bff4afebcd50c21949ed6a06323d2120c649bd82" />
+      <torznab:attr name="magneturl" value="magnet:?xt=urn:btih:5QK77JL7LZVIMEGKJ5VVAMMR5EEQMMSN" />
+    </item>
+  </channel>
+</rss>

src/NzbDrone.Core.Test/HealthCheck/Checks/DownloadClientCheckFixture.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using NUnit.Framework;
 using NzbDrone.Core.Download;
 using NzbDrone.Core.HealthCheck.Checks;
-using NzbDrone.Core.Indexers;
 using NzbDrone.Core.Test.Framework;
 using NzbDrone.Test.Common;
 
@@ -26,7 +25,7 @@ namespace NzbDrone.Core.Test.HealthCheck.Checks
         public void should_return_error_when_download_client_throws()
         {
             var downloadClient = Mocker.GetMock<IDownloadClient>();
-            downloadClient.Setup(s => s.Definition).Returns(new IndexerDefinition{Name = "Test"});
+            downloadClient.Setup(s => s.Definition).Returns(new DownloadClientDefinition{Name = "Test"});
 
             downloadClient.Setup(s => s.GetItems())
                           .Throws<Exception>();
@@ -36,8 +35,6 @@ namespace NzbDrone.Core.Test.HealthCheck.Checks
                   .Returns(new IDownloadClient[] { downloadClient.Object });
 
             Subject.Check().ShouldBeError();
-            
-            ExceptionVerification.ExpectedErrors(1);
         }
 
         [Test]

src/NzbDrone.Core.Test/HealthCheck/Checks/IndexerStatusCheckFixture.cs

@@ -22,7 +22,7 @@ namespace NzbDrone.Core.Test.HealthCheck.Checks
                   .Returns(_indexers);
 
             Mocker.GetMock<IIndexerStatusService>()
-                   .Setup(v => v.GetBlockedIndexers())
+                   .Setup(v => v.GetBlockedProviders())
                    .Returns(_blockedIndexers);
         }
 
@@ -40,7 +40,7 @@ namespace NzbDrone.Core.Test.HealthCheck.Checks
             {
                 _blockedIndexers.Add(new IndexerStatus
                     {
-                        IndexerId = id,
+                        ProviderId = id,
                         InitialFailure = DateTime.UtcNow.AddHours(-failureHours),
                         MostRecentFailure = DateTime.UtcNow.AddHours(-0.1),
                         EscalationLevel = 5,
@@ -57,13 +57,6 @@ namespace NzbDrone.Core.Test.HealthCheck.Checks
         {
             Subject.Check().ShouldBeOk();
         }
-        [Test]
-        public void should_not_return_error_when_indexer_failed_less_than_an_hour()
-        {
-            GivenIndexer(1, 0.1, 0.5);
-
-            Subject.Check().ShouldBeOk();
-        }
 
         [Test]
         public void should_return_warning_if_indexer_unavailable()

src/NzbDrone.Core.Test/HistoryTests/HistoryServiceFixture.cs

@@ -13,6 +13,7 @@ using NzbDrone.Core.Qualities;
 using System.Collections.Generic;
 using NzbDrone.Core.Test.Qualities;
 using FluentAssertions;
+using NzbDrone.Core.Download;
 using NzbDrone.Core.Tv;
 
 namespace NzbDrone.Core.Test.HistoryTests
@@ -81,10 +82,16 @@ namespace NzbDrone.Core.Test.HistoryTests
                                    Path = @"C:\Test\Unsorted\Series.s01e01.mkv"
                                };
 
-            Subject.Handle(new EpisodeImportedEvent(localEpisode, episodeFile, true, "sab", "abcd", true));
+            var downloadClientItem = new DownloadClientItem
+                                     {
+                                         DownloadClient = "sab",
+                                         DownloadId = "abcd"
+                                     };
+
+            Subject.Handle(new EpisodeImportedEvent(localEpisode, episodeFile, new List<EpisodeFile>(), true, downloadClientItem));
 
             Mocker.GetMock<IHistoryRepository>()
                 .Verify(v => v.Insert(It.Is<History.History>(h => h.SourceTitle == Path.GetFileNameWithoutExtension(localEpisode.Path))));
         }
     }
-}
+}

src/NzbDrone.Core.Test/Housekeeping/Housekeepers/CleanupDownloadClientUnavailablePendingReleasesFixture.cs

@@ -0,0 +1,60 @@
+using System;
+using FizzWare.NBuilder;
+using FluentAssertions;
+using NUnit.Framework;
+using NzbDrone.Core.Download.Pending;
+using NzbDrone.Core.Housekeeping.Housekeepers;
+using NzbDrone.Core.Parser.Model;
+using NzbDrone.Core.Test.Framework;
+
+namespace NzbDrone.Core.Test.Housekeeping.Housekeepers
+{
+    [TestFixture]
+    public class CleanupDownloadClientUnavailablePendingReleasesFixture : DbTest<CleanupDownloadClientUnavailablePendingReleases, PendingRelease>
+    {
+        [Test]
+        public void should_delete_old_DownloadClientUnavailable_pending_items()
+        {
+            var pendingRelease = Builder<PendingRelease>.CreateNew()
+                .With(h => h.Reason = PendingReleaseReason.DownloadClientUnavailable)
+                .With(h => h.Added = DateTime.UtcNow.AddDays(-21))
+                .With(h => h.ParsedEpisodeInfo = new ParsedEpisodeInfo())
+                .With(h => h.Release = new ReleaseInfo())
+                .BuildNew();
+
+            Db.Insert(pendingRelease);
+            Subject.Clean();
+            AllStoredModels.Should().BeEmpty();
+        }
+
+        [Test]
+        public void should_delete_old_Fallback_pending_items()
+        {
+            var pendingRelease = Builder<PendingRelease>.CreateNew()
+                .With(h => h.Reason = PendingReleaseReason.Fallback)
+                .With(h => h.Added = DateTime.UtcNow.AddDays(-21))
+                .With(h => h.ParsedEpisodeInfo = new ParsedEpisodeInfo())
+                .With(h => h.Release = new ReleaseInfo())
+                .BuildNew();
+
+            Db.Insert(pendingRelease);
+            Subject.Clean();
+            AllStoredModels.Should().BeEmpty();
+        }
+
+        [Test]
+        public void should_not_delete_old_Delay_pending_items()
+        {
+            var pendingRelease = Builder<PendingRelease>.CreateNew()
+                .With(h => h.Reason = PendingReleaseReason.Delay)
+                .With(h => h.Added = DateTime.UtcNow.AddDays(-21))
+                .With(h => h.ParsedEpisodeInfo = new ParsedEpisodeInfo())
+                .With(h => h.Release = new ReleaseInfo())
+                .BuildNew();
+
+            Db.Insert(pendingRelease);
+            Subject.Clean();
+            AllStoredModels.Should().HaveCount(1);
+        }
+    }
+}

src/NzbDrone.Core.Test/Housekeeping/Housekeepers/CleanupOrphanedIndexerStatusFixture.cs

@@ -28,7 +28,7 @@ namespace NzbDrone.Core.Test.Housekeeping.Housekeepers
         public void should_delete_orphaned_indexerstatus()
         {
             var status = Builder<IndexerStatus>.CreateNew()
-                                               .With(h => h.IndexerId = _indexer.Id)
+                                               .With(h => h.ProviderId = _indexer.Id)
                                                .BuildNew();
             Db.Insert(status);
 
@@ -42,13 +42,13 @@ namespace NzbDrone.Core.Test.Housekeeping.Housekeepers
             GivenIndexer();
 
             var status = Builder<IndexerStatus>.CreateNew()
-                                               .With(h => h.IndexerId = _indexer.Id)
+                                               .With(h => h.ProviderId = _indexer.Id)
                                                .BuildNew();
             Db.Insert(status);
 
             Subject.Clean();
             AllStoredModels.Should().HaveCount(1);
-            AllStoredModels.Should().Contain(h => h.IndexerId == _indexer.Id);
+            AllStoredModels.Should().Contain(h => h.ProviderId == _indexer.Id);
         }
     }
 }

src/NzbDrone.Core.Test/IndexerTests/IPTorrentsTests/IPTorrentsFixture.cs

@@ -20,7 +20,7 @@ namespace NzbDrone.Core.Test.IndexerTests.IPTorrentsTests
             Subject.Definition = new IndexerDefinition()
                                     {
                                         Name = "IPTorrents",
-                                        Settings = new IPTorrentsSettings() {  Url = "http://fake.com/" }
+                                        Settings = new IPTorrentsSettings() {  BaseUrl = "http://fake.com/" }
                                     };
         }
 

src/NzbDrone.Core.Test/IndexerTests/IndexerStatusServiceFixture.cs

@@ -11,7 +11,7 @@ namespace NzbDrone.Core.Test.IndexerTests
     public class IndexerStatusServiceFixture : CoreTest<IndexerStatusService>
     {
         private DateTime _epoch;
-        
+
         [SetUp]
         public void SetUp()
         {
@@ -21,7 +21,7 @@ namespace NzbDrone.Core.Test.IndexerTests
         private void WithStatus(IndexerStatus status)
         {
             Mocker.GetMock<IIndexerStatusRepository>()
-                .Setup(v => v.FindByIndexerId(1))
+                .Setup(v => v.FindByProviderId(1))
                 .Returns(status);
 
             Mocker.GetMock<IIndexerStatusRepository>()
@@ -29,25 +29,16 @@ namespace NzbDrone.Core.Test.IndexerTests
                 .Returns(new[] { status });
         }
 
-        private void VerifyUpdate(bool updated = true)
+        private void VerifyUpdate()
         {
             Mocker.GetMock<IIndexerStatusRepository>()
-                .Verify(v => v.Upsert(It.IsAny<IndexerStatus>()), Times.Exactly(updated ? 1 : 0));
+                .Verify(v => v.Upsert(It.IsAny<IndexerStatus>()), Times.Once());
         }
 
-        [Test]
-        public void should_start_backoff_on_first_failure()
+        private void VerifyNoUpdate()
         {
-            WithStatus(new IndexerStatus());
-
-            Subject.RecordFailure(1);
-
-            VerifyUpdate();
-
-            var status = Subject.GetBlockedIndexers().FirstOrDefault();
-            status.Should().NotBeNull();
-            status.DisabledTill.Should().HaveValue();
-            status.DisabledTill.Value.Should().BeCloseTo(_epoch + TimeSpan.FromMinutes(5), 500);
+            Mocker.GetMock<IIndexerStatusRepository>()
+                .Verify(v => v.Upsert(It.IsAny<IndexerStatus>()), Times.Never());
         }
 
         [Test]
@@ -59,7 +50,7 @@ namespace NzbDrone.Core.Test.IndexerTests
 
             VerifyUpdate();
 
-            var status = Subject.GetBlockedIndexers().FirstOrDefault();
+            var status = Subject.GetBlockedProviders().FirstOrDefault();
             status.Should().BeNull();
         }
 
@@ -70,22 +61,7 @@ namespace NzbDrone.Core.Test.IndexerTests
 
             Subject.RecordSuccess(1);
 
-            VerifyUpdate(false);
-        }
-
-        [Test]
-        public void should_preserve_escalation_on_intermittent_success()
-        {
-            WithStatus(new IndexerStatus { MostRecentFailure = _epoch - TimeSpan.FromSeconds(4), EscalationLevel = 3 });
-
-            Subject.RecordSuccess(1);
-            Subject.RecordSuccess(1);
-            Subject.RecordFailure(1);
-
-            var status = Subject.GetBlockedIndexers().FirstOrDefault();
-            status.Should().NotBeNull();
-            status.DisabledTill.Should().HaveValue();
-            status.DisabledTill.Value.Should().BeCloseTo(_epoch + TimeSpan.FromMinutes(15), 500);
+            VerifyNoUpdate();
         }
     }
 }

src/NzbDrone.Core.Test/IndexerTests/NewznabTests/NewznabCapabilitiesProviderFixture.cs

@@ -21,7 +21,7 @@ namespace NzbDrone.Core.Test.IndexerTests.NewznabTests
         {
             _settings = new NewznabSettings()
             {
-                Url = "http://indxer.local"
+                BaseUrl = "http://indxer.local"
             };
 
             _caps = ReadAllText("Files/Indexers/Newznab/newznab_caps.xml");

src/NzbDrone.Core.Test/IndexerTests/NewznabTests/NewznabFixture.cs

@@ -1,12 +1,15 @@
 using System;
 using System.Linq;
+using System.Net;
 using FluentAssertions;
 using Moq;
 using NUnit.Framework;
 using NzbDrone.Common.Http;
 using NzbDrone.Core.Indexers;
 using NzbDrone.Core.Indexers.Newznab;
+using NzbDrone.Core.Parser.Model;
 using NzbDrone.Core.Test.Framework;
+using NzbDrone.Test.Common;
 
 namespace NzbDrone.Core.Test.IndexerTests.NewznabTests
 {
@@ -24,7 +27,7 @@ namespace NzbDrone.Core.Test.IndexerTests.NewznabTests
                     Name = "Newznab",
                     Settings = new NewznabSettings()
                         {
-                            Url = "http://indexer.local/",
+                            BaseUrl = "http://indexer.local/",
                             Categories = new int[] { 1 }
                         }
                 };
@@ -43,7 +46,7 @@ namespace NzbDrone.Core.Test.IndexerTests.NewznabTests
             Mocker.GetMock<IHttpClient>()
                 .Setup(o => o.Execute(It.Is<HttpRequest>(v => v.Method == HttpMethod.GET)))
                 .Returns<HttpRequest>(r => new HttpResponse(r, new HttpHeader(), recentFeed));
-            
+
             var releases = Subject.FetchRecent();
 
             releases.Should().HaveCount(100);
@@ -61,6 +64,35 @@ namespace NzbDrone.Core.Test.IndexerTests.NewznabTests
             releaseInfo.Size.Should().Be(1183105773);
         }
 
+
+        [Test]
+        public void should_parse_recent_feed_from_newznab_animetosho()
+        {
+            var recentFeed = ReadAllText(@"Files/Indexers/Torznab/torznab_animetosho.xml");
+
+            Mocker.GetMock<IHttpClient>()
+                .Setup(o => o.Execute(It.Is<HttpRequest>(v => v.Method == HttpMethod.GET)))
+                .Returns<HttpRequest>(r => new HttpResponse(r, new HttpHeader(), recentFeed));
+
+            var releases = Subject.FetchRecent();
+
+            releases.Should().HaveCount(1);
+
+            releases.First().Should().BeOfType<ReleaseInfo>();
+            var releaseInfo = releases.First() as ReleaseInfo;
+
+            releaseInfo.Title.Should().Be("[HorribleSubs] Frame Arms Girl - 07 [720p].mkv");
+            releaseInfo.DownloadProtocol.Should().Be(DownloadProtocol.Usenet);
+            releaseInfo.DownloadUrl.Should().Be("http://storage.localhost/nzb/123452.nzb");
+            releaseInfo.InfoUrl.Should().Be("https://localhost/view/horriblesubs-frame-arms-girl-07-720p-mkv.123452");
+            releaseInfo.CommentUrl.Should().Be("https://localhost/view/horriblesubs-frame-arms-girl-07-720p-mkv.123452");
+            releaseInfo.Indexer.Should().Be(Subject.Definition.Name);
+            releaseInfo.PublishDate.Should().Be(DateTime.Parse("Mon, 15 May 2017 19:15:56 +0000").ToUniversalTime());
+            releaseInfo.Size.Should().Be(473987489);
+            releaseInfo.TvdbId.Should().Be(0);
+            releaseInfo.TvRageId.Should().Be(0);
+        }
+
         [Test]
         public void should_use_pagesize_reported_by_caps()
         {
@@ -69,5 +101,27 @@ namespace NzbDrone.Core.Test.IndexerTests.NewznabTests
 
             Subject.PageSize.Should().Be(25);
         }
+
+        [Test]
+        public void should_record_indexer_failure_if_caps_throw()
+        {
+            var request = new HttpRequest("http://my.indexer.com");
+            var response = new HttpResponse(request, new HttpHeader(), new byte[0], (HttpStatusCode)429);
+            response.Headers["Retry-After"] = "300";
+
+            Mocker.GetMock<INewznabCapabilitiesProvider>()
+                .Setup(v => v.GetCapabilities(It.IsAny<NewznabSettings>()))
+                .Throws(new TooManyRequestsException(request, response));
+
+            _caps.MaxPageSize = 30;
+            _caps.DefaultPageSize = 25;
+
+            Subject.FetchRecent().Should().BeEmpty();
+
+            Mocker.GetMock<IIndexerStatusService>()
+                  .Verify(v => v.RecordFailure(It.IsAny<int>(), TimeSpan.FromMinutes(5.0)), Times.Once());
+
+            ExceptionVerification.ExpectedWarns(1);
+        }
     }
 }

src/NzbDrone.Core.Test/IndexerTests/NewznabTests/NewznabRequestGeneratorFixture.cs

@@ -20,10 +20,10 @@ namespace NzbDrone.Core.Test.IndexerTests.NewznabTests
         {
             Subject.Settings = new NewznabSettings()
             {
-                 Url = "http://127.0.0.1:1234/",
-                 Categories = new [] { 1, 2 },
-                 AnimeCategories = new [] { 3, 4 },
-                 ApiKey = "abcd",
+                BaseUrl = "http://127.0.0.1:1234/",
+                Categories = new [] { 1, 2 },
+                AnimeCategories = new [] { 3, 4 },
+                ApiKey = "abcd",
             };
 
             _singleEpisodeSearchCriteria = new SingleEpisodeSearchCriteria
@@ -84,7 +84,7 @@ namespace NzbDrone.Core.Test.IndexerTests.NewznabTests
 
             page.Url.FullUri.Should().Contain("&cat=3,4&");
         }
-        
+
         [Test]
         public void should_use_mode_search_for_anime()
         {

src/NzbDrone.Core.Test/IndexerTests/NewznabTests/NewznabSettingFixture.cs

@@ -15,12 +15,12 @@ namespace NzbDrone.Core.Test.IndexerTests.NewznabTests
             var setting = new NewznabSettings()
             {
                 ApiKey = "",
-                Url = url
+                BaseUrl = url
             };
 
 
             setting.Validate().IsValid.Should().BeFalse();
-            setting.Validate().Errors.Should().Contain(c => c.PropertyName == "ApiKey");
+            setting.Validate().Errors.Should().Contain(c => c.PropertyName == nameof(NewznabSettings.ApiKey));
 
         }
 
@@ -32,13 +32,13 @@ namespace NzbDrone.Core.Test.IndexerTests.NewznabTests
             var setting = new NewznabSettings
             {
                 ApiKey = "",
-                Url = url
+                BaseUrl = url
             };
 
 
             setting.Validate().IsValid.Should().BeFalse();
-            setting.Validate().Errors.Should().NotContain(c => c.PropertyName == "ApiKey");
-            setting.Validate().Errors.Should().Contain(c => c.PropertyName == "Url");
+            setting.Validate().Errors.Should().NotContain(c => c.PropertyName == nameof(NewznabSettings.ApiKey));
+            setting.Validate().Errors.Should().Contain(c => c.PropertyName == nameof(NewznabSettings.BaseUrl));
 
         }
 
@@ -49,11 +49,11 @@ namespace NzbDrone.Core.Test.IndexerTests.NewznabTests
             var setting = new NewznabSettings()
             {
                 ApiKey = "",
-                Url = url
+                BaseUrl = url
             };
 
 
             setting.Validate().IsValid.Should().BeTrue();
         }
     }
-}
+}

src/NzbDrone.Core.Test/IndexerTests/TestIndexerSettings.cs

@@ -1,14 +1,17 @@
 using System;
+using NzbDrone.Core.Indexers;
 using NzbDrone.Core.ThingiProvider;
 using NzbDrone.Core.Validation;
 
 namespace NzbDrone.Core.Test.IndexerTests
 {
-    public class TestIndexerSettings : IProviderConfig
+    public class TestIndexerSettings : IIndexerSettings
     {
         public NzbDroneValidationResult Validate()
         {
             throw new NotImplementedException();
         }
+
+        public string BaseUrl { get; set; }
     }
 }

src/NzbDrone.Core.Test/IndexerTests/TorrentRssIndexerTests/TorrentRssIndexerFixture.cs

@@ -5,9 +5,11 @@ using Moq;
 using NUnit.Framework;
 using NzbDrone.Common.Http;
 using NzbDrone.Core.Indexers;
+using NzbDrone.Core.Indexers.Exceptions;
 using NzbDrone.Core.Indexers.TorrentRss;
 using NzbDrone.Core.Parser.Model;
 using NzbDrone.Core.Test.Framework;
+using NzbDrone.Test.Common;
 
 namespace NzbDrone.Core.Test.IndexerTests.TorrentRssIndexerTests
 {
@@ -48,7 +50,7 @@ namespace NzbDrone.Core.Test.IndexerTests.TorrentRssIndexerTests
 
             releases.Should().HaveCount(50);
             releases.First().Should().BeOfType<TorrentInfo>();
-            
+
             var torrentInfo = (TorrentInfo)releases.First();
 
             torrentInfo.Title.Should().Be("Conan.2015.02.05.Jeff.Bridges.720p.HDTV.X264-CROOKS");
@@ -239,7 +241,7 @@ namespace NzbDrone.Core.Test.IndexerTests.TorrentRssIndexerTests
 
             torrentInfo.Title.Should().Be("DAYS - 05 (1280x720 HEVC2 AAC).mkv");
             torrentInfo.DownloadProtocol.Should().Be(DownloadProtocol.Torrent);
-            torrentInfo.DownloadUrl.Should().Be("http://storage.animetosho.org/torrents/4b58360143d59a55cbd922397a3eaa378165f3ff/DAYS%20-%2005%20%281280x720%20HEVC2%20AAC%29.torrent");            
+            torrentInfo.DownloadUrl.Should().Be("http://storage.animetosho.org/torrents/4b58360143d59a55cbd922397a3eaa378165f3ff/DAYS%20-%2005%20%281280x720%20HEVC2%20AAC%29.torrent");
         }
 
         [Test]
@@ -258,5 +260,18 @@ namespace NzbDrone.Core.Test.IndexerTests.TorrentRssIndexerTests
             torrentInfo.DownloadProtocol.Should().Be(DownloadProtocol.Torrent);
             torrentInfo.DownloadUrl.Should().Be("https://alpharatio.cc/torrents.php?action=download&authkey=private_auth_key&torrent_pass=private_torrent_pass&id=465831");
         }
+
+        [Test]
+        public void should_record_indexer_failure_if_unsupported_feed()
+        {
+            GivenRecentFeedResponse("TorrentRss/invalid/TorrentDay_NoPubDate.xml");
+
+            Subject.FetchRecent().Should().BeEmpty();
+
+            Mocker.GetMock<IIndexerStatusService>()
+                  .Verify(v => v.RecordFailure(It.IsAny<int>(), TimeSpan.Zero), Times.Once());
+
+            ExceptionVerification.ExpectedErrors(1);
+        }
     }
 }

src/NzbDrone.Core.Test/IndexerTests/TorrentRssIndexerTests/TorrentRssSettingsDetectorFixture.cs

@@ -254,13 +254,11 @@ namespace NzbDrone.Core.Test.IndexerTests.TorrentRssIndexerTests
         }
 
         [TestCase("BitMeTv/BitMeTv.xml")]
-        [TestCase("Fanzub/fanzub.xml")]
         [TestCase("IPTorrents/IPTorrents.xml")]
-        [TestCase("Newznab/newznab_nzb_su.xml")]
         [TestCase("Nyaa/Nyaa.xml")]
-        [TestCase("Omgwtfnzbs/Omgwtfnzbs.xml")]
         [TestCase("Torznab/torznab_hdaccess_net.xml")]
         [TestCase("Torznab/torznab_tpb.xml")]
+        [TestCase("Torznab/torznab_animetosho.xml")]
         public void should_detect_recent_feed(string rssXmlFile)
         {
             GivenRecentFeedResponse(rssXmlFile);
@@ -287,9 +285,7 @@ namespace NzbDrone.Core.Test.IndexerTests.TorrentRssIndexerTests
 
             var ex = Assert.Throws<UnsupportedFeedException>(() => Subject.Detect(_indexerSettings));
 
-            ex.Message.Should().Contain("Empty feed");
-
-            ExceptionVerification.ExpectedErrors(1);
+            ex.Message.Should().Contain("Rss feed must have a pubDate");
         }
 
         [TestCase("Torrentleech/Torrentleech.xml")]

src/NzbDrone.Core.Test/IndexerTests/TorznabTests/TorznabFixture.cs

@@ -25,7 +25,7 @@ namespace NzbDrone.Core.Test.IndexerTests.TorznabTests
                     Name = "Torznab",
                     Settings = new TorznabSettings()
                         {
-                            Url = "http://indexer.local/",
+                            BaseUrl = "http://indexer.local/",
                             Categories = new int[] { 1 }
                         }
                 };
@@ -44,7 +44,7 @@ namespace NzbDrone.Core.Test.IndexerTests.TorznabTests
             Mocker.GetMock<IHttpClient>()
                 .Setup(o => o.Execute(It.Is<HttpRequest>(v => v.Method == HttpMethod.GET)))
                 .Returns<HttpRequest>(r => new HttpResponse(r, new HttpHeader(), recentFeed));
-            
+
             var releases = Subject.FetchRecent();
 
             releases.Should().HaveCount(5);
@@ -97,6 +97,37 @@ namespace NzbDrone.Core.Test.IndexerTests.TorznabTests
             releaseInfo.Peers.Should().Be(36724);
         }
 
+        [Test]
+        public void should_parse_recent_feed_from_torznab_animetosho()
+        {
+            var recentFeed = ReadAllText(@"Files/Indexers/Torznab/torznab_animetosho.xml");
+
+            Mocker.GetMock<IHttpClient>()
+                .Setup(o => o.Execute(It.Is<HttpRequest>(v => v.Method == HttpMethod.GET)))
+                .Returns<HttpRequest>(r => new HttpResponse(r, new HttpHeader(), recentFeed));
+
+            var releases = Subject.FetchRecent();
+
+            releases.Should().HaveCount(2);
+
+            releases.First().Should().BeOfType<TorrentInfo>();
+            var releaseInfo = releases.First() as TorrentInfo;
+
+            releaseInfo.Title.Should().Be("[finFAGs]_Frame_Arms_Girl_07_(1280x720_TV_AAC)_[1262B6F7].mkv");
+            releaseInfo.DownloadProtocol.Should().Be(DownloadProtocol.Torrent);
+            releaseInfo.DownloadUrl.Should().Be("http://storage.localhost/torrents/123451.torrent");
+            releaseInfo.InfoUrl.Should().Be("https://localhost/view/finfags-_frame_arms_girl_07_-1280x720_tv_aac-_-1262b6f7-mkv.123451");
+            releaseInfo.CommentUrl.Should().Be("https://localhost/view/finfags-_frame_arms_girl_07_-1280x720_tv_aac-_-1262b6f7-mkv.123451");
+            releaseInfo.Indexer.Should().Be(Subject.Definition.Name);
+            releaseInfo.PublishDate.Should().Be(DateTime.Parse("Wed, 17 May 2017 20:36:06 +0000").ToUniversalTime());
+            releaseInfo.Size.Should().Be(316477946);
+            releaseInfo.TvdbId.Should().Be(0);
+            releaseInfo.TvRageId.Should().Be(0);
+            releaseInfo.InfoHash.Should().Be("2d69a861bef5a9f2cdf791b7328e37b7953205e1");
+            releaseInfo.Seeders.Should().BeNull();
+            releaseInfo.Peers.Should().BeNull();
+        }
+
         [Test]
         public void should_use_pagesize_reported_by_caps()
         {

src/NzbDrone.Core.Test/MediaFiles/DownloadedEpisodesImportServiceFixture.cs

@@ -1,10 +1,13 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using FizzWare.NBuilder;
+using FluentAssertions;
 using Moq;
 using NUnit.Framework;
 using NzbDrone.Common.Disk;
+using NzbDrone.Core.Download;
+using NzbDrone.Core.Download.TrackedDownloads;
 using NzbDrone.Core.MediaFiles;
 using NzbDrone.Core.MediaFiles.EpisodeImport;
 using NzbDrone.Core.Parser;
@@ -13,7 +16,6 @@ using NzbDrone.Core.Qualities;
 using NzbDrone.Core.Test.Framework;
 using NzbDrone.Core.Tv;
 using NzbDrone.Test.Common;
-using FluentAssertions;
 
 namespace NzbDrone.Core.Test.MediaFiles
 {
@@ -24,12 +26,17 @@ namespace NzbDrone.Core.Test.MediaFiles
         private string[] _subFolders = new[] { "c:\\root\\foldername".AsOsAgnostic() };
         private string[] _videoFiles = new[] { "c:\\root\\foldername\\30.rock.s01e01.ext".AsOsAgnostic() };
 
+        private TrackedDownload _trackedDownload;
+
         [SetUp]
         public void Setup()
         {
             Mocker.GetMock<IDiskScanService>().Setup(c => c.GetVideoFiles(It.IsAny<string>(), It.IsAny<bool>()))
                   .Returns(_videoFiles);
 
+            Mocker.GetMock<IDiskScanService>().Setup(c => c.FilterFiles(It.IsAny<string>(), It.IsAny<IEnumerable<string>>()))
+                  .Returns<string, IEnumerable<string>>((b,s) => s.ToList());
+
             Mocker.GetMock<IDiskProvider>().Setup(c => c.GetDirectories(It.IsAny<string>()))
                   .Returns(_subFolders);
 
@@ -39,6 +46,23 @@ namespace NzbDrone.Core.Test.MediaFiles
             Mocker.GetMock<IImportApprovedEpisodes>()
                   .Setup(s => s.Import(It.IsAny<List<ImportDecision>>(), true, null, ImportMode.Auto))
                   .Returns(new List<ImportResult>());
+
+
+            var downloadItem = Builder<DownloadClientItem>.CreateNew()
+                .With(v => v.DownloadId = "sab1")
+                .With(v => v.Status = DownloadItemStatus.Downloading)
+                .Build();
+
+            var remoteEpisode = Builder<RemoteEpisode>.CreateNew()
+                .With(v => v.Series = new Series())
+                .Build();
+
+            _trackedDownload = new TrackedDownload
+            {
+                DownloadItem = downloadItem,
+                RemoteEpisode = remoteEpisode,
+                State = TrackedDownloadStage.Downloading
+            };
         }
 
         private void GivenValidSeries()
@@ -48,6 +72,29 @@ namespace NzbDrone.Core.Test.MediaFiles
                   .Returns(Builder<Series>.CreateNew().Build());
         }
 
+        private void GivenSuccessfulImport()
+        {
+            var localEpisode = new LocalEpisode();
+
+            var imported = new List<ImportDecision>();
+            imported.Add(new ImportDecision(localEpisode));
+
+            Mocker.GetMock<IMakeImportDecision>()
+                  .Setup(s => s.GetImportDecisions(It.IsAny<List<string>>(), It.IsAny<Series>(), It.IsAny<DownloadClientItem>(), null, true))
+                  .Returns(imported);
+
+            Mocker.GetMock<IImportApprovedEpisodes>()
+                  .Setup(s => s.Import(It.IsAny<List<ImportDecision>>(), It.IsAny<bool>(), It.IsAny<DownloadClientItem>(), It.IsAny<ImportMode>()))
+                  .Returns(imported.Select(i => new ImportResult(i)).ToList())
+                  .Callback(() => WasImportedResponse());
+        }
+
+        private void WasImportedResponse()
+        {
+            Mocker.GetMock<IDiskScanService>().Setup(c => c.GetVideoFiles(It.IsAny<string>(), It.IsAny<bool>()))
+                  .Returns(new string[0]);
+        }
+
         [Test]
         public void should_search_for_series_using_folder_name()
         {
@@ -77,7 +124,7 @@ namespace NzbDrone.Core.Test.MediaFiles
             Subject.ProcessRootFolder(new DirectoryInfo(_droneFactory));
 
             Mocker.GetMock<IMakeImportDecision>()
-                .Verify(c => c.GetImportDecisions(It.IsAny<List<string>>(), It.IsAny<Series>(), It.IsAny<ParsedEpisodeInfo>(), It.IsAny<bool>()),
+                .Verify(c => c.GetImportDecisions(It.IsAny<List<string>>(), It.IsAny<Series>(), It.IsAny<DownloadClientItem>(), It.IsAny<ParsedEpisodeInfo>(), It.IsAny<bool>()),
                     Times.Never());
 
             VerifyNoImport();
@@ -128,7 +175,7 @@ namespace NzbDrone.Core.Test.MediaFiles
             imported.Add(new ImportDecision(localEpisode));
 
             Mocker.GetMock<IMakeImportDecision>()
-                  .Setup(s => s.GetImportDecisions(It.IsAny<List<string>>(), It.IsAny<Series>(), null, true))
+                  .Setup(s => s.GetImportDecisions(It.IsAny<List<string>>(), It.IsAny<Series>(), It.IsAny<DownloadClientItem>(), null, true))
                   .Returns(imported);
 
             Mocker.GetMock<IImportApprovedEpisodes>()
@@ -154,7 +201,7 @@ namespace NzbDrone.Core.Test.MediaFiles
             imported.Add(new ImportDecision(localEpisode));
 
             Mocker.GetMock<IMakeImportDecision>()
-                  .Setup(s => s.GetImportDecisions(It.IsAny<List<string>>(), It.IsAny<Series>(), null, true))
+                  .Setup(s => s.GetImportDecisions(It.IsAny<List<string>>(), It.IsAny<Series>(), It.IsAny<DownloadClientItem>(), null, true))
                   .Returns(imported);
 
             Mocker.GetMock<IImportApprovedEpisodes>()
@@ -163,11 +210,9 @@ namespace NzbDrone.Core.Test.MediaFiles
 
             Mocker.GetMock<IDetectSample>()
                   .Setup(s => s.IsSample(It.IsAny<Series>(),
-                      It.IsAny<QualityModel>(),
                       It.IsAny<string>(),
-                      It.IsAny<long>(),
                       It.IsAny<bool>()))
-                  .Returns(true);
+                  .Returns(DetectSampleResult.Sample);
 
             Subject.ProcessRootFolder(new DirectoryInfo(_droneFactory));
 
@@ -226,7 +271,7 @@ namespace NzbDrone.Core.Test.MediaFiles
             imported.Add(new ImportDecision(localEpisode));
 
             Mocker.GetMock<IMakeImportDecision>()
-                  .Setup(s => s.GetImportDecisions(It.IsAny<List<string>>(), It.IsAny<Series>(), null, true))
+                  .Setup(s => s.GetImportDecisions(It.IsAny<List<string>>(), It.IsAny<Series>(), It.IsAny<DownloadClientItem>(), null, true))
                   .Returns(imported);
 
             Mocker.GetMock<IImportApprovedEpisodes>()
@@ -235,11 +280,9 @@ namespace NzbDrone.Core.Test.MediaFiles
 
             Mocker.GetMock<IDetectSample>()
                   .Setup(s => s.IsSample(It.IsAny<Series>(),
-                      It.IsAny<QualityModel>(),
                       It.IsAny<string>(),
-                      It.IsAny<long>(),
                       It.IsAny<bool>()))
-                  .Returns(true);
+                  .Returns(DetectSampleResult.Sample);
 
             Mocker.GetMock<IDiskProvider>()
                   .Setup(s => s.GetFiles(It.IsAny<string>(), SearchOption.AllDirectories))
@@ -280,7 +323,7 @@ namespace NzbDrone.Core.Test.MediaFiles
             Subject.ProcessPath(fileName);
 
             Mocker.GetMock<IMakeImportDecision>()
-                  .Verify(s => s.GetImportDecisions(It.IsAny<List<string>>(), It.IsAny<Series>(), It.Is<ParsedEpisodeInfo>(v => v.AbsoluteEpisodeNumbers.First() == 9), true), Times.Once());
+                  .Verify(s => s.GetImportDecisions(It.IsAny<List<string>>(), It.IsAny<Series>(), It.IsAny<DownloadClientItem>(), It.Is<ParsedEpisodeInfo>(v => v.AbsoluteEpisodeNumbers.First() == 9), true), Times.Once());
         }
 
         [Test]
@@ -304,7 +347,7 @@ namespace NzbDrone.Core.Test.MediaFiles
             var result = Subject.ProcessPath(fileName);
 
             Mocker.GetMock<IMakeImportDecision>()
-                  .Verify(s => s.GetImportDecisions(It.IsAny<List<string>>(), It.IsAny<Series>(), null, true), Times.Once());
+                  .Verify(s => s.GetImportDecisions(It.IsAny<List<string>>(), It.IsAny<Series>(), It.IsAny<DownloadClientItem>(), null, true), Times.Once());
         }
 
         [Test]
@@ -337,7 +380,7 @@ namespace NzbDrone.Core.Test.MediaFiles
             imported.Add(new ImportDecision(localEpisode));
 
             Mocker.GetMock<IMakeImportDecision>()
-                  .Setup(s => s.GetImportDecisions(It.IsAny<List<string>>(), It.IsAny<Series>(), null, true))
+                  .Setup(s => s.GetImportDecisions(It.IsAny<List<string>>(), It.IsAny<Series>(), It.IsAny<DownloadClientItem>(), null, true))
                   .Returns(imported);
 
             Mocker.GetMock<IImportApprovedEpisodes>()
@@ -346,11 +389,9 @@ namespace NzbDrone.Core.Test.MediaFiles
 
             Mocker.GetMock<IDetectSample>()
                   .Setup(s => s.IsSample(It.IsAny<Series>(),
-                      It.IsAny<QualityModel>(),
                       It.IsAny<string>(),
-                      It.IsAny<long>(),
                       It.IsAny<bool>()))
-                  .Returns(true);
+                  .Returns(DetectSampleResult.Sample);
 
             Mocker.GetMock<IDiskProvider>()
                   .Setup(s => s.GetFileSize(It.IsAny<string>()))
@@ -362,6 +403,51 @@ namespace NzbDrone.Core.Test.MediaFiles
                   .Verify(v => v.DeleteFolder(It.IsAny<string>(), true), Times.Never());
         }
 
+        [Test]
+        public void should_not_delete_folder_after_import()
+        {
+            GivenValidSeries();
+
+            GivenSuccessfulImport();
+
+            _trackedDownload.DownloadItem.CanMoveFiles = false;
+
+            Subject.ProcessPath(_droneFactory, ImportMode.Auto, _trackedDownload.RemoteEpisode.Series, _trackedDownload.DownloadItem);
+
+            Mocker.GetMock<IDiskProvider>()
+                  .Verify(v => v.DeleteFolder(It.IsAny<string>(), true), Times.Never());
+        }
+
+        [Test]
+        public void should_delete_folder_if_importmode_move()
+        {
+            GivenValidSeries();
+
+            GivenSuccessfulImport();
+
+            _trackedDownload.DownloadItem.CanMoveFiles = false;
+
+            Subject.ProcessPath(_droneFactory, ImportMode.Move, _trackedDownload.RemoteEpisode.Series, _trackedDownload.DownloadItem);
+
+            Mocker.GetMock<IDiskProvider>()
+                  .Verify(v => v.DeleteFolder(It.IsAny<string>(), true), Times.Once());
+        }
+
+        [Test]
+        public void should_not_delete_folder_if_importmode_copy()
+        {
+            GivenValidSeries();
+
+            GivenSuccessfulImport();
+
+            _trackedDownload.DownloadItem.CanMoveFiles = true;
+
+            Subject.ProcessPath(_droneFactory, ImportMode.Copy, _trackedDownload.RemoteEpisode.Series, _trackedDownload.DownloadItem);
+
+            Mocker.GetMock<IDiskProvider>()
+                  .Verify(v => v.DeleteFolder(It.IsAny<string>(), true), Times.Never());
+        }
+
         private void VerifyNoImport()
         {
             Mocker.GetMock<IImportApprovedEpisodes>().Verify(c => c.Import(It.IsAny<List<ImportDecision>>(), true, null, ImportMode.Auto),

src/NzbDrone.Core.Test/MediaFiles/EpisodeImport/DetectSampleFixture.cs

@@ -10,11 +10,12 @@ using NzbDrone.Core.Parser.Model;
 using NzbDrone.Core.Qualities;
 using NzbDrone.Core.Test.Framework;
 using NzbDrone.Core.Tv;
+using NzbDrone.Test.Common;
 
 namespace NzbDrone.Core.Test.MediaFiles.EpisodeImport
 {
     [TestFixture]
-    public class SampleServiceFixture : CoreTest<DetectSample>
+    public class DetectSampleFixture : CoreTest<DetectSample>
     {
         private Series _series;
         private LocalEpisode _localEpisode;
@@ -42,11 +43,6 @@ namespace NzbDrone.Core.Test.MediaFiles.EpisodeImport
                                 };
         }
 
-        private void GivenFileSize(long size)
-        {
-            _localEpisode.Size = size;
-        }
-
         private void GivenRuntime(int seconds)
         {
             Mocker.GetMock<IVideoFileInfoReader>()
@@ -58,7 +54,7 @@ namespace NzbDrone.Core.Test.MediaFiles.EpisodeImport
         public void should_return_false_if_season_zero()
         {
             _localEpisode.Episodes[0].SeasonNumber = 0;
-            ShouldBeFalse();
+            ShouldBeNotSample();
         }
 
         [Test]
@@ -66,7 +62,7 @@ namespace NzbDrone.Core.Test.MediaFiles.EpisodeImport
         {
             _localEpisode.Path = @"C:\Test\some.show.s01e01.flv";
 
-            ShouldBeFalse();
+            ShouldBeNotSample();
 
             Mocker.GetMock<IVideoFileInfoReader>().Verify(c => c.GetRunTime(It.IsAny<string>()), Times.Never());
         }
@@ -76,7 +72,7 @@ namespace NzbDrone.Core.Test.MediaFiles.EpisodeImport
         {
             _localEpisode.Path = @"C:\Test\some.show.s01e01.strm";
 
-            ShouldBeFalse();
+            ShouldBeNotSample();
 
             Mocker.GetMock<IVideoFileInfoReader>().Verify(c => c.GetRunTime(It.IsAny<string>()), Times.Never());
         }
@@ -85,12 +81,9 @@ namespace NzbDrone.Core.Test.MediaFiles.EpisodeImport
         public void should_use_runtime()
         {
             GivenRuntime(120);
-            GivenFileSize(1000.Megabytes());
 
             Subject.IsSample(_localEpisode.Series,
-                             _localEpisode.Quality,
                              _localEpisode.Path,
-                             _localEpisode.Size,
                              _localEpisode.IsSpecial);
 
             Mocker.GetMock<IVideoFileInfoReader>().Verify(v => v.GetRunTime(It.IsAny<string>()), Times.Once());
@@ -101,7 +94,7 @@ namespace NzbDrone.Core.Test.MediaFiles.EpisodeImport
         {
             GivenRuntime(60);
 
-            ShouldBeTrue();
+            ShouldBeSample();
         }
 
         [Test]
@@ -109,7 +102,7 @@ namespace NzbDrone.Core.Test.MediaFiles.EpisodeImport
         {
             GivenRuntime(600);
 
-            ShouldBeFalse();
+            ShouldBeNotSample();
         }
 
         [Test]
@@ -118,29 +111,39 @@ namespace NzbDrone.Core.Test.MediaFiles.EpisodeImport
             _series.Runtime = 6;
             GivenRuntime(299);
 
-            ShouldBeFalse();
+            ShouldBeNotSample();
         }
 
         [Test]
-        public void should_fall_back_to_file_size_if_mediainfo_dll_not_found_acceptable_size()
+        public void should_return_false_if_runtime_greater_than_anime_short_minimum()
         {
-            Mocker.GetMock<IVideoFileInfoReader>()
-                  .Setup(s => s.GetRunTime(It.IsAny<string>()))
-                  .Throws<DllNotFoundException>();
+            _series.Runtime = 2;
+            GivenRuntime(60);
 
-            GivenFileSize(1000.Megabytes());
-            ShouldBeFalse();
+            ShouldBeNotSample();
         }
 
         [Test]
-        public void should_fall_back_to_file_size_if_mediainfo_dll_not_found_undersize()
+        public void should_return_true_if_runtime_less_than_anime_short_minimum()
+        {
+            _series.Runtime = 2;
+            GivenRuntime(10);
+
+            ShouldBeSample();
+        }
+
+        [Test]
+        public void should_return_indeterminate_if_mediainfo_result_is_null()
         {
             Mocker.GetMock<IVideoFileInfoReader>()
                   .Setup(s => s.GetRunTime(It.IsAny<string>()))
-                  .Throws<DllNotFoundException>();
+                  .Returns((TimeSpan?)null);
 
-            GivenFileSize(1.Megabytes());
-            ShouldBeTrue();
+            Subject.IsSample(_localEpisode.Series,
+                             _localEpisode.Path,
+                             _localEpisode.IsSpecial).Should().Be(DetectSampleResult.Indeterminate);
+
+            ExceptionVerification.ExpectedErrors(1);
         }
 
         [Test]
@@ -149,7 +152,7 @@ namespace NzbDrone.Core.Test.MediaFiles.EpisodeImport
             GivenRuntime(600);
             _series.SeriesType = SeriesTypes.Daily;
             _localEpisode.Episodes[0].SeasonNumber = 0;
-            ShouldBeFalse();
+            ShouldBeNotSample();
         }
 
         [Test]
@@ -158,25 +161,21 @@ namespace NzbDrone.Core.Test.MediaFiles.EpisodeImport
             _series.SeriesType = SeriesTypes.Anime;
             _localEpisode.Episodes[0].SeasonNumber = 0;
 
-            ShouldBeFalse();
+            ShouldBeNotSample();
         }
 
-        private void ShouldBeTrue()
+        private void ShouldBeSample()
         {
             Subject.IsSample(_localEpisode.Series,
-                                         _localEpisode.Quality,
-                                         _localEpisode.Path,
-                                         _localEpisode.Size,
-                                         _localEpisode.IsSpecial).Should().BeTrue();
-        }
-
-        private void ShouldBeFalse()
-        {
-            Subject.IsSample(_localEpisode.Series,
-                             _localEpisode.Quality,
                              _localEpisode.Path,
-                             _localEpisode.Size,
-                             _localEpisode.IsSpecial).Should().BeFalse();
+                             _localEpisode.IsSpecial).Should().Be(DetectSampleResult.Sample);
+        }
+
+        private void ShouldBeNotSample()
+        {
+            Subject.IsSample(_localEpisode.Series,
+                             _localEpisode.Path,
+                             _localEpisode.IsSpecial).Should().Be(DetectSampleResult.NotSample);
         }
     }
 }

src/NzbDrone.Core.Test/MediaFiles/EpisodeImport/ImportDecisionMakerFixture.cs

@@ -14,6 +14,7 @@ using NzbDrone.Core.Test.Framework;
 using NzbDrone.Core.Tv;
 using NzbDrone.Test.Common;
 using FizzWare.NBuilder;
+using NzbDrone.Core.Download;
 
 namespace NzbDrone.Core.Test.MediaFiles.EpisodeImport
 {
@@ -44,13 +45,13 @@ namespace NzbDrone.Core.Test.MediaFiles.EpisodeImport
             _fail2 = new Mock<IImportDecisionEngineSpecification>();
             _fail3 = new Mock<IImportDecisionEngineSpecification>();
 
-            _pass1.Setup(c => c.IsSatisfiedBy(It.IsAny<LocalEpisode>())).Returns(Decision.Accept());
-            _pass2.Setup(c => c.IsSatisfiedBy(It.IsAny<LocalEpisode>())).Returns(Decision.Accept());
-            _pass3.Setup(c => c.IsSatisfiedBy(It.IsAny<LocalEpisode>())).Returns(Decision.Accept());
+            _pass1.Setup(c => c.IsSatisfiedBy(It.IsAny<LocalEpisode>(), It.IsAny<DownloadClientItem>())).Returns(Decision.Accept());
+            _pass2.Setup(c => c.IsSatisfiedBy(It.IsAny<LocalEpisode>(), It.IsAny<DownloadClientItem>())).Returns(Decision.Accept());
+            _pass3.Setup(c => c.IsSatisfiedBy(It.IsAny<LocalEpisode>(), It.IsAny<DownloadClientItem>())).Returns(Decision.Accept());
 
-            _fail1.Setup(c => c.IsSatisfiedBy(It.IsAny<LocalEpisode>())).Returns(Decision.Reject("_fail1"));
-            _fail2.Setup(c => c.IsSatisfiedBy(It.IsAny<LocalEpisode>())).Returns(Decision.Reject("_fail2"));
-            _fail3.Setup(c => c.IsSatisfiedBy(It.IsAny<LocalEpisode>())).Returns(Decision.Reject("_fail3"));
+            _fail1.Setup(c => c.IsSatisfiedBy(It.IsAny<LocalEpisode>(), It.IsAny<DownloadClientItem>())).Returns(Decision.Reject("_fail1"));
+            _fail2.Setup(c => c.IsSatisfiedBy(It.IsAny<LocalEpisode>(), It.IsAny<DownloadClientItem>())).Returns(Decision.Reject("_fail2"));
+            _fail3.Setup(c => c.IsSatisfiedBy(It.IsAny<LocalEpisode>(), It.IsAny<DownloadClientItem>())).Returns(Decision.Reject("_fail3"));
 
             _series = Builder<Series>.CreateNew()
                                      .With(e => e.Profile = new Profile { Items = Qualities.QualityFixture.GetDefaultQualities() })
@@ -90,16 +91,17 @@ namespace NzbDrone.Core.Test.MediaFiles.EpisodeImport
         [Test]
         public void should_call_all_specifications()
         {
+            var downloadClientItem = Builder<DownloadClientItem>.CreateNew().Build();
             GivenSpecifications(_pass1, _pass2, _pass3, _fail1, _fail2, _fail3);
 
-            Subject.GetImportDecisions(_videoFiles, new Series(), null, false);
+            Subject.GetImportDecisions(_videoFiles, new Series(), downloadClientItem, null, false);
 
-            _fail1.Verify(c => c.IsSatisfiedBy(_localEpisode), Times.Once());
-            _fail2.Verify(c => c.IsSatisfiedBy(_localEpisode), Times.Once());
-            _fail3.Verify(c => c.IsSatisfiedBy(_localEpisode), Times.Once());
-            _pass1.Verify(c => c.IsSatisfiedBy(_localEpisode), Times.Once());
-            _pass2.Verify(c => c.IsSatisfiedBy(_localEpisode), Times.Once());
-            _pass3.Verify(c => c.IsSatisfiedBy(_localEpisode), Times.Once());
+            _fail1.Verify(c => c.IsSatisfiedBy(_localEpisode, downloadClientItem), Times.Once());
+            _fail2.Verify(c => c.IsSatisfiedBy(_localEpisode, downloadClientItem), Times.Once());
+            _fail3.Verify(c => c.IsSatisfiedBy(_localEpisode, downloadClientItem), Times.Once());
+            _pass1.Verify(c => c.IsSatisfiedBy(_localEpisode, downloadClientItem), Times.Once());
+            _pass2.Verify(c => c.IsSatisfiedBy(_localEpisode, downloadClientItem), Times.Once());
+            _pass3.Verify(c => c.IsSatisfiedBy(_localEpisode, downloadClientItem), Times.Once());
         }
 
         [Test]
@@ -184,7 +186,7 @@ namespace NzbDrone.Core.Test.MediaFiles.EpisodeImport
             GivenSpecifications(_pass1, _pass2, _pass3);
             var expectedQuality = QualityParser.ParseQuality(_videoFiles.Single());
 
-            var result = Subject.GetImportDecisions(_videoFiles, _series, new ParsedEpisodeInfo{Quality = new QualityModel(Quality.SDTV)}, true);
+            var result = Subject.GetImportDecisions(_videoFiles, _series, null, new ParsedEpisodeInfo{Quality = new QualityModel(Quality.SDTV)}, true);
 
             result.Single().LocalEpisode.Quality.Should().Be(expectedQuality);
         }
@@ -201,7 +203,7 @@ namespace NzbDrone.Core.Test.MediaFiles.EpisodeImport
 
             var expectedQuality = new QualityModel(Quality.SDTV);
 
-            var result = Subject.GetImportDecisions(_videoFiles, _series, new ParsedEpisodeInfo { Quality = expectedQuality }, true);
+            var result = Subject.GetImportDecisions(_videoFiles, _series, null, new ParsedEpisodeInfo { Quality = expectedQuality }, true);
 
             result.Single().LocalEpisode.Quality.Should().Be(expectedQuality);
         }
@@ -217,7 +219,7 @@ namespace NzbDrone.Core.Test.MediaFiles.EpisodeImport
 
             var expectedQuality = new QualityModel(Quality.Bluray720p);
 
-            var result = Subject.GetImportDecisions(_videoFiles, _series, new ParsedEpisodeInfo { Quality = expectedQuality }, true);
+            var result = Subject.GetImportDecisions(_videoFiles, _series, null, new ParsedEpisodeInfo { Quality = expectedQuality }, true);
 
             result.Single().LocalEpisode.Quality.Should().Be(expectedQuality);
         }
@@ -264,7 +266,7 @@ namespace NzbDrone.Core.Test.MediaFiles.EpisodeImport
 
             var folderInfo = Parser.Parser.ParseTitle("Series.Title.S01");
 
-            Subject.GetImportDecisions(_videoFiles, _series, folderInfo, true);
+            Subject.GetImportDecisions(_videoFiles, _series, null, folderInfo, true);
 
             Mocker.GetMock<IParsingService>()
                   .Verify(c => c.GetLocalEpisode(It.IsAny<string>(), It.IsAny<Series>(), null, true), Times.Exactly(3));
@@ -287,7 +289,7 @@ namespace NzbDrone.Core.Test.MediaFiles.EpisodeImport
 
             var folderInfo = Parser.Parser.ParseTitle("Series.Title.S01E01");
 
-            Subject.GetImportDecisions(_videoFiles, _series, folderInfo, true);
+            Subject.GetImportDecisions(_videoFiles, _series, null, folderInfo, true);
 
             Mocker.GetMock<IParsingService>()
                   .Verify(c => c.GetLocalEpisode(It.IsAny<string>(), It.IsAny<Series>(), null, true), Times.Exactly(2));
@@ -309,7 +311,7 @@ namespace NzbDrone.Core.Test.MediaFiles.EpisodeImport
 
             var folderInfo = Parser.Parser.ParseTitle("Series.Title.S01E01");
 
-            Subject.GetImportDecisions(_videoFiles, _series, folderInfo, true);
+            Subject.GetImportDecisions(_videoFiles, _series, null, folderInfo, true);
 
             Mocker.GetMock<IParsingService>()
                   .Verify(c => c.GetLocalEpisode(It.IsAny<string>(), It.IsAny<Series>(), It.IsAny<ParsedEpisodeInfo>(), true), Times.Exactly(1));
@@ -331,12 +333,20 @@ namespace NzbDrone.Core.Test.MediaFiles.EpisodeImport
             GivenVideoFiles(videoFiles.ToList());
 
             Mocker.GetMock<IDetectSample>()
-                  .Setup(s => s.IsSample(_series, It.IsAny<QualityModel>(), It.Is<string>(c => c.Contains("sample")), It.IsAny<long>(), It.IsAny<bool>()))
-                  .Returns(true);
+                  .Setup(s => s.IsSample(_series, It.IsAny<string>(), It.IsAny<bool>()))
+                  .Returns((Series s, string path, bool special) =>
+                  {
+                      if (path.Contains("sample"))
+                      {
+                          return DetectSampleResult.Sample;
+                      }
+
+                      return DetectSampleResult.NotSample;
+                  });
 
             var folderInfo = Parser.Parser.ParseTitle("Series.Title.S01E01");
 
-            Subject.GetImportDecisions(_videoFiles, _series, folderInfo, true);
+            Subject.GetImportDecisions(_videoFiles, _series, null, folderInfo, true);
 
             Mocker.GetMock<IParsingService>()
                   .Verify(c => c.GetLocalEpisode(It.IsAny<string>(), It.IsAny<Series>(), It.IsAny<ParsedEpisodeInfo>(), true), Times.Exactly(2));
@@ -358,7 +368,7 @@ namespace NzbDrone.Core.Test.MediaFiles.EpisodeImport
 
             var folderInfo = Parser.Parser.ParseTitle("Series.Title.S01E01.720p.HDTV-LOL");
 
-            Subject.GetImportDecisions(_videoFiles, _series, folderInfo, true);
+            Subject.GetImportDecisions(_videoFiles, _series, null, folderInfo, true);
 
             Mocker.GetMock<IParsingService>()
                   .Verify(c => c.GetLocalEpisode(It.IsAny<string>(), It.IsAny<Series>(), null, true), Times.Exactly(1));
@@ -380,7 +390,7 @@ namespace NzbDrone.Core.Test.MediaFiles.EpisodeImport
 
             var folderQuality = new QualityModel(Quality.Unknown);
 
-            var result = Subject.GetImportDecisions(_videoFiles, _series, new ParsedEpisodeInfo { Quality = folderQuality}, true);
+            var result = Subject.GetImportDecisions(_videoFiles, _series, null, new ParsedEpisodeInfo { Quality = folderQuality}, true);
 
             result.Single().LocalEpisode.Quality.Should().Be(_quality);
         }

src/NzbDrone.Core.Test/MediaFiles/EpisodeImport/Specifications/FreeSpaceSpecificationFixture.cs

@@ -63,7 +63,7 @@ namespace NzbDrone.Core.Test.MediaFiles.EpisodeImport.Specifications
             GivenFileSize(100.Megabytes());
             GivenFreeSpace(80.Megabytes());
 
-            Subject.IsSatisfiedBy(_localEpisode).Accepted.Should().BeFalse();
+            Subject.IsSatisfiedBy(_localEpisode, null).Accepted.Should().BeFalse();
             ExceptionVerification.ExpectedWarns(1);
         }
 
@@ -73,7 +73,7 @@ namespace NzbDrone.Core.Test.MediaFiles.EpisodeImport.Specifications
             GivenFileSize(100.Megabytes());
             GivenFreeSpace(150.Megabytes());
 
-            Subject.IsSatisfiedBy(_localEpisode).Accepted.Should().BeFalse();
+            Subject.IsSatisfiedBy(_localEpisode, null).Accepted.Should().BeFalse();
             ExceptionVerification.ExpectedWarns(1);
         }
 
@@ -83,7 +83,7 @@ namespace NzbDrone.Core.Test.MediaFiles.EpisodeImport.Specifications
             GivenFileSize(100.Megabytes());
             GivenFreeSpace(1.Gigabytes());
 
-            Subject.IsSatisfiedBy(_localEpisode).Accepted.Should().BeTrue();
+            Subject.IsSatisfiedBy(_localEpisode, null).Accepted.Should().BeTrue();
         }
 
         [Test]
@@ -92,7 +92,7 @@ namespace NzbDrone.Core.Test.MediaFiles.EpisodeImport.Specifications
             GivenFileSize(100.Megabytes());
             GivenFreeSpace(1.Gigabytes());
 
-            Subject.IsSatisfiedBy(_localEpisode).Accepted.Should().BeTrue();
+            Subject.IsSatisfiedBy(_localEpisode, null).Accepted.Should().BeTrue();
 
             Mocker.GetMock<IDiskProvider>()
                 .Verify(v => v.GetAvailableSpace(_rootFolder), Times.Once());
@@ -104,7 +104,7 @@ namespace NzbDrone.Core.Test.MediaFiles.EpisodeImport.Specifications
             GivenFileSize(100.Megabytes());
             GivenFreeSpace(null);
 
-            Subject.IsSatisfiedBy(_localEpisode).Accepted.Should().BeTrue();
+            Subject.IsSatisfiedBy(_localEpisode, null).Accepted.Should().BeTrue();
         }
 
         [Test]
@@ -116,7 +116,7 @@ namespace NzbDrone.Core.Test.MediaFiles.EpisodeImport.Specifications
                   .Setup(s => s.GetAvailableSpace(It.IsAny<string>()))
                   .Throws(new TestException());
 
-            Subject.IsSatisfiedBy(_localEpisode).Accepted.Should().BeTrue();
+            Subject.IsSatisfiedBy(_localEpisode, null).Accepted.Should().BeTrue();
             ExceptionVerification.ExpectedErrors(1);
         }
 
@@ -125,7 +125,7 @@ namespace NzbDrone.Core.Test.MediaFiles.EpisodeImport.Specifications
         {
             _localEpisode.ExistingFile = true;
 
-            Subject.IsSatisfiedBy(_localEpisode).Accepted.Should().BeTrue();
+            Subject.IsSatisfiedBy(_localEpisode, null).Accepted.Should().BeTrue();
 
             Mocker.GetMock<IDiskProvider>()
                   .Verify(s => s.GetAvailableSpace(It.IsAny<string>()), Times.Never());
@@ -140,7 +140,7 @@ namespace NzbDrone.Core.Test.MediaFiles.EpisodeImport.Specifications
                   .Setup(s => s.GetAvailableSpace(It.IsAny<string>()))
                   .Returns(freeSpace);
 
-            Subject.IsSatisfiedBy(_localEpisode).Accepted.Should().BeTrue();
+            Subject.IsSatisfiedBy(_localEpisode, null).Accepted.Should().BeTrue();
         }
 
         [Test]
@@ -150,7 +150,7 @@ namespace NzbDrone.Core.Test.MediaFiles.EpisodeImport.Specifications
                   .Setup(s => s.SkipFreeSpaceCheckWhenImporting)
                   .Returns(true);
 
-            Subject.IsSatisfiedBy(_localEpisode).Accepted.Should().BeTrue();
+            Subject.IsSatisfiedBy(_localEpisode, null).Accepted.Should().BeTrue();
         }
     }
 }

src/NzbDrone.Core.Test/MediaFiles/EpisodeImport/Specifications/FullSeasonSpecificationFixture.cs

@@ -34,13 +34,13 @@ namespace NzbDrone.Core.Test.MediaFiles.EpisodeImport.Specifications
         {
             _localEpisode.ParsedEpisodeInfo.FullSeason = true;
 
-            Subject.IsSatisfiedBy(_localEpisode).Accepted.Should().BeFalse();
+            Subject.IsSatisfiedBy(_localEpisode, null).Accepted.Should().BeFalse();
         }
 
         [Test]
         public void should_return_true_when_file_does_not_contain_the_full_season()
         {
-            Subject.IsSatisfiedBy(_localEpisode).Accepted.Should().BeTrue();
+            Subject.IsSatisfiedBy(_localEpisode, null).Accepted.Should().BeTrue();
         }
     }
 }

src/NzbDrone.Core.Test/MediaFiles/EpisodeImport/Specifications/GrabbedReleaseQualityFixture.cs

@@ -0,0 +1,123 @@
+using System.Collections.Generic;
+using FizzWare.NBuilder;
+using FluentAssertions;
+using Moq;
+using NUnit.Framework;
+using NzbDrone.Core.Download;
+using NzbDrone.Core.History;
+using NzbDrone.Core.MediaFiles.EpisodeImport.Specifications;
+using NzbDrone.Core.Parser.Model;
+using NzbDrone.Core.Qualities;
+using NzbDrone.Core.Test.Framework;
+
+namespace NzbDrone.Core.Test.MediaFiles.EpisodeImport.Specifications
+{
+    [TestFixture]
+    public class GrabbedReleaseQualityFixture : CoreTest<GrabbedReleaseQualitySpecification>
+    {
+        private LocalEpisode _localEpisode;
+        private DownloadClientItem _downloadClientItem;
+
+        [SetUp]
+        public void Setup()
+        {
+            _localEpisode = Builder<LocalEpisode>.CreateNew()
+                                                 .With(l => l.Quality = new QualityModel(Quality.Bluray720p))
+                                                 .Build();
+
+            _downloadClientItem = Builder<DownloadClientItem>.CreateNew()
+                                                             .Build();
+        }
+
+        private void GivenHistory(List<History.History> history)
+        {
+            Mocker.GetMock<IHistoryService>()
+                  .Setup(s => s.FindByDownloadId(It.IsAny<string>()))
+                  .Returns(history);
+        }
+
+        [Test]
+        public void should_be_accepted_when_downloadClientItem_is_null()
+        {
+            Subject.IsSatisfiedBy(_localEpisode, null).Accepted.Should().BeTrue();
+        }
+
+        [Test]
+        public void should_be_accepted_if_no_history_for_downloadId()
+        {
+            GivenHistory(new List<History.History>());
+
+            Subject.IsSatisfiedBy(_localEpisode, _downloadClientItem).Accepted.Should().BeTrue();
+        }
+
+        [Test]
+        public void should_be_accepted_if_no_grabbed_history_for_downloadId()
+        {
+            var history = Builder<History.History>.CreateListOfSize(1)
+                                                  .All()
+                                                  .With(h => h.EventType = HistoryEventType.Unknown)
+                                                  .BuildList();
+
+            GivenHistory(history);
+
+            Subject.IsSatisfiedBy(_localEpisode, _downloadClientItem).Accepted.Should().BeTrue();
+        }
+
+        [Test]
+        public void should_be_accepted_if_grabbed_history_is_for_a_season_pack()
+        {
+            var history = Builder<History.History>.CreateListOfSize(1)
+                                                  .All()
+                                                  .With(h => h.EventType = HistoryEventType.Grabbed)
+                                                  .With(h => h.Quality = _localEpisode.Quality)
+                                                  .With(h => h.SourceTitle = "Series.Title.S01.720p.HDTV.x264-RlsGroup")
+                                                  .BuildList();
+
+            GivenHistory(history);
+
+            Subject.IsSatisfiedBy(_localEpisode, _downloadClientItem).Accepted.Should().BeTrue();
+        }
+
+        [Test]
+        public void should_be_accepted_if_grabbed_history_quality_is_unknown()
+        {
+            var history = Builder<History.History>.CreateListOfSize(1)
+                                                  .All()
+                                                  .With(h => h.EventType = HistoryEventType.Grabbed)
+                                                  .With(h => h.Quality = new QualityModel(Quality.Unknown))
+                                                  .BuildList();
+
+            GivenHistory(history);
+
+            Subject.IsSatisfiedBy(_localEpisode, _downloadClientItem).Accepted.Should().BeTrue();
+        }
+
+        [Test]
+        public void should_be_accepted_if_grabbed_history_quality_matches()
+        {
+            var history = Builder<History.History>.CreateListOfSize(1)
+                                                  .All()
+                                                  .With(h => h.EventType = HistoryEventType.Grabbed)
+                                                  .With(h => h.Quality = _localEpisode.Quality)
+                                                  .BuildList();
+
+            GivenHistory(history);
+
+            Subject.IsSatisfiedBy(_localEpisode, _downloadClientItem).Accepted.Should().BeTrue();
+        }
+
+        [Test]
+        public void should_be_rejected_if_grabbed_history_quality_does_not_match()
+        {
+            var history = Builder<History.History>.CreateListOfSize(1)
+                                                  .All()
+                                                  .With(h => h.EventType = HistoryEventType.Grabbed)
+                                                  .With(h => h.Quality = new QualityModel(Quality.HDTV720p))
+                                                  .BuildList();
+
+            GivenHistory(history);
+
+            Subject.IsSatisfiedBy(_localEpisode, _downloadClientItem).Accepted.Should().BeFalse();
+        }
+    }
+}

src/NzbDrone.Core.Test/MediaFiles/EpisodeImport/Specifications/MatchesFolderSpecificationFixture.cs

@@ -31,7 +31,7 @@ namespace NzbDrone.Core.Test.MediaFiles.EpisodeImport.Specifications
         {
             _localEpisode.ExistingFile = true;
 
-            Subject.IsSatisfiedBy(_localEpisode).Accepted.Should().BeTrue();
+            Subject.IsSatisfiedBy(_localEpisode, null).Accepted.Should().BeTrue();
         }
 
         [Test]
@@ -39,7 +39,7 @@ namespace NzbDrone.Core.Test.MediaFiles.EpisodeImport.Specifications
         {
             _localEpisode.Path = @"C:\Test\Unsorted\Series.Title\S01E01.mkv".AsOsAgnostic();
 
-            Subject.IsSatisfiedBy(_localEpisode).Accepted.Should().BeTrue();
+            Subject.IsSatisfiedBy(_localEpisode, null).Accepted.Should().BeTrue();
         }
 
         [Test]
@@ -47,7 +47,7 @@ namespace NzbDrone.Core.Test.MediaFiles.EpisodeImport.Specifications
         {
             _localEpisode.Path = @"C:\Test\Unsorted\Series.Title.S01\S01E01.mkv".AsOsAgnostic();
 
-            Subject.IsSatisfiedBy(_localEpisode).Accepted.Should().BeTrue();
+            Subject.IsSatisfiedBy(_localEpisode, null).Accepted.Should().BeTrue();
         }
 
         [Test]
@@ -55,7 +55,7 @@ namespace NzbDrone.Core.Test.MediaFiles.EpisodeImport.Specifications
         {
             _localEpisode.ParsedEpisodeInfo.EpisodeNumbers = new[] { 1 };
             _localEpisode.Path = @"C:\Test\Unsorted\Series.Title.S01E01.720p.HDTV-Sonarr\S01E01.mkv".AsOsAgnostic();
-            Subject.IsSatisfiedBy(_localEpisode).Accepted.Should().BeTrue();
+            Subject.IsSatisfiedBy(_localEpisode, null).Accepted.Should().BeTrue();
         }
 
         [Test]
@@ -63,14 +63,14 @@ namespace NzbDrone.Core.Test.MediaFiles.EpisodeImport.Specifications
         {
             _localEpisode.ParsedEpisodeInfo.EpisodeNumbers = new[] { 1 };
             _localEpisode.Path = @"C:\Test\Unsorted\Series.Title.S01E01E02.720p.HDTV-Sonarr\S01E01.mkv".AsOsAgnostic();
-            Subject.IsSatisfiedBy(_localEpisode).Accepted.Should().BeTrue();            
+            Subject.IsSatisfiedBy(_localEpisode, null).Accepted.Should().BeTrue();            
         }
 
         [Test]
         public void should_be_rejected_if_file_and_folder_do_not_have_same_episode()
         {
             _localEpisode.Path = @"C:\Test\Unsorted\Series.Title.S01E01.720p.HDTV-Sonarr\S01E05.mkv".AsOsAgnostic();
-            Subject.IsSatisfiedBy(_localEpisode).Accepted.Should().BeFalse();            
+            Subject.IsSatisfiedBy(_localEpisode, null).Accepted.Should().BeFalse();            
         }
 
         [Test]
@@ -78,7 +78,7 @@ namespace NzbDrone.Core.Test.MediaFiles.EpisodeImport.Specifications
         {
             _localEpisode.ParsedEpisodeInfo.EpisodeNumbers = new[] { 5, 6 };
             _localEpisode.Path = @"C:\Test\Unsorted\Series.Title.S01E01E02.720p.HDTV-Sonarr\S01E05E06.mkv".AsOsAgnostic();
-            Subject.IsSatisfiedBy(_localEpisode).Accepted.Should().BeFalse();
+            Subject.IsSatisfiedBy(_localEpisode, null).Accepted.Should().BeFalse();
         }
     }
 }

src/NzbDrone.Core.Test/MediaFiles/EpisodeImport/Specifications/NotSampleSpecificationFixture.cs

@@ -42,7 +42,7 @@ namespace NzbDrone.Core.Test.MediaFiles.EpisodeImport.Specifications
         public void should_return_true_for_existing_file()
         {
             _localEpisode.ExistingFile = true;
-            Subject.IsSatisfiedBy(_localEpisode).Accepted.Should().BeTrue();
+            Subject.IsSatisfiedBy(_localEpisode, null).Accepted.Should().BeTrue();
         }
     }
 }