Temporary mock data while services isn't updated with new endpoint.

COPYRIGHT.md

@@ -1,11 +0,0 @@
-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

@@ -1,675 +0,0 @@
-### 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', '!**/*.css'])
+  return gulp.src([paths.src.content + '**/*.*', '!**/*.less'])
     .pipe(gulp.dest(paths.dest.content))
     .pipe(livereload());
 });

gulp/less.js

@@ -16,10 +16,6 @@ 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',

setup/build.bat

@@ -1,3 +1,3 @@
-REM SET BUILD_NUMBER=1
-REM SET branch=develop
+#SET BUILD_NUMBER=1
+#SET branch=develop
 inno\ISCC.exe nzbdrone.iss

setup/nzbdrone.iss

@@ -40,11 +40,8 @@ VersionInfoVersion={#BuildNumber}
 Name: "english"; MessagesFile: "compiler:Default.isl"
 
 [Tasks]
-Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"
-Name: "windowsService"; Description: "Install Windows Service (Starts when the computer starts)"; GroupDescription: "Start automatically"; Flags: exclusive
-Name: "startupShortcut"; Description: "Create shortcut in Startup folder (Starts when you log into Windows)"; GroupDescription: "Start automatically"; Flags: exclusive unchecked
-Name: "none"; Description: "Do not start automatically"; GroupDescription: "Start automatically"; Flags: exclusive unchecked
-
+;Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
+Name: "windowsService"; Description: "Install as a Windows Service"
 
 [Files]
 Source: "..\_output\NzbDrone.exe"; DestDir: "{app}"; Flags: ignoreversion  
@@ -54,13 +51,10 @@ Source: "..\_output\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs cr
 [Icons]
 Name: "{group}\{#AppName}"; Filename: "{app}\{#AppExeName}"; Parameters: "/icon"
 Name: "{commondesktop}\{#AppName}"; Filename: "{app}\{#AppExeName}"; Parameters: "/icon"
-Name: "{userstartup}\{#AppName}"; Filename: "{app}\NzbDrone.exe"; WorkingDir: "{app}"; Tasks: startupShortcut
 
 [Run]
-Filename: "{app}\nzbdrone.console.exe"; Parameters: "/u"; Flags: runhidden waituntilterminated;
-Filename: "{app}\nzbdrone.console.exe"; Parameters: "/i"; Flags: runhidden waituntilterminated; Tasks: windowsService
-Filename: "{app}\NzbDrone.exe"; Description: "Open Sonarr"; Flags: postinstall skipifsilent nowait; Tasks: windowsService;
-Filename: "{app}\NzbDrone.exe"; Description: "Start Sonarr"; Flags: postinstall skipifsilent nowait; Tasks: startupShortcut none;
+Filename: "{app}\nzbdrone.console.exe"; Parameters: "/u"; Flags: waituntilterminated;
+Filename: "{app}\nzbdrone.console.exe"; Parameters: "/i"; Flags: waituntilterminated; Tasks: windowsService
 
 [UninstallRun]
 Filename: "{app}\nzbdrone.console.exe"; Parameters: "/u"; Flags: waituntilterminated skipifdoesntexist

src/NzbDrone.Api/Authentication/EnableAuthInNancy.cs

@@ -64,8 +64,6 @@ 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",

src/NzbDrone.Api/EpisodeFiles/EpisodeFileModule.cs

@@ -1,13 +1,16 @@
 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
 {
@@ -15,21 +18,27 @@ namespace NzbDrone.Api.EpisodeFiles
                                  IHandle<EpisodeFileAddedEvent>
     {
         private readonly IMediaFileService _mediaFileService;
-        private readonly IDeleteMediaFiles _mediaFileDeletionService;
+        private readonly IDiskProvider _diskProvider;
+        private readonly IRecycleBinProvider _recycleBinProvider;
         private readonly ISeriesService _seriesService;
         private readonly IQualityUpgradableSpecification _qualityUpgradableSpecification;
+        private readonly Logger _logger;
 
         public EpisodeFileModule(IBroadcastSignalRMessage signalRBroadcaster,
                              IMediaFileService mediaFileService,
-                             IDeleteMediaFiles mediaFileDeletionService,
+                             IDiskProvider diskProvider,
+                             IRecycleBinProvider recycleBinProvider,
                              ISeriesService seriesService,
-                             IQualityUpgradableSpecification qualityUpgradableSpecification)
+                             IQualityUpgradableSpecification qualityUpgradableSpecification,
+                             Logger logger)
             : base(signalRBroadcaster)
         {
             _mediaFileService = mediaFileService;
-            _mediaFileDeletionService = mediaFileDeletionService;
+            _diskProvider = diskProvider;
+            _recycleBinProvider = recycleBinProvider;
             _seriesService = seriesService;
             _qualityUpgradableSpecification = qualityUpgradableSpecification;
+            _logger = logger;
             GetResourceById = GetEpisodeFile;
             GetResourceAll = GetEpisodeFiles;
             UpdateResource = SetQuality;
@@ -68,15 +77,13 @@ namespace NzbDrone.Api.EpisodeFiles
         private void DeleteEpisodeFile(int id)
         {
             var episodeFile = _mediaFileService.Get(id);
-
-            if (episodeFile == null)
-            {
-                throw new NzbDroneClientException(HttpStatusCode.NotFound, "Episode file not found");
-            }
-
             var series = _seriesService.GetSeries(episodeFile.SeriesId);
+            var fullPath = Path.Combine(series.Path, episodeFile.RelativePath);
+            var subfolder = _diskProvider.GetParentFolder(series.Path).GetRelativePath(_diskProvider.GetParentFolder(fullPath));
 
-            _mediaFileDeletionService.DeleteEpisodeFile(series, episodeFile);
+            _logger.Info("Deleting episode file: {0}", fullPath);
+            _recycleBinProvider.DeleteFile(fullPath, subfolder);
+            _mediaFileService.Delete(episodeFile, DeleteMediaFileReason.Manual);
         }
 
         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<EpisodeImportedEvent>
+        IHandle<EpisodeDownloadedEvent>
     {
         protected readonly IEpisodeService _episodeService;
         protected readonly ISeriesService _seriesService;
@@ -115,14 +115,9 @@ namespace NzbDrone.Api.Episodes
             }
         }
 
-        public void Handle(EpisodeImportedEvent message)
+        public void Handle(EpisodeDownloadedEvent message)
         {
-            if (!message.NewDownload)
-            {
-                return;
-            }
-
-            foreach (var episode in message.EpisodeInfo.Episodes)
+            foreach (var episode in message.Episode.Episodes)
             {
                 BroadcastResourceChange(ModelAction.Updated, episode.Id);
             }

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

@@ -1,46 +0,0 @@
-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|svg))(?:\"")(?:\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))(?:\"")(?:\s(?<nohash>data-no-hash))?", RegexOptions.Compiled | RegexOptions.IgnoreCase);
 
         private static string API_KEY;
         private static string URL_BASE;

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

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using NLog;
 using Nancy;
@@ -21,7 +21,10 @@ namespace NzbDrone.Api.Frontend.Mappers
             _diskProvider = diskProvider;
             _logger = logger;
 
-            _caseSensitive = RuntimeInfo.IsProduction ? DiskProviderBase.PathStringComparison : StringComparison.OrdinalIgnoreCase;
+            if (!RuntimeInfo.IsProduction)
+            {
+                _caseSensitive = StringComparison.OrdinalIgnoreCase;
+            }
         }
 
         public abstract string Map(string resourceUrl);
@@ -47,5 +50,6 @@ namespace NzbDrone.Api.Frontend.Mappers
         {
             return File.OpenRead(filePath);
         }
+
     }
-}
+}

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,6 +38,20 @@ 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(GetCacheKey(release));
+            var remoteEpisode = _remoteEpisodeCache.Find(release.Guid);
 
             if (remoteEpisode == null)
             {
@@ -68,7 +68,7 @@ namespace NzbDrone.Api.Indexers
             }
             catch (ReleaseDownloadException ex)
             {
-                _logger.Error(ex, ex.Message);
+                _logger.Error(ex);
                 throw new NzbDroneClientException(HttpStatusCode.Conflict, "Getting release from indexer failed");
             }
 
@@ -113,14 +113,8 @@ namespace NzbDrone.Api.Indexers
 
         protected override ReleaseResource MapDecision(DownloadDecision decision, int 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);
+            _remoteEpisodeCache.Set(decision.RemoteEpisode.Release.Guid, decision.RemoteEpisode, TimeSpan.FromMinutes(30));
+           return base.MapDecision(decision, initialWeight);
         }
     }
 }

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.ToUniversalTime();
+            model.PublishDate = resource.PublishDate;
 
             return model;
         }
     }
-}
+}

src/NzbDrone.Api/NzbDrone.Api.csproj

@@ -106,7 +106,6 @@
     <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.Api/Parse/ParseModule.cs

@@ -1,6 +1,5 @@
 using NzbDrone.Api.Episodes;
 using NzbDrone.Api.Series;
-using NzbDrone.Common.Extensions;
 using NzbDrone.Core.Parser;
 
 namespace NzbDrone.Api.Parse
@@ -19,8 +18,7 @@ namespace NzbDrone.Api.Parse
         private ParseResource Parse()
         {
             var title = Request.Query.Title.Value as string;
-            var path = Request.Query.Path.Value as string;
-            var parsedEpisodeInfo = path.IsNotNullOrWhiteSpace() ? Parser.ParsePath(path) : Parser.ParseTitle(title);
+            var parsedEpisodeInfo = Parser.ParseTitle(title);
 
             if (parsedEpisodeInfo == null)
             {

src/NzbDrone.Api/System/Backup/BackupModule.cs

@@ -21,9 +21,9 @@ namespace NzbDrone.Api.System.Backup
 
             return backups.Select(b => new BackupResource
                                        {
-                                           Id = b.Name.GetHashCode(),
-                                           Name = b.Name,
-                                           Path = $"/backup/{b.Type.ToString().ToLower()}/{b.Name}",
+                                           Id = b.Path.GetHashCode(),
+                                           Name = Path.GetFileName(b.Path),
+                                           Path = b.Path,
                                            Type = b.Type,
                                            Time = b.Time
                                        }).ToList();

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

@@ -1,29 +0,0 @@
-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()
         {
@@ -139,54 +139,7 @@ namespace NzbDrone.Common.Test.Http
             var request = new HttpRequest($"http://{_httpBinHost}/redirect/1");
             request.AllowAutoRedirect = true;
 
-            var response = Subject.Get(request);
-
-            response.StatusCode.Should().Be(HttpStatusCode.OK);
-
-            ExceptionVerification.ExpectedErrors(0);
-        }
-
-        [Test]
-        public void should_not_follow_redirects()
-        {
-            var request = new HttpRequest($"http://{_httpBinHost}/redirect/1");
-            request.AllowAutoRedirect = false;
-
-            var response = Subject.Get(request);
-
-            response.StatusCode.Should().Be(HttpStatusCode.Found);
-
-            ExceptionVerification.ExpectedErrors(1);
-        }
-
-        [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));
+            Subject.Get(request);
 
             ExceptionVerification.ExpectedErrors(0);
         }
@@ -454,4 +407,4 @@ namespace NzbDrone.Common.Test.Http
         public string Url { get; set; }
         public string Data { get; set; }
     }
-}
+}

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

@@ -7,13 +7,6 @@ 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")]
@@ -84,7 +77,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/InstrumentationTests/CleanseLogMessageFixture.cs

@@ -15,7 +15,6 @@ namespace NzbDrone.Common.Test.InstrumentationTests
         [TestCase(@"https://rss.omgwtfnzbs.org/rss-search.php?catid=19,20&user=sonarr&api=mySecret&eng=1")]
         [TestCase(@"https://dognzb.cr/fetch/2b51db35e1912ffc138825a12b9933d2/2b51db35e1910123321025a12b9933d2")]
         [TestCase(@"https://baconbits.org/feeds.php?feed=torrents_tv&user=12345&auth=2b51db35e1910123321025a12b9933d2&passkey=mySecret&authkey=2b51db35e1910123321025a12b9933d2")]
-        [TestCase(@"http://127.0.0.1:9117/dl/indexername?jackett_apikey=flwjiefewklfjacketmySecretsdfldskjfsdlk&path=we0re9f0sdfbase64sfdkfjsdlfjk&file=The+Torrent+File+Name.torrent")]
         // NzbGet
         [TestCase(@"{ ""Name"" : ""ControlUsername"", ""Value"" : ""mySecret"" }, { ""Name"" : ""ControlPassword"", ""Value"" : ""mySecret"" }, ")]
         [TestCase(@"{ ""Name"" : ""Server1.Username"", ""Value"" : ""mySecret"" }, { ""Name"" : ""Server1.Password"", ""Value"" : ""mySecret"" }, ")]

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

@@ -80,7 +80,6 @@
     <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/ConsoleService.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Diagnostics;
 using System.IO;
 using NzbDrone.Common.EnvironmentInfo;
@@ -24,8 +24,6 @@ namespace NzbDrone.Common
             Console.WriteLine("                 /{0} Install the application as a Windows Service ({1}).", StartupContext.INSTALL_SERVICE, ServiceProvider.NZBDRONE_SERVICE_NAME);
             Console.WriteLine("                 /{0} Uninstall already installed Windows Service ({1}).", StartupContext.UNINSTALL_SERVICE, ServiceProvider.NZBDRONE_SERVICE_NAME);
             Console.WriteLine("                 /{0} Don't open Sonarr in a browser", StartupContext.NO_BROWSER);
-            Console.WriteLine("                 /{0} Start Sonarr terminating any other instances", StartupContext.TERMINATE);
-            Console.WriteLine("                 /{0}=path Path to use as the AppData location (stores database, config, logs, etc)", StartupContext.APPDATA);
             Console.WriteLine("                 <No Arguments>  Run application in console mode.");
         }
 
@@ -39,4 +37,4 @@ namespace NzbDrone.Common
             Console.WriteLine("Can't find service ({0})", ServiceProvider.NZBDRONE_SERVICE_NAME);
         }
     }
-}
+}

src/NzbDrone.Common/Disk/DiskTransferService.cs

@@ -223,7 +223,7 @@ namespace NzbDrone.Common.Disk
                     _diskProvider.MoveFile(sourcePath, tempPath, true);
                     try
                     {
-                        ClearTargetPath(sourcePath, targetPath, overwrite);
+                        ClearTargetPath(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(sourcePath, targetPath, overwrite);
+            ClearTargetPath(targetPath, overwrite);
 
             if (mode.HasFlag(TransferMode.HardLink))
             {
@@ -330,7 +330,7 @@ namespace NzbDrone.Common.Disk
             return TransferMode.None;
         }
 
-        private void ClearTargetPath(string sourcePath, string targetPath, bool overwrite)
+        private void ClearTargetPath(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}] to [{1}]", sourcePath, targetPath));
+                    throw new IOException(string.Format("Destination already exists [{0}]", targetPath));
                 }
             }
         }

src/NzbDrone.Common/Disk/DriveInfoMount.cs

