Fixed MediaCover endpoint.

Fixed: Don't handle content requests in IndexHtmlMapper
Added: Separate naming tags for AudioLanguage and SubtitleLanguage (#2261 ) (Fixes #2257 )
2026-03-25 17:35:35 -04:00 · 2017-12-13 21:28:42 +01:00 · 2017-12-13 21:28:21 +01:00 · 2017-12-12 23:53:11 +01:00 · 2017-12-12 23:26:16 +01:00 · 2017-12-12 23:15:46 +01:00
202 changed files with 9136 additions and 2812 deletions
--- a/.gitchangelog.rc
+++ b/.gitchangelog.rc
@@ -82,7 +82,7 @@ ignore_regexps = [
 ## whenever you are tweaking this variable.
 ##
 section_regexps = [
-    ('**New Features**', [
+    ('**New features**', [
        r'^[aA]dded?\s*:?\s*((dev|use?r|pkg|test|doc)\s*:\s*)?([^\n]*)$',
        r'^[uU]pdated?\s*:?\s*((dev|use?r|pkg|test|doc)\s*:\s*)?([^\n]*)$',
        r'^[cC]hanged?\s*:?\s*((dev|use?r|pkg|test|doc)\s*:\s*)?([^\n]*)$',
--- a/.gitignore
+++ b/.gitignore
@@ -150,3 +150,6 @@ Thumbs.db
 # AppVeyor
 /tools-cake/
 /_artifacts/
+
+# Cake
+/tools/Addins/*
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
--- a/674
+++ b/674
@@ -0,0 +1,674 @@
+                    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:
+
+    {project}  Copyright (C) {year}  {fullname}
+    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>.
--- a/README.md
+++ b/README.md
@@ -50,6 +50,13 @@ The project was inspired by other Usenet/BitTorrent movie downloaders such as Co
 | AppVeyor | [![AppVeyor](https://img.shields.io/appveyor/ci/galli-leo/Radarr/master.svg?maxAge=60&style=flat-square)](https://ci.appveyor.com/project/galli-leo/Radarr) | [![AppVeyor](https://img.shields.io/appveyor/ci/galli-leo/Radarr-usby1/develop.svg?maxAge=60&style=flat-square)](https://ci.appveyor.com/project/galli-leo/Radarr-usby1) |
 | Travis   | [![Travis](https://img.shields.io/travis/Radarr/Radarr/master.svg?maxAge=60&style=flat-square)](https://travis-ci.org/Radarr/Radarr) | [![Travis](https://img.shields.io/travis/Radarr/Radarr/develop.svg?maxAge=60&style=flat-square)](https://travis-ci.org/Radarr/Radarr) |

+### [Site and API Status](https://status.radarr.video)
+
+| API | Updates | Sites  |
+|-------|:----:|:----:|
+| [![API V2](http://status.radarr.video/component/1/shield?style=flat-square)](https://api.radarr.video/v2/) | [![Update Server](http://status.radarr.video/component/4/shield?style=flat-square)](https://radarr.aeonlucid.com) | [![Radarr Mappings](http://status.radarr.video/component/6/shield?style=flat-square)](https://mappings.radarr.video/)
+| [![API Staging](http://status.radarr.video/component/2/shield?style=flat-square)](https://staging.api.radarr.video/) | [![Github Updates](http://status.radarr.video/component/5/shield?style=flat-square)](https://api.github.com/v3/) | [![Main Site](http://status.radarr.video/component/7/shield?style=flat-square)](https://radarr.video/)
+
 Radarr is currently undergoing rapid development and pull requests are actively added into the repository.

 ## Features
@@ -108,10 +115,17 @@ Radarr is currently undergoing rapid development and pull requests are actively
 > **Notice**  
 > Gulp must be running at all times while you are working with Radarr client source files.

+### Build
+
+* To build run `sh build.sh`
+
+**Note:** Windows users must have bash available to do this. [cmder](http://cmder.net/) which is a console emulator for windows has bash as part of it's default installation.
+
 ### Development

 * Open `NzbDrone.sln` in Visual Studio or run the build.sh script, if Mono is installed
 * Make sure `NzbDrone.Console` is set as the startup project
+* Run `build.sh` before running

 ### License

--- a/changelog.tpl
+++ b/changelog.tpl
@@ -5,11 +5,10 @@

 {{#sections}}
 ### {{{label}}}
-
 {{#commits}}
 - {{{subject}}} [{{{author}}}]
-
 {{/commits}}
+
 {{/sections}}

 {{/versions}}
--- a/package.sh
+++ b/package.sh
@@ -17,10 +17,10 @@ case "$(uname -s)" in
 esac

 if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then
-  VERSION="`date +%H:%M:%S`"
-  YEAR="`date +%Y`"
-  MONTH="`date +%m`"
-  DAY="`date +%d`"
+  VERSION="$(date +%H:%M:%S)"
+  YEAR="$(date +%Y)"
+  MONTH="$(date +%m)"
+  DAY="$(date +%d)"
 else
  VERSION=$1
  BRANCH=$2
--- a/src/Libraries/MediaInfo/MediaInfo.dll
+++ b/src/Libraries/MediaInfo/MediaInfo.dll
--- a/src/Libraries/MediaInfo/libmediainfo.0.dylib
+++ b/src/Libraries/MediaInfo/libmediainfo.0.dylib
--- a/src/NzbDrone.Api/Calendar/CalendarFeedModule.cs
+++ b/src/NzbDrone.Api/Calendar/CalendarFeedModule.cs
@@ -1,9 +1,10 @@
-using Nancy;
+using Nancy;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using Ical.Net;
 using Ical.Net.DataTypes;
+using Ical.Net.General;
 using Ical.Net.Interfaces.Serialization;
 using Ical.Net.Serialization;
 using Ical.Net.Serialization.iCalendar.Factory;
@@ -86,6 +87,10 @@ namespace NzbDrone.Api.Calendar
                ProductId = "-//radarr.video//Radarr//EN"
            };

+            var calendarName = "Radarr Movies Calendar";
+            calendar.AddProperty(new CalendarProperty("NAME", calendarName));
+            calendar.AddProperty(new CalendarProperty("X-WR-CALNAME", calendarName));
+
            foreach (var movie in movies.OrderBy(v => v.Added))
            {
                if (tags.Any() && tags.None(movie.Tags.Contains))
@@ -114,8 +119,10 @@ namespace NzbDrone.Api.Calendar
                            occurrence.End = new CalDateTime(movie.InCinemas.Value.AddMinutes(movie.Runtime)) { HasTime = true };
                        }
                        break;
+
                    case MovieStatusType.Announced:
                        continue; // no date
+
                    default:
                        if (movie.PhysicalRelease != null)
                        {
--- a/src/NzbDrone.Api/Extensions/Pipelines/CacheHeaderPipeline.cs
+++ b/src/NzbDrone.Api/Extensions/Pipelines/CacheHeaderPipeline.cs
@@ -23,6 +23,8 @@ namespace NzbDrone.Api.Extensions.Pipelines

        private void Handle(NancyContext context)
        {
+            if (context.Request.Method == "OPTIONS") return;
+
            if (_cacheableSpecification.IsCacheable(context))
            {
                context.Response.Headers.EnableCache();
@@ -33,4 +35,4 @@ namespace NzbDrone.Api.Extensions.Pipelines
            }
        }
    }
-}
+}
--- a/src/NzbDrone.Api/Extensions/Pipelines/CorsPipeline.cs
+++ b/src/NzbDrone.Api/Extensions/Pipelines/CorsPipeline.cs
@@ -2,6 +2,7 @@
 using System.Linq;
 using Nancy;
 using Nancy.Bootstrapper;
+using NzbDrone.Common.Extensions;

 namespace NzbDrone.Api.Extensions.Pipelines
 {
@@ -11,10 +12,25 @@ namespace NzbDrone.Api.Extensions.Pipelines

        public void Register(IPipelines pipelines)
        {
-            pipelines.AfterRequest.AddItemToEndOfPipeline((Action<NancyContext>) Handle);
+            pipelines.BeforeRequest.AddItemToEndOfPipeline(HandleRequest);
+            pipelines.AfterRequest.AddItemToEndOfPipeline(HandleResponse);
        }

-        private void Handle(NancyContext context)
+        private Response HandleRequest(NancyContext context)
+        {
+            if (context == null || context.Request.Method != "OPTIONS")
+            {
+                return null;
+            }
+
+            var response = new Response()
+                .WithStatusCode(HttpStatusCode.OK)
+                .WithContentType("");
+            ApplyResponseHeaders(response, context.Request);
+            return response;
+        }
+
+        private void HandleResponse(NancyContext context)
        {
            if (context == null || context.Response.Headers.ContainsKey(AccessControlHeaders.AllowOrigin))
            {
@@ -26,21 +42,39 @@ namespace NzbDrone.Api.Extensions.Pipelines

        private static void ApplyResponseHeaders(Response response, Request request)
        {
-            var allowedMethods = "GET, OPTIONS, PATCH, POST, PUT, DELETE";
-
-            if (response.Headers.ContainsKey("Allow"))
+            if (request.IsApiRequest())
            {
-                allowedMethods = response.Headers["Allow"];
+                // Allow Cross-Origin access to the API since it's protected with the apikey, and nothing else.
+                ApplyCorsResponseHeaders(response, request, "*", "GET, OPTIONS, PATCH, POST, PUT, DELETE");
            }
-            
-            var requestedHeaders = string.Join(", ", request.Headers[AccessControlHeaders.RequestHeaders]);
-
-            response.Headers.Add(AccessControlHeaders.AllowOrigin, "*");
-            response.Headers.Add(AccessControlHeaders.AllowMethods, allowedMethods);
-
-            if (request.Headers[AccessControlHeaders.RequestHeaders].Any())
+            else if (request.IsSharedContentRequest())
            {
-                response.Headers.Add(AccessControlHeaders.AllowHeaders, requestedHeaders);
+                // Allow Cross-Origin access to specific shared content such as mediacovers and images.
+                ApplyCorsResponseHeaders(response, request, "*", "GET, OPTIONS");
+            }
+
+            // Disallow Cross-Origin access for any other route.
+        }
+
+        private static void ApplyCorsResponseHeaders(Response response, Request request, string allowOrigin, string allowedMethods)
+        {
+            response.Headers.Add(AccessControlHeaders.AllowOrigin, allowOrigin);
+
+            if (request.Method == "OPTIONS")
+            {
+                if (response.Headers.ContainsKey("Allow"))
+                {
+                    allowedMethods = response.Headers["Allow"];
+                }
+
+                response.Headers.Add(AccessControlHeaders.AllowMethods, allowedMethods);
+
+                if (request.Headers[AccessControlHeaders.RequestHeaders].Any())
+                {
+                    var requestedHeaders = string.Join(", ", request.Headers[AccessControlHeaders.RequestHeaders]);
+
+                    response.Headers.Add(AccessControlHeaders.AllowHeaders, requestedHeaders);
+                }
            }
        }
    }
--- a/src/NzbDrone.Api/Extensions/Pipelines/GZipPipeline.cs
+++ b/src/NzbDrone.Api/Extensions/Pipelines/GZipPipeline.cs
@@ -33,7 +33,8 @@ namespace NzbDrone.Api.Extensions.Pipelines
            try
            {
                if (
-                   !response.ContentType.Contains("image")
+                   response.Contents != Response.NoBody
+                && !response.ContentType.Contains("image")
                && !response.ContentType.Contains("font")
                && request.Headers.AcceptEncoding.Any(x => x.Contains("gzip"))
                && !AlreadyGzipEncoded(response)
@@ -80,4 +81,4 @@ namespace NzbDrone.Api.Extensions.Pipelines
            return false;
        }
    }
-}
+}
--- a/src/NzbDrone.Api/Extensions/RequestExtensions.cs
+++ b/src/NzbDrone.Api/Extensions/RequestExtensions.cs
@@ -36,5 +36,11 @@ namespace NzbDrone.Api.Extensions
        {
            return request.Path.StartsWith("/Content/", StringComparison.InvariantCultureIgnoreCase);
        }
+
+        public static bool IsSharedContentRequest(this Request request)
+        {
+            return request.Path.StartsWith("/MediaCover/", StringComparison.InvariantCultureIgnoreCase) ||
+                   request.Path.StartsWith("/Content/Images/", StringComparison.InvariantCultureIgnoreCase);
+        }
    }
 }
--- a/src/NzbDrone.Api/Frontend/Mappers/IndexHtmlMapper.cs
+++ b/src/NzbDrone.Api/Frontend/Mappers/IndexHtmlMapper.cs
@@ -49,7 +49,12 @@ namespace NzbDrone.Api.Frontend.Mappers

        public override bool CanHandle(string resourceUrl)
        {
-            return !resourceUrl.Contains(".") && !resourceUrl.StartsWith("/login");
+            resourceUrl = resourceUrl.ToLowerInvariant();
+
+            return !resourceUrl.StartsWith("/content") &&
+                   !resourceUrl.StartsWith("/mediacover") &&
+                   !resourceUrl.Contains(".") &&
+                   !resourceUrl.StartsWith("/login");
        }

        public override Response GetResponse(string resourceUrl)
@@ -113,4 +118,4 @@ namespace NzbDrone.Api.Frontend.Mappers
            return _generatedContent;
        }
    }
-}
+}
--- a/src/NzbDrone.Api/Frontend/Mappers/MediaCoverMapper.cs
+++ b/src/NzbDrone.Api/Frontend/Mappers/MediaCoverMapper.cs
@@ -1,3 +1,4 @@
+using System;
 using System.IO;
 using System.Text.RegularExpressions;
 using NLog;
@@ -42,7 +43,7 @@ namespace NzbDrone.Api.Frontend.Mappers

        public override bool CanHandle(string resourceUrl)
        {
-            return resourceUrl.StartsWith("/MediaCover");
+            return resourceUrl.StartsWith("/MediaCover", StringComparison.InvariantCultureIgnoreCase);
        }
    }
-}
+}
--- a/src/NzbDrone.Api/Frontend/Mappers/StaticResourceMapper.cs
+++ b/src/NzbDrone.Api/Frontend/Mappers/StaticResourceMapper.cs
@@ -1,3 +1,4 @@
+using System;
 using System.IO;
 using NLog;
 using NzbDrone.Common.Disk;
@@ -28,7 +29,9 @@ namespace NzbDrone.Api.Frontend.Mappers

        public override bool CanHandle(string resourceUrl)
        {
-            return resourceUrl.StartsWith("/Content") ||
+            resourceUrl = resourceUrl.ToLowerInvariant();
+
+            return resourceUrl.StartsWith("/content") ||
                   resourceUrl.EndsWith(".js") ||
                   resourceUrl.EndsWith(".map") ||
                   resourceUrl.EndsWith(".css") ||
@@ -37,4 +40,4 @@ namespace NzbDrone.Api.Frontend.Mappers
                   resourceUrl.EndsWith("oauth.html");
        }
    }
-}
+}
--- a/src/NzbDrone.Api/Frontend/StaticResourceModule.cs
+++ b/src/NzbDrone.Api/Frontend/StaticResourceModule.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Nancy.Responses;
 using NLog;
 using Nancy;
 using NzbDrone.Api.Frontend.Mappers;
--- a/src/NzbDrone.Api/NancyBootstrapper.cs
+++ b/src/NzbDrone.Api/NancyBootstrapper.cs
@@ -34,7 +34,6 @@ namespace NzbDrone.Api
            RegisterPipelines(pipelines);

            container.Resolve<DatabaseTarget>().Register();
-            container.Resolve<IEventAggregator>().PublishEvent(new ApplicationStartedEvent());
        }

        private void RegisterPipelines(IPipelines pipelines)
@@ -56,4 +55,4 @@ namespace NzbDrone.Api

        protected override byte[] FavIcon => null;
    }
-}
+}
--- a/src/NzbDrone.Api/REST/RestModule.cs
+++ b/src/NzbDrone.Api/REST/RestModule.cs
@@ -124,7 +124,7 @@ namespace NzbDrone.Api.REST
                Get[ROOT_ROUTE] = options =>
                {
 					var pagingSpec = ReadPagingResourceFromRequest();
-					if (pagingSpec.Page == 0 && pagingSpec.PageSize == 0)
+					if ((pagingSpec.Page == 0 && pagingSpec.PageSize == 0) || pagingSpec.PageSize == -1)
 					{
 						var all = GetResourceAll();
 						return all.AsResponse();
--- a/src/NzbDrone.Api/Series/MovieFileResource.cs
+++ b/src/NzbDrone.Api/Series/MovieFileResource.cs
@@ -44,14 +44,14 @@ namespace NzbDrone.Api.Movie

            MovieResource movie = null;

-            if (model.Movie != null)
+            /*if (model.Movie != null)
            {
-                model.Movie.LazyLoad();
+                //model.Movie.LazyLoad();
                if (model.Movie.Value != null)
                {
                    //movie = model.Movie.Value.ToResource();
                }
-            }
+            }*/

            return new MovieFileResource
            {
@@ -60,6 +60,7 @@ namespace NzbDrone.Api.Movie
                Path = model.Path,
                Size = model.Size,
                DateAdded = model.DateAdded,
+                SceneName = model.SceneName,
                ReleaseGroup = model.ReleaseGroup,
                Quality = model.Quality,
                Movie = movie,
--- a/src/NzbDrone.Api/Series/MovieModule.cs
+++ b/src/NzbDrone.Api/Series/MovieModule.cs
@@ -132,8 +132,8 @@ namespace NzbDrone.Api.Movie

            var resource = movies.ToResource();
            MapCoversToLocal(resource);
-            FetchAndLinkMovieStatistics(resource);
-            PopulateAlternateTitles(resource);
+            //FetchAndLinkMovieStatistics(resource);
+            //PopulateAlternateTitles(resource);

            return resource;
        }
--- a/src/NzbDrone.Api/Series/MovieResource.cs
+++ b/src/NzbDrone.Api/Series/MovieResource.cs
@@ -93,12 +93,13 @@ namespace NzbDrone.Api.Movie
            if (model == null) return null;


-            long size = 0;
-            bool downloaded = false;
-            MovieFileResource movieFile = null;
+            long size = model.MovieFile?.Size ?? 0;
+            bool downloaded = model.MovieFile != null;
+            MovieFileResource movieFile = model.MovieFile?.ToResource();
+            

            
-            if(model.MovieFile != null)
+            /*if(model.MovieFile != null)
            {
                model.MovieFile.LazyLoad();
            }
@@ -108,7 +109,7 @@ namespace NzbDrone.Api.Movie
                size = model.MovieFile.Value.Size;
                downloaded = true;
                movieFile = model.MovieFile.Value.ToResource();
-            }
+            }*/
            
            //model.AlternativeTitles.LazyLoad();

--- a/src/NzbDrone.Common.Test/InstrumentationTests/CleanseLogMessageFixture.cs
+++ b/src/NzbDrone.Common.Test/InstrumentationTests/CleanseLogMessageFixture.cs
@@ -15,6 +15,7 @@ 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"" }, ")]
--- a/src/NzbDrone.Common/Instrumentation/CleanseLogMessage.cs
+++ b/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)=(?<secret>[^&=]+?)(?= |&|$)", RegexOptions.Compiled | RegexOptions.IgnoreCase),
+                new Regex(@"(?<=\?|&)(apikey|token|passkey|auth|authkey|user|uid|api|[a-z_]*apikey)=(?<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),
--- a/src/NzbDrone.Console/ConsoleApp.cs
+++ b/src/NzbDrone.Console/ConsoleApp.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Net.Sockets;
 using NLog;
 using NzbDrone.Common.EnvironmentInfo;
@@ -11,6 +11,13 @@ namespace NzbDrone.Console
    {
        private static readonly Logger Logger = NzbDroneLogger.GetLogger(typeof(ConsoleApp));

+        private enum ExitCodes : int
+        {
+            Normal = 0,
+            UnknownFailure = 1,
+            RecoverableFailure = 2
+        }
+
        public static void Main(string[] args)
        {
            try
@@ -19,30 +26,41 @@ namespace NzbDrone.Console
                NzbDroneLogger.Register(startupArgs, false, true);
                Bootstrap.Start(startupArgs, new ConsoleAlerts());
            }
-            catch (SocketException exception)
+            catch (SocketException e)
            {
                System.Console.WriteLine("");
                System.Console.WriteLine("");
-                Logger.Fatal(exception.Message + ". This can happen if another instance of Radarr is already running another application is using the same port (default: 7878) or the user has insufficient permissions");
-                System.Console.WriteLine("Press enter to exit...");
-                System.Console.ReadLine();
-                Environment.Exit(1);
+                Logger.Fatal(e.Message + ". This can happen if another instance of Radarr is already running another application is using the same port (default: 7878) or the user has insufficient permissions");
+                Exit(ExitCodes.RecoverableFailure);
            }
            catch (Exception e)
            {
                System.Console.WriteLine("");
                System.Console.WriteLine("");
                Logger.Fatal(e, "EPIC FAIL!");
-                System.Console.WriteLine("Press enter to exit...");
-                System.Console.ReadLine();
-                Environment.Exit(1);
+                Exit(ExitCodes.UnknownFailure);
            }

            Logger.Info("Exiting main.");

-            //Need this to terminate on mono (thanks nlog)
-            LogManager.Configuration = null;
-            Environment.Exit(0);
+            Exit(ExitCodes.Normal);
+        }
+
+        private static void Exit(ExitCodes exitCode)
+        {
+            LogManager.Shutdown();
+
+            if (exitCode != ExitCodes.Normal)
+            {
+                System.Console.WriteLine("Press enter to exit...");
+
+                System.Threading.Thread.Sleep(1000);
+
+                // Please note that ReadLine silently succeeds if there is no console, KeyAvailable does not.
+                System.Console.ReadLine();
+            }
+
+            Environment.Exit((int)exitCode);
        }
    }
 }
--- a/src/NzbDrone.Core.Test/Download/DownloadClientTests/NzbgetTests/NzbgetFixture.cs
+++ b/src/NzbDrone.Core.Test/Download/DownloadClientTests/NzbgetTests/NzbgetFixture.cs
@@ -30,7 +30,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.NzbgetTests
                                              Port = 2222,
                                              Username = "admin",
                                              Password = "pass",
-                                              TvCategory = "tv",
+                                              MovieCategory = "movie",
                                              RecentTvPriority = (int)NzbgetPriority.High
                                          };

@@ -38,7 +38,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.NzbgetTests
                {
                    FileSizeLo = 1000,
                    RemainingSizeLo = 10,
-                    Category = "tv",
+                    Category = "movie",
                    NzbName = "Droned.1998.1080p.WEB-DL-DRONE",
                    Parameters = new List<NzbgetParameter> { new NzbgetParameter { Name = "drone", Value = "id" } }
                };
@@ -46,7 +46,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.NzbgetTests
            _failed = new NzbgetHistoryItem
                {
                    FileSizeLo = 1000,
-                    Category = "tv",
+                    Category = "movie",
                    Name = "Droned.1998.1080p.WEB-DL-DRONE",
                    DestDir = "somedirectory",
                    Parameters = new List<NzbgetParameter> { new NzbgetParameter { Name = "drone", Value = "id" } },
@@ -61,7 +61,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.NzbgetTests
            _completed = new NzbgetHistoryItem
                {
                    FileSizeLo = 1000,
-                    Category = "tv",
+                    Category = "movie",
                    Name = "Droned.1998.1080p.WEB-DL-DRONE",
                    DestDir = "/remote/mount/tv/Droned.1998.1080p.WEB-DL-DRONE",
                    Parameters = new List<NzbgetParameter> { new NzbgetParameter { Name = "drone", Value = "id" } },
@@ -81,8 +81,8 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.NzbgetTests
                });

            var configItems = new Dictionary<string, string>();
-            configItems.Add("Category1.Name", "tv");
-            configItems.Add("Category1.DestDir", @"/remote/mount/tv");
+            configItems.Add("Category1.Name", "movie");
+            configItems.Add("Category1.DestDir", @"/remote/mount/movie");

            Mocker.GetMock<INzbgetProxy>()
                .Setup(v => v.GetConfig(It.IsAny<NzbgetSettings>()))
--- a/src/NzbDrone.Core.Test/Download/DownloadClientTests/SabnzbdTests/SabnzbdFixture.cs
+++ b/src/NzbDrone.Core.Test/Download/DownloadClientTests/SabnzbdTests/SabnzbdFixture.cs
@@ -36,7 +36,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.SabnzbdTests
                                              ApiKey = "5c770e3197e4fe763423ee7c392c25d1",
                                              Username = "admin",
                                              Password = "pass",
-                                              TvCategory = "tv",
+                                              MovieCategory = "movie",
                                              RecentTvPriority = (int)SabnzbdPriority.High
                                          };
            _queued = new SabnzbdQueue
@@ -51,7 +51,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.SabnzbdTests
                            Size = 1000,
                            Sizeleft = 10,
                            Timeleft = TimeSpan.FromSeconds(10),
-                            Category = "tv",
+                            Category = "movie",
                            Id = "sabnzbd_nzb12345",
                            Title = "Droned.1998.1080p.WEB-DL-DRONE"
                        }
@@ -66,7 +66,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.SabnzbdTests
                        {
                            Status = SabnzbdDownloadStatus.Failed,
                            Size = 1000,
-                            Category = "tv",
+                            Category = "movie",
                            Id = "sabnzbd_nzb12345",
                            Title = "Droned.1998.1080p.WEB-DL-DRONE"
                        }
@@ -81,7 +81,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.SabnzbdTests
                        {
                            Status = SabnzbdDownloadStatus.Completed,
                            Size = 1000,
-                            Category = "tv",
+                            Category = "movie",
                            Id = "sabnzbd_nzb12345",
                            Title = "Droned.1998.1080p.WEB-DL-DRONE",
                            Storage = "/remote/mount/vv/Droned.1998.1080p.WEB-DL-DRONE"
@@ -97,7 +97,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.SabnzbdTests
                        },
                    Categories = new List<SabnzbdCategory>
                        {
-                            new SabnzbdCategory  { Name = "tv", Dir = "vv" }
+                            new SabnzbdCategory  { Name = "movie", Dir = "vv" }
                        }
                };