@@ -51,7 +51,7 @@ namespace NzbDrone.Common.Disk
         {
             get
             {
-                if (VolumeLabel.IsNullOrWhiteSpace() || VolumeLabel.StartsWith("UUID=") || Name == VolumeLabel)
+                if (VolumeLabel.IsNullOrWhiteSpace())
                 {
                     return Name;
                 }

src/NzbDrone.Common/EnvironmentInfo/AppFolderFactory.cs

@@ -3,7 +3,6 @@ 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
@@ -34,11 +33,6 @@ 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/EnvironmentInfo/IRuntimeInfo.cs

@@ -1,3 +1,5 @@
+using System;
+
 namespace NzbDrone.Common.EnvironmentInfo
 {
     public interface IRuntimeInfo
@@ -5,9 +7,8 @@ namespace NzbDrone.Common.EnvironmentInfo
         bool IsUserInteractive { get; }
         bool IsAdmin { get; }
         bool IsWindowsService { get; }
-        bool IsWindowsTray { get; }
         bool IsExiting { get; set; }
         bool RestartPending { get; set; }
         string ExecutingApplication { get; }
     }
-}
+}

src/NzbDrone.Common/EnvironmentInfo/RuntimeInfo.cs

@@ -1,11 +1,10 @@
-using System;
+using System;
 using System.Diagnostics;
 using System.IO;
 using System.Reflection;
 using System.Security.Principal;
 using System.ServiceProcess;
 using NLog;
-using NzbDrone.Common.Processes;
 
 namespace NzbDrone.Common.EnvironmentInfo
 {
@@ -28,7 +27,6 @@ namespace NzbDrone.Common.EnvironmentInfo
             if (entry != null)
             {
                 ExecutingApplication = entry.Location;
-                IsWindowsTray = entry.ManifestModule.Name == $"{ProcessProvider.NZB_DRONE_PROCESS_NAME}.exe";
             }
         }
 
@@ -104,7 +102,5 @@ namespace NzbDrone.Common.EnvironmentInfo
 
             return true;
         }
-
-        public bool IsWindowsTray { get; private set; }
     }
 }

src/NzbDrone.Common/Exceptions/SonarrStartupException.cs

@@ -1,44 +0,0 @@
-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/StringExtensions.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 using System.Text;
@@ -64,11 +63,6 @@ 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();
@@ -84,16 +78,6 @@ 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;
@@ -134,4 +118,4 @@ namespace NzbDrone.Common.Extensions
             return Encoding.ASCII.GetString(new [] { byteResult });
         }
     }
-}
+}

src/NzbDrone.Common/Extensions/UrlExtensions.cs

@@ -11,11 +11,6 @@ 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 = false;
+                    curlEasy.FollowLocation = request.AllowAutoRedirect;
 
                     if (request.RequestTimeout != TimeSpan.Zero)
                     {

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

@@ -34,11 +34,18 @@ namespace NzbDrone.Common.Http.Dispatchers
                     {
                         return _managedDispatcher.GetResponse(request, cookies);
                     }
-                    catch (TlsFailureException)
+                    catch (Exception ex)
                     {
-                        _logger.Debug("https request failed in tls error for {0}, trying curl fallback.", request.Url.Host);
+                        if (ex.ToString().Contains("The authentication or decryption has failed."))
+                        {
+                            _logger.Debug("https request failed in tls error for {0}, trying curl fallback.", request.Url.Host);
 
-                        _curlTLSFallbackCache.Set(request.Url.Host, true);
+                            _curlTLSFallbackCache.Set(request.Url.Host, true);
+                        }
+                        else
+                        {
+                            throw;
+                        }
                     }
                 }
 

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 = false;
+            webRequest.AllowAutoRedirect = request.AllowAutoRedirect;
             webRequest.CookieContainer = cookies;
 
             if (request.RequestTimeout != TimeSpan.Zero)
@@ -47,19 +47,19 @@ namespace NzbDrone.Common.Http.Dispatchers
                 AddRequestHeaders(webRequest, request.Headers);
             }
 
+            if (request.ContentData != null)
+            {
+                webRequest.ContentLength = request.ContentData.Length;
+                using (var writeStream = webRequest.GetRequestStream())
+                {
+                    writeStream.Write(request.ContentData, 0, request.ContentData.Length);
+                }
+            }
+
             HttpWebResponse httpWebResponse;
 
             try
             {
-                if (request.ContentData != null)
-                {
-                    webRequest.ContentLength = request.ContentData.Length;
-                    using (var writeStream = webRequest.GetRequestStream())
-                    {
-                        writeStream.Write(request.ContentData, 0, request.ContentData.Length);
-                    }
-                }
-
                 httpWebResponse = (HttpWebResponse)webRequest.GetResponse();
             }
             catch (WebException e)
@@ -73,27 +73,7 @@ namespace NzbDrone.Common.Http.Dispatchers
 
                 if (httpWebResponse == null)
                 {
-                    // 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 (e.ToString().Contains("TLS Support not"))
-                    {
-                        throw new TlsFailureException(webRequest, e);
-                    }
-                    else if (e.ToString().Contains("The authentication or decryption has failed."))
-                    {
-                        throw new TlsFailureException(webRequest, e);
-                    }
-                    else if (OsInfo.IsNotWindows)
-                    {
-                        throw new WebException($"{e.Message}: '{webRequest.RequestUri}'", e, e.Status, e.Response);
-                    }
-                    else
-                    {
-                        throw;
-                    }
+                    throw;
                 }
             }
 
@@ -103,14 +83,7 @@ namespace NzbDrone.Common.Http.Dispatchers
             {
                 if (responseStream != null)
                 {
-                    try
-                    {
-                        data = responseStream.ToBytes();
-                    }
-                    catch (Exception ex)
-                    {
-                        throw new WebException("Failed to read complete http response", ex, WebExceptionStatus.ReceiveFailure, httpWebResponse);
-                    }
+                    data = responseStream.ToBytes();
                 }
             }
 

src/NzbDrone.Common/Http/HttpClient.cs

@@ -7,7 +7,6 @@ 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;
 
@@ -51,54 +50,6 @@ namespace NzbDrone.Common.Http
         }
 
         public HttpResponse Execute(HttpRequest request)
-        {
-            var response = ExecuteRequest(request);
-
-            if (request.AllowAutoRedirect && response.HasHttpRedirect)
-            {
-                var autoRedirectChain = new List<string>();
-                autoRedirectChain.Add(request.Url.ToString());
-
-                do
-                {
-                    request.Url += new HttpUri(response.Headers.GetSingleValue("Location"));
-                    autoRedirectChain.Add(request.Url.ToString());
-
-                    _logger.Trace("Redirected to {0}", request.Url);
-
-                    if (autoRedirectChain.Count > 3)
-                    {
-                        throw new WebException($"Too many automatic redirections were attempted for {autoRedirectChain.Join(" -> ")}", WebExceptionStatus.ProtocolError);
-                    }
-
-                    response = ExecuteRequest(request);
-                }
-                while (response.HasHttpRedirect);
-            }
-
-            if (response.HasHttpRedirect && !RuntimeInfo.IsProduction)
-            {
-                _logger.Error("Server requested a redirect to [{0}] while in developer mode. 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;
-        }
-
-        private HttpResponse ExecuteRequest(HttpRequest request)
         {
             foreach (var interceptor in _requestInterceptors)
             {
@@ -134,6 +85,28 @@ 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;
         }
 
@@ -244,4 +217,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($"Expected {key} to occur only once, but was {values.Join("|")}.");
+                throw new ApplicationException(string.Format("Expected {0} to occur only once.", key));
             }
 
             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,14 +1,13 @@
-namespace NzbDrone.Common.Http
+namespace NzbDrone.Common.Http
 {
     public enum HttpMethod
     {
         GET,
-        POST,
         PUT,
-        DELETE,
+        POST,
         HEAD,
-        OPTIONS,
+        DELETE,
         PATCH,
-        MERGE
+        OPTIONS
     }
 }

src/NzbDrone.Common/Http/HttpResponse.cs

@@ -35,7 +35,7 @@ namespace NzbDrone.Common.Http
 
         private string _content;
 
-        public string Content
+        public string Content 
         {
             get
             {
@@ -51,10 +51,6 @@ namespace NzbDrone.Common.Http
 
         public bool HasHttpError => (int)StatusCode >= 400;
 
-        public bool HasHttpRedirect => StatusCode == HttpStatusCode.Moved ||
-                                       StatusCode == HttpStatusCode.MovedPermanently ||
-                                       StatusCode == HttpStatusCode.Found;
-
         public Dictionary<string, string> GetCookies()
         {
             var result = new Dictionary<string, string>();
@@ -99,4 +95,4 @@ namespace NzbDrone.Common.Http
 
         public T Resource { get; private set; }
     }
-}
+}

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/Http/TlsFailureException.cs

@@ -1,18 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using System.Text;
-
-namespace NzbDrone.Common.Http
-{
-    public class TlsFailureException : WebException
-    {
-        public TlsFailureException(WebRequest request, WebException innerException)
-            : base("Failed to establish secure https connection to '" + request.RequestUri + "', libcurl fallback might be unavailable.", innerException, WebExceptionStatus.SecureChannelFailure, innerException.Response)
-        {
-
-        }
-
-    }
-}

src/NzbDrone.Common/Instrumentation/CleanseLogMessage.cs

@@ -6,10 +6,10 @@ namespace NzbDrone.Common.Instrumentation
 {
     public class CleanseLogMessage
     {
-        private static readonly Regex[] CleansingRules = new[]
+        private static readonly Regex[] CleansingRules = new[] 
             {
                 // Url
-                new Regex(@"(?<=\?|&)(apikey|token|passkey|auth|authkey|user|uid|api|[a-z_]*apikey)=(?<secret>[^&=]+?)(?= |&|$)", RegexOptions.Compiled | RegexOptions.IgnoreCase),
+                new Regex(@"(?<=\?|&)(apikey|token|passkey|auth|authkey|user|uid|api)=(?<secret>[^&=]+?)(?= |&|$)", RegexOptions.Compiled | RegexOptions.IgnoreCase),
                 new Regex(@"(?<=\?|&)[^=]*?(username|password)=(?<secret>[^&=]+?)(?= |&|$)", RegexOptions.Compiled | RegexOptions.IgnoreCase),
                 new Regex(@"torrentleech\.org/(?!rss)(?<secret>[0-9a-z]+)", RegexOptions.Compiled | RegexOptions.IgnoreCase),
                 new Regex(@"torrentleech\.org/rss/download/[0-9]+/(?<secret>[0-9a-z]+)", RegexOptions.Compiled | RegexOptions.IgnoreCase),

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

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

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

@@ -1,58 +0,0 @@
-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://a013727b8d224e719894e1e13ff4966b:c95ca1f9ca02418d829db10c2938baf4@sentry.sonarr.tv/8"
+                    ? "https://3e8a38b1a4df4de8b0453a724f5a1139:5a708dd75c724b32ae5128b6a895650f@sentry.sonarr.tv/8"
                     : "https://4ee3580e01d8407c96a7430fbc953512:5f2d07227a0b4fde99dea07041a3ff93@sentry.sonarr.tv/10";
             }
 
@@ -109,13 +109,9 @@ namespace NzbDrone.Common.Instrumentation
                 Layout = "${message}"
             };
 
-            var loggingRule = new LoggingRule("*", updateClient ? LogLevel.Trace : LogLevel.Warn, target);
+            var loggingRule = new LoggingRule("*", updateClient ? LogLevel.Trace : LogLevel.Error, 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/SentryTarget.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net;
@@ -72,11 +71,6 @@ 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(),
@@ -100,33 +94,13 @@ 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 (!IsSentryMessage(logEvent))
+                if (logEvent.Exception == null || _unauthorized)
                 {
                     return;
                 }
@@ -138,17 +112,8 @@ 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);
 
                 var sentryEvent = new SentryEvent(logEvent.Exception)
@@ -169,16 +134,11 @@ 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/NzbDrone.Common.csproj

@@ -92,7 +92,6 @@
     <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" />
@@ -172,14 +171,12 @@
     <Compile Include="Http\HttpRequestBuilder.cs" />
     <Compile Include="Http\HttpRequestBuilderFactory.cs" />
     <Compile Include="Http\Proxy\ProxyType.cs" />
-    <Compile Include="Http\TlsFailureException.cs" />
     <Compile Include="Http\TooManyRequestsException.cs" />
     <Compile Include="Extensions\IEnumerableExtensions.cs" />
     <Compile Include="Http\UserAgentBuilder.cs" />
     <Compile Include="Instrumentation\CleanseLogMessage.cs" />
     <Compile Include="Instrumentation\CleansingJsonVisitor.cs" />
-    <Compile Include="Instrumentation\Extensions\LoggerExtensions.cs" />
-    <Compile Include="Instrumentation\Extensions\SentryLoggerExtensions.cs" />
+    <Compile Include="Instrumentation\Extensions\LoggerProgressExtensions.cs" />
     <Compile Include="Instrumentation\GlobalExceptionHandlers.cs" />
     <Compile Include="Instrumentation\LogEventExtensions.cs" />
     <Compile Include="Instrumentation\NzbDroneFileTarget.cs" />

src/NzbDrone.Common/Processes/PidFileProvider.cs

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

src/NzbDrone.Common/Reflection/ReflectionExtensions.cs

@@ -60,11 +60,6 @@ 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));
@@ -75,4 +70,4 @@ namespace NzbDrone.Common.Reflection
             return type.GetCustomAttributes(typeof(TAttribute), true).Any();
         }
     }
-}
+}

src/NzbDrone.Common/Security/SecurityProtocolPolicy.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Net;
 using NLog;
-using NzbDrone.Common.EnvironmentInfo;
 using NzbDrone.Common.Instrumentation;
 
 namespace NzbDrone.Common.Security
@@ -15,12 +14,6 @@ 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.
-                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.Console/ConsoleApp.cs

@@ -2,7 +2,6 @@
 using System.Net.Sockets;
 using NLog;
 using NzbDrone.Common.EnvironmentInfo;
-using NzbDrone.Common.Exceptions;
 using NzbDrone.Common.Instrumentation;
 using NzbDrone.Host;
 
@@ -12,14 +11,6 @@ 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
@@ -28,61 +19,30 @@ namespace NzbDrone.Console
                 NzbDroneLogger.Register(startupArgs, false, true);
                 Bootstrap.Start(startupArgs, new ConsoleAlerts());
             }
-            catch (SonarrStartupException ex)
+            catch (SocketException exception)
             {
                 System.Console.WriteLine("");
                 System.Console.WriteLine("");
-                Logger.Fatal(ex, "EPIC FAIL!");
-                Exit(ExitCodes.NonRecoverableFailure);
+                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);
             }
-            catch (SocketException ex)
+            catch (Exception e)
             {
                 System.Console.WriteLine("");
                 System.Console.WriteLine("");
-                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.Fatal(e, "EPIC FAIL!");
+                System.Console.WriteLine("Press enter to exit...");
+                System.Console.ReadLine();
+                Environment.Exit(1);
             }
 
             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((int)exitCode);
+            Environment.Exit(0);
         }
     }
 }

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

@@ -5,7 +5,6 @@ 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;
@@ -99,6 +98,7 @@ namespace NzbDrone.Core.Test.DataAugmentation.SceneNumbering
             });
         }
 
+
         [Test]
         public void should_not_fetch_scenenumbering_if_not_listed()
         {
@@ -108,7 +108,7 @@ namespace NzbDrone.Core.Test.DataAugmentation.SceneNumbering
                   .Verify(v => v.GetSceneTvdbMappings(10), Times.Never());
 
             Mocker.GetMock<ISeriesService>()
-                  .Verify(v => v.UpdateSeries(It.IsAny<Series>(), It.IsAny<bool>()), Times.Never());
+                  .Verify(v => v.UpdateSeries(It.IsAny<Series>()), Times.Never());
         }
 
         [Test]
@@ -119,7 +119,7 @@ namespace NzbDrone.Core.Test.DataAugmentation.SceneNumbering
             Subject.Handle(new SeriesUpdatedEvent(_series));
 
             Mocker.GetMock<ISeriesService>()
-                  .Verify(v => v.UpdateSeries(It.Is<Series>(s => s.UseSceneNumbering == true), It.IsAny<bool>()), Times.Once());
+                  .Verify(v => v.UpdateSeries(It.Is<Series>(s => s.UseSceneNumbering == true)), Times.Once());
         }
 
         [Test]
@@ -130,7 +130,7 @@ namespace NzbDrone.Core.Test.DataAugmentation.SceneNumbering
             Subject.Handle(new SeriesUpdatedEvent(_series));
 
             Mocker.GetMock<ISeriesService>()
-                  .Verify(v => v.UpdateSeries(It.IsAny<Series>(), It.IsAny<bool>()), Times.Once());
+                  .Verify(v => v.UpdateSeries(It.IsAny<Series>()), Times.Once());
         }
 
         [Test]
@@ -143,7 +143,7 @@ namespace NzbDrone.Core.Test.DataAugmentation.SceneNumbering
             Subject.Handle(new SeriesUpdatedEvent(_series));
 
             Mocker.GetMock<ISeriesService>()
-                  .Verify(v => v.UpdateSeries(It.IsAny<Series>(), It.IsAny<bool>()), Times.Never());
+                  .Verify(v => v.UpdateSeries(It.IsAny<Series>()), Times.Never());
 
             ExceptionVerification.ExpectedWarns(1);
         }
@@ -160,7 +160,7 @@ namespace NzbDrone.Core.Test.DataAugmentation.SceneNumbering
             Subject.Handle(new SeriesUpdatedEvent(_series));
 
             Mocker.GetMock<ISeriesService>()
-                  .Verify(v => v.UpdateSeries(It.IsAny<Series>(), It.IsAny<bool>()), Times.Never());
+                  .Verify(v => v.UpdateSeries(It.IsAny<Series>()), Times.Never());
 
             ExceptionVerification.ExpectedWarns(1);
         }
@@ -308,19 +308,5 @@ 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

@@ -1,54 +0,0 @@
-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/FullSeasonSpecificationFixture.cs

@@ -49,27 +49,27 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
         {
             _remoteEpisode.ParsedEpisodeInfo.FullSeason = false;
             _remoteEpisode.Episodes.Last().AirDateUtc = DateTime.UtcNow.AddDays(+2);
-            Subject.IsSatisfiedBy(_remoteEpisode, null).Accepted.Should().BeTrue();
+            Mocker.Resolve<FullSeasonSpecification>().IsSatisfiedBy(_remoteEpisode, null).Accepted.Should().BeTrue();
         }
 
         [Test]
         public void should_return_true_if_all_episodes_have_aired()
         {
-            Subject.IsSatisfiedBy(_remoteEpisode, null).Accepted.Should().BeTrue();
+            Mocker.Resolve<FullSeasonSpecification>().IsSatisfiedBy(_remoteEpisode, null).Accepted.Should().BeTrue();
         }
 
         [Test]
         public void should_return_false_if_one_episode_has_not_aired()
         {
             _remoteEpisode.Episodes.Last().AirDateUtc = DateTime.UtcNow.AddDays(+2);
-            Subject.IsSatisfiedBy(_remoteEpisode, null).Accepted.Should().BeFalse();
+            Mocker.Resolve<FullSeasonSpecification>().IsSatisfiedBy(_remoteEpisode, null).Accepted.Should().BeFalse();
         }
 
         [Test]
         public void should_return_false_if_an_episode_does_not_have_an_air_date()
         {
             _remoteEpisode.Episodes.Last().AirDateUtc = null;
-            Subject.IsSatisfiedBy(_remoteEpisode, null).Accepted.Should().BeFalse();
+            Mocker.Resolve<FullSeasonSpecification>().IsSatisfiedBy(_remoteEpisode, null).Accepted.Should().BeFalse();
         }
     }
 }

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

@@ -19,11 +19,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
         {
             _remoteEpisode = new RemoteEpisode
             {
-                Release = new ReleaseInfo
-                          {
-                              Title = "Series.title.s01e01",
-                              DownloadProtocol = DownloadProtocol.Torrent
-                          }
+                Release = new ReleaseInfo() { DownloadProtocol = DownloadProtocol.Torrent }
             };
         }
 
@@ -33,7 +29,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
         }
         
         [Test]
-        public void should_return_true_if_no_container_specified_and_does_not_match_disc_release_pattern()
+        public void should_return_true_if_no_container_specified()
         {
             Subject.IsSatisfiedBy(_remoteEpisode, null).Accepted.Should().BeTrue();
         }
@@ -73,15 +69,5 @@ 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/Search/TorrentSeedingSpecificationFixture.cs

@@ -1,111 +0,0 @@
-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/DiskSpace/DiskSpaceServiceFixture.cs

@@ -130,26 +130,5 @@ namespace NzbDrone.Core.Test.DiskSpace
             Mocker.GetMock<IDiskProvider>()
                   .Verify(v => v.GetAvailableSpace(It.IsAny<string>()), Times.Never());
         }
-
-        [TestCase("/boot")]
-        [TestCase("/var/lib/rancher")]
-        [TestCase("/var/lib/rancher/volumes")]
-        [TestCase("/var/lib/kubelet")]
-        [TestCase("/var/lib/docker")]
-        [TestCase("/some/place/docker/aufs")]
-        public void should_not_check_diskspace_for_irrelevant_mounts(string path)
-        {
-            var mount = new Mock<IMount>();
-            mount.SetupGet(v => v.RootDirectory).Returns(path);
-            mount.SetupGet(v => v.DriveType).Returns(System.IO.DriveType.Fixed);
-
-            Mocker.GetMock<IDiskProvider>()
-                  .Setup(v => v.GetMounts())
-                  .Returns(new List<IMount> { mount.Object });
-
-            var freeSpace = Subject.GetFreeSpace();
-
-            freeSpace.Should().BeEmpty();
-        }
     }
 }

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

@@ -6,9 +6,7 @@ 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;
@@ -37,7 +35,7 @@ namespace NzbDrone.Core.Test.Download.DownloadApprovedReportsTests
                             .Build();
         }
 
-        private RemoteEpisode GetRemoteEpisode(List<Episode> episodes, QualityModel quality, DownloadProtocol downloadProtocol = DownloadProtocol.Usenet)
+        private RemoteEpisode GetRemoteEpisode(List<Episode> episodes, QualityModel quality)
         {
             var remoteEpisode = new RemoteEpisode();
             remoteEpisode.ParsedEpisodeInfo = new ParsedEpisodeInfo();
@@ -47,7 +45,6 @@ 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()
@@ -195,6 +192,7 @@ 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());
@@ -211,7 +209,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>(), It.IsAny<PendingReleaseReason>()), Times.Never());
+            Mocker.GetMock<IPendingReleaseService>().Verify(v => v.Add(It.IsAny<DownloadDecision>()), Times.Never());
         }
 
         [Test]
@@ -225,43 +223,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>(), 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());
+            Mocker.GetMock<IPendingReleaseService>().Verify(v => v.Add(It.IsAny<DownloadDecision>()), Times.Exactly(2));
         }
     }
 }

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

@@ -1,156 +0,0 @@
-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,17 +1,15 @@
 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.Core.Download.Clients.Blackhole;
-using NzbDrone.Core.MediaFiles;
-using NzbDrone.Core.Test.Framework;
 using NzbDrone.Test.Common;
+using System.Threading;
+using NzbDrone.Core.Test.Framework;
+using NzbDrone.Core.Download.Clients.Blackhole;
 
 namespace NzbDrone.Core.Test.Download.DownloadClientTests.Blackhole
 {
@@ -20,7 +18,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);
@@ -35,9 +33,6 @@ 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()
@@ -48,7 +43,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,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Net;
@@ -11,7 +10,6 @@ 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;
@@ -50,9 +48,6 @@ 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()

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

@@ -1,6 +1,5 @@
 
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Net;
@@ -11,7 +10,6 @@ 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
@@ -43,9 +41,6 @@ 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()

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

@@ -7,12 +7,11 @@ using NzbDrone.Core.Download.Clients.DownloadStation;
 using NzbDrone.Core.Download.Clients.DownloadStation.Proxies;
 using NzbDrone.Core.Test.Framework;
 using NzbDrone.Test.Common;