@@ -111,7 +111,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.SabnzbdTests

            _fullStatus = new SabnzbdFullStatus
                {
-                    CompleteDir = @"Y:\nzbget\root\complete".AsOsAgnostic()
+                    CompleteDir = @"Y:\sabnzbd\root\complete".AsOsAgnostic()
                };

            Mocker.GetMock<ISabnzbdProxy>()
@@ -408,10 +408,10 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.SabnzbdTests
            result.OutputPath.Should().Be(@"C:\sorted\somewhere\asdfasdf\asdfasdf.mkv".AsOsAgnostic());
        }

-        [TestCase(@"Y:\nzbget\root", @"completed\downloads", @"vv", @"Y:\nzbget\root\completed\downloads", @"Y:\nzbget\root\completed\downloads\vv")]
-        [TestCase(@"Y:\nzbget\root", @"completed", @"vv", @"Y:\nzbget\root\completed", @"Y:\nzbget\root\completed\vv")]
-        [TestCase(@"/nzbget/root", @"completed/downloads", @"vv", @"/nzbget/root/completed/downloads", @"/nzbget/root/completed/downloads/vv")]
-        [TestCase(@"/nzbget/root", @"completed", @"vv", @"/nzbget/root/completed", @"/nzbget/root/completed/vv")]
+        [TestCase(@"Y:\sabnzbd\root", @"completed\downloads", @"vv", @"Y:\sabnzbd\root\completed\downloads", @"Y:\sabnzbd\root\completed\downloads\vv")]
+        [TestCase(@"Y:\sabnzbd\root", @"completed", @"vv", @"Y:\sabnzbd\root\completed", @"Y:\sabnzbd\root\completed\vv")]
+        [TestCase(@"/sabnzbd/root", @"completed/downloads", @"vv", @"/sabnzbd/root/completed/downloads", @"/sabnzbd/root/completed/downloads/vv")]
+        [TestCase(@"/sabnzbd/root", @"completed", @"vv", @"/sabnzbd/root/completed", @"/sabnzbd/root/completed/vv")]
        public void should_return_status_with_outputdir_for_version_lt_2(string rootFolder, string completeDir, string categoryDir, string fullCompleteDir, string fullCategoryDir)
        {
            _fullStatus.CompleteDir = null;
@@ -429,10 +429,10 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.SabnzbdTests
            result.OutputRootFolders.First().Should().Be(fullCategoryDir);
        }

-        [TestCase(@"Y:\nzbget\root", @"completed\downloads", @"vv", @"Y:\nzbget\root\completed\downloads", @"Y:\nzbget\root\completed\downloads\vv")]
-        [TestCase(@"Y:\nzbget\root", @"completed", @"vv", @"Y:\nzbget\root\completed", @"Y:\nzbget\root\completed\vv")]
-        [TestCase(@"/nzbget/root", @"completed/downloads", @"vv", @"/nzbget/root/completed/downloads", @"/nzbget/root/completed/downloads/vv")]
-        [TestCase(@"/nzbget/root", @"completed", @"vv", @"/nzbget/root/completed", @"/nzbget/root/completed/vv")]
+        [TestCase(@"Y:\sabnzbd\root", @"completed\downloads", @"vv", @"Y:\sabnzbd\root\completed\downloads", @"Y:\sabnzbd\root\completed\downloads\vv")]
+        [TestCase(@"Y:\sabnzbd\root", @"completed", @"vv", @"Y:\sabnzbd\root\completed", @"Y:\sabnzbd\root\completed\vv")]
+        [TestCase(@"/sabnzbd/root", @"completed/downloads", @"vv", @"/sabnzbd/root/completed/downloads", @"/sabnzbd/root/completed/downloads/vv")]
+        [TestCase(@"/sabnzbd/root", @"completed", @"vv", @"/sabnzbd/root/completed", @"/sabnzbd/root/completed/vv")]
        public void should_return_status_with_outputdir_for_version_gte_2(string rootFolder, string completeDir, string categoryDir, string fullCompleteDir, string fullCategoryDir)
        {
            _fullStatus.CompleteDir = fullCompleteDir;
@@ -554,7 +554,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.SabnzbdTests
        [Test]
        public void should_test_failed_if_tv_sorting_default_category()
        {
-            Subject.Definition.Settings.As<SabnzbdSettings>().TvCategory = null;
+            Subject.Definition.Settings.As<SabnzbdSettings>().MovieCategory = null;

            _config.Misc.enable_tv_sorting = true;
            _config.Misc.tv_categories = new[] { "Default" };
--- a/src/NzbDrone.Core.Test/Download/DownloadClientTests/UTorrentTests/UTorrentFixture.cs
+++ b/src/NzbDrone.Core.Test/Download/DownloadClientTests/UTorrentTests/UTorrentFixture.cs
@@ -30,7 +30,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.UTorrentTests
                                              Port = 2222,
                                              Username = "admin",
                                              Password = "pass",
-                                              TvCategory = "tv"
+                                              MovieCategory = "movie"
                                          };

            _queued = new UTorrentTorrent
@@ -41,7 +41,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.UTorrentTests
                        Size = 1000,
                        Remaining = 1000,
                        Progress = 0,
-                        Label = "tv",
+                        Label = "movie",
                        DownloadUrl = _downloadUrl,
                        RootDownloadPath = "somepath"
                    };
@@ -54,7 +54,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.UTorrentTests
                        Size = 1000,
                        Remaining = 100,
                        Progress = 0.9,
-                        Label = "tv",
+                        Label = "movie",
                        DownloadUrl = _downloadUrl,
                        RootDownloadPath = "somepath"
                    };
@@ -67,7 +67,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.UTorrentTests
                        Size = 1000,
                        Remaining = 100,
                        Progress = 0.9,
-                        Label = "tv",
+                        Label = "movie",
                        DownloadUrl = _downloadUrl,
                        RootDownloadPath = "somepath"
                    };
@@ -80,7 +80,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.UTorrentTests
                        Size = 1000,
                        Remaining = 0,
                        Progress = 1.0,
-                        Label = "tv",
+                        Label = "movie",
                        DownloadUrl = _downloadUrl,
                        RootDownloadPath = "somepath"
                    };
--- a/src/NzbDrone.Core.Test/NotificationTests/SynologyIndexerFixture.cs
+++ b/src/NzbDrone.Core.Test/NotificationTests/SynologyIndexerFixture.cs
@@ -19,29 +19,29 @@ namespace NzbDrone.Core.Test.NotificationTests
        [SetUp]
        public void SetUp()
        {
-            _movie = new Movie()
+            _movie = new Movie
            {
                Path = @"C:\Test\".AsOsAgnostic()
            };

-            _upgrade = new DownloadMessage()
+            _upgrade = new DownloadMessage
            {
                Movie = _movie,

                MovieFile = new MovieFile
                {
-                    RelativePath = "file1.S01E01E02.mkv"
+                    RelativePath = "moviefile1.mkv"
                },

                OldMovieFiles = new List<MovieFile>
                {
                    new MovieFile
                    {
-                        RelativePath = "file1.S01E01.mkv"
+                        RelativePath = "oldmoviefile1.mkv"
                    },
                    new MovieFile
                    {
-                        RelativePath = "file1.S01E02.mkv"
+                        RelativePath = "oldmoviefile2.mkv"
                    }
                }
            };
@@ -63,37 +63,37 @@ namespace NzbDrone.Core.Test.NotificationTests
            Subject.OnMovieRename(_movie);

            Mocker.GetMock<ISynologyIndexerProxy>()
-                .Verify(v => v.UpdateFolder(_movie.Path), Times.Never());
+                  .Verify(v => v.UpdateFolder(_movie.Path), Times.Never());
        }

        [Test]
-        public void should_remove_old_episodes_on_upgrade()
+        public void should_remove_old_movie_on_upgrade()
        {
            Subject.OnDownload(_upgrade);

            Mocker.GetMock<ISynologyIndexerProxy>()
-                .Verify(v => v.DeleteFile(@"C:\Test\file1.S01E01.mkv".AsOsAgnostic()), Times.Once());
+                  .Verify(v => v.DeleteFile(@"C:\Test\oldmoviefile1.mkv".AsOsAgnostic()), Times.Once());

            Mocker.GetMock<ISynologyIndexerProxy>()
-                .Verify(v => v.DeleteFile(@"C:\Test\file1.S01E02.mkv".AsOsAgnostic()), Times.Once());
+                  .Verify(v => v.DeleteFile(@"C:\Test\oldmoviefile2.mkv".AsOsAgnostic()), Times.Once());
        }

        [Test]
-        public void should_add_new_episode_on_upgrade()
+        public void should_add_new_movie_on_upgrade()
        {
            Subject.OnDownload(_upgrade);

            Mocker.GetMock<ISynologyIndexerProxy>()
-                .Verify(v => v.AddFile(@"C:\Test\file1.S01E01E02.mkv".AsOsAgnostic()), Times.Once());
+                  .Verify(v => v.AddFile(@"C:\Test\moviefile1.mkv".AsOsAgnostic()), Times.Once());
        }

        [Test]