-using NzbDrone.Core.Download.Clients.DownloadStation.Responses;
 
 namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
 {
     [TestFixture]
-    public class DSMInfoProviderFixture : CoreTest<DSMInfoProvider>
+    public class SerialNumberProviderFixture : CoreTest<SerialNumberProvider>
     {
         protected DownloadStationSettings _settings;
 
@@ -25,27 +24,17 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
         private void GivenValidResponse()
         {
             Mocker.GetMock<IDSMInfoProxy>()
-                  .Setup(d => d.GetInfo(It.IsAny<DownloadStationSettings>()))
-                  .Returns(new DSMInfoResponse() { SerialNumber = "serial", Version = "DSM 6.0.1" });
+                  .Setup(d => d.GetSerialNumber(It.IsAny<DownloadStationSettings>()))
+                  .Returns("serial");
         }
 
         private void GivenInvalidResponse()
         {
             Mocker.GetMock<IDSMInfoProxy>()
-                  .Setup(d => d.GetInfo(It.IsAny<DownloadStationSettings>()))
+                  .Setup(d => d.GetSerialNumber(It.IsAny<DownloadStationSettings>()))
                   .Throws(new DownloadClientException("Serial response invalid"));
         }
 
-        [Test]
-        public void should_return_version()
-        {
-            GivenValidResponse();
-
-            var version = Subject.GetDSMVersion(_settings);
-
-            version.Should().Be(new Version("6.0.1"));
-        }
-
         [Test]
         public void should_return_hashedserialnumber()
         {
@@ -57,7 +46,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
             serial.Should().Be("50DE66B735D30738618568294742FCF1DFA52A47");
 
             Mocker.GetMock<IDSMInfoProxy>()
-                  .Verify(d => d.GetInfo(It.IsAny<DownloadStationSettings>()), Times.Once());
+                  .Verify(d => d.GetSerialNumber(It.IsAny<DownloadStationSettings>()), Times.Once());
         }
 
         [Test]
@@ -71,7 +60,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
             serial2.Should().Be(serial1);
 
             Mocker.GetMock<IDSMInfoProxy>()
-                  .Verify(d => d.GetInfo(It.IsAny<DownloadStationSettings>()), Times.Once());
+                  .Verify(d => d.GetSerialNumber(It.IsAny<DownloadStationSettings>()), Times.Once());
         }
 
         [Test]

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

@@ -12,7 +12,6 @@ using NzbDrone.Core.Download.Clients.DownloadStation.Proxies;
 using NzbDrone.Core.MediaFiles.TorrentInfo;
 using NzbDrone.Core.Parser.Model;
 using NzbDrone.Test.Common;
-using NzbDrone.Core.Download.Clients.DownloadStation.Responses;
 
 namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
 {
@@ -281,21 +280,6 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
               .Returns(_downloadStationConfigItems);
         }
 
-        protected void GivenApiVersions()
-        {
-            Mocker.GetMock<IDownloadStationTaskProxy>()
-                .Setup(s => s.GetApiInfo(It.IsAny<DownloadStationSettings>()))
-                .Returns(new DiskStationApiInfo() { Name = "Task", MinVersion = 1, MaxVersion = 2 });
-
-            Mocker.GetMock<IDownloadStationInfoProxy>()
-                .Setup(s => s.GetApiInfo(It.IsAny<DownloadStationSettings>()))
-                .Returns(new DiskStationApiInfo() { Name = "Info", MinVersion = 1, MaxVersion = 3 });
-
-            Mocker.GetMock<IFileStationProxy>()
-                .Setup(s => s.GetApiInfo(It.IsAny<DownloadStationSettings>()))
-                .Returns(new DiskStationApiInfo() { Name = "File", MinVersion = 1, MaxVersion = 2 });
-        }
-
         protected void GivenSharedFolder()
         {
             Mocker.GetMock<ISharedFolderResolver>()
@@ -305,7 +289,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
 
         protected void GivenSerialNumber()
         {
-            Mocker.GetMock<IDSMInfoProvider>()
+            Mocker.GetMock<ISerialNumberProvider>()
                 .Setup(s => s.GetSerialNumber(It.IsAny<DownloadStationSettings>()))
                 .Returns(_serialNumber);
         }
@@ -375,26 +359,6 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
             return tasks.Count;
         }
 
-
-        protected void GivenDSMVersion(string version)
-        {
-            Mocker.GetMock<IDSMInfoProvider>()
-                .Setup(d => d.GetDSMVersion(It.IsAny<DownloadStationSettings>()))
-                .Returns(new Version(version));
-        }
-
-        [TestCase("6.0.0", 0)]
-        [TestCase("5.0.0", 1)]
-        public void TestConnection_should_return_validation_failure_as_expected(string version, int count)
-        {
-            GivenApiVersions();
-            GivenDSMVersion(version);
-
-            var result = Subject.Test();
-
-            result.Errors.Should().HaveCount(count);
-        }
-
         [Test]
         public void Download_with_TvDirectory_should_force_directory()
         {
@@ -496,7 +460,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
         [Test]
         public void GetItems_should_throw_if_serial_number_unavailable()
         {
-            Mocker.GetMock<IDSMInfoProvider>()
+            Mocker.GetMock<ISerialNumberProvider>()
                   .Setup(s => s.GetSerialNumber(_settings))
                   .Throws(new ApplicationException("Some unknown exception, HttpException or DownloadClientException"));
 
@@ -512,7 +476,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
         {
             var remoteEpisode = CreateRemoteEpisode();
 
-            Mocker.GetMock<IDSMInfoProvider>()
+            Mocker.GetMock<ISerialNumberProvider>()
                   .Setup(s => s.GetSerialNumber(_settings))
                   .Throws(new ApplicationException("Some unknown exception, HttpException or DownloadClientException"));
 

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

@@ -182,21 +182,6 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
               .Returns(_downloadStationConfigItems);
         }
 
-        protected void GivenApiVersions()
-        {
-            Mocker.GetMock<IDownloadStationTaskProxy>()
-                .Setup(s => s.GetApiInfo(It.IsAny<DownloadStationSettings>()))
-                .Returns(new DiskStationApiInfo() { Name = "Task", MinVersion = 1, MaxVersion = 2 });
-
-            Mocker.GetMock<IDownloadStationInfoProxy>()
-                .Setup(s => s.GetApiInfo(It.IsAny<DownloadStationSettings>()))
-                .Returns(new DiskStationApiInfo() { Name = "Info", MinVersion = 1, MaxVersion = 3 });
-
-            Mocker.GetMock<IFileStationProxy>()
-                .Setup(s => s.GetApiInfo(It.IsAny<DownloadStationSettings>()))
-                .Returns(new DiskStationApiInfo() { Name = "File", MinVersion = 1, MaxVersion = 2 });
-        }
-
         protected void GivenSharedFolder()
         {
             Mocker.GetMock<ISharedFolderResolver>()
@@ -206,7 +191,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
 
         protected void GivenSerialNumber()
         {
-            Mocker.GetMock<IDSMInfoProvider>()
+            Mocker.GetMock<ISerialNumberProvider>()
                 .Setup(s => s.GetSerialNumber(It.IsAny<DownloadStationSettings>()))
                 .Returns(_serialNumber);
         }
@@ -260,25 +245,6 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
             Mocker.GetMock<IDownloadStationTaskProxy>()
                   .Setup(d => d.GetTasks(_settings))
                   .Returns(tasks);
-		}
-
- 		protected void GivenDSMVersion(string version)
-        {
-            Mocker.GetMock<IDSMInfoProvider>()
-                .Setup(d => d.GetDSMVersion(It.IsAny<DownloadStationSettings>()))
-                .Returns(new Version(version));
-        }
-
-        [TestCase("6.0.0", 0)]
-        [TestCase("5.0.0", 1)]
-        public void TestConnection_should_return_validation_failure_as_expected(string version, int count)
-        {
-            GivenApiVersions();
-            GivenDSMVersion(version);
-
-            var result = Subject.Test();
-
-            result.Errors.Should().HaveCount(count);
         }
 
         [Test]
@@ -382,7 +348,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
         [Test]
         public void GetItems_should_throw_if_serial_number_unavailable()
         {
-            Mocker.GetMock<IDSMInfoProvider>()
+            Mocker.GetMock<ISerialNumberProvider>()
                   .Setup(s => s.GetSerialNumber(_settings))
                   .Throws(new ApplicationException("Some unknown exception, HttpException or DownloadClientException"));
 
@@ -398,7 +364,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
         {
             var remoteEpisode = CreateRemoteEpisode();
 
-            Mocker.GetMock<IDSMInfoProvider>()
+            Mocker.GetMock<ISerialNumberProvider>()
                   .Setup(s => s.GetSerialNumber(_settings))
                   .Throws(new ApplicationException("Some unknown exception, HttpException or DownloadClientException"));
 

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

@@ -19,7 +19,6 @@ 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()
@@ -81,18 +80,13 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.NzbgetTests
                     DownloadRate = 7000000
                 });
 
-
-            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");
+            var 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()
@@ -420,18 +414,5 @@ 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/DownloadServiceFixture.cs

@@ -22,7 +22,6 @@ namespace NzbDrone.Core.Test.Download
     {
         private RemoteEpisode _parseResult;
         private List<IDownloadClient> _downloadClients;
-
         [SetUp]
         public void Setup()
         {
@@ -83,7 +82,7 @@ namespace NzbDrone.Core.Test.Download
         {
             var mock = WithUsenetClient();
             mock.Setup(s => s.Download(It.IsAny<RemoteEpisode>()));
-
+            
             Subject.DownloadReport(_parseResult);
 
             VerifyEventPublished<EpisodeGrabbedEvent>();
@@ -94,7 +93,7 @@ namespace NzbDrone.Core.Test.Download
         {
             var mock = WithUsenetClient();
             mock.Setup(s => s.Download(It.IsAny<RemoteEpisode>()));
-
+            
             Subject.DownloadReport(_parseResult);
 
             mock.Verify(s => s.Download(It.IsAny<RemoteEpisode>()), Times.Once());
@@ -118,7 +117,7 @@ namespace NzbDrone.Core.Test.Download
             var mock = WithUsenetClient();
             mock.Setup(s => s.Download(It.IsAny<RemoteEpisode>()))
                 .Callback<RemoteEpisode>(v => {
-                    throw new ReleaseDownloadException(v.Release, "Error", new WebException());
+                    throw new ReleaseDownloadException(v.Release, "Error", new WebException()); 
                 });
 
             Assert.Throws<ReleaseDownloadException>(() => Subject.DownloadReport(_parseResult));
@@ -137,7 +136,7 @@ namespace NzbDrone.Core.Test.Download
             var mock = WithUsenetClient();
             mock.Setup(s => s.Download(It.IsAny<RemoteEpisode>()))
                 .Callback<RemoteEpisode>(v => {
-                    throw new ReleaseDownloadException(v.Release, "Error", new TooManyRequestsException(request, response));
+                    throw new ReleaseDownloadException(v.Release, "Error", new TooManyRequestsException(request, response)); 
                 });
 
             Assert.Throws<ReleaseDownloadException>(() => Subject.DownloadReport(_parseResult));
@@ -181,27 +180,14 @@ namespace NzbDrone.Core.Test.Download
         }
 
         [Test]
-        public void should_not_attempt_download_if_client_isnt_configured()
+        public void should_not_attempt_download_if_client_isnt_configure()
         {
-            Assert.Throws<DownloadClientUnavailableException>(() => Subject.DownloadReport(_parseResult));
+            Subject.DownloadReport(_parseResult);
 
             Mocker.GetMock<IDownloadClient>().Verify(c => c.Download(It.IsAny<RemoteEpisode>()), Times.Never());
             VerifyEventNotPublished<EpisodeGrabbedEvent>();
-        }
 
-        [Test]
-        public void should_not_attempt_download_if_client_is_disabled()
-        {
-            WithUsenetClient();
-
-            Mocker.GetMock<IDownloadClientStatusService>()
-                  .Setup(v => v.IsDisabled(It.IsAny<int>()))
-                  .Returns(true);
-
-            Assert.Throws<DownloadClientUnavailableException>(() => Subject.DownloadReport(_parseResult));
-
-            Mocker.GetMock<IDownloadClient>().Verify(c => c.Download(It.IsAny<RemoteEpisode>()), Times.Never());
-            VerifyEventNotPublished<EpisodeGrabbedEvent>();
+            ExceptionVerification.ExpectedWarns(1);
         }
 
         [Test]

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, PendingReleaseReason.Delay);
+            Subject.Add(_temporarilyRejected);
 
             VerifyInsert();
         }
@@ -112,7 +112,7 @@ namespace NzbDrone.Core.Test.Download.Pending.PendingReleaseServiceTests
         {
             GivenHeldRelease(_release.Title, _release.Indexer, _release.PublishDate);
 
-            Subject.Add(_temporarilyRejected, PendingReleaseReason.Delay);
+            Subject.Add(_temporarilyRejected);
 
             VerifyNoInsert();
         }
@@ -122,7 +122,7 @@ namespace NzbDrone.Core.Test.Download.Pending.PendingReleaseServiceTests
         {
             GivenHeldRelease(_release.Title + "-RP", _release.Indexer, _release.PublishDate);
 
-            Subject.Add(_temporarilyRejected, PendingReleaseReason.Delay);
+            Subject.Add(_temporarilyRejected);
 
             VerifyInsert();
         }
@@ -132,7 +132,7 @@ namespace NzbDrone.Core.Test.Download.Pending.PendingReleaseServiceTests
         {
             GivenHeldRelease(_release.Title, "AnotherIndexer", _release.PublishDate);
 
-            Subject.Add(_temporarilyRejected, PendingReleaseReason.Delay);
+            Subject.Add(_temporarilyRejected);
 
             VerifyInsert();
         }
@@ -142,7 +142,7 @@ namespace NzbDrone.Core.Test.Download.Pending.PendingReleaseServiceTests
         {
             GivenHeldRelease(_release.Title, _release.Indexer, _release.PublishDate.AddHours(1));
 
-            Subject.Add(_temporarilyRejected, PendingReleaseReason.Delay);
+            Subject.Add(_temporarilyRejected);
 
             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.GetBlockedProviders())
+                .Setup(v => v.GetBlockedIndexers())
                 .Returns(new List<IndexerStatus>());
 
             GivenPendingRelease();
@@ -43,7 +43,7 @@ namespace NzbDrone.Core.Test.Download.Pending.PendingReleaseServiceTests
         public void should_ignore_pending_items_from_unavailable_indexer()
         {
             Mocker.GetMock<IIndexerStatusService>()
-                .Setup(v => v.GetBlockedProviders())
+                .Setup(v => v.GetBlockedIndexers())
                 .Returns(new List<IndexerStatus> { new IndexerStatus { ProviderId = 1, DisabledTill = DateTime.UtcNow.AddHours(2) } });
 
             GivenPendingRelease();

src/NzbDrone.Core.Test/Files/Indexers/TorrentRss/EvolutionWorld.xml

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-    <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
-    <channel>
-    <title>Evolution World</title>
-    <description>Advanced RSS Feed for xbtitFM by Petr1fied</description>
-    <link>http://ew.pw</link>
-    <lastBuildDate>Tue, 15 Aug 2017 00:00:00 +0000</lastBuildDate>
-    <copyright>(c) 2017 Evolution World</copyright>
-    <atom:link href="http://ew.pw/advanced_rss.php?cats=34%3B35%3B36%3B37%3B38%3B39%3B41%3B48%3B49%3B50%3B51%3B79%3B80%3B81&amp;tpc=100&amp;auth=secret" rel="self" type="application/rss+xml" />
-
-                        <item>
-                    <title><![CDATA[[TVShow --> TVShow Bluray 720p] Fargo S01 Complete Season 1 720p BRRip DD5.1 x264-PSYPHER [SEEDERS (3)/LEECHERS (0)]]]></title>
-                    <description><![CDATA[<br />Fargo S01 Complete Season 1 720p BRRip DD5.1 x264-PSYPHER<br /><br /><br /><br />Plot:<br /><br />Various chronicles of deception, intrigue and murder in and around frozen Minnesota.<br /><br />Note::-<br />Encode is tested and its perfect, no sync issue there in any episode.<br />All episodes comes with AC3 Audio for better audio and video plaback and English Subs are muxed in video .<br /><br />TECHNiCAL Information:<br /><br /><br />RUNTIME..................: 1 hr x 10<br />Total SIZE...............: 9.75 GiB<br />Total Episodes...........: 10<br />VIDEO CODEC..............: x264 2nd Pass (High,L4.1)<br />RESOLUTION...............: 1280x720<br />BITRATE (Video)..........: 2100 Kbps - 2400 kbps<br />Aspect Ratio.............: 16:9<br />Video Container..........: MKV<br />FRAMERATE................: 23.967 fps<br />AUDIO....................: English AC3 6 Channel 384 kbps<br />SUBTITLES................: English, English (SDH)<br />CHAPTERS.................: Yes<br />SOURCE...................: DON (Thanks !)<br /><br /><br />GENRE...................: Crime | Drama | Thriller<br />RATING..................: 9.1/10 from 140,765 users<br />IMDB link...............: <a href=&quot;http://www.imdb.com/title/tt2802850/&quot; target=&quot;_blank&quot;>http://www.imdb.com/title/tt2802850/</a>]]></description>
-                    <link>http://ew.pw/index.php?page=torrent-details&amp;id=dea071a7a62a0d662538d46402fb112f30b8c9fa</link>
-                    <guid>http://ew.pw/index.php?page=torrent-details&amp;id=dea071a7a62a0d662538d46402fb112f30b8c9fa</guid>
-                                            <enclosure url="http://ew.pw/download.php?id=dea071a7a62a0d662538d46402fb112f30b8c9fa&amp;f=Fargo%20S01%20Complete%20Season%201%20720p%20BRRip%20DD5.1%20x264-PSYPHER.torrent&amp;auth=secret" length="13625" type="application/x-bittorrent" />
-                                            <pubDate>Sun, 13 Aug 2017 22:21:43 +0000</pubDate>
-                    </item>
-
-                                        <item>
-                    <title><![CDATA[[TVShow --> TVShow Bluray 720p] American Horror Story S04 Complete Season 4 720p BRRip DD5.1 x264 - PSYPHER [SEEDERS (2)/LEECHERS (0)]]]></title>
-                    <description><![CDATA[]]></description>
-                    <link>http://ew.pw/index.php?page=torrent-details&amp;id=2725fe19ea2addf5aafbd523d134191b8abbb2ee</link>
-                    <guid>http://ew.pw/index.php?page=torrent-details&amp;id=2725fe19ea2addf5aafbd523d134191b8abbb2ee</guid>
-                                            <enclosure url="http://ew.pw/download.php?id=2725fe19ea2addf5aafbd523d134191b8abbb2ee&amp;f=American%20Horror%20Story%20S04%20Complete%20Season%204%20720p%20BRRip%20DD5.1%20x264%20-%20PSYPHER.torrent&amp;auth=secret" length="16583" type="application/x-bittorrent" />
-                                            <pubDate>Fri, 28 Jul 2017 16:29:51 +0000</pubDate>
-                    </item>
-                        </channel>
-    </rss>
-    

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

@@ -1,60 +0,0 @@
-<?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,6 +3,7 @@ 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;
 
@@ -25,7 +26,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 DownloadClientDefinition{Name = "Test"});
+            downloadClient.Setup(s => s.Definition).Returns(new IndexerDefinition{Name = "Test"});
 
             downloadClient.Setup(s => s.GetItems())
                           .Throws<Exception>();
@@ -35,6 +36,8 @@ 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.GetBlockedProviders())
+                   .Setup(v => v.GetBlockedIndexers())
                    .Returns(_blockedIndexers);
         }
 
@@ -57,6 +57,13 @@ 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,7 +13,6 @@ 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
@@ -82,13 +81,7 @@ namespace NzbDrone.Core.Test.HistoryTests
                                    Path = @"C:\Test\Unsorted\Series.s01e01.mkv"
                                };
 
-            var downloadClientItem = new DownloadClientItem
-                                     {
-                                         DownloadClient = "sab",
-                                         DownloadId = "abcd"
-                                     };
-
-            Subject.Handle(new EpisodeImportedEvent(localEpisode, episodeFile, new List<EpisodeFile>(), true, downloadClientItem));
+            Subject.Handle(new EpisodeImportedEvent(localEpisode, episodeFile, true, "sab", "abcd"));
 
             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

@@ -1,60 +0,0 @@
-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/FixFutureDownloadClientStatusTimesFixture.cs

@@ -1,119 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using FizzWare.NBuilder;
-using Moq;
-using NUnit.Framework;
-using NzbDrone.Core.Download;
-using NzbDrone.Core.Housekeeping.Housekeepers;
-using NzbDrone.Core.Test.Framework;
-using NzbDrone.Core.ThingiProvider.Status;
-
-namespace NzbDrone.Core.Test.Housekeeping.Housekeepers
-{
-    [TestFixture]
-    public class FixFutureDownloadClientStatusTimesFixture : CoreTest<FixFutureDownloadClientStatusTimes>
-    {
-        [Test]
-        public void should_set_disabled_till_when_its_too_far_in_the_future()
-        {
-            var disabledTillTime = EscalationBackOff.Periods[1];
-            var downloadClientStatuses = Builder<DownloadClientStatus>.CreateListOfSize(5)
-                                                        .All()
-                                                        .With(t => t.DisabledTill = DateTime.UtcNow.AddDays(5))
-                                                        .With(t => t.InitialFailure = DateTime.UtcNow.AddDays(-5))
-                                                        .With(t => t.MostRecentFailure = DateTime.UtcNow.AddDays(-5))
-                                                        .With(t => t.EscalationLevel = 1)
-                                                        .BuildListOfNew();
-
-            Mocker.GetMock<IDownloadClientStatusRepository>()
-                  .Setup(s => s.All())
-                  .Returns(downloadClientStatuses);
-
-            Subject.Clean();
-
-            Mocker.GetMock<IDownloadClientStatusRepository>()
-                  .Verify(v => v.UpdateMany(
-                          It.Is<List<DownloadClientStatus>>(i => i.All(
-                              s => s.DisabledTill.Value < DateTime.UtcNow.AddMinutes(disabledTillTime)))
-                      )
-                  );
-        }
-
-        [Test]
-        public void should_set_initial_failure_when_its_in_the_future()
-        {
-            var downloadClientStatuses = Builder<DownloadClientStatus>.CreateListOfSize(5)
-                                                        .All()
-                                                        .With(t => t.DisabledTill = DateTime.UtcNow.AddDays(-5))
-                                                        .With(t => t.InitialFailure = DateTime.UtcNow.AddDays(5))
-                                                        .With(t => t.MostRecentFailure = DateTime.UtcNow.AddDays(-5))
-                                                        .With(t => t.EscalationLevel = 1)
-                                                        .BuildListOfNew();
-
-            Mocker.GetMock<IDownloadClientStatusRepository>()
-                  .Setup(s => s.All())
-                  .Returns(downloadClientStatuses);
-
-            Subject.Clean();
-
-            Mocker.GetMock<IDownloadClientStatusRepository>()
-                  .Verify(v => v.UpdateMany(
-                          It.Is<List<DownloadClientStatus>>(i => i.All(
-                              s => s.InitialFailure.Value <= DateTime.UtcNow))
-                      )
-                  );
-        }
-
-        [Test]
-        public void should_set_most_recent_failure_when_its_in_the_future()
-        {
-            var downloadClientStatuses = Builder<DownloadClientStatus>.CreateListOfSize(5)
-                                                        .All()
-                                                        .With(t => t.DisabledTill = DateTime.UtcNow.AddDays(-5))
-                                                        .With(t => t.InitialFailure = DateTime.UtcNow.AddDays(-5))
-                                                        .With(t => t.MostRecentFailure = DateTime.UtcNow.AddDays(5))
-                                                        .With(t => t.EscalationLevel = 1)
-                                                        .BuildListOfNew();
-
-            Mocker.GetMock<IDownloadClientStatusRepository>()
-                  .Setup(s => s.All())
-                  .Returns(downloadClientStatuses);
-
-            Subject.Clean();
-
-            Mocker.GetMock<IDownloadClientStatusRepository>()
-                  .Verify(v => v.UpdateMany(
-                          It.Is<List<DownloadClientStatus>>(i => i.All(
-                              s => s.MostRecentFailure.Value <= DateTime.UtcNow))
-                      )
-                  );
-        }
-
-        [Test]
-        public void should_not_change_statuses_when_times_are_in_the_past()
-        {
-            var downloadClientStatuses = Builder<DownloadClientStatus>.CreateListOfSize(5)
-                                                        .All()
-                                                        .With(t => t.DisabledTill = DateTime.UtcNow.AddDays(-5))
-                                                        .With(t => t.InitialFailure = DateTime.UtcNow.AddDays(-5))
-                                                        .With(t => t.MostRecentFailure = DateTime.UtcNow.AddDays(-5))
-                                                        .With(t => t.EscalationLevel = 0)
-                                                        .BuildListOfNew();
-
-            Mocker.GetMock<IDownloadClientStatusRepository>()
-                  .Setup(s => s.All())
-                  .Returns(downloadClientStatuses);
-
-            Subject.Clean();
-
-            Mocker.GetMock<IDownloadClientStatusRepository>()
-                  .Verify(v => v.UpdateMany(
-                          It.Is<List<DownloadClientStatus>>(i => i.Count == 0)
-                      )
-                  );
-        }
-
-
-    }
-}

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

@@ -1,119 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using FizzWare.NBuilder;
-using Moq;
-using NUnit.Framework;
-using NzbDrone.Core.Housekeeping.Housekeepers;
-using NzbDrone.Core.Indexers;
-using NzbDrone.Core.Test.Framework;
-using NzbDrone.Core.ThingiProvider.Status;
-
-namespace NzbDrone.Core.Test.Housekeeping.Housekeepers
-{
-    [TestFixture]
-    public class FixFutureIndexerStatusTimesFixture : CoreTest<FixFutureIndexerStatusTimes>
-    {
-        [Test]
-        public void should_set_disabled_till_when_its_too_far_in_the_future()
-        {
-            var disabledTillTime = EscalationBackOff.Periods[1];
-            var indexerStatuses = Builder<IndexerStatus>.CreateListOfSize(5)
-                                                        .All()
-                                                        .With(t => t.DisabledTill = DateTime.UtcNow.AddDays(5))
-                                                        .With(t => t.InitialFailure = DateTime.UtcNow.AddDays(-5))
-                                                        .With(t => t.MostRecentFailure = DateTime.UtcNow.AddDays(-5))
-                                                        .With(t => t.EscalationLevel = 1)
-                                                        .BuildListOfNew();
-
-            Mocker.GetMock<IIndexerStatusRepository>()
-                  .Setup(s => s.All())
-                  .Returns(indexerStatuses);
-
-            Subject.Clean();
-
-            Mocker.GetMock<IIndexerStatusRepository>()
-                  .Verify(v => v.UpdateMany(
-                          It.Is<List<IndexerStatus>>(i => i.All(
-                              s => s.DisabledTill.Value < DateTime.UtcNow.AddMinutes(disabledTillTime)))
-                      )
-                  );
-        }
-
-        [Test]
-        public void should_set_initial_failure_when_its_in_the_future()
-        {
-            var indexerStatuses = Builder<IndexerStatus>.CreateListOfSize(5)
-                                                        .All()
-                                                        .With(t => t.DisabledTill = DateTime.UtcNow.AddDays(-5))
-                                                        .With(t => t.InitialFailure = DateTime.UtcNow.AddDays(5))
-                                                        .With(t => t.MostRecentFailure = DateTime.UtcNow.AddDays(-5))
-                                                        .With(t => t.EscalationLevel = 1)
-                                                        .BuildListOfNew();
-
-            Mocker.GetMock<IIndexerStatusRepository>()
-                  .Setup(s => s.All())
-                  .Returns(indexerStatuses);
-
-            Subject.Clean();
-
-            Mocker.GetMock<IIndexerStatusRepository>()
-                  .Verify(v => v.UpdateMany(
-                          It.Is<List<IndexerStatus>>(i => i.All(
-                              s => s.InitialFailure.Value < DateTime.UtcNow))
-                      )
-                  );
-        }
-
-        [Test]
-        public void should_set_most_recent_failure_when_its_in_the_future()
-        {
-            var indexerStatuses = Builder<IndexerStatus>.CreateListOfSize(5)
-                                                        .All()
-                                                        .With(t => t.DisabledTill = DateTime.UtcNow.AddDays(-5))
-                                                        .With(t => t.InitialFailure = DateTime.UtcNow.AddDays(-5))
-                                                        .With(t => t.MostRecentFailure = DateTime.UtcNow.AddDays(5))
-                                                        .With(t => t.EscalationLevel = 1)
-                                                        .BuildListOfNew();
-
-            Mocker.GetMock<IIndexerStatusRepository>()
-                  .Setup(s => s.All())
-                  .Returns(indexerStatuses);
-
-            Subject.Clean();
-
-            Mocker.GetMock<IIndexerStatusRepository>()
-                  .Verify(v => v.UpdateMany(
-                          It.Is<List<IndexerStatus>>(i => i.All(
-                              s => s.MostRecentFailure.Value < DateTime.UtcNow))
-                      )
-                  );
-        }
-
-        [Test]
-        public void should_not_change_statuses_when_times_are_in_the_past()
-        {
-            var indexerStatuses = Builder<IndexerStatus>.CreateListOfSize(5)
-                                                        .All()
-                                                        .With(t => t.DisabledTill = DateTime.UtcNow.AddDays(-5))
-                                                        .With(t => t.InitialFailure = DateTime.UtcNow.AddDays(-5))
-                                                        .With(t => t.MostRecentFailure = DateTime.UtcNow.AddDays(-5))
-                                                        .With(t => t.EscalationLevel = 0)
-                                                        .BuildListOfNew();
-
-            Mocker.GetMock<IIndexerStatusRepository>()
-                  .Setup(s => s.All())
-                  .Returns(indexerStatuses);
-
-            Subject.Clean();
-
-            Mocker.GetMock<IIndexerStatusRepository>()
-                  .Verify(v => v.UpdateMany(
-                          It.Is<List<IndexerStatus>>(i => i.Count == 0)
-                      )
-                  );
-        }
-
-
-    }
-}

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

@@ -0,0 +1,47 @@
+using System;
+using FizzWare.NBuilder;
+using FluentAssertions;
+using Microsoft.Practices.ObjectBuilder2;
+using NUnit.Framework;
+using NzbDrone.Core.Housekeeping.Housekeepers;
+using NzbDrone.Core.Jobs;
+using NzbDrone.Core.Test.Framework;
+
+namespace NzbDrone.Core.Test.Housekeeping.Housekeepers
+{
+    [TestFixture]
+    public class FixFutureRunScheduledTasksFixture : DbTest<FixFutureRunScheduledTasks, ScheduledTask>
+    {
+        [Test]
+        public void should_set_last_execution_time_to_now_when_its_in_the_future()
+        {
+            var tasks = Builder<ScheduledTask>.CreateListOfSize(5)
+                                              .All()
+                                              .With(t => t.LastExecution = DateTime.UtcNow.AddDays(5))
+                                              .BuildListOfNew();
+
+            Db.InsertMany(tasks);
+
+            Subject.Clean();
+
+            AllStoredModels.ForEach(t => t.LastExecution.Should().BeBefore(DateTime.UtcNow));
+        }
+
+        [Test]
+        public void should_not_change_last_execution_time_when_its_in_the_past()
+        {
+            var expectedTime = DateTime.UtcNow.AddHours(-1);
+
+            var tasks = Builder<ScheduledTask>.CreateListOfSize(5)
+                                              .All()
+                                              .With(t => t.LastExecution = expectedTime)
+                                              .BuildListOfNew();
+
+            Db.InsertMany(tasks);
+
+            Subject.Clean();
+
+            AllStoredModels.ForEach(t => t.LastExecution.Should().Be(expectedTime));
+        }
+    }
+}

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

@@ -30,7 +30,6 @@ namespace NzbDrone.Core.Test.IndexerTests
         [TestCase("100 Kb/s")]
         [TestCase(" 12341234")]
         [TestCase("12341234 other")]
-        [TestCase("")]
         public void should_not_parse_size(string sizeString)
         {
             var result = RssParser.ParseSize(sizeString, true);

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.FindByProviderId(1))
+                .Setup(v => v.FindByIndexerId(1))
                 .Returns(status);
 
             Mocker.GetMock<IIndexerStatusRepository>()
@@ -29,16 +29,25 @@ namespace NzbDrone.Core.Test.IndexerTests
                 .Returns(new[] { status });
         }
 
-        private void VerifyUpdate()
+        private void VerifyUpdate(bool updated = true)
         {
             Mocker.GetMock<IIndexerStatusRepository>()
-                .Verify(v => v.Upsert(It.IsAny<IndexerStatus>()), Times.Once());
+                .Verify(v => v.Upsert(It.IsAny<IndexerStatus>()), Times.Exactly(updated ? 1 : 0));
         }
 
-        private void VerifyNoUpdate()
+        [Test]
+        public void should_start_backoff_on_first_failure()
         {
-            Mocker.GetMock<IIndexerStatusRepository>()
-                .Verify(v => v.Upsert(It.IsAny<IndexerStatus>()), Times.Never());
+            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);
         }
 
         [Test]
@@ -50,7 +59,7 @@ namespace NzbDrone.Core.Test.IndexerTests
 
             VerifyUpdate();
 
-            var status = Subject.GetBlockedProviders().FirstOrDefault();
+            var status = Subject.GetBlockedIndexers().FirstOrDefault();
             status.Should().BeNull();
         }
 
@@ -61,7 +70,22 @@ namespace NzbDrone.Core.Test.IndexerTests
 
             Subject.RecordSuccess(1);
 
-            VerifyNoUpdate();
+            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);
         }
     }
 }

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

@@ -7,7 +7,6 @@ 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;
 
@@ -64,35 +63,6 @@ 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()
         {

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

@@ -261,33 +261,6 @@ namespace NzbDrone.Core.Test.IndexerTests.TorrentRssIndexerTests
             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_parse_recent_feed_from_EveolutionWorld_without_size()
-        {
-            Subject.Definition.Settings.As<TorrentRssIndexerSettings>().AllowZeroSize = true;
-            GivenRecentFeedResponse("TorrentRss/EvolutionWorld.xml");
-
-            var releases = Subject.FetchRecent();
-
-            releases.Should().HaveCount(2);
-            releases.First().Should().BeOfType<TorrentInfo>();
-
-            var torrentInfo = releases.First() as TorrentInfo;
-
-            torrentInfo.Title.Should().Be("[TVShow --> TVShow Bluray 720p] Fargo S01 Complete Season 1 720p BRRip DD5.1 x264-PSYPHER [SEEDERS (3)/LEECHERS (0)]");
-            torrentInfo.DownloadProtocol.Should().Be(DownloadProtocol.Torrent);
-            torrentInfo.DownloadUrl.Should().Be("http://ew.pw/download.php?id=dea071a7a62a0d662538d46402fb112f30b8c9fa&f=Fargo%20S01%20Complete%20Season%201%20720p%20BRRip%20DD5.1%20x264-PSYPHER.torrent&auth=secret");
-            torrentInfo.InfoUrl.Should().BeNullOrEmpty();
-            torrentInfo.CommentUrl.Should().BeNullOrEmpty();
-            torrentInfo.Indexer.Should().Be(Subject.Definition.Name);
-            torrentInfo.PublishDate.Should().Be(DateTime.Parse("2017-08-13T22:21:43Z").ToUniversalTime());
-            torrentInfo.Size.Should().Be(0);
-            torrentInfo.InfoHash.Should().BeNull();
-            torrentInfo.MagnetUrl.Should().BeNull();
-            torrentInfo.Peers.Should().NotHaveValue();
-            torrentInfo.Seeders.Should().NotHaveValue();
-        }
-
         [Test]
         public void should_record_indexer_failure_if_unsupported_feed()
         {

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

@@ -254,11 +254,13 @@ 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);

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

@@ -97,37 +97,6 @@ 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/DiskScanServiceTests/ScanFixture.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using FizzWare.NBuilder;
@@ -269,22 +269,6 @@ namespace NzbDrone.Core.Test.MediaFiles.DiskScanServiceTests
                   .Verify(v => v.GetImportDecisions(It.Is<List<string>>(l => l.Count == 1), _series), Times.Once());
         }
 