-        public void should_update_entire_series_folder_on_rename()
+        public void should_update_entire_movie_folder_on_rename()
        {
            Subject.OnMovieRename(_movie);

            Mocker.GetMock<ISynologyIndexerProxy>()
-                .Verify(v => v.UpdateFolder(@"C:\Test\".AsOsAgnostic()), Times.Once());
+                  .Verify(v => v.UpdateFolder(@"C:\Test\".AsOsAgnostic()), Times.Once());
        }
    }
 }
--- a/src/NzbDrone.Core.Test/NotificationTests/Xbmc/Http/ActivePlayersFixture.cs
+++ b/src/NzbDrone.Core.Test/NotificationTests/Xbmc/Http/ActivePlayersFixture.cs
@@ -1,70 +0,0 @@
-using System.Linq;
-using FluentAssertions;
-using NUnit.Framework;
-using NzbDrone.Common.Http;
-using NzbDrone.Core.Notifications.Xbmc;
-using NzbDrone.Core.Test.Framework;
-
-namespace NzbDrone.Core.Test.NotificationTests.Xbmc.Http
-{
-    [TestFixture]
-    public class ActivePlayersFixture : CoreTest<HttpApiProvider>
-    {
-        private XbmcSettings _settings;
-        private string _expectedUrl;
-
-        private void WithNoActivePlayers()
-        {
-            Mocker.GetMock<IHttpProvider>()
-                  .Setup(s => s.DownloadString(_expectedUrl, _settings.Username, _settings.Password))
-                  .Returns("<html><li>Filename:[Nothing Playing]</html>");
-        }
-
-        private void WithVideoPlayerActive()
-        {
-            var activePlayers = @"<html><li>Filename:C:\Test\TV\2 Broke Girls\Season 01\2 Broke Girls - S01E01 - Pilot [SDTV].avi" +
-                              "<li>PlayStatus:Playing<li>VideoNo:0<li>Type:Video<li>Thumb:special://masterprofile/Thumbnails/Video/a/auto-a664d5a2.tbn" +
-                              "<li>Time:00:06<li>Duration:21:35<li>Percentage:0<li>File size:183182590<li>Changed:True</html>";
-
-            Mocker.GetMock<IHttpProvider>()
-                  .Setup(s => s.DownloadString(_expectedUrl, _settings.Username, _settings.Password))
-                  .Returns(activePlayers);
-        }
-
-        [SetUp]
-        public void Setup()
-        {
-            _settings = new XbmcSettings
-            {
-                Host = "localhost",
-                Port = 8080,
-                Username = "xbmc",
-                Password = "xbmc",
-                AlwaysUpdate = false,
-                CleanLibrary = false,
-                UpdateLibrary = true
-            };
-
-            _expectedUrl = string.Format("http://{0}/xbmcCmds/xbmcHttp?command={1}", _settings.Address, "getcurrentlyplaying");
-        }
-
-        [Test]
-        public void _should_be_empty_when_no_active_players()
-        {
-            WithNoActivePlayers();
-
-            Subject.GetActivePlayers(_settings).Should().BeEmpty();
-        }
-
-        [Test]
-        public void should_have_active_video_player()
-        {
-            WithVideoPlayerActive();
-
-            var result = Subject.GetActivePlayers(_settings);
-
-            result.Should().HaveCount(1);
-            result.First().Type.Should().Be("video");
-        }
-    }
-}
--- a/src/NzbDrone.Core.Test/NotificationTests/Xbmc/Http/CheckForErrorFixture.cs
+++ b/src/NzbDrone.Core.Test/NotificationTests/Xbmc/Http/CheckForErrorFixture.cs
@@ -1,35 +0,0 @@
-using FluentAssertions;
-using NUnit.Framework;
-using NzbDrone.Core.Notifications.Xbmc;
-using NzbDrone.Core.Test.Framework;
-
-namespace NzbDrone.Core.Test.NotificationTests.Xbmc.Http
-{
-    [TestFixture]
-    public class CheckForErrorFixture : CoreTest<HttpApiProvider>
-    {
-        [Test]
-        public void should_be_true_when_the_response_contains_an_error()
-        {
-            const string response = "html><li>Error:Unknown command</html>";
-
-            Subject.CheckForError(response).Should().BeTrue();
-        }
-
-        [Test]
-        public void JsonError_true_empty_response()
-        {
-            var response = string.Empty;
-
-            Subject.CheckForError(response).Should().BeTrue();
-        }
-
-        [Test]
-        public void JsonError_false()
-        {
-            const string response = "html><li>Filename:[Nothing Playing]</html>";
-
-            Subject.CheckForError(response).Should().BeFalse();
-        }
-    }
-}
--- a/src/NzbDrone.Core.Test/NotificationTests/Xbmc/Http/GetSeriesPathFixture.cs
+++ b/src/NzbDrone.Core.Test/NotificationTests/Xbmc/Http/GetSeriesPathFixture.cs
@@ -1,94 +0,0 @@
-using FluentAssertions;
-using NUnit.Framework;
-using NzbDrone.Common.Http;
-using NzbDrone.Core.Notifications.Xbmc;
-using NzbDrone.Core.Test.Framework;
-using NzbDrone.Core.Tv;
-
-namespace NzbDrone.Core.Test.NotificationTests.Xbmc.Http
-{
-    [TestFixture]
-    public class GetSeriesPathFixture : CoreTest<HttpApiProvider>
-    {
-        private XbmcSettings _settings;
-        private Series _series;
-
-        [SetUp]
-        public void Setup()
-        {
-            _settings = new XbmcSettings
-            {
-                Host = "localhost",
-                Port = 8080,
-                Username = "xbmc",
-                Password = "xbmc",
-                AlwaysUpdate = false,
-                CleanLibrary = false,
-                UpdateLibrary = true
-            };
-
-            _series = new Series
-            {
-                TvdbId = 79488,
-                Title = "30 Rock"
-            };
-
-            const string setResponseUrl = "http://localhost:8080/xbmcCmds/xbmcHttp?command=SetResponseFormat(webheader;false;webfooter;false;header;<xml>;footer;</xml>;opentag;<tag>;closetag;</tag>;closefinaltag;false)";
-            const string resetResponseUrl = "http://localhost:8080/xbmcCmds/xbmcHttp?command=SetResponseFormat()";
-
-            Mocker.GetMock<IHttpProvider>()
-                  .Setup(s => s.DownloadString(setResponseUrl, _settings.Username, _settings.Password))
-                  .Returns("<xml><tag>OK</xml>");
-
-            Mocker.GetMock<IHttpProvider>()
-                  .Setup(s => s.DownloadString(resetResponseUrl, _settings.Username, _settings.Password))
-                  .Returns(@"<html>
-                             <li>OK
-                             </html>");
-        }
-
-        [Test]
-        public void should_get_series_path()
-        {
-            const string queryResult = @"<xml><record><field>smb://xbmc:xbmc@HOMESERVER/TV/30 Rock/</field></record></xml>";
-            var query = string.Format("http://localhost:8080/xbmcCmds/xbmcHttp?command=QueryVideoDatabase(select path.strPath from path, tvshow, tvshowlinkpath where tvshow.c12 = 79488 and tvshowlinkpath.idShow = tvshow.idShow and tvshowlinkpath.idPath = path.idPath)");
-
-            Mocker.GetMock<IHttpProvider>()
-                  .Setup(s => s.DownloadString(query, _settings.Username, _settings.Password))
-                  .Returns(queryResult);
-
-            Subject.GetSeriesPath(_settings, _series)
-                   .Should().Be("smb://xbmc:xbmc@HOMESERVER/TV/30 Rock/");
-        }
-
-        [Test]
-        public void should_get_null_for_series_path()
-        {
-            const string queryResult = @"<xml></xml>";
-            var query = string.Format("http://localhost:8080/xbmcCmds/xbmcHttp?command=QueryVideoDatabase(select path.strPath from path, tvshow, tvshowlinkpath where tvshow.c12 = 79488 and tvshowlinkpath.idShow = tvshow.idShow and tvshowlinkpath.idPath = path.idPath)");
-
-            Mocker.GetMock<IHttpProvider>()
-                  .Setup(s => s.DownloadString(query, _settings.Username, _settings.Password))
-                  .Returns(queryResult);
-
-
-            Subject.GetSeriesPath(_settings, _series)
-                   .Should().BeNull();
-        }
-
-        [Test]
-        public void should_get_series_path_with_special_characters_in_it()
-        {
-            const string queryResult = @"<xml><record><field>smb://xbmc:xbmc@HOMESERVER/TV/Law & Order- Special Victims Unit/</field></record></xml>";
-            var query = string.Format("http://localhost:8080/xbmcCmds/xbmcHttp?command=QueryVideoDatabase(select path.strPath from path, tvshow, tvshowlinkpath where tvshow.c12 = 79488 and tvshowlinkpath.idShow = tvshow.idShow and tvshowlinkpath.idPath = path.idPath)");
-
-            Mocker.GetMock<IHttpProvider>()
-                  .Setup(s => s.DownloadString(query, _settings.Username, _settings.Password))
-                  .Returns(queryResult);
-
-
-            Subject.GetSeriesPath(_settings, _series)
-                   .Should().Be("smb://xbmc:xbmc@HOMESERVER/TV/Law & Order- Special Victims Unit/");
-        }
-    }
-}
--- a/src/NzbDrone.Core.Test/NotificationTests/Xbmc/Http/UpdateFixture.cs
+++ b/src/NzbDrone.Core.Test/NotificationTests/Xbmc/Http/UpdateFixture.cs
@@ -1,75 +0,0 @@
-using FizzWare.NBuilder;
-using NUnit.Framework;
-using NzbDrone.Common.Http;
-using NzbDrone.Core.Notifications.Xbmc;
-using NzbDrone.Core.Test.Framework;
-using NzbDrone.Core.Tv;
-
-namespace NzbDrone.Core.Test.NotificationTests.Xbmc.Http
-{
-    [TestFixture]
-    public class UpdateFixture : CoreTest<HttpApiProvider>
-    {
-        private XbmcSettings _settings;
-        private string _seriesQueryUrl = "http://localhost:8080/xbmcCmds/xbmcHttp?command=QueryVideoDatabase(select path.strPath from path, tvshow, tvshowlinkpath where tvshow.c12 = 79488 and tvshowlinkpath.idShow = tvshow.idShow and tvshowlinkpath.idPath = path.idPath)";
-        private Series _fakeSeries;
-
-        [SetUp]
-        public void Setup()
-        {
-            _settings = new XbmcSettings
-            {
-                Host = "localhost",
-                Port = 8080,
-                Username = "xbmc",
-                Password = "xbmc",
-                AlwaysUpdate = false,
-                CleanLibrary = false,
-                UpdateLibrary = true
-            };
-
-            _fakeSeries = Builder<Series>.CreateNew()
-                                         .With(s => s.TvdbId = 79488)
-                                         .With(s => s.Title = "30 Rock")
-                                         .Build();
-        }
-
-        private void WithSeriesPath()
-        {
-            Mocker.GetMock<IHttpProvider>()
-                  .Setup(s => s.DownloadString(_seriesQueryUrl, _settings.Username, _settings.Password))
-                  .Returns("<xml><record><field>smb://xbmc:xbmc@HOMESERVER/TV/30 Rock/</field></record></xml>");
-        }
-
-        private void WithoutSeriesPath()
-        {
-            Mocker.GetMock<IHttpProvider>()
-                  .Setup(s => s.DownloadString(_seriesQueryUrl, _settings.Username, _settings.Password))
-                  .Returns("<xml></xml>");
-        }
-
-        [Test]
-        public void should_update_using_series_path()
-        {
-            WithSeriesPath();
-            const string url = "http://localhost:8080/xbmcCmds/xbmcHttp?command=ExecBuiltIn(UpdateLibrary(video,smb://xbmc:xbmc@HOMESERVER/TV/30 Rock/))";
-
-            Mocker.GetMock<IHttpProvider>().Setup(s => s.DownloadString(url, _settings.Username, _settings.Password));
-
-            Subject.Update(_settings, _fakeSeries);
-            Mocker.VerifyAllMocks();
-        }
-
-        [Test]
-        public void should_update_all_paths_when_series_path_not_found()
-        {
-            WithoutSeriesPath();
-            const string url = "http://localhost:8080/xbmcCmds/xbmcHttp?command=ExecBuiltIn(UpdateLibrary(video))";
-
-            Mocker.GetMock<IHttpProvider>().Setup(s => s.DownloadString(url, _settings.Username, _settings.Password));
-
-            Subject.Update(_settings, _fakeSeries);
-            Mocker.VerifyAllMocks();
-        }
-    }
-}
--- a/src/NzbDrone.Core.Test/NotificationTests/Xbmc/Json/GetMoviePathFixture.cs
+++ b/src/NzbDrone.Core.Test/NotificationTests/Xbmc/Json/GetMoviePathFixture.cs
@@ -0,0 +1,91 @@
+using System.Collections.Generic;
+using System.Linq;
+using FizzWare.NBuilder;
+using FluentAssertions;
+using NUnit.Framework;
+using NzbDrone.Core.Notifications.Xbmc;
+using NzbDrone.Core.Notifications.Xbmc.Model;
+using NzbDrone.Core.Test.Framework;
+using NzbDrone.Core.Tv;
+
+namespace NzbDrone.Core.Test.NotificationTests.Xbmc.Json
+{
+    [TestFixture]
+    public class GetMoviePathFixture : CoreTest<JsonApiProvider>
+    {
+        private const string IMDB_ID = "tt67890";
+        private XbmcSettings _settings;
+        private Movie _movie;
+        private List<XbmcMovie> _xbmcMovies;
+
+        [SetUp]
+        public void Setup()
+        {
+            _settings = Builder<XbmcSettings>.CreateNew()
+                                             .Build();
+
+            _xbmcMovies = Builder<XbmcMovie>.CreateListOfSize(3)
+                                            .All()
+                                            .With(s => s.ImdbNumber = "tt00000")
+                                            .TheFirst(1)
+                                            .With(s => s.ImdbNumber = IMDB_ID)
+                                            .Build()
+                                            .ToList();
+
+            Mocker.GetMock<IXbmcJsonApiProxy>()
+                  .Setup(s => s.GetMovies(_settings))
+                  .Returns(_xbmcMovies);
+        }
+
+        private void GivenMatchingImdbId()
+        {
+            _movie = new Movie
+            {
+                ImdbId = IMDB_ID,
+                Title = "Movie"
+            };
+        }
+
+        private void GivenMatchingTitle()
+        {
+            _movie = new Movie
+            {
+                ImdbId = "tt01000",
+                Title = _xbmcMovies.First().Label
+            };
+        }
+
+        private void GivenMatchingMovie()
+        {
+            _movie = new Movie
+            {
+                ImdbId = "tt01000",
+                Title = "Does not exist"
+            }; 
+        }
+
+        [Test]
+        public void should_return_null_when_movie_is_not_found()
+        {
+            GivenMatchingMovie();
+
+            Subject.GetMoviePath(_settings, _movie).Should().BeNull();
+        }
+
+        [Test]
+        public void should_return_path_when_tvdbId_matches()
+        {
+            GivenMatchingImdbId();
+
+            Subject.GetMoviePath(_settings, _movie).Should().Be(_xbmcMovies.First().File);
+        }
+
+        [Test]
+        public void should_return_path_when_title_matches()
+        {
+            GivenMatchingTitle();
+
+            Subject.GetMoviePath(_settings, _movie).Should().Be(_xbmcMovies.First().File);
+        }
+    }
+}
--- a/src/NzbDrone.Core.Test/NotificationTests/Xbmc/Json/GetSeriesPathFixture.cs
+++ b/src/NzbDrone.Core.Test/NotificationTests/Xbmc/Json/GetSeriesPathFixture.cs
@@ -1,106 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using FizzWare.NBuilder;
-using FluentAssertions;
-using NUnit.Framework;
-using NzbDrone.Core.Notifications.Xbmc;
-using NzbDrone.Core.Notifications.Xbmc.Model;
-using NzbDrone.Core.Test.Framework;
-using NzbDrone.Core.Tv;
-
-namespace NzbDrone.Core.Test.NotificationTests.Xbmc.Json
-{
-    [TestFixture]
-    public class GetSeriesPathFixture : CoreTest<JsonApiProvider>
-    {
-        private const int TVDB_ID = 5;
-        private XbmcSettings _settings;
-        private Series _series;
-        private List<TvShow> _xbmcSeries;
-
-        [SetUp]
-        public void Setup()
-        {
-            _settings = Builder<XbmcSettings>.CreateNew()
-                                             .Build();
-
-            _xbmcSeries = Builder<TvShow>.CreateListOfSize(3)
-                                         .All()
-                                         .With(s => s.ImdbNumber = "0")
-                                         .TheFirst(1)
-                                         .With(s => s.ImdbNumber = TVDB_ID.ToString())
-                                         .Build()
-                                         .ToList();
-
-            Mocker.GetMock<IXbmcJsonApiProxy>()
-                  .Setup(s => s.GetSeries(_settings))
-                  .Returns(_xbmcSeries);
-        }
-
-        private void GivenMatchingTvdbId()
-        {
-            _series = new Series
-                          {
-                              TvdbId = TVDB_ID,
-                              Title = "TV Show"
-                          };
-        }
-
-        private void GivenMatchingTitle()
-        {
-            _series = new Series
-            {
-                TvdbId = 1000,
-                Title = _xbmcSeries.First().Label
-            };
-        }
-
-        private void GivenMatchingSeries()
-        {
-            _series = new Series
-            {
-                TvdbId = 1000,
-                Title = "Does not exist"
-            }; 
-        }
-
-        [Test]
-        public void should_return_null_when_series_is_not_found()
-        {
-            GivenMatchingSeries();
-
-            Subject.GetSeriesPath(_settings, _series).Should().BeNull();
-        }
-
-        [Test]
-        public void should_return_path_when_tvdbId_matches()
-        {
-            GivenMatchingTvdbId();
-
-            Subject.GetSeriesPath(_settings, _series).Should().Be(_xbmcSeries.First().File);
-        }
-
-        [Test]
-        public void should_return_path_when_title_matches()
-        {
-            GivenMatchingTitle();
-
-            Subject.GetSeriesPath(_settings, _series).Should().Be(_xbmcSeries.First().File);
-        }
-
-        [Test]
-        public void should_not_throw_when_imdb_number_is_not_a_number()
-        {
-            GivenMatchingTvdbId();
-
-            _xbmcSeries.ForEach(s => s.ImdbNumber = "tt12345");
-            _xbmcSeries.Last().ImdbNumber = TVDB_ID.ToString();
-
-            Mocker.GetMock<IXbmcJsonApiProxy>()
-                  .Setup(s => s.GetSeries(_settings))
-                  .Returns(_xbmcSeries);
-
-            Subject.GetSeriesPath(_settings, _series).Should().NotBeNull();
-        }
-    }
-}
--- a/src/NzbDrone.Core.Test/NotificationTests/Xbmc/Json/UpdateFixture.cs
+++ b/src/NzbDrone.Core.Test/NotificationTests/Xbmc/Json/UpdateFixture.cs
@@ -1,68 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using FizzWare.NBuilder;
-using Moq;
-using NUnit.Framework;
-using NzbDrone.Core.Notifications.Xbmc;
-using NzbDrone.Core.Notifications.Xbmc.Model;
-using NzbDrone.Core.Test.Framework;
-using NzbDrone.Core.Tv;
-
-namespace NzbDrone.Core.Test.NotificationTests.Xbmc.Json
-{
-    [TestFixture]
-    public class UpdateFixture : CoreTest<JsonApiProvider>
-    {
-        private const int TVDB_ID = 5;
-        private XbmcSettings _settings;
-        private List<TvShow> _xbmcSeries;
-
-        [SetUp]
-        public void Setup()
-        {
-            _settings = Builder<XbmcSettings>.CreateNew()
-                                             .Build();
-
-            _xbmcSeries = Builder<TvShow>.CreateListOfSize(3)
-                                         .TheFirst(1)
-                                         .With(s => s.ImdbNumber = TVDB_ID.ToString())
-                                         .Build()
-                                         .ToList();
-
-            Mocker.GetMock<IXbmcJsonApiProxy>()
-                  .Setup(s => s.GetSeries(_settings))
-                  .Returns(_xbmcSeries);
-
-            Mocker.GetMock<IXbmcJsonApiProxy>()
-                  .Setup(s => s.GetActivePlayers(_settings))
-                  .Returns(new List<ActivePlayer>());
-        }
-
-        [Test]
-        public void should_update_using_series_path()
-        {
-            var series = Builder<Series>.CreateNew()
-                                        .With(s => s.TvdbId = TVDB_ID)
-                                        .Build();
-
-            Subject.Update(_settings, series);
-
-            Mocker.GetMock<IXbmcJsonApiProxy>()
-                  .Verify(v => v.UpdateLibrary(_settings, It.IsAny<string>()), Times.Once());
-        }
-
-        [Test]
-        public void should_update_all_paths_when_series_path_not_found()
-        {
-            var fakeSeries = Builder<Series>.CreateNew()
-                                            .With(s => s.TvdbId = 1000)
-                                            .With(s => s.Title = "Not 30 Rock")
-                                            .Build();
-
-             Subject.Update(_settings, fakeSeries);
-
-             Mocker.GetMock<IXbmcJsonApiProxy>()
-                   .Verify(v => v.UpdateLibrary(_settings, null), Times.Once());
-        }
-    }
-}
--- a/src/NzbDrone.Core.Test/NotificationTests/Xbmc/Json/UpdateMovieFixture.cs
+++ b/src/NzbDrone.Core.Test/NotificationTests/Xbmc/Json/UpdateMovieFixture.cs
@@ -0,0 +1,68 @@
+using System.Collections.Generic;
+using System.Linq;
+using FizzWare.NBuilder;
+using Moq;
+using NUnit.Framework;
+using NzbDrone.Core.Notifications.Xbmc;
+using NzbDrone.Core.Notifications.Xbmc.Model;
+using NzbDrone.Core.Test.Framework;
+using NzbDrone.Core.Tv;
+
+namespace NzbDrone.Core.Test.NotificationTests.Xbmc.Json
+{
+    [TestFixture]
+    public class UpdateMovieFixture : CoreTest<JsonApiProvider>
+    {
+        private const string IMDB_ID = "tt67890";
+        private XbmcSettings _settings;
+        private List<XbmcMovie> _xbmcMovies;
+
+        [SetUp]
+        public void Setup()
+        {
+            _settings = Builder<XbmcSettings>.CreateNew()
+                                             .Build();
+
+            _xbmcMovies = Builder<XbmcMovie>.CreateListOfSize(3)
+                                            .TheFirst(1)
+                                            .With(s => s.ImdbNumber = IMDB_ID)
+                                            .Build()
+                                            .ToList();
+
+            Mocker.GetMock<IXbmcJsonApiProxy>()
+                  .Setup(s => s.GetMovies(_settings))
+                  .Returns(_xbmcMovies);
+
+            Mocker.GetMock<IXbmcJsonApiProxy>()
+                  .Setup(s => s.GetActivePlayers(_settings))
+                  .Returns(new List<ActivePlayer>());
+        }
+
+        [Test]
+        public void should_update_using_movie_path()
+        {
+            var movie = Builder<Movie>.CreateNew()
+                                      .With(s => s.ImdbId = IMDB_ID)
+                                      .Build();
+
+            Subject.UpdateMovie(_settings, movie);
+
+            Mocker.GetMock<IXbmcJsonApiProxy>()
+                  .Verify(v => v.UpdateLibrary(_settings, It.IsAny<string>()), Times.Once());
+        }
+
+        [Test]
+        public void should_update_all_paths_when_movie_path_not_found()
+        {
+            var fakeMovie = Builder<Movie>.CreateNew()
+                                          .With(s => s.ImdbId = "tt01000")
+                                          .With(s => s.Title = "Not A Real Movie")
+                                          .Build();
+
+            Subject.UpdateMovie(_settings, fakeMovie);
+
+             Mocker.GetMock<IXbmcJsonApiProxy>()
+                   .Verify(v => v.UpdateLibrary(_settings, null), Times.Once());
+        }
+    }
+}
--- a/src/NzbDrone.Core.Test/NotificationTests/Xbmc/OnDownloadFixture.cs
+++ b/src/NzbDrone.Core.Test/NotificationTests/Xbmc/OnDownloadFixture.cs
@@ -41,8 +41,8 @@ namespace NzbDrone.Core.Test.NotificationTests.Xbmc
        private void GivenOldFiles()
        {
            _downloadMessage.OldMovieFiles = Builder<MovieFile>.CreateListOfSize(1)
-                                                            .Build()
-                                                            .ToList();
+                                                               .Build()
+                                                               .ToList();

            Subject.Definition.Settings = new XbmcSettings
                                          {
@@ -52,7 +52,7 @@ namespace NzbDrone.Core.Test.NotificationTests.Xbmc
        }

        [Test]
-        public void should_not_clean_if_no_episode_was_replaced()
+        public void should_not_clean_if_no_movie_was_replaced()
        {
            Subject.OnDownload(_downloadMessage);

@@ -60,7 +60,7 @@ namespace NzbDrone.Core.Test.NotificationTests.Xbmc
        }

        [Test]
-        public void should_clean_if_episode_was_replaced()
+        public void should_clean_if_movie_was_replaced()
        {
            GivenOldFiles();
            Subject.OnDownload(_downloadMessage);
--- a/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj
+++ b/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj
@@ -317,12 +317,6 @@
    <Compile Include="Metadata\Consumers\Wdtv\FindMetadataFileFixture.cs" />
    <Compile Include="NotificationTests\PlexClientServiceTest.cs" />
    <Compile Include="NotificationTests\ProwlProviderTest.cs" />
-    <Compile Include="NotificationTests\Xbmc\Http\ActivePlayersFixture.cs" />
-    <Compile Include="NotificationTests\Xbmc\Http\CheckForErrorFixture.cs" />
-    <Compile Include="NotificationTests\Xbmc\Http\GetSeriesPathFixture.cs" />
-    <Compile Include="NotificationTests\Xbmc\Http\UpdateFixture.cs" />
-    <Compile Include="NotificationTests\Xbmc\Json\GetSeriesPathFixture.cs" />
-    <Compile Include="NotificationTests\Xbmc\Json\UpdateFixture.cs" />
    <Compile Include="NotificationTests\Xbmc\OnDownloadFixture.cs" />
    <Compile Include="OrganizerTests\BuildFilePathFixture.cs" />
    <Compile Include="OrganizerTests\GetSeasonFolderFixture.cs" />
@@ -395,6 +389,8 @@
    <None Include="Files\Indexers\PTP\imdbsearch.json">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    </None>
+    <Compile Include="NotificationTests\Xbmc\Json\GetMoviePathFixture.cs" />
+    <Compile Include="NotificationTests\Xbmc\Json\UpdateMovieFixture.cs" />
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\Marr.Data\Marr.Data.csproj">
--- a/src/NzbDrone.Core.Test/ParserTests/ExtendedQualityParserRegex.cs
+++ b/src/NzbDrone.Core.Test/ParserTests/ExtendedQualityParserRegex.cs
@@ -54,6 +54,7 @@ namespace NzbDrone.Core.Test.ParserTests
        [TestCase("The Revenant 2015 2160p UHD BluRay DTS x264-Whatevs", 19)]
        [TestCase("The Revenant 2015 2160p UHD BluRay FLAC 7 1 x264-Whatevs", 19)]
        [TestCase("The Martian 2015 2160p Ultra HD BluRay DTS-HD MA 7 1 x264-Whatevs", 19)]
+        [TestCase("Movie.Name.2017.Version.UHD.BluRay.HDR.x265.Atmos.Eng.De-RLSGRP", 19)]
        [TestCase("Into the Inferno 2016 2160p Netflix WEBRip DD5 1 x264-Whatevs", 18)]
        public void should_parse_ultrahd_from_title(string title, int version)
        {
--- a/src/NzbDrone.Core.Test/ParserTests/LanguageParserFixture.cs
+++ b/src/NzbDrone.Core.Test/ParserTests/LanguageParserFixture.cs
@@ -14,6 +14,7 @@ namespace NzbDrone.Core.Test.ParserTests
        [TestCase("Ouija.Origin.of.Evil.2016.MULTi.TRUEFRENCH.1080p.BluRay.x264-MELBA", Language.French)]
        [TestCase("Everest.2015.FRENCH.VFQ.BDRiP.x264-CNF30", Language.French)]
        [TestCase("Showdown.In.Little.Tokyo.1991.MULTI.VFQ.VFF.DTSHD-MASTER.1080p.BluRay.x264-ZombiE", Language.French)]
+        [TestCase("The.Polar.Express.2004.MULTI.VF2.1080p.BluRay.x264-PopHD", Language.French)]
        [TestCase("Castle.2009.S01E14.Spanish.HDTV.XviD-LOL", Language.Spanish)]
        [TestCase("Castle.2009.S01E14.German.HDTV.XviD-LOL", Language.German)]
        [TestCase("Castle.2009.S01E14.Germany.HDTV.XviD-LOL", Language.English)]
--- a/src/NzbDrone.Core.Test/ParserTests/QualityParserFixture.cs
+++ b/src/NzbDrone.Core.Test/ParserTests/QualityParserFixture.cs
@@ -46,6 +46,13 @@ namespace NzbDrone.Core.Test.ParserTests
            new object[] { "2160p Remux", Quality.Remux2160p },
        };

+        [TestCase("Despicable.Me.3.2017.720p.TSRip.x264.AAC-Ozlem", false)]
+        [TestCase("IT.2017.HDTSRip.x264.AAC-Ozlem[ETRG]", false)]
+        public void should_parse_ts(string title, bool proper)
+        {
+            ParseAndVerifyQuality(title, Quality.TELESYNC, proper);
+        }
+
        [TestCase("S07E23 .avi ", false)]
        [TestCase("The.Shield.S01E13.x264-CtrlSD", false)]
        [TestCase("Nikita S02E01 HDTV XviD 2HD", false)]
@@ -134,6 +141,7 @@ namespace NzbDrone.Core.Test.ParserTests
        [TestCase("DEXTER.S07E01.ARE.YOU.1080P.HDTV.proper.X264-QCF", true)]
        [TestCase("Dexter - S01E01 - Title [HDTV-1080p]", false)]
        [TestCase("[HorribleSubs] Yowamushi Pedal - 32 [1080p]", false)]
+        [TestCase("Stripes (1981) 1080i HDTV DD5.1 MPEG2-TrollHD", false)]
        public void should_parse_hdtv1080p_quality(string title, bool proper)
        {
            ParseAndVerifyQuality(title, Quality.HDTV1080p, proper);
@@ -174,6 +182,7 @@ 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("The.Simpsons.2017.1080p.WEB-DL.DD5.1.H.264.Remux.-NTb", false)]
        public void should_parse_webdl1080p_quality(string title, bool proper)
        {
            ParseAndVerifyQuality(title, Quality.WEBDL1080p, proper);
@@ -308,6 +317,7 @@ namespace NzbDrone.Core.Test.ParserTests
        [TestCase("Movie.Title.2016.1080p.KORSUB.WEBRip.x264.AAC2.0-RADARR", "korsub")]
        [TestCase("Movie.Title.2016.1080p.KORSUBS.WEBRip.x264.AAC2.0-RADARR", "korsubs")]
        [TestCase("Wonder Woman 2017 HC 720p HDRiP DD5 1 x264-LEGi0N", "Generic Hardcoded Subs")]
+        [TestCase("Ghost.In.The.Shell.2017.720p.SUBBED.HDRip.V2.XViD-26k.avi", "Generic Hardcoded Subs")]
        public void should_parse_hardcoded_subs(string postTitle, string sub)
        {
            QualityParser.ParseQuality(postTitle).HardcodedSubs.Should().Be(sub);
--- a/src/NzbDrone.Core/Datastore/BasicRepository.cs
+++ b/src/NzbDrone.Core/Datastore/BasicRepository.cs
@@ -59,7 +59,7 @@ namespace NzbDrone.Core.Datastore

        public IEnumerable<TModel> All()
        {
-            return DataMapper.Query<TModel>().ToList();
+            return Query.ToList();
        }

        public int Count()
--- a/src/NzbDrone.Core/Datastore/Migration/141_fix_duplicate_alt_titles.cs
+++ b/src/NzbDrone.Core/Datastore/Migration/141_fix_duplicate_alt_titles.cs
@@ -0,0 +1,32 @@
+using System.Collections.Generic;
+using System.Data;
+using FluentMigrator;
+using Newtonsoft.Json.Linq;
+using NzbDrone.Common.Extensions;
+using NzbDrone.Common.Serializer;
+using NzbDrone.Core.Datastore.Migration.Framework;
+
+namespace NzbDrone.Core.Datastore.Migration
+{
+    [Migration(141)]
+    public class fix_duplicate_alt_titles : NzbDroneMigrationBase
+    {
+        protected override void MainDbUpgrade()
+        {
+            Execute.WithConnection(RenameUrlToBaseUrl);
+            Alter.Table("AlternativeTitles").AlterColumn("CleanTitle").AsString().Unique();
+        }
+
+        private void RenameUrlToBaseUrl(IDbConnection conn, IDbTransaction tran)
+        {
+            using (var cmd = conn.CreateCommand())
+            {
+                cmd.Transaction = tran;
+                cmd.CommandText = "DELETE FROM AlternativeTitles WHERE rowid NOT IN ( SELECT MIN(rowid) FROM AlternativeTitles GROUP BY CleanTitle )";
+
+                cmd.ExecuteNonQuery();
+                
+            }
+        }
+    }
+}
--- a/src/NzbDrone.Core/Datastore/TableMapping.cs
+++ b/src/NzbDrone.Core/Datastore/TableMapping.cs
@@ -142,9 +142,12 @@ namespace NzbDrone.Core.Datastore

            Mapper.Entity<Movie>().RegisterModel("Movies")
                .Ignore(s => s.RootFolderPath)
+                .Ignore(m => m.Actors)
+                .Ignore(m => m.Genres)
+//                .Ignore(m => m.Tags)
                .Relationship()
-                .HasOne(s => s.Profile, s => s.ProfileId)
-                .HasOne(m => m.MovieFile, m => m.MovieFileId);
+                .HasOne(s => s.Profile, s => s.ProfileId);
+                //.HasOne(m => m.MovieFile, m => m.MovieFileId);

            Mapper.Entity<AlternativeTitle>().RegisterModel("AlternativeTitles")
                .For(t => t.Id)
--- a/src/NzbDrone.Core/DecisionEngine/Specifications/CutoffSpecification.cs
+++ b/src/NzbDrone.Core/DecisionEngine/Specifications/CutoffSpecification.cs
@@ -38,9 +38,9 @@ namespace NzbDrone.Core.DecisionEngine.Specifications

        public virtual Decision IsSatisfiedBy(RemoteMovie subject, SearchCriteriaBase searchCriteria)
        {
-            if (subject.Movie.MovieFile.Value != null)
+            if (subject.Movie.MovieFile != null)
            {
-                if (!_qualityUpgradableSpecification.CutoffNotMet(subject.Movie.Profile, subject.Movie.MovieFile.Value.Quality, subject.ParsedMovieInfo.Quality))
+                if (!_qualityUpgradableSpecification.CutoffNotMet(subject.Movie.Profile, subject.Movie.MovieFile.Quality, subject.ParsedMovieInfo.Quality))
                {
                    return Decision.Reject("Existing file meets cutoff: {0}", subject.Movie.Profile.Value.Cutoff);
                }
--- a/src/NzbDrone.Core/DecisionEngine/Specifications/RssSync/DelaySpecification.cs
+++ b/src/NzbDrone.Core/DecisionEngine/Specifications/RssSync/DelaySpecification.cs
@@ -39,20 +39,20 @@ namespace NzbDrone.Core.DecisionEngine.Specifications.RssSync
            var profile = subject.Movie.Profile.Value;
            var delayProfile = _delayProfileService.BestForTags(subject.Movie.Tags);
            var delay = delayProfile.GetProtocolDelay(subject.Release.DownloadProtocol);
-            var isPreferredProtocol = subject.Release.DownloadProtocol == delayProfile.PreferredProtocol;
-
-            // Preferred word count 
-            var title = subject.Release.Title;
-            var preferredWords = subject.Movie.Profile.Value.PreferredTags;
-            var preferredCount = 0;
-
-            if (preferredWords == null)
-            {
-                preferredCount = 1;
+            var isPreferredProtocol = subject.Release.DownloadProtocol == delayProfile.PreferredProtocol;
+
+            // Preferred word count 
+            var title = subject.Release.Title;
+            var preferredWords = subject.Movie.Profile.Value.PreferredTags;
+            var preferredCount = 0;
+
+            if (preferredWords == null)
+            {
+                preferredCount = 1;
                _logger.Debug("Preferred words is null, setting preffered count to 1.");
-            }
-            else
-            {
+            }
+            else
+            {
                preferredCount = preferredWords.AsEnumerable().Count(w => title.ToLower().Contains(w.ToLower()));
            }

@@ -66,11 +66,11 @@ namespace NzbDrone.Core.DecisionEngine.Specifications.RssSync

            if (isPreferredProtocol && (subject.Movie.MovieFileId != 0 && subject.Movie.MovieFile != null) && (preferredCount > 0 || preferredWords == null))
            {
-                    var upgradable = _qualityUpgradableSpecification.IsUpgradable(profile, subject.Movie.MovieFile.Value.Quality, subject.ParsedMovieInfo.Quality);
+                    var upgradable = _qualityUpgradableSpecification.IsUpgradable(profile, subject.Movie.MovieFile.Quality, subject.ParsedMovieInfo.Quality);

                    if (upgradable)
                    {
-                        var revisionUpgrade = _qualityUpgradableSpecification.IsRevisionUpgrade(subject.Movie.MovieFile.Value.Quality, subject.ParsedMovieInfo.Quality);
+                        var revisionUpgrade = _qualityUpgradableSpecification.IsRevisionUpgrade(subject.Movie.MovieFile.Quality, subject.ParsedMovieInfo.Quality);

                        if (revisionUpgrade)
                        {
@@ -83,7 +83,7 @@ namespace NzbDrone.Core.DecisionEngine.Specifications.RssSync

            // If quality meets or exceeds the best allowed quality in the profile accept it immediately
            var bestQualityInProfile = new QualityModel(profile.LastAllowedQuality());
-            var isBestInProfile = comparer.Compare(subject.ParsedMovieInfo.Quality, bestQualityInProfile) >= 0;
+            var isBestInProfile = comparer.Compare(subject.ParsedMovieInfo.Quality, bestQualityInProfile) >= 0;

            if (isBestInProfile && isPreferredProtocol && (preferredCount > 0  || preferredWords == null))
            {
--- a/src/NzbDrone.Core/DecisionEngine/Specifications/RssSync/ProperSpecification.cs
+++ b/src/NzbDrone.Core/DecisionEngine/Specifications/RssSync/ProperSpecification.cs
@@ -57,12 +57,12 @@ namespace NzbDrone.Core.DecisionEngine.Specifications.RssSync
                return Decision.Accept();
            }

-            if (subject.Movie.MovieFile.Value == null)
+            if (subject.Movie.MovieFile == null)
            {
                return Decision.Accept();
            }

-            var file = subject.Movie.MovieFile.Value;
+            var file = subject.Movie.MovieFile;

                if (_qualityUpgradableSpecification.IsRevisionUpgrade(file.Quality, subject.ParsedMovieInfo.Quality))
                {
--- a/src/NzbDrone.Core/DecisionEngine/Specifications/UpgradeDiskSpecification.cs
+++ b/src/NzbDrone.Core/DecisionEngine/Specifications/UpgradeDiskSpecification.cs
@@ -35,12 +35,12 @@ namespace NzbDrone.Core.DecisionEngine.Specifications

        public virtual Decision IsSatisfiedBy(RemoteMovie subject, SearchCriteriaBase searchCriteria)
        {
-            if (subject.Movie.MovieFile.Value == null)
+            if (subject.Movie.MovieFile == null)
            {
                return Decision.Accept();
            }

-            var file = subject.Movie.MovieFile.Value;
+            var file = subject.Movie.MovieFile;
                _logger.Debug("Comparing file quality with report. Existing file is {0}", file.Quality);

                if (!_qualityUpgradableSpecification.IsUpgradable(subject.Movie.Profile, file.Quality, subject.ParsedMovieInfo.Quality))
--- a/src/NzbDrone.Core/Download/Clients/Nzbget/Nzbget.cs
+++ b/src/NzbDrone.Core/Download/Clients/Nzbget/Nzbget.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Linq;
 using System.Collections.Generic;
@@ -38,7 +38,7 @@ namespace NzbDrone.Core.Download.Clients.Nzbget

        protected override string AddFromNzbFile(RemoteMovie remoteMovie, string filename, byte[] fileContents)
        {
-            var category = Settings.TvCategory; // TODO: Update this to MovieCategory?
+            var category = Settings.MovieCategory;

            var priority = Settings.RecentTvPriority;

@@ -204,7 +204,7 @@ namespace NzbDrone.Core.Download.Clients.Nzbget

        public override IEnumerable<DownloadClientItem> GetItems()
        {
-            return GetQueue().Concat(GetHistory()).Where(downloadClientItem => downloadClientItem.Category == Settings.TvCategory);
+            return GetQueue().Concat(GetHistory()).Where(downloadClientItem => downloadClientItem.Category == Settings.MovieCategory);
        }

        public override void RemoveItem(string downloadId, bool deleteData)
@@ -221,7 +221,7 @@ namespace NzbDrone.Core.Download.Clients.Nzbget
        {
            var config = _proxy.GetConfig(Settings);

-            var category = GetCategories(config).FirstOrDefault(v => v.Name == Settings.TvCategory);
+            var category = GetCategories(config).FirstOrDefault(v => v.Name == Settings.MovieCategory);

            var status = new DownloadClientStatus
            {
@@ -283,7 +283,7 @@ namespace NzbDrone.Core.Download.Clients.Nzbget

                if (Version.Parse(version) < Version.Parse("12.0"))
                {
-                    return new ValidationFailure(string.Empty, "Nzbget version too low, need 12.0 or higher");
+                    return new ValidationFailure(string.Empty, "NZBGet version too low, need 12.0 or higher");
                }
            }
            catch (Exception ex)
@@ -304,12 +304,12 @@ namespace NzbDrone.Core.Download.Clients.Nzbget
            var config = _proxy.GetConfig(Settings);
            var categories = GetCategories(config);

-            if (!Settings.TvCategory.IsNullOrWhiteSpace() && !categories.Any(v => v.Name == Settings.TvCategory))
+            if (!Settings.MovieCategory.IsNullOrWhiteSpace() && !categories.Any(v => v.Name == Settings.MovieCategory))
            {
-                return new NzbDroneValidationFailure("TvCategory", "Category does not exist")
+                return new NzbDroneValidationFailure("MovieCategory", "Category does not exist")
                {
                    InfoLink = string.Format("http://{0}:{1}/", Settings.Host, Settings.Port),
-                    DetailedDescription = "The Category your entered doesn't exist in NzbGet. Go to NzbGet to create it."
+                    DetailedDescription = "The category you entered doesn't exist in NZBGet. Go to NZBGet to create it."
                };
            }

@@ -323,10 +323,10 @@ namespace NzbDrone.Core.Download.Clients.Nzbget
            var keepHistory = config.GetValueOrDefault("KeepHistory");
            if (keepHistory == "0")
            {
-                return new NzbDroneValidationFailure(string.Empty, "NzbGet setting KeepHistory should be greater than 0")
+                return new NzbDroneValidationFailure(string.Empty, "NZBGet setting KeepHistory should be greater than 0")
                {
                    InfoLink = string.Format("http://{0}:{1}/", Settings.Host, Settings.Port),
-                    DetailedDescription = "NzbGet setting KeepHistory is set to 0. Which prevents Radarr from seeing completed downloads."
+                    DetailedDescription = "NZBGet setting KeepHistory is set to 0. Which prevents Radarr from seeing completed downloads."
                };
            }

--- a/src/NzbDrone.Core/Download/Clients/Nzbget/NzbgetProxy.cs
+++ b/src/NzbDrone.Core/Download/Clients/Nzbget/NzbgetProxy.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using NLog;
@@ -88,7 +88,7 @@ namespace NzbDrone.Core.Download.Clients.Nzbget
            var editResult = EditQueue("GroupSetParameter", 0, "drone=" + droneId, item.NzbId, settings);
            if (editResult)
            {
-                _logger.Debug("Nzbget download drone parameter set to: {0}", droneId);
+                _logger.Debug("NZBGet download drone parameter set to: {0}", droneId);
            }

            return droneId;
@@ -114,7 +114,7 @@ namespace NzbDrone.Core.Download.Clients.Nzbget

            if (editResult)
            {
-                _logger.Debug("Nzbget download drone parameter set to: {0}", droneId);
+                _logger.Debug("NZBGet download drone parameter set to: {0}", droneId);
            }

            return droneId;
@@ -175,7 +175,7 @@ namespace NzbDrone.Core.Download.Clients.Nzbget
            {
                if (!EditQueue("GroupFinalDelete", 0, "", queueItem.NzbId, settings))
                {
-                    _logger.Warn("Failed to remove item from nzbget queue, {0} [{1}]", queueItem.NzbName, queueItem.NzbId);
+                    _logger.Warn("Failed to remove item from NZBGet, {0} [{1}]", queueItem.NzbName, queueItem.NzbId);
                }
            }

@@ -183,13 +183,13 @@ namespace NzbDrone.Core.Download.Clients.Nzbget
            {
                if (!EditQueue("HistoryDelete", 0, "", historyItem.Id, settings))
                {
-                    _logger.Warn("Failed to remove item from nzbget history, {0} [{1}]", historyItem.Name, historyItem.Id);
+                    _logger.Warn("Failed to remove item from NZBGet history, {0} [{1}]", historyItem.Name, historyItem.Id);
                }
            }

            else
            {
-                _logger.Warn("Unable to remove item from nzbget, Unknown ID: {0}", id);
+                _logger.Warn("Unable to remove item from NZBGet, Unknown ID: {0}", id);
                return;
            }
        }
@@ -235,21 +235,21 @@ namespace NzbDrone.Core.Download.Clients.Nzbget
            {
                if (ex.Response.StatusCode == HttpStatusCode.Unauthorized)
                {
-                    throw new DownloadClientException("Authentication failed for NzbGet, please check your settings", ex);
+                    throw new DownloadClientException("Authentication failed for NZBGet, please check your settings", ex);
                }

-                throw new DownloadClientException("Unable to connect to NzbGet. " + ex.Message, ex);
+                throw new DownloadClientException("Unable to connect to NZBGet. " + ex.Message, ex);
            }
            catch (WebException ex)
            {
-                throw new DownloadClientException("Unable to connect to NzbGet. " + ex.Message, ex);
+                throw new DownloadClientException("Unable to connect to NZBGet. " + ex.Message, ex);
            }

            var result = Json.Deserialize<JsonRpcResponse<T>>(response.Content);

            if (result.Error != null)
            {
-                throw new DownloadClientException("Error response received from nzbget: {0}", result.Error.ToString());
+                throw new DownloadClientException("Error response received from NZBGet: {0}", result.Error.ToString());
            }

            return result.Result;
--- a/src/NzbDrone.Core/Download/Clients/Nzbget/NzbgetResponse.cs
+++ b/src/NzbDrone.Core/Download/Clients/Nzbget/NzbgetResponse.cs
@@ -1,4 +1,4 @@
-namespace NzbDrone.Core.Download.Clients.Nzbget
+namespace NzbDrone.Core.Download.Clients.Nzbget
 {
    public class NzbgetResponse<T>
    {
--- a/src/NzbDrone.Core/Download/Clients/Nzbget/NzbgetSettings.cs
+++ b/src/NzbDrone.Core/Download/Clients/Nzbget/NzbgetSettings.cs
@@ -1,4 +1,4 @@
-using FluentValidation;
+using FluentValidation;
 using NzbDrone.Core.Annotations;
 using NzbDrone.Core.ThingiProvider;
 using NzbDrone.Core.Validation;
@@ -14,7 +14,7 @@ namespace NzbDrone.Core.Download.Clients.Nzbget
            RuleFor(c => c.Username).NotEmpty().When(c => !string.IsNullOrWhiteSpace(c.Password));
            RuleFor(c => c.Password).NotEmpty().When(c => !string.IsNullOrWhiteSpace(c.Username));

-            RuleFor(c => c.TvCategory).NotEmpty().WithMessage("A category is recommended").AsWarning();
+            RuleFor(c => c.MovieCategory).NotEmpty().WithMessage("A category is recommended").AsWarning();
        }
    }

@@ -26,7 +26,7 @@ namespace NzbDrone.Core.Download.Clients.Nzbget
        {
            Host = "localhost";
            Port = 6789;
-            TvCategory = "Movies";
+            MovieCategory = "Movies";
            Username = "nzbget";
            Password = "tegbzn6789";
            RecentTvPriority = (int)NzbgetPriority.Normal;
@@ -46,7 +46,7 @@ namespace NzbDrone.Core.Download.Clients.Nzbget
        public string Password { get; set; }

        [FieldDefinition(4, Label = "Category", Type = FieldType.Textbox, HelpText = "Adding a category specific to Radarr avoids conflicts with unrelated downloads, but it's optional")]
-        public string TvCategory { get; set; }        
+        public string MovieCategory { get; set; }        

        [FieldDefinition(5, Label = "Recent Priority", Type = FieldType.Select, SelectOptions = typeof(NzbgetPriority), HelpText = "Priority to use when grabbing releases that aired within the last 14 days")]
        public int RecentTvPriority { get; set; }
@@ -57,7 +57,7 @@ namespace NzbDrone.Core.Download.Clients.Nzbget
        [FieldDefinition(7, Label = "Use SSL", Type = FieldType.Checkbox)]
        public bool UseSsl { get; set; }

-        [FieldDefinition(8, Label = "Add Paused", Type = FieldType.Checkbox, HelpText = "This option requires at least NzbGet version 16.0")]
+        [FieldDefinition(8, Label = "Add Paused", Type = FieldType.Checkbox, HelpText = "This option requires at least NZBGet version 16.0")]
        public bool AddPaused { get; set; }

        public NzbDroneValidationResult Validate()
--- a/src/NzbDrone.Core/Download/Clients/QBittorrent/QBittorrent.cs
+++ b/src/NzbDrone.Core/Download/Clients/QBittorrent/QBittorrent.cs
@@ -50,6 +50,8 @@ namespace NzbDrone.Core.Download.Clients.QBittorrent
                _proxy.SetTorrentLabel(hash.ToLower(), Settings.MovieCategory, Settings);
            }

+            SetInitialState(hash.ToLower());
+
            return hash;
        }

@@ -62,6 +64,8 @@ namespace NzbDrone.Core.Download.Clients.QBittorrent
                _proxy.SetTorrentLabel(hash.ToLower(), Settings.MovieCategory, Settings);
            }

+            SetInitialState(hash);
+
            return hash;
        }

@@ -261,5 +265,28 @@ namespace NzbDrone.Core.Download.Clients.QBittorrent

            return null;
        }
+
+        private void SetInitialState(string hash)
+        {
+            try
+            {
+                switch ((QBittorrentState)Settings.InitialState)
+                {
+                    case QBittorrentState.ForceStart:
+                        _proxy.SetForceStart(hash, true, Settings);
+                        break;
+                    case QBittorrentState.Start:
+                        _proxy.ResumeTorrent(hash, Settings);
+                        break;
+                    case QBittorrentState.Pause:
+                        _proxy.PauseTorrent(hash, Settings);
+                        break;
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.Warn(ex, "Failed to set inital state for {0}.", hash);
+            }
+        }
    }
 }
--- a/src/NzbDrone.Core/Download/Clients/QBittorrent/QBittorrentProxy.cs
+++ b/src/NzbDrone.Core/Download/Clients/QBittorrent/QBittorrentProxy.cs
@@ -23,6 +23,9 @@ namespace NzbDrone.Core.Download.Clients.QBittorrent
        void RemoveTorrent(string hash, Boolean removeData, QBittorrentSettings settings);
        void SetTorrentLabel(string hash, string label, QBittorrentSettings settings);
        void MoveTorrentToTopInQueue(string hash, QBittorrentSettings settings);
+        void PauseTorrent(string hash, QBittorrentSettings settings);
+        void ResumeTorrent(string hash, QBittorrentSettings settings);
+        void SetForceStart(string hash, bool enabled, QBittorrentSettings settings);
    }

    public class QBittorrentProxy : IQBittorrentProxy
@@ -154,6 +157,34 @@ namespace NzbDrone.Core.Download.Clients.QBittorrent

        }

+        public void PauseTorrent(string hash, QBittorrentSettings settings)
+        {
+            var request = BuildRequest(settings).Resource("/command/pause")
+                                                .Post()
+                                                .AddFormParameter("hash", hash);
+
+            ProcessRequest(request, settings);
+        }
+
+        public void ResumeTorrent(string hash, QBittorrentSettings settings)
+        {
+            var request = BuildRequest(settings).Resource("/command/resume")
+                                                .Post()
+                                                .AddFormParameter("hash", hash);
+
+            ProcessRequest(request, settings);
+        }
+
+        public void SetForceStart(string hash, bool enabled, QBittorrentSettings settings)
+        {
+            var request = BuildRequest(settings).Resource("/command/setForceStart")
+                                                .Post()
+                                                .AddFormParameter("hashes", hash)
+                                                .AddFormParameter("value", enabled ? "true": "false");
+
+            ProcessRequest(request, settings);
+        }
+
        private HttpRequestBuilder BuildRequest(QBittorrentSettings settings)
        {
            var requestBuilder = new HttpRequestBuilder(settings.UseSsl, settings.Host, settings.Port);
--- a/src/NzbDrone.Core/Download/Clients/QBittorrent/QBittorrentSettings.cs
+++ b/src/NzbDrone.Core/Download/Clients/QBittorrent/QBittorrentSettings.cs
@@ -1,4 +1,4 @@
-using FluentValidation;
+using FluentValidation;
 using NzbDrone.Core.Annotations;
 using NzbDrone.Core.ThingiProvider;
 using NzbDrone.Core.Validation;
@@ -21,7 +21,7 @@ namespace NzbDrone.Core.Download.Clients.QBittorrent
        public QBittorrentSettings()
        {
            Host = "localhost";
-            Port = 9091;
+            Port = 8080;
            MovieCategory = "radarr";
        }

@@ -40,7 +40,10 @@ namespace NzbDrone.Core.Download.Clients.QBittorrent
        [FieldDefinition(4, Label = "Category", Type = FieldType.Textbox, HelpText = "Adding a category specific to Radarr avoids conflicts with unrelated downloads, but it's optional")]
        public string MovieCategory { get; set; }

-        [FieldDefinition(5, Label = "Use SSL", Type = FieldType.Checkbox, HelpText = "Use a secure connection. See Options -> Web UI -> 'Use HTTPS instead of HTTP' in qBittorrent.")]
+        [FieldDefinition(5, Label = "Initial State", Type = FieldType.Select, SelectOptions = typeof(QBittorrentState), HelpText = "Initial state for torrents added to qBittorrent")]
+        public int InitialState { get; set; }
+
+        [FieldDefinition(6, Label = "Use SSL", Type = FieldType.Checkbox, HelpText = "Use a secure connection. See Options -> Web UI -> 'Use HTTPS instead of HTTP' in qBittorrent.")]
        public bool UseSsl { get; set; }

        public NzbDroneValidationResult Validate()
--- a/src/NzbDrone.Core/Download/Clients/QBittorrent/QBittorrentState.cs
+++ b/src/NzbDrone.Core/Download/Clients/QBittorrent/QBittorrentState.cs
@@ -0,0 +1,9 @@
+namespace NzbDrone.Core.Download.Clients.QBittorrent
+{
+    public enum QBittorrentState
+    {
+        Start = 0,
+        ForceStart = 1,
+        Pause = 2
+    }
+}
--- a/src/NzbDrone.Core/Download/Clients/Sabnzbd/Sabnzbd.cs
+++ b/src/NzbDrone.Core/Download/Clients/Sabnzbd/Sabnzbd.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.RegularExpressions;
@@ -39,7 +39,7 @@ namespace NzbDrone.Core.Download.Clients.Sabnzbd

        protected override string AddFromNzbFile(RemoteMovie remoteMovie, string filename, byte[] fileContents)
        {
-            var category = Settings.TvCategory;
+            var category = Settings.MovieCategory;
            var priority = Settings.RecentTvPriority;

            var response = _proxy.DownloadNzb(fileContents, filename, category, priority, Settings);
@@ -119,7 +119,7 @@ namespace NzbDrone.Core.Download.Clients.Sabnzbd

            try
            {
-                sabHistory = _proxy.GetHistory(0, _configService.DownloadClientHistoryLimit, Settings.TvCategory, Settings);
+                sabHistory = _proxy.GetHistory(0, _configService.DownloadClientHistoryLimit, Settings.MovieCategory, Settings);
            }
            catch (DownloadClientException ex)
            {
@@ -200,7 +200,7 @@ namespace NzbDrone.Core.Download.Clients.Sabnzbd
        {
            foreach (var downloadClientItem in GetQueue().Concat(GetHistory()))
            {
-                if (downloadClientItem.Category == Settings.TvCategory || downloadClientItem.Category == "*" && Settings.TvCategory.IsNullOrWhiteSpace())
+                if (downloadClientItem.Category == Settings.MovieCategory || downloadClientItem.Category == "*" && Settings.MovieCategory.IsNullOrWhiteSpace())
                {
                    yield return downloadClientItem;
                }
@@ -254,7 +254,7 @@ namespace NzbDrone.Core.Download.Clients.Sabnzbd
            var config = _proxy.GetConfig(Settings);
            var categories = GetCategories(config).ToArray();

-            var category = categories.FirstOrDefault(v => v.Name == Settings.TvCategory);
+            var category = categories.FirstOrDefault(v => v.Name == Settings.MovieCategory);

            if (category == null)
            {
@@ -366,7 +366,7 @@ namespace NzbDrone.Core.Download.Clients.Sabnzbd

                if (rawVersion.Equals("develop", StringComparison.InvariantCultureIgnoreCase))
                {
-                    return new NzbDroneValidationFailure("Version", "Sabnzbd develop version, assuming version 1.1.0 or higher.")
+                    return new NzbDroneValidationFailure("Version", "SABnzbd develop version, assuming version 1.1.0 or higher.")
                    {
                        IsWarning = true,
                        DetailedDescription = "Radarr may not be able to support new features added to SABnzbd when running develop versions."
@@ -419,10 +419,10 @@ namespace NzbDrone.Core.Download.Clients.Sabnzbd
            var config = _proxy.GetConfig(Settings);
            if (config.Misc.pre_check && !HasVersion(1, 1))
            {
-                return new NzbDroneValidationFailure("", "Disable 'Check before download' option in Sabnbzd")
+                return new NzbDroneValidationFailure("", "Disable 'Check before download' option in SABnzbd")
                {
                    InfoLink = string.Format("http://{0}:{1}/sabnzbd/config/switches/", Settings.Host, Settings.Port),
-                    DetailedDescription = "Using Check before download affects Radarr ability to track new downloads. Also Sabnzbd recommends 'Abort jobs that cannot be completed' instead since it's more effective."
+                    DetailedDescription = "Using Check before download affects Radarr ability to track new downloads. Also SABnzbd recommends 'Abort jobs that cannot be completed' instead since it's more effective."
                };
            }

@@ -432,52 +432,52 @@ namespace NzbDrone.Core.Download.Clients.Sabnzbd
        private ValidationFailure TestCategory()
        {
            var config = _proxy.GetConfig(Settings);
-            var category = GetCategories(config).FirstOrDefault((SabnzbdCategory v) => v.Name == Settings.TvCategory);
+            var category = GetCategories(config).FirstOrDefault((SabnzbdCategory v) => v.Name == Settings.MovieCategory);

            if (category != null)
            {
                if (category.Dir.EndsWith("*"))
                {
-                    return new NzbDroneValidationFailure("TvCategory", "Enable Job folders")
+                    return new NzbDroneValidationFailure("MovieCategory", "Enable Job folders")
                    {
                        InfoLink = string.Format("http://{0}:{1}/sabnzbd/config/categories/", Settings.Host, Settings.Port),
-                        DetailedDescription = "Radarr prefers each download to have a separate folder. With * appended to the Folder/Path Sabnzbd will not create these job folders. Go to Sabnzbd to fix it."
+                        DetailedDescription = "Radarr prefers each download to have a separate folder. With * appended to the Folder/Path SABnzbd will not create these job folders. Go to SABnzbd to fix it."
                    };
                }
            }
            else
            {
-                if (!Settings.TvCategory.IsNullOrWhiteSpace())
+                if (!Settings.MovieCategory.IsNullOrWhiteSpace())
                {
-                    return new NzbDroneValidationFailure("TvCategory", "Category does not exist")
+                    return new NzbDroneValidationFailure("MovieCategory", "Category does not exist")
                    {
                        InfoLink = string.Format("http://{0}:{1}/sabnzbd/config/categories/", Settings.Host, Settings.Port),
-                        DetailedDescription = "The Category your entered doesn't exist in Sabnzbd. Go to Sabnzbd to create it."
+                        DetailedDescription = "The category you entered doesn't exist in SABnzbd. Go to SABnzbd to create it."
                    };
                }
            }
-            if (config.Misc.enable_tv_sorting && ContainsCategory(config.Misc.tv_categories, Settings.TvCategory))
+            if (config.Misc.enable_tv_sorting && ContainsCategory(config.Misc.tv_categories, Settings.MovieCategory))
            {
-                return new NzbDroneValidationFailure("TvCategory", "Disable TV Sorting")
+                return new NzbDroneValidationFailure("MovieCategory", "Disable TV Sorting")
                {
                    InfoLink = string.Format("http://{0}:{1}/sabnzbd/config/sorting/", Settings.Host, Settings.Port),
-                    DetailedDescription = "You must disable Sabnzbd TV Sorting for the category Radarr uses to prevent import issues. Go to Sabnzbd to fix it."
+                    DetailedDescription = "You must disable SABnzbd TV Sorting for the category Radarr uses to prevent import issues. Go to SABnzbd to fix it."
                };
            }
-            if (config.Misc.enable_movie_sorting && ContainsCategory(config.Misc.movie_categories, Settings.TvCategory))
+            if (config.Misc.enable_movie_sorting && ContainsCategory(config.Misc.movie_categories, Settings.MovieCategory))
            {
-                return new NzbDroneValidationFailure("TvCategory", "Disable Movie Sorting")
+                return new NzbDroneValidationFailure("MovieCategory", "Disable Movie Sorting")
                {
                    InfoLink = string.Format("http://{0}:{1}/sabnzbd/config/sorting/", Settings.Host, Settings.Port),
-                    DetailedDescription = "You must disable Sabnzbd Movie Sorting for the category Radarr uses to prevent import issues. Go to Sabnzbd to fix it."
+                    DetailedDescription = "You must disable SABnzbd Movie Sorting for the category Radarr uses to prevent import issues. Go to SABnzbd to fix it."
                };
            }
-            if (config.Misc.enable_date_sorting && ContainsCategory(config.Misc.date_categories, Settings.TvCategory))
+            if (config.Misc.enable_date_sorting && ContainsCategory(config.Misc.date_categories, Settings.MovieCategory))
            {
-                return new NzbDroneValidationFailure("TvCategory", "Disable Date Sorting")
+                return new NzbDroneValidationFailure("MovieCategory", "Disable Date Sorting")
                {
                    InfoLink = string.Format("http://{0}:{1}/sabnzbd/config/sorting/", Settings.Host, Settings.Port),
-                    DetailedDescription = "You must disable Sabnzbd Date Sorting for the category Radarr uses to prevent import issues. Go to Sabnzbd to fix it."
+                    DetailedDescription = "You must disable SABnzbd Date Sorting for the category Radarr uses to prevent import issues. Go to SABnzbd to fix it."
                };
            }

--- a/src/NzbDrone.Core/Download/Clients/Sabnzbd/SabnzbdSettings.cs
+++ b/src/NzbDrone.Core/Download/Clients/Sabnzbd/SabnzbdSettings.cs
@@ -1,4 +1,4 @@
-using FluentValidation;
+using FluentValidation;
 using NzbDrone.Core.Annotations;
 using NzbDrone.Core.ThingiProvider;
 using NzbDrone.Core.Validation;
@@ -24,7 +24,7 @@ namespace NzbDrone.Core.Download.Clients.Sabnzbd
                                    .WithMessage("Password is required when API key is not configured")
                                    .When(c => string.IsNullOrWhiteSpace(c.ApiKey));

-            RuleFor(c => c.TvCategory).NotEmpty()
+            RuleFor(c => c.MovieCategory).NotEmpty()
                                      .WithMessage("A category is recommended")
                                      .AsWarning();
        }
@@ -38,7 +38,7 @@ namespace NzbDrone.Core.Download.Clients.Sabnzbd
        {
            Host = "localhost";
            Port = 8080;
-            TvCategory = "movies";
+            MovieCategory = "movies";
            RecentTvPriority = (int)SabnzbdPriority.Default;
            OlderTvPriority = (int)SabnzbdPriority.Default;
        }
@@ -59,7 +59,7 @@ namespace NzbDrone.Core.Download.Clients.Sabnzbd
        public string Password { get; set; }

        [FieldDefinition(5, Label = "Category", Type = FieldType.Textbox, HelpText = "Adding a category specific to Radarr avoids conflicts with unrelated downloads, but it's optional")]
-        public string TvCategory { get; set; }
+        public string MovieCategory { get; set; }

        [FieldDefinition(6, Label = "Recent Priority", Type = FieldType.Select, SelectOptions = typeof(SabnzbdPriority), HelpText = "Priority to use when grabbing releases that aired within the last 14 days")]
        public int RecentTvPriority { get; set; }
--- a/src/NzbDrone.Core/Download/Clients/uTorrent/UTorrent.cs
+++ b/src/NzbDrone.Core/Download/Clients/uTorrent/UTorrent.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Linq;
 using System.Collections.Generic;
 using NzbDrone.Common.Disk;
@@ -49,7 +49,7 @@ namespace NzbDrone.Core.Download.Clients.UTorrent
        protected override string AddFromMagnetLink(RemoteMovie remoteMovie, string hash, string magnetLink)
        {
            _proxy.AddTorrentFromUrl(magnetLink, Settings);
-            _proxy.SetTorrentLabel(hash, Settings.TvCategory, Settings);
+            _proxy.SetTorrentLabel(hash, Settings.MovieCategory, Settings);

            /*var isRecentEpisode = remoteEpisode.IsRecentEpisode();

@@ -59,13 +59,15 @@ namespace NzbDrone.Core.Download.Clients.UTorrent
                _proxy.MoveTorrentToTopInQueue(hash, Settings);
            }*/

+            _proxy.SetState(hash, (UTorrentState)Settings.IntialState, Settings);
+
            return hash;
        }

        protected override string AddFromTorrentFile(RemoteMovie remoteMovie, string hash, string filename, byte[] fileContent)
        {
            _proxy.AddTorrentFromFile(filename, fileContent, Settings);
-            _proxy.SetTorrentLabel(hash, Settings.TvCategory, Settings);
+            _proxy.SetTorrentLabel(hash, Settings.MovieCategory, Settings);

            /*var isRecentEpisode = remoteEpisode.IsRecentEpisode();

@@ -75,6 +77,8 @@ namespace NzbDrone.Core.Download.Clients.UTorrent
                _proxy.MoveTorrentToTopInQueue(hash, Settings);
            }*/

+            _proxy.SetState(hash, (UTorrentState)Settings.IntialState, Settings);
+
            return hash;
        }

@@ -86,7 +90,7 @@ namespace NzbDrone.Core.Download.Clients.UTorrent

            try
            {
-                var cacheKey = string.Format("{0}:{1}:{2}", Settings.Host, Settings.Port, Settings.TvCategory);
+                var cacheKey = string.Format("{0}:{1}:{2}", Settings.Host, Settings.Port, Settings.MovieCategory);
                var cache = _torrentCache.Find(cacheKey);

                var response = _proxy.GetTorrents(cache == null ? null : cache.CacheID, Settings);
@@ -123,7 +127,7 @@ namespace NzbDrone.Core.Download.Clients.UTorrent

            foreach (var torrent in torrents)
            {
-                if (torrent.Label != Settings.TvCategory)
+                if (torrent.Label != Settings.MovieCategory)
                {
                    continue;
                }
@@ -205,7 +209,7 @@ namespace NzbDrone.Core.Download.Clients.UTorrent

                if (config.GetValueOrDefault("dir_add_label") == "true")
                {
-                    destDir = destDir + Settings.TvCategory;
+                    destDir = destDir + Settings.MovieCategory;
                }
            }

--- a/src/NzbDrone.Core/Download/Clients/uTorrent/UTorrentProxy.cs
+++ b/src/NzbDrone.Core/Download/Clients/uTorrent/UTorrentProxy.cs
@@ -22,6 +22,7 @@ namespace NzbDrone.Core.Download.Clients.UTorrent
        void RemoveTorrent(string hash, bool removeData, UTorrentSettings settings);
        void SetTorrentLabel(string hash, string label, UTorrentSettings settings);
        void MoveTorrentToTopInQueue(string hash, UTorrentSettings settings);
+        void SetState(string hash, UTorrentState state, UTorrentSettings settings);
    }

    public class UTorrentProxy : IUTorrentProxy
@@ -157,6 +158,15 @@ namespace NzbDrone.Core.Download.Clients.UTorrent
            ProcessRequest(requestBuilder, settings);
        }

+        public void SetState(string hash, UTorrentState state, UTorrentSettings settings)
+        {
+            var requestBuilder = BuildRequest(settings)
+                .AddQueryParam("action", state.ToString().ToLowerInvariant())
+                .AddQueryParam("hash", hash);
+
+            ProcessRequest(requestBuilder, settings);
+        }
+
        private HttpRequestBuilder BuildRequest(UTorrentSettings settings)
        {
            var requestBuilder = new HttpRequestBuilder(false, settings.Host, settings.Port)
--- a/src/NzbDrone.Core/Download/Clients/uTorrent/UTorrentSettings.cs
+++ b/src/NzbDrone.Core/Download/Clients/uTorrent/UTorrentSettings.cs
@@ -11,7 +11,7 @@ namespace NzbDrone.Core.Download.Clients.UTorrent
        {
            RuleFor(c => c.Host).ValidHost();
            RuleFor(c => c.Port).InclusiveBetween(1, 65535);
-            RuleFor(c => c.TvCategory).NotEmpty();
+            RuleFor(c => c.MovieCategory).NotEmpty();
        }
    }

@@ -22,8 +22,8 @@ namespace NzbDrone.Core.Download.Clients.UTorrent
        public UTorrentSettings()
        {
            Host = "localhost";
-            Port = 9091;
-            TvCategory = "radarr";
+            Port = 8080;
+            MovieCategory = "radarr";
        }

        [FieldDefinition(0, Label = "Host", Type = FieldType.Textbox)]
@@ -39,7 +39,7 @@ namespace NzbDrone.Core.Download.Clients.UTorrent
        public string Password { get; set; }

        [FieldDefinition(4, Label = "Category", Type = FieldType.Textbox, HelpText = "Adding a category specific to Radarr avoids conflicts with unrelated downloads, but it's optional")]
-        public string TvCategory { get; set; }
+        public string MovieCategory { get; set; }

        [FieldDefinition(5, Label = "Recent Priority", Type = FieldType.Select, SelectOptions = typeof(UTorrentPriority), HelpText = "Priority to use when grabbing releases that aired within the last 14 days")]
        public int RecentTvPriority { get; set; }
@@ -47,6 +47,9 @@ namespace NzbDrone.Core.Download.Clients.UTorrent
        [FieldDefinition(6, Label = "Older Priority", Type = FieldType.Select, SelectOptions = typeof(UTorrentPriority), HelpText = "Priority to use when grabbing releases that aired over 14 days ago")]
        public int OlderTvPriority { get; set; }

+        [FieldDefinition(7, Label = "Initial State", Type = FieldType.Select, SelectOptions = typeof(UTorrentState), HelpText = "Initial state for torrents added to uTorrent")]
+        public int IntialState { get; set; }
+
        public NzbDroneValidationResult Validate()
        {
            return new NzbDroneValidationResult(Validator.Validate(this));
--- a/src/NzbDrone.Core/Download/Clients/uTorrent/UtorrentState.cs
+++ b/src/NzbDrone.Core/Download/Clients/uTorrent/UtorrentState.cs
@@ -0,0 +1,10 @@
+namespace NzbDrone.Core.Download.Clients.UTorrent
+{
+    public enum UTorrentState
+    {
+        Start = 0,
+        ForceStart = 1,
+        Pause = 2,
+        Stop = 3
+    }
+}
--- a/src/NzbDrone.Core/Indexers/HDBits/HDBitsSettings.cs
+++ b/src/NzbDrone.Core/Indexers/HDBits/HDBitsSettings.cs
@@ -82,7 +82,8 @@ namespace NzbDrone.Core.Indexers.HDBits
        H264 = 1,
        Mpeg2 = 2,
        Vc1 = 3,
-        Xvid = 4
+        Xvid = 4,
+        HEVC = 5
    }

    public enum HdBitsMedium
--- a/src/NzbDrone.Core/Indexers/Newznab/NewznabRequestGenerator.cs
+++ b/src/NzbDrone.Core/Indexers/Newznab/NewznabRequestGenerator.cs
@@ -52,24 +52,29 @@ namespace NzbDrone.Core.Indexers.Newznab
        {
            var pageableRequests = new IndexerPageableRequestChain();

-            if (SupportsMovieSearch && searchCriteria.Movie.ImdbId.IsNotNullOrWhiteSpace())
+            if (!Settings.SearchByTitle && SupportsMovieSearch && searchCriteria.Movie.ImdbId.IsNotNullOrWhiteSpace())
            {
                pageableRequests.Add(GetPagedRequests(MaxPages, Settings.Categories, "movie", $"&imdbid={searchCriteria.Movie.ImdbId.Substring(2)}"));
            }
            else
            {
-                var searchTitle = System.Web.HttpUtility.UrlPathEncode(Parser.Parser.ReplaceGermanUmlauts(Parser.Parser.NormalizeTitle(searchCriteria.Movie.Title)));
                var altTitles = searchCriteria.Movie.AlternativeTitles.Take(5).Select(t => t.Title).ToList();
+                altTitles.Add(searchCriteria.Movie.Title);

-                var realMaxPages = (int)MaxPages / (altTitles.Count() + 1);
+                var realMaxPages = (int)MaxPages / (altTitles.Count());

-                pageableRequests.Add(GetPagedRequests(MaxPages - (altTitles.Count() * realMaxPages), Settings.Categories, "search", $"&q={searchTitle}%20{searchCriteria.Movie.Year}"));
+                //pageableRequests.Add(GetPagedRequests(MaxPages - (altTitles.Count() * realMaxPages), Settings.Categories, "search", $"&q={searchTitle}%20{searchCriteria.Movie.Year}"));

                //Also use alt titles for searching.
                foreach (String altTitle in altTitles)
                {
                    var searchAltTitle = System.Web.HttpUtility.UrlPathEncode(Parser.Parser.ReplaceGermanUmlauts(Parser.Parser.NormalizeTitle(altTitle)));
-                    pageableRequests.Add(GetPagedRequests(realMaxPages, Settings.Categories, "search", $"&q={searchAltTitle}%20{searchCriteria.Movie.Year}"));
+                    var queryString = $"&q={searchAltTitle}";
+                    if (!Settings.RemoveYear)
+                    {
+                        queryString += $"%20{searchCriteria.Movie.Year}";
+                    }
+                    pageableRequests.Add(GetPagedRequests(realMaxPages, Settings.Categories, "search", queryString));
                }
            }

--- a/src/NzbDrone.Core/Indexers/Newznab/NewznabSettings.cs
+++ b/src/NzbDrone.Core/Indexers/Newznab/NewznabSettings.cs
@@ -79,7 +79,15 @@ namespace NzbDrone.Core.Indexers.Newznab
        [FieldDefinition(4, Label = "Additional Parameters", HelpText = "Additional Newznab parameters", Advanced = true)]
        public string AdditionalParameters { get; set; }

-        // Field 5 is used by TorznabSettings MinimumSeeders
+        [FieldDefinition(5, Label = "Remove year from search string",
+            HelpText = "Should Radarr remove the year after the title when searching this indexer?", Advanced = true, Type = FieldType.Checkbox)]
+        public bool RemoveYear { get; set; }
+
+        [FieldDefinition(6, Label = "Search by Title",
+            HelpText = "By default, Radarr will try to search by IMDB ID if your indexer supports that. However, some indexers are not very good at tagging their releases correctly, so you can force Radarr to search that indexer by title instead.",
+            Advanced = true, Type = FieldType.Checkbox)]
+        public bool SearchByTitle { get; set; }
+        // Field 7 is used by TorznabSettings MinimumSeeders
        // If you need to add another field here, update TorznabSettings as well and this comment

        public virtual NzbDroneValidationResult Validate()
--- a/src/NzbDrone.Core/Indexers/Torznab/TorznabSettings.cs
+++ b/src/NzbDrone.Core/Indexers/Torznab/TorznabSettings.cs
@@ -56,7 +56,7 @@ namespace NzbDrone.Core.Indexers.Torznab
            MinimumSeeders = IndexerDefaults.MINIMUM_SEEDERS;
        }

-        [FieldDefinition(5, Type = FieldType.Textbox, Label = "Minimum Seeders", HelpText = "Minimum number of seeders required.", Advanced = true)]
+        [FieldDefinition(7, Type = FieldType.Textbox, Label = "Minimum Seeders", HelpText = "Minimum number of seeders required.", Advanced = true)]
        public int MinimumSeeders { get; set; }

        public override NzbDroneValidationResult Validate()
--- a/src/NzbDrone.Core/MediaCover/MediaCoverService.cs
+++ b/src/NzbDrone.Core/MediaCover/MediaCoverService.cs
@@ -72,11 +72,11 @@ namespace NzbDrone.Core.MediaCover

                mediaCover.Url = _configFileProvider.UrlBase + @"/MediaCover/" + seriesId + "/" + mediaCover.CoverType.ToString().ToLower() + ".jpg";

-                if (_diskProvider.FileExists(filePath))
+                /*if (_diskProvider.FileExists(filePath))
                {
                    var lastWrite = _diskProvider.FileGetLastWrite(filePath);
                    mediaCover.Url += "?lastWrite=" + lastWrite.Ticks;
-                }
+                }*/
            }
        }

--- a/src/NzbDrone.Core/MediaFiles/EpisodeImport/ImportApprovedMovie.cs
+++ b/src/NzbDrone.Core/MediaFiles/EpisodeImport/ImportApprovedMovie.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -131,7 +131,7 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport

                    if (newDownload)
                    {
-                        _eventAggregator.PublishEvent(new MovieDownloadedEvent(localMovie, movieFile, oldFiles));
+                        _eventAggregator.PublishEvent(new MovieDownloadedEvent(localMovie, movieFile, oldFiles, downloadClientItem));
                    }
                }
                catch (Exception e)
--- a/src/NzbDrone.Core/MediaFiles/EpisodeImport/ImportDecisionMaker.cs
+++ b/src/NzbDrone.Core/MediaFiles/EpisodeImport/ImportDecisionMaker.cs
@@ -136,10 +136,11 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport

                    _logger.Debug("Size: {0}", localMovie.Size);
 					var current = localMovie.Quality;
+                    localMovie.MediaInfo = _videoFileInfoReader.GetMediaInfo(file);
                    //TODO: make it so media info doesn't ruin the import process of a new series
 					if (sceneSource && ShouldCheckQualityForParsedQuality(current.Quality))
                    {
-                        localMovie.MediaInfo = _videoFileInfoReader.GetMediaInfo(file);
+                        
                        if (shouldCheckQuality)
                        {
 							_logger.Debug("Checking quality for this video file to make sure nothing mismatched.");
--- a/src/NzbDrone.Core/MediaFiles/Events/MovieDownloadedEvent.cs
+++ b/src/NzbDrone.Core/MediaFiles/Events/MovieDownloadedEvent.cs
@@ -1,6 +1,7 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using NzbDrone.Common.Messaging;
 using NzbDrone.Core.Parser.Model;
+using NzbDrone.Core.Download;

 namespace NzbDrone.Core.MediaFiles.Events
 {
@@ -9,12 +10,17 @@ namespace NzbDrone.Core.MediaFiles.Events
        public LocalMovie Movie { get; private set; }
        public MovieFile MovieFile { get; private set; }
        public List<MovieFile> OldFiles { get; private set; }
+        public string DownloadId { get; private set; }

-        public MovieDownloadedEvent(LocalMovie episode, MovieFile episodeFile, List<MovieFile> oldFiles)
+        public MovieDownloadedEvent(LocalMovie episode, MovieFile episodeFile, List<MovieFile> oldFiles, DownloadClientItem downloadClientItem)
        {
            Movie = episode;
            MovieFile = episodeFile;
            OldFiles = oldFiles;
+            if (downloadClientItem != null)
+            {
+                DownloadId = downloadClientItem.DownloadId;
+            }
        }
    }
-}
+}
--- a/src/NzbDrone.Core/MediaFiles/UpgradeMediaFileService.cs
+++ b/src/NzbDrone.Core/MediaFiles/UpgradeMediaFileService.cs
@@ -44,7 +44,7 @@ namespace NzbDrone.Core.MediaFiles
            _logger.Trace("Upgrading existing movie file.");
            var moveFileResult = new MovieFileMoveResult();

-            var existingFile = localMovie.Movie.MovieFile.Value;
+            var existingFile = localMovie.Movie.MovieFile;

            if (existingFile != null)
            {
--- a/src/NzbDrone.Core/Notifications/Boxcar/Boxcar.cs
+++ b/src/NzbDrone.Core/Notifications/Boxcar/Boxcar.cs
@@ -34,10 +34,6 @@ namespace NzbDrone.Core.Notifications.Boxcar
        {
        }
 		
-        public override void OnRename(Series series)
-        {
-        }
-
        public override string Name => "Boxcar";

        public override bool SupportsOnRename => false;
--- a/src/NzbDrone.Core/Notifications/CustomScript/CustomScript.cs
+++ b/src/NzbDrone.Core/Notifications/CustomScript/CustomScript.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.IO;
@@ -31,6 +31,7 @@ namespace NzbDrone.Core.Notifications.CustomScript
        {
            var movie = message.Movie;
            var remoteMovie = message.RemoteMovie;
+            var quality = message.Quality;
            var environmentVariables = new StringDictionary();

            environmentVariables.Add("Radarr_EventType", "Grab");
@@ -42,6 +43,8 @@ namespace NzbDrone.Core.Notifications.CustomScript
            environmentVariables.Add("Radarr_Release_Indexer", remoteMovie.Release.Indexer);
            environmentVariables.Add("Radarr_Release_Size", remoteMovie.Release.Size.ToString());
            environmentVariables.Add("Radarr_Release_ReleaseGroup", remoteMovie.ParsedMovieInfo.ReleaseGroup ?? string.Empty);
+            environmentVariables.Add("Radarr_Release_Quality", quality.Quality.Name);
+            environmentVariables.Add("Radarr_Release_QualityVersion", quality.Revision.Version.ToString());

            ExecuteScript(environmentVariables);
        }
@@ -54,6 +57,7 @@ namespace NzbDrone.Core.Notifications.CustomScript
            var environmentVariables = new StringDictionary();

            environmentVariables.Add("Radarr_EventType", "Download");
+            environmentVariables.Add("Radarr_IsUpgrade", message.OldMovieFiles.Any().ToString());
            environmentVariables.Add("Radarr_Movie_Id", movie.Id.ToString());
            environmentVariables.Add("Radarr_Movie_Title", movie.Title);
            environmentVariables.Add("Radarr_Movie_Path", movie.Path);
@@ -68,7 +72,13 @@ namespace NzbDrone.Core.Notifications.CustomScript
            environmentVariables.Add("Radarr_MovieFile_SceneName", movieFile.SceneName ?? string.Empty);
            environmentVariables.Add("Radarr_MovieFile_SourcePath", sourcePath);
            environmentVariables.Add("Radarr_MovieFile_SourceFolder", Path.GetDirectoryName(sourcePath));
+            environmentVariables.Add("Radarr_Download_Id", message.DownloadId ?? string.Empty);

+            if (message.OldMovieFiles.Any())
+            {
+                environmentVariables.Add("Radarr_DeletedRelativePaths", string.Join("|", message.OldMovieFiles.Select(e => e.RelativePath)));
+                environmentVariables.Add("Radarr_DeletedPaths", string.Join("|", message.OldMovieFiles.Select(e => Path.Combine(movie.Path, e.RelativePath))));
+            }
            ExecuteScript(environmentVariables);
        }

@@ -86,10 +96,6 @@ namespace NzbDrone.Core.Notifications.CustomScript
            ExecuteScript(environmentVariables);
        }

-        public override void OnRename(Series series)
-        {
-        }
-
        public override string Name => "Custom Script";

        public override ValidationResult Test()
--- a/src/NzbDrone.Core/Notifications/DownloadMessage.cs
+++ b/src/NzbDrone.Core/Notifications/DownloadMessage.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using NzbDrone.Core.MediaFiles;
 using NzbDrone.Core.Tv;

@@ -7,13 +7,11 @@ namespace NzbDrone.Core.Notifications
    public class DownloadMessage
    {
        public string Message { get; set; }
-        public Series Series { get; set; }
        public Movie Movie { get; set; }
-        public EpisodeFile EpisodeFile { get; set; }
-        public List<EpisodeFile> OldFiles { get; set; }
        public MovieFile MovieFile { get; set; }
        public List<MovieFile> OldMovieFiles { get; set; }
        public string SourcePath { get; set; }
+        public string DownloadId { get; set; }

        public override string ToString()
        {
--- a/src/NzbDrone.Core/Notifications/Email/Email.cs
+++ b/src/NzbDrone.Core/Notifications/Email/Email.cs
@@ -36,10 +36,6 @@ namespace NzbDrone.Core.Notifications.Email
        {
        }
 		
-        public override void OnRename(Series series)
-        {
-        }
-
        public override string Name => "Email";

        public override bool SupportsOnRename => false;
--- a/src/NzbDrone.Core/Notifications/GrabMessage.cs
+++ b/src/NzbDrone.Core/Notifications/GrabMessage.cs
@@ -7,10 +7,8 @@ namespace NzbDrone.Core.Notifications
    public class GrabMessage
    {
        public string Message { get; set; }
-        public Series Series { get; set; }
        public Movie Movie { get; set; }
        public RemoteMovie RemoteMovie { get; set; }
-        public RemoteEpisode Episode { get; set; }
        public QualityModel Quality { get; set; }   

        public override string ToString()
--- a/src/NzbDrone.Core/Notifications/Growl/Growl.cs
+++ b/src/NzbDrone.Core/Notifications/Growl/Growl.cs
@@ -34,10 +34,6 @@ namespace NzbDrone.Core.Notifications.Growl
        {
        }
 		
-        public override void OnRename(Series series)
-        {
-        }
-
        public override string Name => "Growl";

        public override bool SupportsOnRename => false;
--- a/src/NzbDrone.Core/Notifications/Growl/GrowlService.cs
+++ b/src/NzbDrone.Core/Notifications/Growl/GrowlService.cs
@@ -133,8 +133,8 @@ namespace NzbDrone.Core.Notifications.Growl
        {
            var notificationTypes = new List<NotificationType>();
            notificationTypes.Add(new NotificationType("TEST", "Test"));
-            notificationTypes.Add(new NotificationType("GRAB", "Episode Grabbed"));
-            notificationTypes.Add(new NotificationType("DOWNLOAD", "Episode Complete"));
+            notificationTypes.Add(new NotificationType("GRAB", "Movie Grabbed"));
+            notificationTypes.Add(new NotificationType("DOWNLOAD", "Movie Complete"));

            return notificationTypes.ToArray();
        }
--- a/src/NzbDrone.Core/Notifications/INotification.cs
+++ b/src/NzbDrone.Core/Notifications/INotification.cs
@@ -9,7 +9,6 @@ namespace NzbDrone.Core.Notifications

        void OnGrab(GrabMessage grabMessage);
        void OnDownload(DownloadMessage message);
-        void OnRename(Series series);
        void OnMovieRename(Movie movie);
        bool SupportsOnGrab { get; }
        bool SupportsOnDownload { get; }
--- a/src/NzbDrone.Core/Notifications/Join/Join.cs
+++ b/src/NzbDrone.Core/Notifications/Join/Join.cs
@@ -34,10 +34,6 @@ namespace NzbDrone.Core.Notifications.Join
        {
        }
 		
-        public override void OnRename(Series series)
-        {
-        }
-
        public override string Name => "Join";

        public override bool SupportsOnRename => false;
--- a/src/NzbDrone.Core/Notifications/MediaBrowser/MediaBrowser.cs
+++ b/src/NzbDrone.Core/Notifications/MediaBrowser/MediaBrowser.cs
@@ -49,14 +49,6 @@ namespace NzbDrone.Core.Notifications.MediaBrowser
            }
        }

-        public override void OnRename(Series series)
-        {
-            if (Settings.UpdateLibrary)
-            {
-                _mediaBrowserService.Update(Settings, series);
-            }
-        }
-
        public override string Name => "Emby (Media Browser)";

        public override ValidationResult Test()
--- a/src/NzbDrone.Core/Notifications/MediaBrowser/MediaBrowserProxy.cs
+++ b/src/NzbDrone.Core/Notifications/MediaBrowser/MediaBrowserProxy.cs
@@ -31,16 +31,6 @@ namespace NzbDrone.Core.Notifications.MediaBrowser
            ProcessRequest(request, settings);
        }

-        public void Update(MediaBrowserSettings settings, int tvdbId)
-        {
-            var path = string.Format("/Library/Series/Updated?tvdbid={0}", tvdbId);            
-            var request = BuildRequest(path, settings);
-            request.Headers.Add("Content-Length", "0");
-
-            ProcessRequest(request, settings);
-        }
-
-
        public void UpdateMovies(MediaBrowserSettings settings, string imdbid)
        {
            var path = string.Format("/Library/Movies/Updated?ImdbId={0}", imdbid);
--- a/src/NzbDrone.Core/Notifications/MediaBrowser/MediaBrowserService.cs
+++ b/src/NzbDrone.Core/Notifications/MediaBrowser/MediaBrowserService.cs
@@ -10,7 +10,6 @@ namespace NzbDrone.Core.Notifications.MediaBrowser
    public interface IMediaBrowserService
    {
        void Notify(MediaBrowserSettings settings, string title, string message);
-        void Update(MediaBrowserSettings settings, Series series);
        void UpdateMovies(MediaBrowserSettings settings, Movie movie);
        ValidationFailure Test(MediaBrowserSettings settings);
    }
@@ -31,12 +30,6 @@ namespace NzbDrone.Core.Notifications.MediaBrowser
            _proxy.Notify(settings, title, message);
        }

-        public void Update(MediaBrowserSettings settings, Series series)
-        {
-            _proxy.Update(settings, series.TvdbId);
-        }
-
-
        public void UpdateMovies(MediaBrowserSettings settings, Movie movie)
        {
            _proxy.UpdateMovies(settings, movie.ImdbId);
--- a/src/NzbDrone.Core/Notifications/NotificationBase.cs
+++ b/src/NzbDrone.Core/Notifications/NotificationBase.cs
@@ -26,7 +26,6 @@ namespace NzbDrone.Core.Notifications

        public abstract void OnGrab(GrabMessage grabMessage);
        public abstract void OnDownload(DownloadMessage message); 
-        public abstract void OnRename(Series series);
        public abstract void OnMovieRename(Movie movie);

        public virtual bool SupportsOnGrab => true;
--- a/src/NzbDrone.Core/Notifications/NotificationService.cs
+++ b/src/NzbDrone.Core/Notifications/NotificationService.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using NLog;
@@ -30,47 +30,6 @@ namespace NzbDrone.Core.Notifications
            _logger = logger;
        }

-        private string GetMessage(Series series, List<Episode> episodes, QualityModel quality)
-        {
-            var qualityString = quality.Quality.ToString();
-
-            if (quality.Revision.Version > 1)
-            {
-                if (series.SeriesType == SeriesTypes.Anime)
-                {
-                    qualityString += " v" + quality.Revision.Version;
-                }
-
-                else
-                {
-                    qualityString += " Proper";
-                }
-            }
-            
-            if (series.SeriesType == SeriesTypes.Daily)
-            {
-                var episode = episodes.First();
-
-                return string.Format("{0} - {1} - {2} [{3}]",
-                                         series.Title,
-                                         episode.AirDate,
-                                         episode.Title,
-                                         qualityString);
-            }
-
-            var episodeNumbers = string.Concat(episodes.Select(e => e.EpisodeNumber)
-                                                       .Select(i => string.Format("x{0:00}", i)));
-
-            var episodeTitles = string.Join(" + ", episodes.Select(e => e.Title));
-
-            return string.Format("{0} - {1}{2} - {3} [{4}]",
-                                    series.Title,
-                                    episodes.First().SeasonNumber,
-                                    episodeNumbers,
-                                    episodeTitles,
-                                    qualityString);
-        }
-
        private string GetMessage(Movie movie, QualityModel quality)
        {
            var qualityString = quality.Quality.ToString();
@@ -100,7 +59,7 @@ namespace NzbDrone.Core.Notifications

            if (notificationDefinition.Tags.Intersect(movie.Tags).Any())
            {
-                _logger.Debug("Notification and series have one or more matching tags.");
+                _logger.Debug("Notification and movie have one or more matching tags.");
                return true;
            }

@@ -109,49 +68,9 @@ namespace NzbDrone.Core.Notifications
            return false;
        }

-        private bool ShouldHandleSeries(ProviderDefinition definition, Series series)
-        {
-            var notificationDefinition = (NotificationDefinition) definition;
-
-            if (notificationDefinition.Tags.Empty())
-            {
-                _logger.Debug("No tags set for this notification.");
-                return true;
-            }
-
-            if (notificationDefinition.Tags.Intersect(series.Tags).Any())
-            {
-                _logger.Debug("Notification and series have one or more matching tags.");
-                return true;
-            }
-
-            //TODO: this message could be more clear
-            _logger.Debug("{0} does not have any tags that match {1}'s tags", notificationDefinition.Name, series.Title);
-            return false;
-        }
-
        public void Handle(EpisodeGrabbedEvent message)
        {
-            var grabMessage = new GrabMessage {
-                Message = GetMessage(message.Episode.Series, message.Episode.Episodes, message.Episode.ParsedEpisodeInfo.Quality),
-                Series = message.Episode.Series,
-                Quality = message.Episode.ParsedEpisodeInfo.Quality,
-                Episode = message.Episode
-            };
-
-            foreach (var notification in _notificationFactory.OnGrabEnabled())
-            {
-                try
-                {
-                    if (!ShouldHandleSeries(notification.Definition, message.Episode.Series)) continue;
-                    notification.OnGrab(grabMessage);
-                }
-
-                catch (Exception ex)
-                {
-                    _logger.Error(ex, "Unable to send OnGrab notification to: " + notification.Definition.Name);
-                }
-            }
+            throw new NotImplementedException("Remove Series/Season/Episode");
        }

        public void Handle(MovieGrabbedEvent message)
@@ -159,9 +78,7 @@ namespace NzbDrone.Core.Notifications
            var grabMessage = new GrabMessage
            {
                Message = GetMessage(message.Movie.Movie, message.Movie.ParsedMovieInfo.Quality),
-                Series = null,
                Quality = message.Movie.ParsedMovieInfo.Quality,
-                Episode = null,
                Movie = message.Movie.Movie,
                RemoteMovie = message.Movie
            };
@@ -183,44 +100,18 @@ namespace NzbDrone.Core.Notifications

        public void Handle(EpisodeDownloadedEvent message)
        {
-            var downloadMessage = new DownloadMessage();
-            downloadMessage.Message = GetMessage(message.Episode.Series, message.Episode.Episodes, message.Episode.Quality);
-            downloadMessage.Series = message.Episode.Series;
-            downloadMessage.EpisodeFile = message.EpisodeFile;
-            downloadMessage.OldFiles = message.OldFiles;
-            downloadMessage.SourcePath = message.Episode.Path;
-
-            foreach (var notification in _notificationFactory.OnDownloadEnabled())
-            {
-                try
-                {
-                    if (ShouldHandleSeries(notification.Definition, message.Episode.Series))
-                    {
-                        if (downloadMessage.OldFiles.Empty() || ((NotificationDefinition)notification.Definition).OnUpgrade)
-                        {
-                            notification.OnDownload(downloadMessage);
-                        }
-                    }
-                }
-
-                catch (Exception ex)
-                {
-                    _logger.Warn(ex, "Unable to send OnDownload notification to: " + notification.Definition.Name);
-                }
-            }
+            throw new NotImplementedException("Remove Series/Season/Episode");
        }

        public void Handle(MovieDownloadedEvent message)
        {
            var downloadMessage = new DownloadMessage();
            downloadMessage.Message = GetMessage(message.Movie.Movie, message.Movie.Quality);
-            downloadMessage.Series = null;
-            downloadMessage.EpisodeFile = null;
            downloadMessage.MovieFile = message.MovieFile;
            downloadMessage.Movie = message.Movie.Movie;
-            downloadMessage.OldFiles = null;
            downloadMessage.OldMovieFiles = message.OldFiles;
            downloadMessage.SourcePath = message.Movie.Path;
+            downloadMessage.DownloadId = message.DownloadId;

            foreach (var notification in _notificationFactory.OnDownloadEnabled())
            {
@@ -244,21 +135,7 @@ namespace NzbDrone.Core.Notifications

        public void Handle(SeriesRenamedEvent message)
        {
-            foreach (var notification in _notificationFactory.OnRenameEnabled())
-            {
-                try
-                {
-                    if (ShouldHandleSeries(notification.Definition, message.Series))
-                    {
-                        notification.OnRename(message.Series);
-                    }
-                }
-
-                catch (Exception ex)
-                {
-                    _logger.Warn(ex, "Unable to send OnRename notification to: " + notification.Definition.Name);
-                }
-            }
+            throw new NotImplementedException("Remove Series/Season/Episode");
        }

        public void Handle(MovieRenamedEvent message)
--- a/src/NzbDrone.Core/Notifications/NotifyMyAndroid/NotifyMyAndroid.cs
+++ b/src/NzbDrone.Core/Notifications/NotifyMyAndroid/NotifyMyAndroid.cs
@@ -35,10 +35,6 @@ namespace NzbDrone.Core.Notifications.NotifyMyAndroid
        {
        }
 		
-        public override void OnRename(Series series)
-        {
-        }
-
        public override string Name => "Notify My Android";

        public override bool SupportsOnRename => false;
--- a/src/NzbDrone.Core/Notifications/Plex/PlexClient.cs
+++ b/src/NzbDrone.Core/Notifications/Plex/PlexClient.cs
@@ -32,10 +32,6 @@ namespace NzbDrone.Core.Notifications.Plex
        {
        }
 		
-        public override void OnRename(Series series)
-        {
-        }
-
        public override string Name => "Plex Media Center";

        public override bool SupportsOnRename => false;
--- a/src/NzbDrone.Core/Notifications/Plex/PlexHomeTheater.cs
+++ b/src/NzbDrone.Core/Notifications/Plex/PlexHomeTheater.cs
@@ -39,11 +39,6 @@ namespace NzbDrone.Core.Notifications.Plex
        {
        }
 		
-        public override void OnRename(Series series)
-        {
-            
-        }
-
        public override string Name => "Plex Home Theater";

        public override bool SupportsOnRename => false;
--- a/src/NzbDrone.Core/Notifications/Plex/PlexServer.cs
+++ b/src/NzbDrone.Core/Notifications/Plex/PlexServer.cs
@@ -30,11 +30,6 @@ namespace NzbDrone.Core.Notifications.Plex
            UpdateIfEnabled(movie);
        }
 		
-        public override void OnRename(Series series)
-        {
-            //UpdateIfEnabled(movie);
-        }
-
        private void UpdateIfEnabled(Movie movie)
        {
            if (Settings.UpdateLibrary)
--- a/src/NzbDrone.Core/Notifications/Plex/PlexServerProxy.cs
+++ b/src/NzbDrone.Core/Notifications/Plex/PlexServerProxy.cs
@@ -19,10 +19,10 @@ namespace NzbDrone.Core.Notifications.Plex
        List<PlexSection> GetTvSections(PlexServerSettings settings);
        List<PlexSection> GetMovieSections(PlexServerSettings settings);
        void Update(int sectionId, PlexServerSettings settings);
-        void UpdateSeries(int metadataId, PlexServerSettings settings);
+        void UpdateItem(int metadataId, PlexServerSettings settings);
        string Version(PlexServerSettings settings);
        List<PlexPreference> Preferences(PlexServerSettings settings);
-        int? GetMetadataId(int sectionId, int tvdbId, string language, PlexServerSettings settings);
+        int? GetMetadataId(int sectionId, string imdbId, string language, PlexServerSettings settings);
    }

    public class PlexServerProxy : IPlexServerProxy
@@ -109,14 +109,14 @@ namespace NzbDrone.Core.Notifications.Plex
            CheckForError(response, settings);
        }

-        public void UpdateSeries(int metadataId, PlexServerSettings settings)
+        public void UpdateItem(int metadataId, PlexServerSettings settings)
        {
            var resource = string.Format("library/metadata/{0}/refresh", metadataId);
            var request = GetPlexServerRequest(resource, Method.PUT, settings);
            var client = GetPlexServerClient(settings);
            var response = client.Execute(request);

-            _logger.Trace("Update Series response: {0}", response.Content);
+            _logger.Trace("Update Item response: {0}", response.Content);
            CheckForError(response, settings);
        }

@@ -160,9 +160,9 @@ namespace NzbDrone.Core.Notifications.Plex
                       .Preferences;
        }

-        public int? GetMetadataId(int sectionId, int tvdbId, string language, PlexServerSettings settings)
+        public int? GetMetadataId(int sectionId, string imdbId, string language, PlexServerSettings settings)
        {
-            var guid = string.Format("com.plexapp.agents.thetvdb://{0}?lang={1}", tvdbId, language);
+            var guid = string.Format("com.plexapp.agents.imdb://{0}?lang={1}", imdbId, language);
            var resource = string.Format("library/sections/{0}/all?guid={1}", sectionId, System.Web.HttpUtility.UrlEncode(guid));
            var request = GetPlexServerRequest(resource, Method.GET, settings);
            var client = GetPlexServerClient(settings);
--- a/src/NzbDrone.Core/Notifications/Plex/PlexServerService.cs
+++ b/src/NzbDrone.Core/Notifications/Plex/PlexServerService.cs
@@ -13,7 +13,6 @@ namespace NzbDrone.Core.Notifications.Plex
 {
    public interface IPlexServerService
    {
-        void UpdateLibrary(Series series, PlexServerSettings settings);
        void UpdateMovieSections(Movie movie, PlexServerSettings settings);
        ValidationFailure Test(PlexServerSettings settings);
    }
@@ -33,7 +32,7 @@ namespace NzbDrone.Core.Notifications.Plex
            _logger = logger;
        }

-        public void UpdateLibrary(Series series, PlexServerSettings settings)
+        public void UpdateMovieSections(Movie movie, PlexServerSettings settings)
        {
            try
            {
@@ -47,7 +46,7 @@ namespace NzbDrone.Core.Notifications.Plex

                if (partialUpdates)
                {
-                    UpdatePartialSection(series, sections, settings);
+                    UpdatePartialSection(movie, sections, settings);
                }

                else
@@ -56,38 +55,6 @@ namespace NzbDrone.Core.Notifications.Plex
                }
            }

-            catch(Exception ex)
-            {
-                _logger.Warn(ex, "Failed to Update Plex host: " + settings.Host);
-                throw;
-            }
-        }
-
-        public void UpdateMovieSections(Movie movie, PlexServerSettings settings)
-        {
-            try
-            {
-                _logger.Debug("Sending Update Request to Plex Server");
-
-                var version = _versionCache.Get(settings.Host, () => GetVersion(settings), TimeSpan.FromHours(2));
-                ValidateVersion(version);
-
-                var sections = GetSections(settings);
-                var partialUpdates = _partialUpdateCache.Get(settings.Host, () => PartialUpdatesAllowed(settings, version), TimeSpan.FromHours(2));
-
-                // TODO: Investiate partial updates later, for now just update all movie sections...
-                
-                //if (partialUpdates)
-                //{
-                //    UpdatePartialSection(series, sections, settings);
-                //}
-
-                //else
-                //{
-                    sections.ForEach(s => UpdateSection(s.Id, settings));
-                //}
-            }
-
            catch (Exception ex)
            {
                _logger.Warn(ex, "Failed to Update Plex host: " + settings.Host);
@@ -163,18 +130,18 @@ namespace NzbDrone.Core.Notifications.Plex
            _plexServerProxy.Update(sectionId, settings);
        }

-        private void UpdatePartialSection(Series series, List<PlexSection> sections, PlexServerSettings settings)
+        private void UpdatePartialSection(Movie movie, List<PlexSection> sections, PlexServerSettings settings)
        {
            var partiallyUpdated = false;

            foreach (var section in sections)
            {
-                var metadataId = GetMetadataId(section.Id, series, section.Language, settings);
+                var metadataId = GetMetadataId(section.Id, movie, section.Language, settings);

                if (metadataId.HasValue)
                {
-                    _logger.Debug("Updating Plex host: {0}, Section: {1}, Series: {2}", settings.Host, section.Id, series);
-                    _plexServerProxy.UpdateSeries(metadataId.Value, settings);
+                    _logger.Debug("Updating Plex host: {0}, Section: {1}, Movie: {2}", settings.Host, section.Id, movie);
+                    _plexServerProxy.UpdateItem(metadataId.Value, settings);

                    partiallyUpdated = true;
                }
@@ -188,11 +155,11 @@ namespace NzbDrone.Core.Notifications.Plex
            }
        }

-        private int? GetMetadataId(int sectionId, Series series, string language, PlexServerSettings settings)
+        private int? GetMetadataId(int sectionId, Movie movie, string language, PlexServerSettings settings)
        {
-            _logger.Debug("Getting metadata from Plex host: {0} for series: {1}", settings.Host, series);
+            _logger.Debug("Getting metadata from Plex host: {0} for movie: {1}", settings.Host, movie);

-            return _plexServerProxy.GetMetadataId(sectionId, series.TvdbId, language, settings);
+            return _plexServerProxy.GetMetadataId(sectionId, movie.ImdbId, language, settings);
        }

        public ValidationFailure Test(PlexServerSettings settings)
--- a/src/NzbDrone.Core/Notifications/Prowl/Prowl.cs
+++ b/src/NzbDrone.Core/Notifications/Prowl/Prowl.cs
@@ -35,10 +35,6 @@ namespace NzbDrone.Core.Notifications.Prowl
        {
        }
 		
-        public override void OnRename(Series series)
-        {
-        }
-
        public override string Name => "Prowl";

        public override bool SupportsOnRename => false;
--- a/src/NzbDrone.Core/Notifications/PushBullet/PushBullet.cs
+++ b/src/NzbDrone.Core/Notifications/PushBullet/PushBullet.cs
@@ -33,10 +33,6 @@ namespace NzbDrone.Core.Notifications.PushBullet
        public override void OnMovieRename(Movie movie)
        {
        }
-		
-        public override void OnRename(Series series)
-        {
-        }

        public override string Name => "Pushbullet";

--- a/src/NzbDrone.Core/Notifications/Pushalot/Pushalot.cs
+++ b/src/NzbDrone.Core/Notifications/Pushalot/Pushalot.cs
@@ -34,10 +34,6 @@ namespace NzbDrone.Core.Notifications.Pushalot
        {
        }
 		
-        public override void OnRename(Series series)
-        {
-        }
-
        public override string Name => "Pushalot";

        public override bool SupportsOnRename => false;
--- a/src/NzbDrone.Core/Notifications/Pushover/Pushover.cs
+++ b/src/NzbDrone.Core/Notifications/Pushover/Pushover.cs
@@ -34,10 +34,6 @@ namespace NzbDrone.Core.Notifications.Pushover
        {
        }
 		
-        public override void OnRename(Series series)
-        {
-        }
-
        public override string Name => "Pushover";

        public override bool SupportsOnRename => false;
--- a/src/NzbDrone.Core/Notifications/Slack/Payloads/SlackPayload.cs
+++ b/src/NzbDrone.Core/Notifications/Slack/Payloads/SlackPayload.cs
@@ -15,6 +15,8 @@ namespace NzbDrone.Core.Notifications.Slack.Payloads
        [JsonProperty("icon_url")]
        public string IconUrl { get; set; }

+        public string Channel { get; set; }
+
        public List<Attachment> Attachments { get; set; }
    }
 }
--- a/src/NzbDrone.Core/Notifications/Slack/Slack.cs
+++ b/src/NzbDrone.Core/Notifications/Slack/Slack.cs
@@ -78,21 +78,6 @@ namespace NzbDrone.Core.Notifications.Slack
            _proxy.SendPayload(payload, Settings);
        }

-        public override void OnRename(Series series)
-        {
-            var attachments = new List<Attachment>
-                                {
-                                    new Attachment
-                                    {
-                                        Title = series.Title,
-                                    }
-                                };
-
-            var payload = CreatePayload("Renamed", attachments);
-
-            _proxy.SendPayload(payload, Settings);
-        }
-        
        public override ValidationResult Test()
        {
            var failures = new List<ValidationFailure>();
@@ -124,6 +109,7 @@ namespace NzbDrone.Core.Notifications.Slack
        private SlackPayload CreatePayload(string message, List<Attachment> attachments = null)
        {
            var icon = Settings.Icon;
+            var channel = Settings.Channel;

            var payload = new SlackPayload
            {
@@ -145,6 +131,11 @@ namespace NzbDrone.Core.Notifications.Slack
                }
            }

+            if (channel.IsNotNullOrWhiteSpace())
+            {
+                payload.Channel = channel;
+            }
+
            return payload;
        }
    }
--- a/src/NzbDrone.Core/Notifications/Slack/SlackSettings.cs
+++ b/src/NzbDrone.Core/Notifications/Slack/SlackSettings.cs
@@ -27,6 +27,9 @@ namespace NzbDrone.Core.Notifications.Slack
        [FieldDefinition(2, Label = "Icon", HelpText = "Change the icon that is used for messages from this integration (Emoji or URL)", Type = FieldType.Textbox, HelpLink = "http://www.emoji-cheat-sheet.com/")]
        public string Icon { get; set; }

+        [FieldDefinition(3, Label = "Channel", HelpText = "Overrides the default channel for the incoming webhook (#other-channel)", Type = FieldType.Textbox)]
+        public string Channel { get; set; }
+
        public NzbDroneValidationResult Validate()
        {
            return new NzbDroneValidationResult(Validator.Validate(this));
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Taloth Saldono	efbb587290	Fixed MediaCover endpoint.	2017-12-13 21:28:42 +01:00
Mark McDowall	72a12a73af	Fixed: Don't handle content requests in IndexHtmlMapper	2017-12-13 21:28:21 +01:00
fhscholl	95bc93042c	Added: Separate naming tags for AudioLanguage and SubtitleLanguage (#2261 ) (Fixes #2257 )	2017-12-12 23:53:11 +01:00
Leonardo Galli	172cf4d06e	Fixed: Movies parsed from lists with no year and only title getting added mutliple times.	2017-12-12 23:26:16 +01:00
Taloth Saldono	5ac0f28fff	Fixed: Security Vulnerabilities allowing authentication to be bypassed (discovered by Kyle Neideck)	2017-12-12 23:15:46 +01:00
Leonardo Galli	948af901da	Added: Include APFS disks in disk space calculation.	2017-12-12 22:46:00 +01:00
Leonardo Galli	f36716135b	Added: Upgrade MediaInfo to 17.10 (Windows/macOS)	2017-12-12 22:44:14 +01:00
kriegalex	b70016d082	Added: Support for VF2 french tag. (#2291 ) (Fixes #2290 )	2017-12-12 22:28:36 +01:00
grokdesigns	6a1b099117	Added: Customize Slack Channel (#2308 ) (Fixes #2298 )	2017-12-04 09:07:42 +01:00
Leonardo Galli	ffb098357d	Fixed: Movie Editor Path screwed up. Might also fix some other movie editor issues. (Fixes #2170 )	2017-11-19 15:11:53 +01:00
Leonardo Galli	1a22486aba	Fixed: Tags disappearing (Fixes #2204 )	2017-11-19 14:57:15 +01:00
Fish2	72631eab8f	Fixed: moment.js deprecated zone and add functions (Fixes #2232 ) (Fixes #2231 ) (#2264 )	2017-11-16 20:20:41 +01:00
Mike	e4a3e63c44	Fixed: CPU locking at a 100% in certain instances. (#2258 ) (Fixes #2218 )	2017-11-12 12:25:46 +01:00
Fish2	5dc2df3d49	Revert "Fixed: moment.js deprecated zone and Added: and lossless compression of images (#2232 ) (Fixes #2231 )" This reverts commit `32b1f75eb3`.	2017-11-10 17:11:42 +01:00
fhscholl	01f0c6d85f	Added: SceneName to MovieFile API output (#2250 ) (Fixes #2245 )	2017-11-10 16:13:14 +01:00
fhscholl	c7c423b13d	Added: Functionality to XBMC and Plex to update indivdual titles. Also: Notification Cleanup (#2240 )	2017-11-10 16:11:09 +01:00
Fish2	32b1f75eb3	Fixed: moment.js deprecated zone and Added: and lossless compression of images (#2232 ) (Fixes #2231 )	2017-11-10 16:08:02 +01:00
adnanklink	29909db604	Added: FolderPath to the Movie Webhook (#2230 )	2017-11-10 16:06:45 +01:00
Mike	ec3f094d12	Fixes #2218 . (#2254 ) * Fixed: Raise ApplicationStartupEvent after Owin is running. * Actually inject the container.	2017-11-08 19:39:50 +01:00
adnanklink	cb857934c4	Added: Download_Id to On Download/On Upgrade (#2229 )	2017-10-29 19:19:30 +01:00
Leonardo Galli	d0174c7b7b	Merge remote-tracking branch 'origin/develop' into develop	2017-10-29 12:24:41 +01:00
Leonardo Galli	9d19c4ec21	Fixed: Manual Import. Fixes #2160	2017-10-29 12:24:35 +01:00
fhscholl	0a030386f2	Added: Movie_Quality to onGrab (#2221 ) (Fixes #1833 )	2017-10-28 17:19:49 +02:00
fhscholl	5e121c78e1	Updated: Webhook Improvements (#2220 ) (Fixes #1751 )	2017-10-28 17:18:52 +02:00
James White	b521ffb588	Added: Message about adblockers preventing the log table from loading (#2213 ) (Fixes #2209 )	2017-10-23 21:50:03 +02:00
James White	386a434aeb	Changed: Sabnzbd Update test cases and rename to MovieCategory (#2212 )	2017-10-23 21:49:02 +02:00
James White	5674d8ad60	Changed: Nzbget Rename TvCategory references to MovieCategory (#2211 )	2017-10-23 21:47:49 +02:00
Oliver Rivett-Carnac	b313dd1845	Minor error message tweak (#1778 ) * Added: some tips to how to build. Gave some info to Windows developers. * Fixed: Alignment of validation errors in labels * Fixed: error message mentioning 'series'	2017-10-22 20:58:25 -04:00
James White	dffa50a82f	uTorrent initial state feature (#2192 ) * New: Initial state for torrents added to UTorrent Closes #409 (cherry picked from commit `19a4d3536b`) * Change default port * Rename TvCategory to MovieCategory	2017-10-22 20:51:07 -04:00
James White	5337f79281	Change default port of qBittorrent download client config (#2187 )	2017-10-22 20:49:54 -04:00
fhscholl	8861c8d8a4	Add IsUpgrade and related deleted file paths for CustomScript (#2205 ) * Add IsUpgrade flag and deleted file paths for updates * use OldMovieFiles instead of OldFiles	2017-10-22 20:49:37 -04:00
James White	4574ff5f6d	Fixed: typo on margin-bottom (#2182 )	2017-10-15 16:11:27 +02:00
James White	dd53e51468	@cosmetic Fix jshint warnings on MoviesCollection.js (#2180 )	2017-10-15 13:37:19 +02:00
James White	7ae2d455c3	Fixed: Remove unit on zero values (#2178 )	2017-10-15 13:29:32 +02:00
James White	e2e6630b69	Added: Initial state for torrents added to qBittorrent (#2176 )	2017-10-15 12:35:53 +02:00
James White	ed744b5702	Fixed: Jackett apikey cleaned from log again. (#2177 )	2017-10-15 12:35:04 +02:00
Leonardo Galli	5ffa27ec29	@cosmetic changed title	2017-10-14 12:05:17 +02:00
Leonardo Galli	53bfe61eb6	@cosmetic Added status images for websites and update api.	2017-10-14 12:04:22 +02:00
Leonardo Galli	a4a8e4547f	Merge remote-tracking branch 'origin/develop' into develop	2017-10-11 23:09:36 +02:00
Leonardo Galli	e2bda29737	Fixed: Manual Movie Page Filtering.	2017-10-11 23:09:29 +02:00
James White	ab117082ed	@cosmetic Stop commented out code appearing in HTML source (#2158 )	2017-10-11 22:55:33 +02:00
Leonardo Galli	c708c3f5a1	Merge remote-tracking branch 'origin/develop' into develop	2017-10-11 22:54:51 +02:00
Leonardo Galli	a98494ab63	Fixed: MediaInfo not getting read when quality isn't Bluray, Web-dl or HDTV. Fixes #1465 . Fixes #1572 .	2017-10-11 22:54:45 +02:00
James White	779a722175	Changed: Adjust ambiguous date options (#2165 ) (cherry picked from commit `00c3074216`)	2017-10-11 22:45:15 +02:00
James White	805927205c	@cosmetic Simplify ical ProductId code since adding properties (#2164 )	2017-10-11 21:11:16 +02:00
James White	1d8eec42ef	Added: a default name for Radarr.ics (#2163 )	2017-10-11 19:19:57 +02:00
Leonardo Galli	a951ad811d	@cosmetic Updated changelog.	2017-10-09 21:51:21 +02:00
James White	27c58f6151	Fixed: Alignment and buttons position of Trakt Auth (#2153 )	2017-10-09 21:39:14 +02:00
Leonardo Galli	a5dd426dd7	Fixed: SUBBED in release name not recognized as hardcoded subs. Fixes #1520	2017-10-07 23:54:24 +02:00
Leonardo Galli	c30a681aea	Fixed: 1080i not correctly recognized as 1080p. Fixes #1622	2017-10-07 23:47:22 +02:00
Leonardo Galli	4d712d7760	Fixed: Releases with UHD not getting correct resolution label. Fixes #2134	2017-10-07 20:24:50 +02:00
Leonardo Galli	63645c81bb	Fixed: WebDL gets marked as Remux. Fixes #1954	2017-10-07 20:21:59 +02:00
Leonardo Galli	dc55eba74f	Merge remote-tracking branch 'origin/develop' into develop	2017-10-07 20:20:47 +02:00
Leonardo Galli	b6be297093	Fixed: Parsing of TSRip and HDTSRip. Fixes #1998	2017-10-07 20:16:21 +02:00
Leonardo Galli	5ff9dc3500	Added: Option to omit year from indexer searches when searching by title. Also added option to force a movie search by title instead of imdb id. Fixes #1912	2017-10-07 20:09:22 +02:00
Wyall	4789f80df2	Added new codec HEVC with ID=5 for HDBits (#2146 ) According to LSL1337 on Discord there's a new codec option HEVC with ID=5	2017-10-07 19:57:09 +02:00
Leonardo Galli	e77d9ce848	Added: Last round of optimisation. Large libraries should load around 2x faster again compared to the last version.	2017-10-07 18:16:15 +02:00
Leonardo Galli	a9b244bf75	Added: Improved load times of very large libraries again (around x5)	2017-10-05 23:31:12 +02:00
Leonardo Galli	628c044c46	Added: Movie files are now eager loaded. This should speed up the loading process a lot as well as RSS Sync and other tasks. It should also prevent some other bugs.	2017-10-01 18:41:19 +02:00
Leonardo Galli	ecd25dddf1	Merge remote-tracking branch 'origin/develop' into develop	2017-09-24 16:17:52 +02:00
Leonardo Galli	25b0a52ba6	Fixed: Alternative Titles appearing multiple times. Duplicate alt titles will be deleted. Fixes #2040	2017-09-24 16:17:43 +02:00
James White	321ba98e49	Fixed: unclosed <span> tag on BulkImportView (#2110 )	2017-09-24 13:19:39 +02:00
James White	9178a0aa1b	@cosmetic Convert backticks (#2112 )	2017-09-24 13:16:05 +02:00
James White	6942fb892d	Fixed: Change to correct provider of search results (#2113 )	2017-09-24 13:15:35 +02:00
James White	f64d349119	Fixed: Icon not being hidden on Discover New Movies button in X-Small breakpoint (#2114 )	2017-09-24 13:14:44 +02:00
James White	926dbdf2cd	Fixed: Font folder case fix (#2066 )	2017-09-21 22:37:10 +02:00
Adam Dangoor	645a3dca64	Fixed: Add space in confirmation message (#2101 )	2017-09-20 07:55:44 +02:00
Leonardo Galli	2b2a1265ad	Create LICENSE	2017-09-10 16:10:48 +02:00