-        [Test]
-        public void should_scan_files_that_start_with_period()
-        {
-            GivenSeriesFolder();
-
-            GivenFiles(new List<string>
-                       {
-                           Path.Combine(_series.Path, "Season 1", ".s01e01.mkv").AsOsAgnostic()
-                       });
-
-            Subject.Scan(_series);
-
-            Mocker.GetMock<IMakeImportDecision>()
-                  .Verify(v => v.GetImportDecisions(It.Is<List<string>>(l => l.Count == 1), _series), Times.Once());
-        }
-
         [Test]
         public void should_not_scan_subfolder_of_season_folder_that_starts_with_a_period()
         {

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

@@ -2,12 +2,9 @@
 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;
@@ -16,6 +13,8 @@ using NzbDrone.Core.Qualities;
 using NzbDrone.Core.Test.Framework;
 using NzbDrone.Core.Tv;
 using NzbDrone.Test.Common;
+using FluentAssertions;
+using NzbDrone.Core.Download;
 
 namespace NzbDrone.Core.Test.MediaFiles
 {
@@ -26,17 +25,12 @@ 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);
 
@@ -46,23 +40,6 @@ 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()
@@ -72,29 +49,6 @@ 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()
         {
@@ -210,9 +164,11 @@ 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(DetectSampleResult.Sample);
+                  .Returns(true);
 
             Subject.ProcessRootFolder(new DirectoryInfo(_droneFactory));
 
@@ -280,9 +236,11 @@ 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(DetectSampleResult.Sample);
+                  .Returns(true);
 
             Mocker.GetMock<IDiskProvider>()
                   .Setup(s => s.GetFiles(It.IsAny<string>(), SearchOption.AllDirectories))
@@ -389,9 +347,11 @@ 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(DetectSampleResult.Sample);
+                  .Returns(true);
 
             Mocker.GetMock<IDiskProvider>()
                   .Setup(s => s.GetFileSize(It.IsAny<string>()))
@@ -403,51 +363,6 @@ 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/ImportDecisionMakerFixture.cs

@@ -333,16 +333,8 @@ namespace NzbDrone.Core.Test.MediaFiles.EpisodeImport
             GivenVideoFiles(videoFiles.ToList());
 
             Mocker.GetMock<IDetectSample>()
-                  .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;
-                  });
+                  .Setup(s => s.IsSample(_series, It.IsAny<QualityModel>(), It.Is<string>(c => c.Contains("sample")), It.IsAny<long>(), It.IsAny<bool>()))
+                  .Returns(true);
 
             var folderInfo = Parser.Parser.ParseTitle("Series.Title.S01E01");
 

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

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

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

@@ -63,35 +63,6 @@ namespace NzbDrone.Core.Test.MediaFiles.EpisodeImport.Specifications
             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()
         {

src/NzbDrone.Core.Test/MediaFiles/MediaFileDeletionService/DeleteEpisodeFileFixture.cs

@@ -1,140 +0,0 @@
-using System.IO;
-using FizzWare.NBuilder;
-using Moq;
-using NUnit.Framework;
-using NzbDrone.Common.Disk;
-using NzbDrone.Core.Exceptions;
-using NzbDrone.Core.MediaFiles;
-using NzbDrone.Core.Test.Framework;
-using NzbDrone.Core.Tv;
-using NzbDrone.Test.Common;
-
-namespace NzbDrone.Core.Test.MediaFiles.MediaFileDeletionService
-{
-    [TestFixture]
-    public class DeleteEpisodeFileFixture : CoreTest<Core.MediaFiles.MediaFileDeletionService>
-    {
-        private static readonly string RootFolder = @"C:\Test\TV";
-        private Series _series;
-        private EpisodeFile _episodeFile;
-
-        [SetUp]
-        public void Setup()
-        {
-            _series = Builder<Series>.CreateNew()
-                                     .With(s => s.Path = Path.Combine(RootFolder, "Series Title"))
-                                     .Build();
-
-            _episodeFile = Builder<EpisodeFile>.CreateNew()
-                                               .With(f => f.RelativePath = "Series Title - S01E01")
-                                               .With(f => f.Path = Path.Combine(_series.Path, "Series Title - S01E01"))
-                                               .Build();
-
-            Mocker.GetMock<IDiskProvider>()
-                  .Setup(s => s.GetParentFolder(_series.Path))
-                  .Returns(RootFolder);
-
-            Mocker.GetMock<IDiskProvider>()
-                  .Setup(s => s.GetParentFolder(_episodeFile.Path))
-                  .Returns(_series.Path);
-        }
-
-        private void GivenRootFolderExists()
-        {
-            Mocker.GetMock<IDiskProvider>()
-                  .Setup(s => s.FolderExists(RootFolder))
-                  .Returns(true);
-        }
-
-        private void GivenRootFolderHasFolders()
-        {
-            Mocker.GetMock<IDiskProvider>()
-                  .Setup(s => s.GetDirectories(RootFolder))
-                  .Returns(new[] { _series.Path });
-        }
-
-        private void GivenSeriesFolderExists()
-        {
-            Mocker.GetMock<IDiskProvider>()
-                  .Setup(s => s.FolderExists(_series.Path))
-                  .Returns(true);
-        }
-
-        [Test]
-        public void should_throw_if_root_folder_does_not_exist()
-        {
-            Assert.Throws<NzbDroneClientException>(() => Subject.DeleteEpisodeFile(_series, _episodeFile));
-        }
-
-        [Test]
-        public void should_should_throw_if_root_folder_is_empty()
-        {
-            GivenRootFolderExists();
-            Assert.Throws<NzbDroneClientException>(() => Subject.DeleteEpisodeFile(_series, _episodeFile));
-        }
-
-        [Test]
-        public void should_delete_from_db_if_series_folder_does_not_exist()
-        {
-            GivenRootFolderExists();
-            GivenRootFolderHasFolders();
-
-            Subject.DeleteEpisodeFile(_series, _episodeFile);
-
-            Mocker.GetMock<IMediaFileService>().Verify(v => v.Delete(_episodeFile, DeleteMediaFileReason.Manual), Times.Once());
-            Mocker.GetMock<IRecycleBinProvider>().Verify(v => v.DeleteFile(_episodeFile.Path, It.IsAny<string>()), Times.Never());
-        }
-
-        [Test]
-        public void should_delete_from_db_if_episode_file_does_not_exist()
-        {
-            GivenRootFolderExists();
-            GivenRootFolderHasFolders();
-            GivenSeriesFolderExists();
-
-            Subject.DeleteEpisodeFile(_series, _episodeFile);
-
-            Mocker.GetMock<IMediaFileService>().Verify(v => v.Delete(_episodeFile, DeleteMediaFileReason.Manual), Times.Once());
-            Mocker.GetMock<IRecycleBinProvider>().Verify(v => v.DeleteFile(_episodeFile.Path, It.IsAny<string>()), Times.Never());
-        }
-
-        [Test]
-        public void should_delete_from_disk_and_db_if_episode_file_exists()
-        {
-            GivenRootFolderExists();
-            GivenRootFolderHasFolders();
-            GivenSeriesFolderExists();
-
-            Mocker.GetMock<IDiskProvider>()
-                  .Setup(s => s.FileExists(_episodeFile.Path))
-                  .Returns(true);
-
-            Subject.DeleteEpisodeFile(_series, _episodeFile);
-
-            Mocker.GetMock<IRecycleBinProvider>().Verify(v => v.DeleteFile(_episodeFile.Path, "Series Title"), Times.Once());
-            Mocker.GetMock<IMediaFileService>().Verify(v => v.Delete(_episodeFile, DeleteMediaFileReason.Manual), Times.Once());
-        }
-
-        [Test]
-        public void should_handle_error_deleting_episode_file()
-        {
-            GivenRootFolderExists();
-            GivenRootFolderHasFolders();
-            GivenSeriesFolderExists();
-
-            Mocker.GetMock<IDiskProvider>()
-                  .Setup(s => s.FileExists(_episodeFile.Path))
-                  .Returns(true);
-
-            Mocker.GetMock<IRecycleBinProvider>()
-                  .Setup(s => s.DeleteFile(_episodeFile.Path, "Series Title"))
-                  .Throws(new IOException());
-
-            Assert.Throws<NzbDroneClientException>(() => Subject.DeleteEpisodeFile(_series, _episodeFile));
-
-            ExceptionVerification.ExpectedErrors(1);
-            Mocker.GetMock<IRecycleBinProvider>().Verify(v => v.DeleteFile(_episodeFile.Path, "Series Title"), Times.Once());
-            Mocker.GetMock<IMediaFileService>().Verify(v => v.Delete(_episodeFile, DeleteMediaFileReason.Manual), Times.Never());
-        }
-    }
-}

src/NzbDrone.Core.Test/MediaFiles/MediaInfo/FormattedAudioChannelsFixture.cs

@@ -1,12 +1,11 @@
-using FluentAssertions;
+using FluentAssertions;
 using NUnit.Framework;
 using NzbDrone.Core.MediaFiles.MediaInfo;
-using NzbDrone.Test.Common;
 
-namespace NzbDrone.Core.Test.MediaFiles.MediaInfo.MediaInfoFormatterTests
+namespace NzbDrone.Core.Test.MediaFiles.MediaInfo
 {
     [TestFixture]
-    public class FormatAudioChannelsFixture : TestBase
+    public class FormattedAudioChannelsFixture
     {
         [Test]
         public void should_subtract_one_from_AudioChannels_as_total_channels_if_LFE_in_AudioChannelPositionsText()
@@ -18,7 +17,7 @@ namespace NzbDrone.Core.Test.MediaFiles.MediaInfo.MediaInfoFormatterTests
                 AudioChannelPositionsText = "Front: L C R, Side: L R, LFE"
             };
 
-            MediaInfoFormatter.FormatAudioChannels(mediaInfoModel).Should().Be(5.1m);
+            mediaInfoModel.FormattedAudioChannels.Should().Be(5.1m);
         }
 
         [Test]
@@ -31,7 +30,7 @@ namespace NzbDrone.Core.Test.MediaFiles.MediaInfo.MediaInfoFormatterTests
                 AudioChannelPositionsText = "Front: L R"
             };
 
-            MediaInfoFormatter.FormatAudioChannels(mediaInfoModel).Should().Be(2);
+            mediaInfoModel.FormattedAudioChannels.Should().Be(2);
         }
 
         [Test]
@@ -45,7 +44,7 @@ namespace NzbDrone.Core.Test.MediaFiles.MediaInfo.MediaInfoFormatterTests
                 SchemaRevision = 2
             };
 
-            MediaInfoFormatter.FormatAudioChannels(mediaInfoModel).Should().Be(0);
+            mediaInfoModel.FormattedAudioChannels.Should().Be(0);
         }
 
         [Test]
@@ -59,7 +58,7 @@ namespace NzbDrone.Core.Test.MediaFiles.MediaInfo.MediaInfoFormatterTests
                 SchemaRevision = 3
             };
 
-            MediaInfoFormatter.FormatAudioChannels(mediaInfoModel).Should().Be(2);
+            mediaInfoModel.FormattedAudioChannels.Should().Be(2);
         }
 
         [Test]
@@ -73,7 +72,7 @@ namespace NzbDrone.Core.Test.MediaFiles.MediaInfo.MediaInfoFormatterTests
                 SchemaRevision = 3
             };
 
-            MediaInfoFormatter.FormatAudioChannels(mediaInfoModel).Should().Be(2);
+            mediaInfoModel.FormattedAudioChannels.Should().Be(2);
         }
 
         [Test]
@@ -87,7 +86,7 @@ namespace NzbDrone.Core.Test.MediaFiles.MediaInfo.MediaInfoFormatterTests
                 SchemaRevision = 3
             };
 
-            MediaInfoFormatter.FormatAudioChannels(mediaInfoModel).Should().Be(5.1m);
+            mediaInfoModel.FormattedAudioChannels.Should().Be(5.1m);
         }
 
         [Test]
@@ -101,21 +100,7 @@ namespace NzbDrone.Core.Test.MediaFiles.MediaInfo.MediaInfoFormatterTests
                 SchemaRevision = 3
             };
 
-            MediaInfoFormatter.FormatAudioChannels(mediaInfoModel).Should().Be(7.1m);
-        }
-
-        [Test]
-        public void should_skip_empty_groups_in_AudioChannelPositions()
-        {
-            var mediaInfoModel = new MediaInfoModel
-            {
-                AudioChannels = 2,
-                AudioChannelPositions = " / 2/0/0.0",
-                AudioChannelPositionsText = null,
-                SchemaRevision = 3
-            };
-
-            MediaInfoFormatter.FormatAudioChannels(mediaInfoModel).Should().Be(2);
+            mediaInfoModel.FormattedAudioChannels.Should().Be(7.1m);
         }
 
         [Test]
@@ -129,21 +114,7 @@ namespace NzbDrone.Core.Test.MediaFiles.MediaInfo.MediaInfoFormatterTests
                 SchemaRevision = 3
             };
 
-            MediaInfoFormatter.FormatAudioChannels(mediaInfoModel).Should().Be(7.1m);
-        }
-
-        [Test]
-        public void should_sum_dual_mono_representation_AudioChannelPositions()
-        {
-            var mediaInfoModel = new MediaInfoModel
-            {
-                AudioChannels = 2,
-                AudioChannelPositions = "1+1",
-                AudioChannelPositionsText = null,
-                SchemaRevision = 3
-            };
-
-            MediaInfoFormatter.FormatAudioChannels(mediaInfoModel).Should().Be(2.0m);
+            mediaInfoModel.FormattedAudioChannels.Should().Be(7.1m);
         }
     }
 }

src/NzbDrone.Core.Test/MediaFiles/MediaInfo/MediaInfoFormatterTests/FormatAudioCodecFixture.cs

@@ -1,74 +0,0 @@
-using FluentAssertions;
-using NUnit.Framework;
-using NzbDrone.Core.MediaFiles.MediaInfo;
-using NzbDrone.Test.Common;
-
-namespace NzbDrone.Core.Test.MediaFiles.MediaInfo.MediaInfoFormatterTests
-{
-    [TestFixture]
-    public class FormatAudioCodecFixture : TestBase
-    {
-        private static string sceneName = "My.Series.S01E01-Sonarr";
-
-        [TestCase("AC-3", "AC3")]
-        [TestCase("E-AC-3", "EAC3")]
-        [TestCase("MPEG Audio", "MPEG Audio")]
-        [TestCase("DTS", "DTS")]
-        public void should_format_audio_format_legacy(string audioFormat, string expectedFormat)
-        {
-            var mediaInfoModel = new MediaInfoModel
-            {
-                AudioFormat = audioFormat
-            };
-
-            MediaInfoFormatter.FormatAudioCodec(mediaInfoModel, sceneName).Should().Be(expectedFormat);
-        }
-
-        [TestCase("MPEG Audio, A_MPEG/L2, , ", "droned.s01e03.swedish.720p.hdtv.x264-prince", "MP2")]
-        [TestCase("Vorbis, A_VORBIS, , Xiph.Org libVorbis I 20101101 (Schaufenugget)", "DB Super HDTV", "Vorbis")]
-        [TestCase("PCM, 1, , ", "DW DVDRip XviD-idTV", "PCM")] // Dubbed most likely
-        [TestCase("TrueHD, A_TRUEHD, , ", "", "TrueHD")]
-        [TestCase("WMA, 161, , ", "Droned.wmv", "WMA")]
-        [TestCase("WMA, 162, Pro, ", "B.N.S04E18.720p.WEB-DL", "WMA")]
-        [TestCase("Opus, A_OPUS, , ", "Roadkill Ep3x11 - YouTube.webm", "Opus")]
-        [TestCase("mp3 , 0, , ", "climbing.mp4", "MP3")]
-        public void should_format_audio_format(string audioFormatPack, string sceneName, string expectedFormat)
-        {
-            var split = audioFormatPack.Split(new string[] { ", " }, System.StringSplitOptions.None);
-            var mediaInfoModel = new MediaInfoModel
-            {
-                AudioFormat = split[0],
-                AudioCodecID = split[1],
-                AudioProfile = split[2],
-                AudioCodecLibrary = split[3]
-            };
-
-            MediaInfoFormatter.FormatAudioCodec(mediaInfoModel, sceneName).Should().Be(expectedFormat);
-        }
-
-        [Test]
-        public void should_return_MP3_for_MPEG_Audio_with_Layer_3_for_the_profile()
-        {
-            var mediaInfoModel = new MediaInfoModel
-            {
-                AudioFormat = "MPEG Audio",
-                AudioProfile = "Layer 3"
-            };
-
-            MediaInfoFormatter.FormatAudioCodec(mediaInfoModel, sceneName).Should().Be("MP3");
-        }
-
-        [Test]
-        public void should_return_AudioFormat_by_default()
-        {
-            var mediaInfoModel = new MediaInfoModel
-            {
-                AudioFormat = "Other Audio Format",
-                AudioCodecID = "Other Audio Codec"
-            };
-
-            MediaInfoFormatter.FormatAudioCodec(mediaInfoModel, sceneName).Should().Be(mediaInfoModel.AudioFormat);
-            ExceptionVerification.ExpectedWarns(1);
-        }
-    }
-}

src/NzbDrone.Core.Test/MediaFiles/MediaInfo/MediaInfoFormatterTests/FormatVideoCodecFixture.cs

@@ -1,68 +0,0 @@
-using FluentAssertions;
-using NUnit.Framework;
-using NzbDrone.Core.MediaFiles.MediaInfo;
-using NzbDrone.Test.Common;
-
-namespace NzbDrone.Core.Test.MediaFiles.MediaInfo.MediaInfoFormatterTests
-{
-    [TestFixture]
-    public class FormatVideoCodecFixture : TestBase
-    {
-        [TestCase("AVC", null, "x264")]
-        [TestCase("AVC", "source.title.x264.720p-Sonarr", "x264")]
-        [TestCase("AVC", "source.title.h264.720p-Sonarr", "h264")]
-        [TestCase("V_MPEGH/ISO/HEVC", null, "x265")]
-        [TestCase("V_MPEGH/ISO/HEVC", "source.title.x265.720p-Sonarr", "x265")]
-        [TestCase("V_MPEGH/ISO/HEVC", "source.title.h265.720p-Sonarr", "h265")]
-        [TestCase("MPEG-2 Video", null, "MPEG2")]
-        public void should_format_video_codec_with_source_title(string videoCodec, string sceneName, string expectedFormat)
-        {
-            var mediaInfoModel = new MediaInfoModel
-            {
-                VideoCodec = videoCodec
-            };
-
-            MediaInfoFormatter.FormatVideoCodec(mediaInfoModel, sceneName).Should().Be(expectedFormat);
-        }
-
-        [TestCase("MPEG Video, 2, Main@High, ", "Droned.S01E02.1080i.HDTV.DD5.1.MPEG2-NTb", "MPEG2")]
-        [TestCase("MPEG Video, V_MPEG2, Main@High, ", "", "MPEG2")]
-        [TestCase("MPEG Video, , , ", "The.Simpsons.S13E04.INTERNAL-ANiVCD.mpg", "MPEG")]
-        [TestCase("VC-1, WVC1, Advanced@L4, ", "B.N.S04E18.720p.WEB-DL", "VC1")]
-        [TestCase("VC-1, V_MS/VFW/FOURCC / WVC1, Advanced@L3, ", "", "VC1")]
-        [TestCase("VC-1, WMV3, MP@LL, ", "It's Always Sunny S07E13 The Gang's RevengeHDTV.XviD-2HD.avi", "VC1")]
-        [TestCase("V.MPEG4/ISO/AVC, V.MPEG4/ISO/AVC, , ", "pd.2015.S03E08.720p.iP.WEBRip.AAC2.0.H264-BTW", "h264")]
-        [TestCase("WMV2, WMV2, , ", "Droned.wmv", "WMV")]
-        [TestCase("xvid, xvid, , ", "", "XviD")]
-        [TestCase("div3, div3, , ", "spsm.dvdrip.divx.avi'.", "DivX")]
-        [TestCase("VP6, 4, , ", "Top Gear - S12E01 - Lorries - SD TV.flv", "VP6")]
-        [TestCase("VP7, VP70, General, ", "Sweet Seymour.avi", "VP7")]
-        [TestCase("VP8, V_VP8, , ", "Dick.mkv", "VP8")]
-        [TestCase("VP9, V_VP9, , ", "Roadkill Ep3x11 - YouTube.webm", "VP9")]
-        public void should_format_video_format(string videoFormatPack, string sceneName, string expectedFormat)
-        {
-            var split = videoFormatPack.Split(new string[] { ", " }, System.StringSplitOptions.None);
-            var mediaInfoModel = new MediaInfoModel
-            {
-                VideoFormat = split[0],
-                VideoCodecID = split[1],
-                VideoProfile = split[2],
-                VideoCodecLibrary = split[3]
-            };
-
-            MediaInfoFormatter.FormatVideoCodec(mediaInfoModel, sceneName).Should().Be(expectedFormat);
-        }
-
-        [Test]
-        public void should_return_VideoFormat_by_default()
-        {
-            var mediaInfoModel = new MediaInfoModel
-            {
-                VideoFormat = "VideoCodec"
-            };
-
-            MediaInfoFormatter.FormatVideoCodec(mediaInfoModel, null).Should().Be(mediaInfoModel.VideoFormat);
-            ExceptionVerification.ExpectedWarns(1);
-        }
-    }
-}

src/NzbDrone.Core.Test/MediaFiles/MediaInfo/UpdateMediaInfoServiceFixture.cs

@@ -60,33 +60,7 @@ namespace NzbDrone.Core.Test.MediaFiles.MediaInfo
                 .All()
                 .With(v => v.RelativePath = "media.mkv")
                 .TheFirst(1)
-                .With(v => v.MediaInfo = new MediaInfoModel { SchemaRevision = UpdateMediaInfoService.CURRENT_MEDIA_INFO_SCHEMA_REVISION })
-                .BuildList();
-
-            Mocker.GetMock<IMediaFileService>()
-                  .Setup(v => v.GetFilesBySeries(1))
-                  .Returns(episodeFiles);
-
-            GivenFileExists();
-            GivenSuccessfulScan();
-
-            Subject.Handle(new SeriesScannedEvent(_series));
-
-            Mocker.GetMock<IVideoFileInfoReader>()
-                  .Verify(v => v.GetMediaInfo(Path.Combine(_series.Path, "media.mkv")), Times.Exactly(2));
-
-            Mocker.GetMock<IMediaFileService>()
-                  .Verify(v => v.Update(It.IsAny<EpisodeFile>()), Times.Exactly(2));
-        }
-
-        [Test]
-        public void should_skip_not_yet_date_media_info()
-        {
-            var episodeFiles = Builder<EpisodeFile>.CreateListOfSize(3)
-                .All()
-                .With(v => v.RelativePath = "media.mkv")
-                .TheFirst(1)
-                .With(v => v.MediaInfo = new MediaInfoModel { SchemaRevision = UpdateMediaInfoService.MINIMUM_MEDIA_INFO_SCHEMA_REVISION })
+                .With(v => v.MediaInfo = new MediaInfoModel { SchemaRevision = 3 })
                 .BuildList();
 
             Mocker.GetMock<IMediaFileService>()

src/NzbDrone.Core.Test/MediaFiles/MediaInfo/VideoFileInfoReaderFixture.cs

@@ -1,4 +1,4 @@
-using System.IO;
+using System.IO;
 using FluentAssertions;
 using Moq;
 using NUnit.Framework;
@@ -30,9 +30,11 @@ namespace NzbDrone.Core.Test.MediaFiles.MediaInfo
         {
             var path = Path.Combine(TestContext.CurrentContext.TestDirectory, "Files", "Media", "H264_sample.mp4");
 
-            Subject.GetRunTime(path).Value.Seconds.Should().Be(10);
+            Subject.GetRunTime(path).Seconds.Should().Be(10);
+
         }
 
+
         [Test]
         public void get_info()
         {
@@ -40,23 +42,18 @@ namespace NzbDrone.Core.Test.MediaFiles.MediaInfo
 
             var info = Subject.GetMediaInfo(path);
 
-            info.VideoCodec.Should().BeNull();
-            info.VideoFormat.Should().Be("AVC");
-            info.VideoCodecID.Should().Be("avc1");
-            info.VideoProfile.Should().Be("Baseline@L2.1");
-            info.VideoCodecLibrary.Should().Be("");
-            info.AudioFormat.Should().Be("AAC");
-            info.AudioCodecID.Should().Be("40");
-            info.AudioProfile.Should().Be("LC");
-            info.AudioCodecLibrary.Should().Be("");
+
             info.AudioBitrate.Should().Be(128000);
             info.AudioChannels.Should().Be(2);
+            info.AudioFormat.Should().Be("AAC");
             info.AudioLanguages.Should().Be("English");
+            info.AudioProfile.Should().Be("LC");
             info.Height.Should().Be(320);
             info.RunTime.Seconds.Should().Be(10);
             info.ScanType.Should().Be("Progressive");
             info.Subtitles.Should().Be("");
             info.VideoBitrate.Should().Be(193329);
+            info.VideoCodec.Should().Be("AVC");
             info.VideoFps.Should().Be(24);
             info.Width.Should().Be(480);
 
@@ -76,25 +73,20 @@ namespace NzbDrone.Core.Test.MediaFiles.MediaInfo
 
             var info = Subject.GetMediaInfo(path);
 
-            info.VideoCodec.Should().BeNull();
-            info.VideoFormat.Should().Be("AVC");
-            info.VideoCodecID.Should().Be("avc1");
-            info.VideoProfile.Should().Be("Baseline@L2.1");
-            info.VideoCodecLibrary.Should().Be("");
-            info.AudioFormat.Should().Be("AAC");
-            info.AudioCodecID.Should().Be("40");
-            info.AudioProfile.Should().Be("LC");
-            info.AudioCodecLibrary.Should().Be("");
             info.AudioBitrate.Should().Be(128000);
             info.AudioChannels.Should().Be(2);
+            info.AudioFormat.Should().Be("AAC");
             info.AudioLanguages.Should().Be("English");
+            info.AudioProfile.Should().Be("LC");
             info.Height.Should().Be(320);
             info.RunTime.Seconds.Should().Be(10);
             info.ScanType.Should().Be("Progressive");
             info.Subtitles.Should().Be("");
             info.VideoBitrate.Should().Be(193329);
+            info.VideoCodec.Should().Be("AVC");
             info.VideoFps.Should().Be(24);
             info.Width.Should().Be(480);
+
         }
 
         [Test]
@@ -109,4 +101,4 @@ namespace NzbDrone.Core.Test.MediaFiles.MediaInfo
             stream.Close();
         }
     }
-}
+}

src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj

@@ -161,11 +161,9 @@
     <Compile Include="DecisionEngineTests\RssSync\DelaySpecificationFixture.cs" />
     <Compile Include="DecisionEngineTests\RssSync\DeletedEpisodeFileSpecificationFixture.cs" />
     <Compile Include="DecisionEngineTests\RssSync\ProperSpecificationFixture.cs" />
-    <Compile Include="DecisionEngineTests\Search\TorrentSeedingSpecificationFixture.cs" />
     <Compile Include="DecisionEngineTests\Search\SeriesSpecificationFixture.cs" />
     <Compile Include="DecisionEngineTests\SameEpisodesSpecificationFixture.cs" />
     <Compile Include="DecisionEngineTests\RawDiskSpecificationFixture.cs" />
-    <Compile Include="DecisionEngineTests\BlockedIndexerSpecificationFixture.cs" />
     <Compile Include="DecisionEngineTests\UpgradeDiskSpecificationFixture.cs" />
     <Compile Include="DiskSpace\DiskSpaceServiceFixture.cs" />
     <Compile Include="Download\CompletedDownloadServiceFixture.cs" />
@@ -176,11 +174,10 @@
     <Compile Include="Download\DownloadClientTests\DelugeTests\DelugeFixture.cs" />
     <Compile Include="Download\DownloadClientTests\DownloadClientFixtureBase.cs" />
     <Compile Include="Download\DownloadClientTests\DownloadStationTests\TorrentDownloadStationFixture.cs" />
-    <Compile Include="Download\DownloadClientTests\DownloadStationTests\DSMInfoProviderFixture.cs" />
+    <Compile Include="Download\DownloadClientTests\DownloadStationTests\SerialNumberProviderFixture.cs" />
     <Compile Include="Download\DownloadClientTests\DownloadStationTests\SharedFolderResolverFixture.cs" />
     <Compile Include="Download\DownloadClientTests\DownloadStationTests\UsenetDownloadStationFixture.cs" />
     <Compile Include="Download\DownloadClientTests\HadoukenTests\HadoukenFixture.cs" />
-    <Compile Include="Download\DownloadClientStatusServiceFixture.cs" />
     <Compile Include="Download\DownloadClientTests\NzbgetTests\NzbgetFixture.cs" />
     <Compile Include="Download\DownloadClientTests\NzbVortexTests\NzbVortexFixture.cs" />
     <Compile Include="Download\DownloadClientTests\PneumaticProviderFixture.cs" />
@@ -238,11 +235,9 @@
     <Compile Include="Housekeeping\Housekeepers\CleanupOrphanedIndexerStatusFixture.cs" />
     <Compile Include="Housekeeping\Housekeepers\CleanupOrphanedHistoryItemsFixture.cs" />
     <Compile Include="Housekeeping\Housekeepers\CleanupOrphanedMetadataFilesFixture.cs" />
-    <Compile Include="Housekeeping\Housekeepers\CleanupDownloadClientUnavailablePendingReleasesFixture.cs" />
     <Compile Include="Housekeeping\Housekeepers\CleanupUnusedTagsFixture.cs" />
     <Compile Include="Housekeeping\Housekeepers\CleanupOrphanedPendingReleasesFixture.cs" />
-    <Compile Include="Housekeeping\Housekeepers\FixFutureDownloadClientStatusTimesFixture.cs" />
-    <Compile Include="Housekeeping\Housekeepers\FixFutureIndexerStatusTimesFixture.cs" />
+    <Compile Include="Housekeeping\Housekeepers\FixFutureRunScheduledTasksFixture.cs" />
     <Compile Include="Http\HttpProxySettingsProviderFixture.cs" />
     <Compile Include="Http\TorCacheHttpRequestInterceptorFixture.cs" />
     <Compile Include="IndexerSearchTests\SeriesSearchServiceFixture.cs" />
@@ -285,7 +280,7 @@
     <Compile Include="MediaFiles\DownloadedEpisodesImportServiceFixture.cs" />
     <Compile Include="MediaFiles\EpisodeFileMovingServiceTests\MoveEpisodeFileFixture.cs" />
     <Compile Include="MediaFiles\EpisodeImport\ImportDecisionMakerFixture.cs" />
-    <Compile Include="MediaFiles\EpisodeImport\DetectSampleFixture.cs" />
+    <Compile Include="MediaFiles\EpisodeImport\SampleServiceFixture.cs" />
     <Compile Include="MediaFiles\EpisodeImport\Specifications\FreeSpaceSpecificationFixture.cs" />
     <Compile Include="MediaFiles\EpisodeImport\Specifications\FullSeasonSpecificationFixture.cs" />
     <Compile Include="MediaFiles\EpisodeImport\Specifications\SameFileSpecificationFixture.cs" />
@@ -295,11 +290,8 @@
     <Compile Include="MediaFiles\EpisodeImport\Specifications\NotUnpackingSpecificationFixture.cs" />
     <Compile Include="MediaFiles\EpisodeImport\Specifications\UpgradeSpecificationFixture.cs" />
     <Compile Include="MediaFiles\ImportApprovedEpisodesFixture.cs" />
-    <Compile Include="MediaFiles\MediaFileDeletionService\DeleteEpisodeFileFixture.cs" />
     <Compile Include="MediaFiles\MediaFileRepositoryFixture.cs" />
-    <Compile Include="MediaFiles\MediaInfo\MediaInfoFormatterTests\FormatAudioCodecFixture.cs" />
-    <Compile Include="MediaFiles\MediaInfo\MediaInfoFormatterTests\FormatVideoCodecFixture.cs" />
-    <Compile Include="MediaFiles\MediaInfo\MediaInfoFormatterTests\FormatAudioChannelsFixture.cs" />
+    <Compile Include="MediaFiles\MediaInfo\FormattedAudioChannelsFixture.cs" />
     <Compile Include="Messaging\Commands\CommandQueueManagerFixture.cs" />
     <Compile Include="MetadataSource\SkyHook\SkyHookProxySearchFixture.cs" />
     <Compile Include="MetadataSource\SearchSeriesComparerFixture.cs" />
@@ -309,7 +301,6 @@
     <Compile Include="OrganizerTests\FileNameBuilderTests\CleanTitleFixture.cs" />
     <Compile Include="OrganizerTests\FileNameBuilderTests\EpisodeTitleCollapseFixture.cs" />
     <Compile Include="OrganizerTests\FileNameBuilderTests\MultiEpisodeFixture.cs" />
-    <Compile Include="OrganizerTests\FileNameBuilderTests\TitleTheFixture.cs" />
     <Compile Include="ParserTests\MiniSeriesEpisodeParserFixture.cs" />
     <Compile Include="Qualities\RevisionComparableFixture.cs" />
     <Compile Include="QueueTests\QueueServiceFixture.cs" />
@@ -375,8 +366,8 @@
     <Compile Include="Qualities\QualityModelComparerFixture.cs" />
     <Compile Include="RootFolderTests\RootFolderServiceFixture.cs" />
     <Compile Include="SeriesStatsTests\SeriesStatisticsFixture.cs" />
-    <Compile Include="ThingiProviderTests\ProviderStatusServiceFixture.cs" />
-    <Compile Include="ThingiProviderTests\ProviderBaseFixture.cs" />
+    <Compile Include="SkyhookNotifications\SkyhookNotificationServiceFixture.cs" />
+    <Compile Include="ThingiProvider\ProviderBaseFixture.cs" />
     <Compile Include="ThingiProviderTests\NullConfigFixture.cs" />
     <Compile Include="TvTests\EpisodeServiceTests\FindEpisodeByTitleFixture.cs" />
     <Compile Include="TvTests\EpisodeServiceTests\HandleEpisodeFileDeletedFixture.cs" />
@@ -433,10 +424,6 @@
       <Link>sqlite3.dll</Link>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="Files\Indexers\TorrentRss\EvolutionWorld.xml">
-      <SubType>Designer</SubType>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
     <Content Include="Files\Indexers\TorrentRss\AlphaRatio.xml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       <SubType>Designer</SubType>
@@ -444,9 +431,6 @@
     <Content Include="Files\Indexers\TorrentRss\LimeTorrents.xml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="Files\Indexers\Torznab\torznab_animetosho.xml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
     <Content Include="License.txt" />
     <None Include="Files\Indexers\BroadcastheNet\RecentFeed.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>

src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/TitleTheFixture.cs

@@ -1,83 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using FizzWare.NBuilder;
-using FluentAssertions;
-using NUnit.Framework;
-using NzbDrone.Core.MediaFiles;
-using NzbDrone.Core.Organizer;
-using NzbDrone.Core.Qualities;
-using NzbDrone.Core.Test.Framework;
-using NzbDrone.Core.Tv;
-
-namespace NzbDrone.Core.Test.OrganizerTests.FileNameBuilderTests
-{
-    [TestFixture]
-    public class TitleTheFixture : CoreTest<FileNameBuilder>
-    {
-        private Series _series;
-        private Episode _episode;
-        private EpisodeFile _episodeFile;
-        private NamingConfig _namingConfig;
-
-        [SetUp]
-        public void Setup()
-        {
-            _series = Builder<Series>
-                    .CreateNew()
-                    .With(s => s.Title = "South Park")
-                    .Build();
-
-            _episode = Builder<Episode>.CreateNew()
-                            .With(e => e.Title = "City Sushi")
-                            .With(e => e.SeasonNumber = 15)
-                            .With(e => e.EpisodeNumber = 6)
-                            .With(e => e.AbsoluteEpisodeNumber = 100)
-                            .Build();
-
-            _episodeFile = new EpisodeFile { Quality = new QualityModel(Quality.HDTV720p), ReleaseGroup = "SonarrTest" };
-
-            _namingConfig = NamingConfig.Default;
-            _namingConfig.RenameEpisodes = true;
-
-            Mocker.GetMock<INamingConfigService>()
-                  .Setup(c => c.GetConfig()).Returns(_namingConfig);
-
-            Mocker.GetMock<IQualityDefinitionService>()
-                .Setup(v => v.Get(Moq.It.IsAny<Quality>()))
-                .Returns<Quality>(v => Quality.DefaultQualityDefinitions.First(c => c.Quality == v));
-        }
-
-        [TestCase("The Mist", "Mist, The")]
-        [TestCase("A Place to Call Home", "Place to Call Home, A")]
-        [TestCase("An Adventure in Space and Time", "Adventure in Space and Time, An")]
-        [TestCase("The Flash (2010)", "Flash, The (2010)")]
-        [TestCase("A League Of Their Own (AU)", "League Of Their Own, A (AU)")]
-        [TestCase("The Fixer (ZH) (2015)", "Fixer, The (ZH) (2015)")]
-        [TestCase("The Sixth Sense 2 (Thai)", "Sixth Sense 2, The (Thai)")]
-        [TestCase("The Amazing Race (Latin America)", "Amazing Race, The (Latin America)")]
-        [TestCase("The Rat Pack (A&E)", "Rat Pack, The (A&E)")]
-        [TestCase("The Climax: I (Almost) Got Away With It (2016)", "Climax- I (Almost) Got Away With It, The (2016)")]
-        //[TestCase("", "")]
-        public void should_get_expected_title_back(string title, string expected)
-        {
-            _series.Title = title;
-            _namingConfig.StandardEpisodeFormat = "{Series TitleThe}";
-
-            Subject.BuildFileName(new List<Episode> { _episode }, _series, _episodeFile)
-                   .Should().Be(expected);
-        }
-
-        [TestCase("A")]
-        [TestCase("Anne")]
-        [TestCase("Theodore")]
-        [TestCase("3%")]
-        public void should_not_change_title(string title)
-        {
-            _series.Title = title;
-            _namingConfig.StandardEpisodeFormat = "{Series TitleThe}";
-
-            Subject.BuildFileName(new List<Episode> { _episode }, _series, _episodeFile)
-                   .Should().Be(title);
-        }
-    }
-}

src/NzbDrone.Core.Test/ParserTests/LanguageParserFixture.cs

@@ -1,4 +1,4 @@
-using FluentAssertions;
+using FluentAssertions;
 using NUnit.Framework;
 using NzbDrone.Core.Parser;
 using NzbDrone.Core.Test.Framework;
@@ -46,9 +46,6 @@ namespace NzbDrone.Core.Test.ParserTests
         [TestCase("Castle.2009.S01E14.HDTV.XviD.HUNDUB-LOL", Language.Hungarian)]
         [TestCase("Castle.2009.S01E14.HDTV.XviD.ENG.HUN-LOL", Language.Hungarian)]
         [TestCase("Castle.2009.S01E14.HDTV.XviD.HUN-LOL", Language.Hungarian)]
-        [TestCase("Avatar.The.Last.Airbender.S01-03.DVDRip.HebDub",Language.Hebrew)]
-        [TestCase("Prison.Break.S05E01.WEBRip.x264.AC3.LT.EN-CNN", Language.Lithuanian)]
-        [TestCase("The.​Walking.​Dead.​S07E11.​WEB Rip.​XviD.​Louige-​CZ.​EN.​5.​1", Language.Czech)]
         public void should_parse_language(string postTitle, Language language)
         {
             var result = LanguageParser.ParseLanguage(postTitle);

src/NzbDrone.Core.Test/ParserTests/ParserFixture.cs

@@ -72,13 +72,5 @@ namespace NzbDrone.Core.Test.ParserTests
             Parser.Parser.ParseTitle(title).Quality.Quality.Should().NotBe(Quality.Unknown);
             Parser.Parser.ParseTitle(title).Quality.QualitySource.Should().Be(QualitySource.Extension);
         }
-
-
-        [TestCase("Revolution.S01E02.Chained.Heat.mkv", "Revolution.S01E02.Chained.Heat")]
-        public void should_parse_releasetitle(string path, string releaseTitle)
-        {
-            var result = Parser.Parser.ParseTitle(path);
-            result.ReleaseTitle.Should().Be(releaseTitle);
-        }
     }
 }

src/NzbDrone.Core.Test/ParserTests/QualityParserFixture.cs

@@ -92,8 +92,6 @@ namespace NzbDrone.Core.Test.ParserTests
         [TestCase("Glee.S04E10.Glee.Actually.480p.WEB-DL.x264-mSD", false)]
         [TestCase("The.Big.Bang.Theory.S06E11.The.Santa.Simulation.480p.WEB-DL.x264-mSD", false)]
         [TestCase("Da.Vincis.Demons.S02E04.480p.WEB.DL.nSD.x264-NhaNc3", false)]
-        [TestCase("Incorporated.S01E08.Das.geloeschte.Ich.German.Dubbed.DL.AmazonHD.x264-TVS", false)]
-        [TestCase("Haters.Back.Off.S01E04.Rod.Trip.mit.meinem.Onkel.German.DL.NetflixUHD.x264", false)]
         public void should_parse_webdl480p_quality(string title, bool proper)
         {
             ParseAndVerifyQuality(title, Quality.WEBDL480p, proper);
@@ -147,9 +145,6 @@ namespace NzbDrone.Core.Test.ParserTests
         [TestCase("Castle.S06E23.720p.WebHD.h264-euHD", false)]
         [TestCase("The.Nightly.Show.2016.03.14.720p.WEB.x264-spamTV", false)]
         [TestCase("The.Nightly.Show.2016.03.14.720p.WEB.h264-spamTV", false)]
-        [TestCase("Incorporated.S01E08.Das.geloeschte.Ich.German.DD51.Dubbed.DL.720p.AmazonHD.x264-TVS", false)]
-        [TestCase("Marco.Polo.S01E11.One.Hundred.Eyes.2015.German.DD51.DL.720p.NetflixUHD.x264.NewUp.by.Wunschtante", false)]
-        [TestCase("Hush 2016 German DD51 DL 720p NetflixHD x264-TVS", false)]
         public void should_parse_webdl720p_quality(string title, bool proper)
         {
             ParseAndVerifyQuality(title, Quality.WEBDL720p, proper);
@@ -171,8 +166,6 @@ namespace NzbDrone.Core.Test.ParserTests
         [TestCase("Series Title S06E08 No One PROPER 1080p WEB DD5 1 H 264-EXCLUSIVE", true)]
         [TestCase("Series Title S06E08 No One PROPER 1080p WEB H 264-EXCLUSIVE", true)]
         [TestCase("The.Simpsons.S25E21.Pay.Pal.1080p.WEB-DL.DD5.1.H.264-NTb", false)]
-        [TestCase("Incorporated.S01E08.Das.geloeschte.Ich.German.DD51.Dubbed.DL.1080p.AmazonHD.x264-TVS", false)]
-        [TestCase("Death.Note.2017.German.DD51.DL.1080p.NetflixHD.x264-TVS", false)]
         public void should_parse_webdl1080p_quality(string title, bool proper)
         {
             ParseAndVerifyQuality(title, Quality.WEBDL1080p, proper);
@@ -185,8 +178,6 @@ namespace NzbDrone.Core.Test.ParserTests
         [TestCase("The.Nightly.Show.2016.03.14.2160p.WEB.x264-spamTV", false)]
         [TestCase("The.Nightly.Show.2016.03.14.2160p.WEB.h264-spamTV", false)]
         [TestCase("The.Nightly.Show.2016.03.14.2160p.WEB.PROPER.h264-spamTV", true)]
-        [TestCase("House.of.Cards.US.s05e13.4K.UHD.WEB.DL", false)]
-        [TestCase("House.of.Cards.US.s05e13.UHD.4K.WEB.DL", false)]
         public void should_parse_webdl2160p_quality(string title, bool proper)
         {
             ParseAndVerifyQuality(title, Quality.WEBDL2160p, proper);
@@ -224,13 +215,6 @@ namespace NzbDrone.Core.Test.ParserTests
             ParseAndVerifyQuality(title, Quality.Bluray1080p, proper);
         }
 
-        [TestCase("House.of.Cards.US.s05e13.4K.UHD.Bluray", false)]
-        [TestCase("House.of.Cards.US.s05e13.UHD.4K.Bluray", false)]
-        public void should_parse_bluray2160p_quality(string title, bool proper)
-        {
-            ParseAndVerifyQuality(title, Quality.Bluray2160p, proper);
-        }
-
         [TestCase("POI S02E11 1080i HDTV DD5.1 MPEG2-TrollHD", false)]
         [TestCase("How I Met Your Mother S01E18 Nothing Good Happens After 2 A.M. 720p HDTV DD5.1 MPEG2-TrollHD", false)]
         [TestCase("The Voice S01E11 The Finals 1080i HDTV DD5.1 MPEG2-TrollHD", false)]