Added a few more codecs, not even halfway.

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

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

            response.Content.Should().NotBeNullOrWhiteSpace();
        }
-        
+
        [Test]
        public void should_execute_https_get()
        {
@@ -144,6 +144,38 @@ namespace NzbDrone.Common.Test.Http
            ExceptionVerification.ExpectedErrors(0);
        }

+        [Test]
+        public void should_follow_redirects_to_https()
+        {
+            if (typeof(TDispatcher) == typeof(ManagedHttpDispatcher) && PlatformInfo.IsMono)
+            {
+                Assert.Ignore("Will fail on tls1.2 via managed dispatcher, ignore.");
+            }
+
+            var request = new HttpRequestBuilder($"http://{_httpBinHost}/redirect-to")
+                .AddQueryParam("url", $"https://sonarr.tv/")
+                .Build();
+            request.AllowAutoRedirect = true;
+
+            var response = Subject.Get(request);
+
+            response.StatusCode.Should().Be(HttpStatusCode.OK);
+            response.Content.Should().Contain("Sonarr");
+
+            ExceptionVerification.ExpectedErrors(0);
+        }
+
+        [Test]
+        public void should_throw_on_too_many_redirects()
+        {
+            var request = new HttpRequest($"http://{_httpBinHost}/redirect/4");
+            request.AllowAutoRedirect = true;
+
+            Assert.Throws<WebException>(() => Subject.Get(request));
+
+            ExceptionVerification.ExpectedErrors(0);
+        }
+
        [Test]
        public void should_send_user_agent()
        {
@@ -407,4 +439,4 @@ namespace NzbDrone.Common.Test.Http
        public string Url { get; set; }
        public string Data { get; set; }
    }
-}
+}
--- a/src/NzbDrone.Common.Test/Http/HttpUriFixture.cs
+++ b/src/NzbDrone.Common.Test/Http/HttpUriFixture.cs
@@ -7,6 +7,13 @@ namespace NzbDrone.Common.Test.Http
 {
    public class HttpUriFixture : TestBase
    {
+        [TestCase("abc://my_host.com:8080/root/api/")]
+        public void should_parse(string uri)
+        {
+            var newUri = new HttpUri(uri);
+            newUri.FullUri.Should().Be(uri);
+        }
+
        [TestCase("", "", "")]
        [TestCase("/", "", "/")]
        [TestCase("base", "", "base")]
@@ -77,7 +84,7 @@ namespace NzbDrone.Common.Test.Http
        public void should_combine_relative_path(string basePath, string relativePath, string expected)
        {
            var newUri = new HttpUri(basePath).CombinePath(relativePath);
-            
+
            newUri.FullUri.Should().Be(expected);
        }
    }
--- a/src/NzbDrone.Common.Test/NzbDrone.Common.Test.csproj
+++ b/src/NzbDrone.Common.Test/NzbDrone.Common.Test.csproj
@@ -80,6 +80,7 @@
    <Compile Include="ExtensionTests\IEnumerableExtensionTests\ExceptByFixture.cs" />
    <Compile Include="ExtensionTests\IEnumerableExtensionTests\IntersectByFixture.cs" />
    <Compile Include="ExtensionTests\Int64ExtensionFixture.cs" />
+    <Compile Include="ExtensionTests\UrlExtensionsFixture.cs" />
    <Compile Include="HashUtilFixture.cs" />
    <Compile Include="Http\HttpClientFixture.cs" />
    <Compile Include="Http\HttpHeaderFixture.cs" />
--- a/src/NzbDrone.Common/Disk/DiskTransferService.cs
+++ b/src/NzbDrone.Common/Disk/DiskTransferService.cs
@@ -223,7 +223,7 @@ namespace NzbDrone.Common.Disk
                    _diskProvider.MoveFile(sourcePath, tempPath, true);
                    try
                    {
-                        ClearTargetPath(targetPath, overwrite);
+                        ClearTargetPath(sourcePath, targetPath, overwrite);

                        _diskProvider.MoveFile(tempPath, targetPath);

@@ -253,7 +253,7 @@ namespace NzbDrone.Common.Disk
                throw new IOException(string.Format("Destination cannot be a child of the source [{0}] => [{1}]", sourcePath, targetPath));
            }

-            ClearTargetPath(targetPath, overwrite);
+            ClearTargetPath(sourcePath, targetPath, overwrite);

            if (mode.HasFlag(TransferMode.HardLink))
            {
@@ -330,7 +330,7 @@ namespace NzbDrone.Common.Disk
            return TransferMode.None;
        }

-        private void ClearTargetPath(string targetPath, bool overwrite)
+        private void ClearTargetPath(string sourcePath, string targetPath, bool overwrite)
        {
            if (_diskProvider.FileExists(targetPath))
            {
@@ -340,7 +340,7 @@ namespace NzbDrone.Common.Disk
                }
                else
                {
-                    throw new IOException(string.Format("Destination already exists [{0}]", targetPath));
+                    throw new IOException(string.Format("Destination already exists. [{0}] to [{1}]", sourcePath, targetPath));
                }
            }
        }
--- a/src/NzbDrone.Common/EnvironmentInfo/AppFolderFactory.cs
+++ b/src/NzbDrone.Common/EnvironmentInfo/AppFolderFactory.cs
@@ -3,6 +3,7 @@ using System.Security.AccessControl;
 using System.Security.Principal;
 using NLog;
 using NzbDrone.Common.Disk;
+using NzbDrone.Common.Exceptions;
 using NzbDrone.Common.Instrumentation;

 namespace NzbDrone.Common.EnvironmentInfo
@@ -33,6 +34,11 @@ namespace NzbDrone.Common.EnvironmentInfo
            {
                SetPermissions();
            }
+
+            if (!_diskProvider.FolderWritable(_appFolderInfo.AppDataFolder))
+            {
+                throw new SonarrStartupException("AppFolder {0} is not writable", _appFolderInfo.AppDataFolder);
+            }
        }

        private void SetPermissions()
--- a/src/NzbDrone.Common/Exceptions/SonarrStartupException.cs
+++ b/src/NzbDrone.Common/Exceptions/SonarrStartupException.cs
@@ -0,0 +1,44 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace NzbDrone.Common.Exceptions
+{
+    public class SonarrStartupException : NzbDroneException
+    {
+        public SonarrStartupException(string message, params object[] args)
+            : base("Sonarr failed to start: " + string.Format(message, args))
+        {
+
+        }
+
+        public SonarrStartupException(string message)
+            : base("Sonarr failed to start: " + message)
+        {
+
+        }
+
+        public SonarrStartupException()
+            : base("Sonarr failed to start")
+        {
+
+        }
+
+        public SonarrStartupException(Exception innerException, string message, params object[] args)
+            : base("Sonarr failed to start: " + string.Format(message, args), innerException)
+        {
+        }
+
+        public SonarrStartupException(Exception innerException, string message)
+            : base("Sonarr failed to start: " + message, innerException)
+        {
+        }
+
+        public SonarrStartupException(Exception innerException)
+            : base("Sonarr failed to start: " + innerException.Message)
+        {
+
+        }
+    }
+}
--- a/src/NzbDrone.Common/Extensions/StringExtensions.cs
+++ b/src/NzbDrone.Common/Extensions/StringExtensions.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 using System.Text;
@@ -63,6 +64,11 @@ namespace NzbDrone.Common.Extensions
            return text;
        }

+        public static string Join(this IEnumerable<string> values, string separator)
+        {
+            return string.Join(separator, values);
+        }
+
        public static string CleanSpaces(this string text)
        {
            return CollapseSpace.Replace(text, " ").Trim();
@@ -78,6 +84,16 @@ namespace NzbDrone.Common.Extensions
            return !string.IsNullOrWhiteSpace(text);
        }

+        public static bool StartsWithIgnoreCase(this string text, string startsWith)
+        {
+            return text.StartsWith(startsWith, StringComparison.InvariantCultureIgnoreCase);
+        }
+
+        public static bool EqualsIgnoreCase(this string text, string equals)
+        {
+            return text.Equals(equals, StringComparison.InvariantCultureIgnoreCase);
+        }
+
        public static bool ContainsIgnoreCase(this string text, string contains)
        {
            return text.IndexOf(contains, StringComparison.InvariantCultureIgnoreCase) > -1;
@@ -118,4 +134,4 @@ namespace NzbDrone.Common.Extensions
            return Encoding.ASCII.GetString(new [] { byteResult });
        }
    }
-}
+}
--- a/src/NzbDrone.Common/Extensions/UrlExtensions.cs
+++ b/src/NzbDrone.Common/Extensions/UrlExtensions.cs
@@ -11,6 +11,11 @@ namespace NzbDrone.Common.Extensions
                return false;
            }

+            if (path.StartsWith(" ") || path.EndsWith(" "))
+            {
+                return false;
+            }
+
            Uri uri;
            if (!Uri.TryCreate(path, UriKind.Absolute, out uri))
            {
--- a/src/NzbDrone.Common/Http/Dispatchers/CurlHttpDispatcher.cs
+++ b/src/NzbDrone.Common/Http/Dispatchers/CurlHttpDispatcher.cs
@@ -38,7 +38,7 @@ namespace NzbDrone.Common.Http.Dispatchers
                _caBundleFilePath = _caBundleFileName;
            }
        }
-        
+
        public CurlHttpDispatcher(IHttpProxySettingsProvider proxySettingsProvider, IUserAgentBuilder userAgentBuilder, Logger logger)
        {
            _proxySettingsProvider = proxySettingsProvider;
@@ -107,7 +107,7 @@ namespace NzbDrone.Common.Http.Dispatchers
                            throw new NotSupportedException($"HttpCurl method {request.Method} not supported");
                    }
                    curlEasy.UserAgent = _userAgentBuilder.GetUserAgent(request.UseSimplifiedUserAgent);
-                    curlEasy.FollowLocation = request.AllowAutoRedirect;
+                    curlEasy.FollowLocation = false;

                    if (request.RequestTimeout != TimeSpan.Zero)
                    {
--- a/src/NzbDrone.Common/Http/Dispatchers/FallbackHttpDispatcher.cs
+++ b/src/NzbDrone.Common/Http/Dispatchers/FallbackHttpDispatcher.cs
@@ -34,18 +34,11 @@ namespace NzbDrone.Common.Http.Dispatchers
                    {
                        return _managedDispatcher.GetResponse(request, cookies);
                    }
-                    catch (Exception ex)
+                    catch (TlsFailureException)
                    {
-                        if (ex.ToString().Contains("The authentication or decryption has failed."))
-                        {
-                            _logger.Debug("https request failed in tls error for {0}, trying curl fallback.", request.Url.Host);
+                        _logger.Debug("https request failed in tls error for {0}, trying curl fallback.", request.Url.Host);

-                            _curlTLSFallbackCache.Set(request.Url.Host, true);
-                        }
-                        else
-                        {
-                            throw;
-                        }
+                        _curlTLSFallbackCache.Set(request.Url.Host, true);
                    }
                }

--- a/src/NzbDrone.Common/Http/Dispatchers/ManagedHttpDispatcher.cs
+++ b/src/NzbDrone.Common/Http/Dispatchers/ManagedHttpDispatcher.cs
@@ -32,7 +32,7 @@ namespace NzbDrone.Common.Http.Dispatchers
            webRequest.Method = request.Method.ToString();
            webRequest.UserAgent = _userAgentBuilder.GetUserAgent(request.UseSimplifiedUserAgent);
            webRequest.KeepAlive = request.ConnectionKeepAlive;
-            webRequest.AllowAutoRedirect = request.AllowAutoRedirect;
+            webRequest.AllowAutoRedirect = false;
            webRequest.CookieContainer = cookies;

            if (request.RequestTimeout != TimeSpan.Zero)
@@ -47,19 +47,19 @@ namespace NzbDrone.Common.Http.Dispatchers
                AddRequestHeaders(webRequest, request.Headers);
            }

-            if (request.ContentData != null)
-            {
-                webRequest.ContentLength = request.ContentData.Length;
-                using (var writeStream = webRequest.GetRequestStream())
-                {
-                    writeStream.Write(request.ContentData, 0, request.ContentData.Length);
-                }
-            }
-
            HttpWebResponse httpWebResponse;

            try
            {
+                if (request.ContentData != null)
+                {
+                    webRequest.ContentLength = request.ContentData.Length;
+                    using (var writeStream = webRequest.GetRequestStream())
+                    {
+                        writeStream.Write(request.ContentData, 0, request.ContentData.Length);
+                    }
+                }
+
                httpWebResponse = (HttpWebResponse)webRequest.GetResponse();
            }
            catch (WebException e)
@@ -73,7 +73,27 @@ namespace NzbDrone.Common.Http.Dispatchers

                if (httpWebResponse == null)
                {
-                    throw;
+                    // The default messages for WebException on mono are pretty horrible.
+                    if (e.Status == WebExceptionStatus.NameResolutionFailure)
+                    {
+                        throw new WebException($"DNS Name Resolution Failure: '{webRequest.RequestUri.Host}'", e.Status);
+                    }
+                    else if (e.ToString().Contains("TLS Support not"))
+                    {
+                        throw new TlsFailureException(webRequest, e);
+                    }
+                    else if (e.ToString().Contains("The authentication or decryption has failed."))
+                    {
+                        throw new TlsFailureException(webRequest, e);
+                    }
+                    else if (OsInfo.IsNotWindows)
+                    {
+                        throw new WebException($"{e.Message}: '{webRequest.RequestUri}'", e, e.Status, e.Response);
+                    }
+                    else
+                    {
+                        throw;
+                    }
                }
            }

@@ -83,7 +103,14 @@ namespace NzbDrone.Common.Http.Dispatchers
            {
                if (responseStream != null)
                {
-                    data = responseStream.ToBytes();
+                    try
+                    {
+                        data = responseStream.ToBytes();
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new WebException("Failed to read complete http response", ex, WebExceptionStatus.ReceiveFailure, httpWebResponse);
+                    }
                }
            }

--- a/src/NzbDrone.Common/Http/HttpClient.cs
+++ b/src/NzbDrone.Common/Http/HttpClient.cs
@@ -7,6 +7,7 @@ using System.Net;
 using NLog;
 using NzbDrone.Common.Cache;
 using NzbDrone.Common.EnvironmentInfo;
+using NzbDrone.Common.Extensions;
 using NzbDrone.Common.Http.Dispatchers;
 using NzbDrone.Common.TPL;

@@ -50,6 +51,57 @@ namespace NzbDrone.Common.Http
        }

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

-            if (!RuntimeInfo.IsProduction &&
-                (response.StatusCode == HttpStatusCode.Moved ||
-                 response.StatusCode == HttpStatusCode.MovedPermanently ||
-                 response.StatusCode == HttpStatusCode.Found))
-            {
-                _logger.Error("Server requested a redirect to [{0}]. Update the request URL to avoid this redirect.", response.Headers["Location"]);
-            }
-
-            if (!request.SuppressHttpError && response.HasHttpError)
-            {
-                _logger.Warn("HTTP Error - {0}", response);
-
-                if ((int)response.StatusCode == 429)
-                {
-                    throw new TooManyRequestsException(request, response);
-                }
-                else
-                {
-                    throw new HttpException(request, response);
-                }
-            }
-
            return response;
        }

@@ -217,4 +247,4 @@ namespace NzbDrone.Common.Http
            return new HttpResponse<T>(response);
        }
    }
-}
+}
--- a/src/NzbDrone.Common/Http/HttpHeader.cs
+++ b/src/NzbDrone.Common/Http/HttpHeader.cs
@@ -37,7 +37,7 @@ namespace NzbDrone.Common.Http
            }
            if (values.Length > 1)
            {
-                throw new ApplicationException(string.Format("Expected {0} to occur only once.", key));
+                throw new ApplicationException($"Expected {key} to occur only once, but was {values.Join("|")}.");
            }

            return values[0];
@@ -54,7 +54,7 @@ namespace NzbDrone.Common.Http
            return converter(value);
        }
        protected void SetSingleValue(string key, string value)
-        {            
+        {
            if (value == null)
            {
                Remove(key);
@@ -175,4 +175,4 @@ namespace NzbDrone.Common.Http
                          .ToList();
        }
    }
-}
+}
--- a/src/NzbDrone.Common/Http/HttpUri.cs
+++ b/src/NzbDrone.Common/Http/HttpUri.cs
@@ -8,7 +8,7 @@ namespace NzbDrone.Common.Http
 {
    public class HttpUri : IEquatable<HttpUri>
    {
-        private static readonly Regex RegexUri = new Regex(@"^(?:(?<scheme>[a-z]+):)?(?://(?<host>[-A-Z0-9.]+)(?::(?<port>[0-9]{1,5}))?)?(?<path>(?:(?:(?<=^)|/)[^/?#\r\n]+)+/?|/)?(?:\?(?<query>[^#\r\n]*))?(?:\#(?<fragment>.*))?$", RegexOptions.Compiled | RegexOptions.IgnoreCase);
+        private static readonly Regex RegexUri = new Regex(@"^(?:(?<scheme>[a-z]+):)?(?://(?<host>[-_A-Z0-9.]+)(?::(?<port>[0-9]{1,5}))?)?(?<path>(?:(?:(?<=^)|/)[^/?#\r\n]+)+/?|/)?(?:\?(?<query>[^#\r\n]*))?(?:\#(?<fragment>.*))?$", RegexOptions.Compiled | RegexOptions.IgnoreCase);

        private readonly string _uri;
        public string FullUri => _uri;
@@ -168,7 +168,7 @@ namespace NzbDrone.Common.Http
            {
                return basePath.Substring(0, baseSlashIndex) + "/" + relativePath;
            }
-            
+
            return relativePath;
        }

@@ -263,7 +263,7 @@ namespace NzbDrone.Common.Http
            {
                return new HttpUri(baseUrl.Scheme, baseUrl.Host, baseUrl.Port, CombineRelativePath(baseUrl.Path, relativeUrl.Path), relativeUrl.Query, relativeUrl.Fragment);
            }
-            
+
            return new HttpUri(baseUrl.Scheme, baseUrl.Host, baseUrl.Port, baseUrl.Path, relativeUrl.Query, relativeUrl.Fragment);
        }
    }
--- a/src/NzbDrone.Common/Http/TlsFailureException.cs
+++ b/src/NzbDrone.Common/Http/TlsFailureException.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Text;
+
+namespace NzbDrone.Common.Http
+{
+    public class TlsFailureException : WebException
+    {
+        public TlsFailureException(WebRequest request, WebException innerException)
+            : base("Failed to establish secure https connection to '" + request.RequestUri + "', libcurl fallback might be unavailable.", innerException, WebExceptionStatus.SecureChannelFailure, innerException.Response)
+        {
+
+        }
+
+    }
+}
--- a/src/NzbDrone.Common/Instrumentation/Extensions/LoggerProgressExtensions.cs
+++ b/src/NzbDrone.Common/Instrumentation/Extensions/LoggerProgressExtensions.cs
@@ -1,4 +1,5 @@
 using NLog;
+using NLog.Fluent;

 namespace NzbDrone.Common.Instrumentation.Extensions
 {
--- a/src/NzbDrone.Common/Instrumentation/Extensions/SentryLoggerExtensions.cs
+++ b/src/NzbDrone.Common/Instrumentation/Extensions/SentryLoggerExtensions.cs
@@ -0,0 +1,58 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using NLog;
+using NLog.Fluent;
+
+namespace NzbDrone.Common.Instrumentation.Extensions
+{
+    public static class SentryLoggerExtensions
+    {
+        public static readonly Logger SentryLogger = LogManager.GetLogger("Sentry");
+
+        public static LogBuilder SentryFingerprint(this LogBuilder logBuilder, params string[] fingerprint)
+        {
+            return logBuilder.Property("Sentry", fingerprint);
+        }
+
+        public static LogBuilder WriteSentryDebug(this LogBuilder logBuilder, params string[] fingerprint)
+        {
+            return LogSentryMessage(logBuilder, LogLevel.Debug, fingerprint);
+        }
+
+        public static LogBuilder WriteSentryInfo(this LogBuilder logBuilder, params string[] fingerprint)
+        {
+            return LogSentryMessage(logBuilder, LogLevel.Info, fingerprint);
+        }
+
+        public static LogBuilder WriteSentryWarn(this LogBuilder logBuilder, params string[] fingerprint)
+        {
+            return LogSentryMessage(logBuilder, LogLevel.Warn, fingerprint);
+        }
+
+        public static LogBuilder WriteSentryError(this LogBuilder logBuilder, params string[] fingerprint)
+        {
+            return LogSentryMessage(logBuilder, LogLevel.Error, fingerprint);
+        }
+
+        private static LogBuilder LogSentryMessage(LogBuilder logBuilder, LogLevel level, string[] fingerprint)
+        {
+            SentryLogger.Log(level)
+                        .CopyLogEvent(logBuilder.LogEventInfo)
+                        .SentryFingerprint(fingerprint)
+                        .Write();
+
+            return logBuilder.Property("Sentry", null);
+        }
+
+        private static LogBuilder CopyLogEvent(this LogBuilder logBuilder, LogEventInfo logEvent)
+        {
+            return logBuilder.LoggerName(logEvent.LoggerName)
+                             .TimeStamp(logEvent.TimeStamp)
+                             .Message(logEvent.Message, logEvent.Parameters)
+                             .Properties((Dictionary<object, object>)logEvent.Properties)
+                             .Exception(logEvent.Exception);
+        }
+    }
+}
--- a/src/NzbDrone.Common/Instrumentation/NzbDroneLogger.cs
+++ b/src/NzbDrone.Common/Instrumentation/NzbDroneLogger.cs
@@ -99,7 +99,7 @@ namespace NzbDrone.Common.Instrumentation
            else
            {
                dsn = RuntimeInfo.IsProduction
-                    ? "https://3e8a38b1a4df4de8b0453a724f5a1139:5a708dd75c724b32ae5128b6a895650f@sentry.sonarr.tv/8"
+                    ? "https://a013727b8d224e719894e1e13ff4966b:c95ca1f9ca02418d829db10c2938baf4@sentry.sonarr.tv/8"
                    : "https://4ee3580e01d8407c96a7430fbc953512:5f2d07227a0b4fde99dea07041a3ff93@sentry.sonarr.tv/10";
            }

@@ -109,9 +109,13 @@ namespace NzbDrone.Common.Instrumentation
                Layout = "${message}"
            };

-            var loggingRule = new LoggingRule("*", updateClient ? LogLevel.Trace : LogLevel.Error, target);
+            var loggingRule = new LoggingRule("*", updateClient ? LogLevel.Trace : LogLevel.Warn, target);
            LogManager.Configuration.AddTarget("sentryTarget", target);
            LogManager.Configuration.LoggingRules.Add(loggingRule);
+
+            // Events logged to Sentry go only to Sentry.
+            var loggingRuleSentry = new LoggingRule("Sentry", LogLevel.Debug, target) { Final = true };
+            LogManager.Configuration.LoggingRules.Insert(0, loggingRuleSentry);
        }

        private static void RegisterDebugger()
--- a/src/NzbDrone.Common/Instrumentation/Sentry/SentryTarget.cs
+++ b/src/NzbDrone.Common/Instrumentation/Sentry/SentryTarget.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net;
@@ -71,6 +72,11 @@ namespace NzbDrone.Common.Instrumentation.Sentry

        private static List<string> GetFingerPrint(LogEventInfo logEvent)
        {
+            if (logEvent.Properties.ContainsKey("Sentry"))
+            {
+                return ((string[])logEvent.Properties["Sentry"]).ToList();
+            }
+
            var fingerPrint = new List<string>
            {
                logEvent.Level.Ordinal.ToString(),
@@ -94,13 +100,33 @@ namespace NzbDrone.Common.Instrumentation.Sentry
            return fingerPrint;
        }

+        private bool IsSentryMessage(LogEventInfo logEvent)
+        {
+            if (logEvent.Properties.ContainsKey("Sentry"))
+            {
+                return logEvent.Properties["Sentry"] != null;
+            }
+
+            if (logEvent.Level >= LogLevel.Error && logEvent.Exception != null)
+            {
+                return true;
+            }
+
+            return false;
+        }
+

        protected override void Write(LogEventInfo logEvent)
        {
+            if (_unauthorized)
+            {
+                return;
+            }
+
            try
            {
                // don't report non-critical events without exceptions
-                if (logEvent.Exception == null || _unauthorized)
+                if (!IsSentryMessage(logEvent))
                {
                    return;
                }
@@ -112,8 +138,17 @@ namespace NzbDrone.Common.Instrumentation.Sentry
                }

                var extras = logEvent.Properties.ToDictionary(x => x.Key.ToString(), x => x.Value.ToString());
+                extras.Remove("Sentry");
                _client.Logger = logEvent.LoggerName;

+                if (logEvent.Exception != null)
+                {
+                    foreach (DictionaryEntry data in logEvent.Exception.Data)
+                    {
+                        extras.Add(data.Key.ToString(), data.Value.ToString());
+                    }
+                }
+
                var sentryMessage = new SentryMessage(logEvent.Message, logEvent.Parameters);

                var sentryEvent = new SentryEvent(logEvent.Exception)
@@ -134,11 +169,16 @@ namespace NzbDrone.Common.Instrumentation.Sentry
                    sentryEvent.Fingerprint.Add(logEvent.Exception.GetType().FullName);
                }

+                if (logEvent.Properties.ContainsKey("Sentry"))
+                {
+                    sentryEvent.Fingerprint.Clear();
+                    Array.ForEach((string[])logEvent.Properties["Sentry"], sentryEvent.Fingerprint.Add);
+                }
+
                var osName = Environment.GetEnvironmentVariable("OS_NAME");
                var osVersion = Environment.GetEnvironmentVariable("OS_VERSION");
                var runTimeVersion = Environment.GetEnvironmentVariable("RUNTIME_VERSION");

-
                sentryEvent.Tags.Add("os_name", osName);
                sentryEvent.Tags.Add("os_version", $"{osName} {osVersion}");
                sentryEvent.Tags.Add("runtime_version", $"{PlatformInfo.PlatformName} {runTimeVersion}");
--- a/src/NzbDrone.Common/NzbDrone.Common.csproj
+++ b/src/NzbDrone.Common/NzbDrone.Common.csproj
@@ -92,6 +92,7 @@
    <Compile Include="EnvironmentInfo\IOsVersionAdapter.cs" />
    <Compile Include="EnvironmentInfo\IPlatformInfo.cs" />
    <Compile Include="EnvironmentInfo\OsVersionModel.cs" />
+    <Compile Include="Exceptions\SonarrStartupException.cs" />
    <Compile Include="Extensions\DictionaryExtensions.cs" />
    <Compile Include="Disk\OsPath.cs" />
    <Compile Include="Disk\DiskProviderBase.cs" />
@@ -171,12 +172,14 @@
    <Compile Include="Http\HttpRequestBuilder.cs" />
    <Compile Include="Http\HttpRequestBuilderFactory.cs" />
    <Compile Include="Http\Proxy\ProxyType.cs" />
+    <Compile Include="Http\TlsFailureException.cs" />
    <Compile Include="Http\TooManyRequestsException.cs" />
    <Compile Include="Extensions\IEnumerableExtensions.cs" />
    <Compile Include="Http\UserAgentBuilder.cs" />
    <Compile Include="Instrumentation\CleanseLogMessage.cs" />
    <Compile Include="Instrumentation\CleansingJsonVisitor.cs" />
-    <Compile Include="Instrumentation\Extensions\LoggerProgressExtensions.cs" />
+    <Compile Include="Instrumentation\Extensions\LoggerExtensions.cs" />
+    <Compile Include="Instrumentation\Extensions\SentryLoggerExtensions.cs" />
    <Compile Include="Instrumentation\GlobalExceptionHandlers.cs" />
    <Compile Include="Instrumentation\LogEventExtensions.cs" />
    <Compile Include="Instrumentation\NzbDroneFileTarget.cs" />
--- a/src/NzbDrone.Common/Processes/PidFileProvider.cs
+++ b/src/NzbDrone.Common/Processes/PidFileProvider.cs
@@ -2,6 +2,7 @@
 using System.IO;
 using NLog;
 using NzbDrone.Common.EnvironmentInfo;
+using NzbDrone.Common.Exceptions;

 namespace NzbDrone.Common.Processes
 {
@@ -38,7 +39,7 @@ namespace NzbDrone.Common.Processes
            catch (Exception ex)
            {
                _logger.Error(ex, "Unable to write PID file {0}", filename);
-                throw;
+                throw new SonarrStartupException(ex, "Unable to write PID file {0}", filename);
            }
        }
    }
--- a/src/NzbDrone.Console/ConsoleApp.cs
+++ b/src/NzbDrone.Console/ConsoleApp.cs
@@ -2,6 +2,7 @@
 using System.Net.Sockets;
 using NLog;
 using NzbDrone.Common.EnvironmentInfo;
+using NzbDrone.Common.Exceptions;
 using NzbDrone.Common.Instrumentation;
 using NzbDrone.Host;

@@ -11,6 +12,14 @@ namespace NzbDrone.Console
    {
        private static readonly Logger Logger = NzbDroneLogger.GetLogger(typeof(ConsoleApp));

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

            Logger.Info("Exiting main.");

+            Exit(ExitCodes.Normal);
+        }
+
+        private static void Exit(ExitCodes exitCode)
+        {
+            LogManager.Flush();
+
+            if (exitCode != ExitCodes.Normal)
+            {
+                System.Console.WriteLine("Press enter to exit...");
+
+                System.Threading.Thread.Sleep(1000);
+
+                if (exitCode == ExitCodes.NonRecoverableFailure)
+                {
+                    System.Console.WriteLine("Non-recoverable failure, waiting for user intervention...");
+                    for (int i = 0; i < 3600; i++)
+                    {
+                        System.Threading.Thread.Sleep(1000);
+
+                        if (System.Console.KeyAvailable) break;
+                    }
+                }
+
+                // Please note that ReadLine silently succeeds if there is no console, KeyAvailable does not.
+                System.Console.ReadLine();
+            }
+
            //Need this to terminate on mono (thanks nlog)
            LogManager.Configuration = null;
-            Environment.Exit(0);
+            Environment.Exit((int)exitCode);
        }
    }
 }
--- a/src/NzbDrone.Core.Test/DecisionEngineTests/RawDiskSpecificationFixture.cs
+++ b/src/NzbDrone.Core.Test/DecisionEngineTests/RawDiskSpecificationFixture.cs
@@ -19,7 +19,11 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
        {
            _remoteEpisode = new RemoteEpisode
            {
-                Release = new ReleaseInfo() { DownloadProtocol = DownloadProtocol.Torrent }
+                Release = new ReleaseInfo
+                          {
+                              Title = "Series.title.s01e01",
+                              DownloadProtocol = DownloadProtocol.Torrent
+                          }
            };
        }

@@ -29,7 +33,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
        }
        
        [Test]
-        public void should_return_true_if_no_container_specified()
+        public void should_return_true_if_no_container_specified_and_does_not_match_disc_release_pattern()
        {
            Subject.IsSatisfiedBy(_remoteEpisode, null).Accepted.Should().BeTrue();
        }
@@ -69,5 +73,15 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
            Subject.IsSatisfiedBy(_remoteEpisode, null).Accepted.Should().BeFalse();
        }

+        [TestCase("How the Earth Was Made S02 Disc 1 1080i Blu-ray DTS-HD MA 2.0 AVC-TrollHD")]
+        [TestCase("The Universe S03 Disc 1 1080p Blu-ray LPCM 2.0 AVC-TrollHD")]
+        [TestCase("HELL ON WHEELS S02 1080P FULL BLURAY AVC DTS-HD MA 5 1")]
+        [TestCase("Game.of.Thrones.S06.2016.DISC.3.BluRay.1080p.AVC.Atmos.TrueHD7.1-MTeam")]
+        [TestCase("Game of Thrones S05 Disc 1 BluRay 1080p AVC Atmos TrueHD 7 1-MTeam")]
+        public void should_return_false_if_matches_disc_format(string title)
+        {
+            _remoteEpisode.Release.Title = title;
+            Subject.IsSatisfiedBy(_remoteEpisode, null).Accepted.Should().BeFalse();
+        }
    }
 }
--- a/src/NzbDrone.Core.Test/Download/DownloadClientTests/Blackhole/ScanWatchFolderFixture.cs
+++ b/src/NzbDrone.Core.Test/Download/DownloadClientTests/Blackhole/ScanWatchFolderFixture.cs
@@ -1,15 +1,17 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Threading;
 using FluentAssertions;
 using Moq;
 using NUnit.Framework;
 using NzbDrone.Common.Disk;
 using NzbDrone.Core.Download;
-using NzbDrone.Test.Common;
-using System.Threading;
-using NzbDrone.Core.Test.Framework;
 using NzbDrone.Core.Download.Clients.Blackhole;
+using NzbDrone.Core.MediaFiles;
+using NzbDrone.Core.Test.Framework;
+using NzbDrone.Test.Common;

 namespace NzbDrone.Core.Test.Download.DownloadClientTests.Blackhole
 {
@@ -18,7 +20,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.Blackhole
    {
        protected readonly string _title = "Droned.S01E01.Pilot.1080p.WEB-DL-DRONE";
        protected string _completedDownloadFolder = @"c:\blackhole\completed".AsOsAgnostic();
-        
+
        protected void GivenCompletedItem()
        {
            var targetDir = Path.Combine(_completedDownloadFolder, _title);
@@ -33,6 +35,9 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.Blackhole
            Mocker.GetMock<IDiskProvider>()
                .Setup(c => c.GetFileSize(It.IsAny<string>()))
                .Returns(1000000);
+
+            Mocker.GetMock<IDiskScanService>().Setup(c => c.FilterFiles(It.IsAny<string>(), It.IsAny<IEnumerable<string>>()))
+                  .Returns<string, IEnumerable<string>>((b, s) => s.ToList());
        }

        protected void GivenChangedItem()
@@ -43,7 +48,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.Blackhole
                .Setup(c => c.GetFileSize(It.IsAny<string>()))
                .Returns(currentSize + 1);
        }
-        
+
        private void VerifySingleItem(DownloadItemStatus status)
        {
            var items = Subject.GetItems(_completedDownloadFolder, TimeSpan.FromMilliseconds(50)).ToList();
--- a/src/NzbDrone.Core.Test/Download/DownloadClientTests/Blackhole/TorrentBlackholeFixture.cs
+++ b/src/NzbDrone.Core.Test/Download/DownloadClientTests/Blackhole/TorrentBlackholeFixture.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Net;
@@ -10,6 +11,7 @@ using NzbDrone.Common.Http;
 using NzbDrone.Core.Download;
 using NzbDrone.Core.Download.Clients.Blackhole;
 using NzbDrone.Core.Exceptions;
+using NzbDrone.Core.MediaFiles;
 using NzbDrone.Core.MediaFiles.TorrentInfo;
 using NzbDrone.Core.Parser.Model;
 using NzbDrone.Test.Common;
@@ -48,6 +50,9 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.Blackhole
            Mocker.GetMock<ITorrentFileInfoReader>()
                .Setup(c => c.GetHashFromTorrentFile(It.IsAny<byte[]>()))
                .Returns("myhash");
+
+            Mocker.GetMock<IDiskScanService>().Setup(c => c.FilterFiles(It.IsAny<string>(), It.IsAny<IEnumerable<string>>()))
+                  .Returns<string, IEnumerable<string>>((b, s) => s.ToList());
        }

        protected void GivenFailedDownload()
--- a/src/NzbDrone.Core.Test/Download/DownloadClientTests/Blackhole/UsenetBlackholeFixture.cs
+++ b/src/NzbDrone.Core.Test/Download/DownloadClientTests/Blackhole/UsenetBlackholeFixture.cs
@@ -1,5 +1,6 @@

 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Net;
@@ -10,6 +11,7 @@ using NzbDrone.Common.Disk;
 using NzbDrone.Common.Http;
 using NzbDrone.Core.Download;
 using NzbDrone.Core.Download.Clients.Blackhole;
+using NzbDrone.Core.MediaFiles;
 using NzbDrone.Test.Common;

 namespace NzbDrone.Core.Test.Download.DownloadClientTests.Blackhole
@@ -41,6 +43,9 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.Blackhole
            Mocker.GetMock<IDiskProvider>()
                .Setup(c => c.OpenWriteStream(It.IsAny<string>()))
                .Returns(() => new FileStream(GetTempFilePath(), FileMode.Create));
+
+            Mocker.GetMock<IDiskScanService>().Setup(c => c.FilterFiles(It.IsAny<string>(), It.IsAny<IEnumerable<string>>()))
+                  .Returns<string, IEnumerable<string>>((b, s) => s.ToList());
        }

        protected void GivenFailedDownload()
--- a/src/NzbDrone.Core.Test/MediaFiles/DownloadedEpisodesImportServiceFixture.cs
+++ b/src/NzbDrone.Core.Test/MediaFiles/DownloadedEpisodesImportServiceFixture.cs
@@ -2,9 +2,12 @@
 using System.IO;
 using System.Linq;
 using FizzWare.NBuilder;
+using FluentAssertions;
 using Moq;
 using NUnit.Framework;
 using NzbDrone.Common.Disk;
+using NzbDrone.Core.Download;
+using NzbDrone.Core.Download.TrackedDownloads;
 using NzbDrone.Core.MediaFiles;
 using NzbDrone.Core.MediaFiles.EpisodeImport;
 using NzbDrone.Core.Parser;
@@ -13,8 +16,6 @@ using NzbDrone.Core.Qualities;
 using NzbDrone.Core.Test.Framework;
 using NzbDrone.Core.Tv;
 using NzbDrone.Test.Common;
-using FluentAssertions;
-using NzbDrone.Core.Download;

 namespace NzbDrone.Core.Test.MediaFiles
 {
@@ -25,12 +26,17 @@ namespace NzbDrone.Core.Test.MediaFiles
        private string[] _subFolders = new[] { "c:\\root\\foldername".AsOsAgnostic() };
        private string[] _videoFiles = new[] { "c:\\root\\foldername\\30.rock.s01e01.ext".AsOsAgnostic() };

+        private TrackedDownload _trackedDownload;
+
        [SetUp]
        public void Setup()
        {
            Mocker.GetMock<IDiskScanService>().Setup(c => c.GetVideoFiles(It.IsAny<string>(), It.IsAny<bool>()))
                  .Returns(_videoFiles);

+            Mocker.GetMock<IDiskScanService>().Setup(c => c.FilterFiles(It.IsAny<string>(), It.IsAny<IEnumerable<string>>()))
+                  .Returns<string, IEnumerable<string>>((b,s) => s.ToList());
+
            Mocker.GetMock<IDiskProvider>().Setup(c => c.GetDirectories(It.IsAny<string>()))
                  .Returns(_subFolders);

@@ -40,6 +46,23 @@ namespace NzbDrone.Core.Test.MediaFiles
            Mocker.GetMock<IImportApprovedEpisodes>()
                  .Setup(s => s.Import(It.IsAny<List<ImportDecision>>(), true, null, ImportMode.Auto))
                  .Returns(new List<ImportResult>());
+
+
+            var downloadItem = Builder<DownloadClientItem>.CreateNew()
+                .With(v => v.DownloadId = "sab1")
+                .With(v => v.Status = DownloadItemStatus.Downloading)
+                .Build();
+
+            var remoteEpisode = Builder<RemoteEpisode>.CreateNew()
+                .With(v => v.Series = new Series())
+                .Build();
+
+            _trackedDownload = new TrackedDownload
+            {
+                DownloadItem = downloadItem,
+                RemoteEpisode = remoteEpisode,
+                State = TrackedDownloadStage.Downloading
+            };
        }

        private void GivenValidSeries()
@@ -49,6 +72,29 @@ namespace NzbDrone.Core.Test.MediaFiles
                  .Returns(Builder<Series>.CreateNew().Build());
        }

+        private void GivenSuccessfulImport()
+        {
+            var localEpisode = new LocalEpisode();
+
+            var imported = new List<ImportDecision>();
+            imported.Add(new ImportDecision(localEpisode));
+
+            Mocker.GetMock<IMakeImportDecision>()
+                  .Setup(s => s.GetImportDecisions(It.IsAny<List<string>>(), It.IsAny<Series>(), It.IsAny<DownloadClientItem>(), null, true))
+                  .Returns(imported);
+
+            Mocker.GetMock<IImportApprovedEpisodes>()
+                  .Setup(s => s.Import(It.IsAny<List<ImportDecision>>(), It.IsAny<bool>(), It.IsAny<DownloadClientItem>(), It.IsAny<ImportMode>()))
+                  .Returns(imported.Select(i => new ImportResult(i)).ToList())
+                  .Callback(() => WasImportedResponse());
+        }
+
+        private void WasImportedResponse()
+        {
+            Mocker.GetMock<IDiskScanService>().Setup(c => c.GetVideoFiles(It.IsAny<string>(), It.IsAny<bool>()))
+                  .Returns(new string[0]);
+        }
+
        [Test]
        public void should_search_for_series_using_folder_name()
        {
@@ -357,6 +403,51 @@ namespace NzbDrone.Core.Test.MediaFiles
                  .Verify(v => v.DeleteFolder(It.IsAny<string>(), true), Times.Never());
        }

+        [Test]
+        public void should_not_delete_folder_after_import()
+        {
+            GivenValidSeries();
+
+            GivenSuccessfulImport();
+
+            _trackedDownload.DownloadItem.CanMoveFiles = false;
+
+            Subject.ProcessPath(_droneFactory, ImportMode.Auto, _trackedDownload.RemoteEpisode.Series, _trackedDownload.DownloadItem);
+
+            Mocker.GetMock<IDiskProvider>()
+                  .Verify(v => v.DeleteFolder(It.IsAny<string>(), true), Times.Never());
+        }
+
+        [Test]
+        public void should_delete_folder_if_importmode_move()
+        {
+            GivenValidSeries();
+
+            GivenSuccessfulImport();
+
+            _trackedDownload.DownloadItem.CanMoveFiles = false;
+
+            Subject.ProcessPath(_droneFactory, ImportMode.Move, _trackedDownload.RemoteEpisode.Series, _trackedDownload.DownloadItem);
+
+            Mocker.GetMock<IDiskProvider>()
+                  .Verify(v => v.DeleteFolder(It.IsAny<string>(), true), Times.Once());
+        }
+
+        [Test]
+        public void should_not_delete_folder_if_importmode_copy()
+        {
+            GivenValidSeries();
+
+            GivenSuccessfulImport();
+
+            _trackedDownload.DownloadItem.CanMoveFiles = true;
+
+            Subject.ProcessPath(_droneFactory, ImportMode.Copy, _trackedDownload.RemoteEpisode.Series, _trackedDownload.DownloadItem);
+
+            Mocker.GetMock<IDiskProvider>()
+                  .Verify(v => v.DeleteFolder(It.IsAny<string>(), true), Times.Never());
+        }
+
        private void VerifyNoImport()
        {
            Mocker.GetMock<IImportApprovedEpisodes>().Verify(c => c.Import(It.IsAny<List<ImportDecision>>(), true, null, ImportMode.Auto),
--- a/src/NzbDrone.Core.Test/MediaFiles/MediaInfo/MediaInfoFormatterTests/FormatAudioCodecFixture.cs
+++ b/src/NzbDrone.Core.Test/MediaFiles/MediaInfo/MediaInfoFormatterTests/FormatAudioCodecFixture.cs
@@ -8,18 +8,42 @@ namespace NzbDrone.Core.Test.MediaFiles.MediaInfo.MediaInfoFormatterTests
    [TestFixture]
    public class FormatAudioCodecFixture : TestBase
    {
+        private static string sceneName = "My.Series.S01E01-Sonarr";
+
        [TestCase("AC-3", "AC3")]
        [TestCase("E-AC-3", "EAC3")]
        [TestCase("MPEG Audio", "MPEG Audio")]
        [TestCase("DTS", "DTS")]
-        public void should_format_audio_format(string audioFormat, string expectedFormat)
+        public void should_format_audio_format_legacy(string audioFormat, string expectedFormat)
        {
            var mediaInfoModel = new MediaInfoModel
            {
                AudioFormat = audioFormat
            };

-            MediaInfoFormatter.FormatAudioCodec(mediaInfoModel).Should().Be(expectedFormat);
+            MediaInfoFormatter.FormatAudioCodec(mediaInfoModel, sceneName).Should().Be(expectedFormat);
+        }
+
+        [TestCase("MPEG Audio, A_MPEG/L2, , ", "droned.s01e03.swedish.720p.hdtv.x264-prince", "MP2")]
+        [TestCase("Vorbis, A_VORBIS, , Xiph.Org libVorbis I 20101101 (Schaufenugget)", "DB Super HDTV", "Vorbis")]
+        [TestCase("PCM, 1, , ", "DW DVDRip XviD-idTV", "PCM")] // Dubbed most likely
+        [TestCase("TrueHD, A_TRUEHD, , ", "", "TrueHD")]
+        [TestCase("WMA, 161, , ", "Droned.wmv", "WMA")]
+        [TestCase("WMA, 162, Pro, ", "B.N.S04E18.720p.WEB-DL", "WMA")]
+        [TestCase("Opus, A_OPUS, , ", "Roadkill Ep3x11 - YouTube.webm", "Opus")]
+        [TestCase("mp3 , 0, , ", "climbing.mp4", "MP3")]
+        public void should_format_audio_format(string audioFormatPack, string sceneName, string expectedFormat)
+        {
+            var split = audioFormatPack.Split(new string[] { ", " }, System.StringSplitOptions.None);
+            var mediaInfoModel = new MediaInfoModel
+            {
+                AudioFormat = split[0],
+                AudioCodecID = split[1],
+                AudioProfile = split[2],
+                AudioCodecLibrary = split[3]
+            };
+
+            MediaInfoFormatter.FormatAudioCodec(mediaInfoModel, sceneName).Should().Be(expectedFormat);
        }

        [Test]
@@ -31,7 +55,7 @@ namespace NzbDrone.Core.Test.MediaFiles.MediaInfo.MediaInfoFormatterTests
                AudioProfile = "Layer 3"
            };

-            MediaInfoFormatter.FormatAudioCodec(mediaInfoModel).Should().Be("MP3");
+            MediaInfoFormatter.FormatAudioCodec(mediaInfoModel, sceneName).Should().Be("MP3");
        }

        [Test]
@@ -39,11 +63,12 @@ namespace NzbDrone.Core.Test.MediaFiles.MediaInfo.MediaInfoFormatterTests
        {
            var mediaInfoModel = new MediaInfoModel
            {
-                AudioFormat = "Other Audio Format"
+                AudioFormat = "Other Audio Format",
+                AudioCodecID = "Other Audio Codec"
            };

-            MediaInfoFormatter.FormatAudioCodec(mediaInfoModel).Should().Be(mediaInfoModel.AudioFormat);
-            ExceptionVerification.ExpectedErrors(1);
+            MediaInfoFormatter.FormatAudioCodec(mediaInfoModel, sceneName).Should().Be(mediaInfoModel.AudioFormat);
+            ExceptionVerification.ExpectedWarns(1);
        }
    }
 }
--- a/src/NzbDrone.Core.Test/MediaFiles/MediaInfo/MediaInfoFormatterTests/FormatVideoCodecFixture.cs
+++ b/src/NzbDrone.Core.Test/MediaFiles/MediaInfo/MediaInfoFormatterTests/FormatVideoCodecFixture.cs
@@ -25,16 +25,44 @@ namespace NzbDrone.Core.Test.MediaFiles.MediaInfo.MediaInfoFormatterTests
            MediaInfoFormatter.FormatVideoCodec(mediaInfoModel, sceneName).Should().Be(expectedFormat);
        }

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

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

            Mocker.GetMock<IMediaFileService>()
--- a/src/NzbDrone.Core.Test/MediaFiles/MediaInfo/VideoFileInfoReaderFixture.cs
+++ b/src/NzbDrone.Core.Test/MediaFiles/MediaInfo/VideoFileInfoReaderFixture.cs
@@ -40,18 +40,23 @@ namespace NzbDrone.Core.Test.MediaFiles.MediaInfo

            var info = Subject.GetMediaInfo(path);

-
+            info.VideoCodec.Should().BeNull();
+            info.VideoFormat.Should().Be("AVC");
+            info.VideoCodecID.Should().Be("avc1");
+            info.VideoProfile.Should().Be("Baseline@L2.1");
+            info.VideoCodecLibrary.Should().Be("");
+            info.AudioFormat.Should().Be("AAC");
+            info.AudioCodecID.Should().Be("40");
+            info.AudioProfile.Should().Be("LC");
+            info.AudioCodecLibrary.Should().Be("");
            info.AudioBitrate.Should().Be(128000);
            info.AudioChannels.Should().Be(2);
-            info.AudioFormat.Should().Be("AAC");
            info.AudioLanguages.Should().Be("English");
-            info.AudioProfile.Should().Be("LC");
            info.Height.Should().Be(320);
            info.RunTime.Seconds.Should().Be(10);
            info.ScanType.Should().Be("Progressive");
            info.Subtitles.Should().Be("");
            info.VideoBitrate.Should().Be(193329);
-            info.VideoCodec.Should().Be("AVC");
            info.VideoFps.Should().Be(24);
            info.Width.Should().Be(480);

@@ -71,17 +76,23 @@ namespace NzbDrone.Core.Test.MediaFiles.MediaInfo

            var info = Subject.GetMediaInfo(path);

+            info.VideoCodec.Should().BeNull();
+            info.VideoFormat.Should().Be("AVC");
+            info.VideoCodecID.Should().Be("avc1");
+            info.VideoProfile.Should().Be("Baseline@L2.1");
+            info.VideoCodecLibrary.Should().Be("");
+            info.AudioFormat.Should().Be("AAC");
+            info.AudioCodecID.Should().Be("40");
+            info.AudioProfile.Should().Be("LC");
+            info.AudioCodecLibrary.Should().Be("");
            info.AudioBitrate.Should().Be(128000);
            info.AudioChannels.Should().Be(2);
-            info.AudioFormat.Should().Be("AAC");
            info.AudioLanguages.Should().Be("English");
-            info.AudioProfile.Should().Be("LC");
            info.Height.Should().Be(320);
            info.RunTime.Seconds.Should().Be(10);
            info.ScanType.Should().Be("Progressive");
            info.Subtitles.Should().Be("");
            info.VideoBitrate.Should().Be(193329);
-            info.VideoCodec.Should().Be("AVC");
            info.VideoFps.Should().Be(24);
            info.Width.Should().Be(480);
        }
@@ -98,4 +109,4 @@ namespace NzbDrone.Core.Test.MediaFiles.MediaInfo
            stream.Close();
        }
    }
-}
+}
--- a/src/NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/GetVideoFilesFixture.cs
+++ b/src/NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/GetVideoFilesFixture.cs
@@ -92,6 +92,7 @@ namespace NzbDrone.Core.Test.ProviderTests.DiskScanProviderTests
        [TestCase("Plex Versions")]
        [TestCase(".secret")]
        [TestCase(".hidden")]
+        [TestCase(".unwanted")]
        public void should_filter_certain_sub_folders(string subFolder)
        {
            var path = @"C:\Test\";
@@ -99,11 +100,7 @@ namespace NzbDrone.Core.Test.ProviderTests.DiskScanProviderTests
            var specialFiles = GetFiles(path, subFolder).ToList();
            var allFiles = files.Concat(specialFiles);

-            var series = Builder<Series>.CreateNew()
-                                        .With(s => s.Path = path)
-                                        .Build();
-
-            var filteredFiles = Subject.FilterFiles(series, allFiles);
+            var filteredFiles = Subject.FilterFiles(path, allFiles);
            filteredFiles.Should().NotContain(specialFiles);
            filteredFiles.Count.Should().BeGreaterThan(0);
        }
--- a/src/NzbDrone.Core/Backup/BackupService.cs
+++ b/src/NzbDrone.Core/Backup/BackupService.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Data;
+using System.Data.SQLite;
 using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
@@ -25,6 +26,7 @@ namespace NzbDrone.Core.Backup
    public class BackupService : IBackupService, IExecute<BackupCommand>
    {
        private readonly IMainDatabase _maindDb;
+        private readonly IMakeDatabaseBackup _makeDatabaseBackup;
        private readonly IDiskTransferService _diskTransferService;
        private readonly IDiskProvider _diskProvider;
        private readonly IAppFolderInfo _appFolderInfo;
@@ -36,6 +38,7 @@ namespace NzbDrone.Core.Backup
        private static readonly Regex BackupFileRegex = new Regex(@"nzbdrone_backup_[._0-9]+\.zip", RegexOptions.Compiled | RegexOptions.IgnoreCase);

        public BackupService(IMainDatabase maindDb,
+                             IMakeDatabaseBackup makeDatabaseBackup,
                             IDiskTransferService diskTransferService,
                             IDiskProvider diskProvider,
                             IAppFolderInfo appFolderInfo,
@@ -43,6 +46,7 @@ namespace NzbDrone.Core.Backup
                             Logger logger)
        {
            _maindDb = maindDb;
+            _makeDatabaseBackup = makeDatabaseBackup;
            _diskTransferService = diskTransferService;
            _diskProvider = diskProvider;
            _appFolderInfo = appFolderInfo;
@@ -68,7 +72,7 @@ namespace NzbDrone.Core.Backup
            {
                CleanupOldBackups(backupType);
            }
-            
+
            BackupConfigFile();
            BackupDatabase();

@@ -111,17 +115,7 @@ namespace NzbDrone.Core.Backup
        {
            _logger.ProgressDebug("Backing up database");

-            using (var unitOfWork = new UnitOfWork(() => _maindDb.GetDataMapper()))
-            {
-                unitOfWork.BeginTransaction(IsolationLevel.Serializable);
-
-                var databaseFile = _appFolderInfo.GetNzbDroneDatabase();
-                var tempDatabaseFile = Path.Combine(_backupTempFolder, Path.GetFileName(databaseFile));
-
-                _diskTransferService.TransferFile(databaseFile, tempDatabaseFile, TransferMode.Copy);
-
-                unitOfWork.Commit();
-            }
+            _makeDatabaseBackup.BackupDatabase(_maindDb, _backupTempFolder);
        }

        private void BackupConfigFile()
--- a/src/NzbDrone.Core/Backup/MakeDatabaseBackup.cs
+++ b/src/NzbDrone.Core/Backup/MakeDatabaseBackup.cs
@@ -0,0 +1,59 @@
+using System;
+using System.Collections.Generic;
+using System.Data.SQLite;
+using System.IO;
+using System.Linq;
+using System.Text;
+using NLog;
+using NzbDrone.Core.Datastore;
+using System.Data;
+
+namespace NzbDrone.Core.Backup
+{
+    public interface IMakeDatabaseBackup
+    {
+        void BackupDatabase(IDatabase database, string targetDirectory);
+    }
+
+    public class MakeDatabaseBackup : IMakeDatabaseBackup
+    {
+        private readonly Logger _logger;
+
+        public MakeDatabaseBackup(Logger logger)
+        {
+            _logger = logger;
+        }
+
+        public void BackupDatabase(IDatabase database, string targetDirectory)
+        {
+            var sourceConnectionString = database.GetDataMapper().ConnectionString;
+            var backupConnectionStringBuilder = new SQLiteConnectionStringBuilder(sourceConnectionString);
+
+            backupConnectionStringBuilder.DataSource = Path.Combine(targetDirectory, Path.GetFileName(backupConnectionStringBuilder.DataSource));
+            // We MUST use journal mode instead of WAL coz WAL has issues when page sizes change. This should also automatically deal with the -journal and -wal files during restore.
+            backupConnectionStringBuilder.JournalMode = SQLiteJournalModeEnum.Truncate;
+
+            using (var sourceConnection = (SQLiteConnection)SQLiteFactory.Instance.CreateConnection())
+            using (var backupConnection = (SQLiteConnection)SQLiteFactory.Instance.CreateConnection())
+            {
+                sourceConnection.ConnectionString = sourceConnectionString;
+                backupConnection.ConnectionString = backupConnectionStringBuilder.ToString();
+
+                sourceConnection.Open();
+                backupConnection.Open();
+
+                sourceConnection.BackupDatabase(backupConnection, "main", "main", -1, null, 500);
+
+                // The backup changes the journal_mode, force it to truncate again.
+                using (var command = backupConnection.CreateCommand())
+                {
+                    command.CommandText = "pragma journal_mode=truncate";
+                    command.ExecuteNonQuery();
+                }
+
+                // Make sure there are no lingering connections.
+                SQLiteConnection.ClearAllPools();
+            }
+        }
+    }
+}
--- a/src/NzbDrone.Core/DataAugmentation/Scene/InvalidSceneMappingException.cs
+++ b/src/NzbDrone.Core/DataAugmentation/Scene/InvalidSceneMappingException.cs
@@ -8,15 +8,15 @@ namespace NzbDrone.Core.DataAugmentation.Scene
 {
    public class InvalidSceneMappingException : NzbDroneException
    {
-        public InvalidSceneMappingException(IEnumerable<SceneMapping> mappings)
-            : base(FormatMessage(mappings))
+        public InvalidSceneMappingException(IEnumerable<SceneMapping> mappings, string releaseTitle)
+            : base(FormatMessage(mappings, releaseTitle))
        {

        }

-        private static string FormatMessage(IEnumerable<SceneMapping> mappings)
+        private static string FormatMessage(IEnumerable<SceneMapping> mappings, string releaseTitle)
        {
-            return string.Format("Scene Mappings contains a conflict for tvdbids {0}. Please notify Sonarr developers.", string.Join(",", mappings.Select(v => v.TvdbId.ToString())));
+            return string.Format("Scene Mappings contains a conflict for tvdbids {0}. Please notify Sonarr developers. ({1})", string.Join(",", mappings.Select(v => v.TvdbId.ToString())), releaseTitle);
        }
    }
 }
--- a/src/NzbDrone.Core/DataAugmentation/Scene/SceneMappingService.cs
+++ b/src/NzbDrone.Core/DataAugmentation/Scene/SceneMappingService.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Linq;
 using NLog;
 using NzbDrone.Common.Cache;
@@ -109,7 +109,7 @@ namespace NzbDrone.Core.DataAugmentation.Scene
                return distinctMappings.FirstOrDefault();
            }

-            throw new InvalidSceneMappingException(mappings);
+            throw new InvalidSceneMappingException(mappings, releaseTitle);
        }

        public int? GetSceneSeasonNumber(string seriesTitle, string releaseTitle)
@@ -177,12 +177,12 @@ namespace NzbDrone.Core.DataAugmentation.Scene
                    }
                    else
                    {
-                        _logger.Warn("Received empty list of mapping. will not update.");
+                        _logger.Warn("Received empty list of mapping. will not update");
                    }
                }
                catch (Exception ex)
                {
-                    _logger.Error(ex, "Failed to Update Scene Mappings.");
+                    _logger.Error(ex, "Failed to Update Scene Mappings");
                }
            }

--- a/src/NzbDrone.Core/Datastore/Database.cs
+++ b/src/NzbDrone.Core/Datastore/Database.cs
@@ -25,7 +25,6 @@ namespace NzbDrone.Core.Datastore
            _datamapperFactory = datamapperFactory;
        }

-
        public IDataMapper GetDataMapper()
        {
            return _datamapperFactory();
@@ -54,4 +53,4 @@ namespace NzbDrone.Core.Datastore
            }
        }
    }
-}
+}
--- a/src/NzbDrone.Core/DecisionEngine/Specifications/RawDiskSpecification.cs
+++ b/src/NzbDrone.Core/DecisionEngine/Specifications/RawDiskSpecification.cs
@@ -1,4 +1,5 @@
-using System.Linq;
+using System.Linq;
+using System.Text.RegularExpressions;
 using NLog;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Core.IndexerSearch.Definitions;
@@ -8,8 +9,13 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
 {
    public class RawDiskSpecification : IDecisionEngineSpecification
    {
-        private static readonly string[] _dvdContainerTypes = new[] { "vob", "iso" };
+        private static readonly Regex[] DiscRegex = new[]
+                                                    {
+                                                        new Regex(@"(?:dis[ck])(?:[-_. ]\d+[-_. ])(?:(?:(?:480|720|1080|2160)[ip]|)[-_. ])?(?:Blu\-?ray)", RegexOptions.Compiled | RegexOptions.IgnoreCase),
+                                                        new Regex(@"(?:(?:480|720|1080|2160)[ip]|)[-_. ](?:full)[-_. ](?:Blu\-?ray)", RegexOptions.Compiled | RegexOptions.IgnoreCase)
+                                                    };

+        private static readonly string[] _dvdContainerTypes = new[] { "vob", "iso" };
        private static readonly string[] _blurayContainerTypes = new[] { "m2ts" };

        private readonly Logger _logger;
@@ -24,7 +30,21 @@ namespace NzbDrone.Core.DecisionEngine.Specifications

        public virtual Decision IsSatisfiedBy(RemoteEpisode subject, SearchCriteriaBase searchCriteria)
        {
-            if (subject.Release == null || subject.Release.Container.IsNullOrWhiteSpace())
+            if (subject.Release == null)
+            {
+                return Decision.Accept();
+            }
+
+            foreach (var regex in DiscRegex)
+            {
+                if (regex.IsMatch(subject.Release.Title))
+                {
+                    _logger.Debug("Release contains raw Bluray, rejecting.");
+                    return Decision.Reject("Raw Bluray release");
+                }
+            }
+
+            if (subject.Release.Container.IsNullOrWhiteSpace())
            {
                return Decision.Accept();
            }
--- a/src/NzbDrone.Core/Download/Clients/Blackhole/ScanWatchFolder.cs
+++ b/src/NzbDrone.Core/Download/Clients/Blackhole/ScanWatchFolder.cs
@@ -1,15 +1,15 @@
-using NLog;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using NLog;
 using NzbDrone.Common.Cache;
 using NzbDrone.Common.Crypto;
 using NzbDrone.Common.Disk;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Core.MediaFiles;
 using NzbDrone.Core.Organizer;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;

 namespace NzbDrone.Core.Download.Clients.Blackhole
 {
@@ -37,7 +37,7 @@ namespace NzbDrone.Core.Download.Clients.Blackhole
        {
            var newWatchItems = new Dictionary<string, WatchFolderItem>();
            var lastWatchItems = _watchFolderItemCache.Get(watchFolder, () => newWatchItems);
-            
+
            foreach (var newWatchItem in GetDownloadItems(watchFolder, lastWatchItems, waitPeriod))
            {
                newWatchItems[newWatchItem.DownloadId] = newWatchItem;
@@ -50,7 +50,7 @@ namespace NzbDrone.Core.Download.Clients.Blackhole

        private IEnumerable<WatchFolderItem> GetDownloadItems(string watchFolder, Dictionary<string, WatchFolderItem> lastWatchItems, TimeSpan waitPeriod)
        {
-            foreach (var folder in _diskProvider.GetDirectories(watchFolder))
+            foreach (var folder in _diskScanService.FilterFiles(watchFolder, _diskProvider.GetDirectories(watchFolder)))
            {
                var title = FileNameBuilder.CleanFileName(Path.GetFileName(folder));

@@ -86,7 +86,7 @@ namespace NzbDrone.Core.Download.Clients.Blackhole
                yield return newWatchItem;
            }

-            foreach (var videoFile in _diskScanService.GetVideoFiles(watchFolder, false))
+            foreach (var videoFile in _diskScanService.FilterFiles(watchFolder, _diskScanService.GetVideoFiles(watchFolder, false)))
            {
                var title = FileNameBuilder.CleanFileName(Path.GetFileName(videoFile));

--- a/src/NzbDrone.Core/Download/Clients/Deluge/Deluge.cs
+++ b/src/NzbDrone.Core/Download/Clients/Deluge/Deluge.cs
@@ -57,6 +57,11 @@ namespace NzbDrone.Core.Download.Clients.Deluge
        {
            var actualHash = _proxy.AddTorrentFromFile(filename, fileContent, Settings);

+            if (actualHash.IsNullOrWhiteSpace())
+            {
+                throw new DownloadClientException("Deluge failed to add torrent " + filename);
+            }
+
            if (!Settings.TvCategory.IsNullOrWhiteSpace())
            {
                _proxy.SetLabel(actualHash, Settings.TvCategory, Settings);
--- a/src/NzbDrone.Core/Download/Clients/QBittorrent/QBittorrentProxy.cs
+++ b/src/NzbDrone.Core/Download/Clients/QBittorrent/QBittorrentProxy.cs
@@ -72,7 +72,13 @@ namespace NzbDrone.Core.Download.Clients.QBittorrent
                                                .Post()
                                                .AddFormParameter("urls", torrentUrl);

-            ProcessRequest<object>(request, settings);
+            var result = ProcessRequest(request, settings);
+
+            // Note: Older qbit versions returned nothing, so we can't do != "Ok." here.
+            if (result == "Fails.")
+            {
+                throw new DownloadClientException("Download client failed to add torrent by url");
+            }
        }

        public void AddTorrentFromFile(string fileName, Byte[] fileContent, QBittorrentSettings settings)
@@ -81,7 +87,13 @@ namespace NzbDrone.Core.Download.Clients.QBittorrent
                                                .Post()
                                                .AddFormUpload("torrents", fileName, fileContent);

-            ProcessRequest<object>(request, settings);
+            var result = ProcessRequest(request, settings);
+
+            // Note: Current qbit versions return nothing, so we can't do != "Ok." here.
+            if (result == "Fails.")
+            {
+                throw new DownloadClientException("Download client failed to add torrent");
+            }
        }

        public void RemoveTorrent(string hash, Boolean removeData, QBittorrentSettings settings)
@@ -90,7 +102,7 @@ namespace NzbDrone.Core.Download.Clients.QBittorrent
                                                .Post()
                                                .AddFormParameter("hashes", hash);

-            ProcessRequest<object>(request, settings);
+            ProcessRequest(request, settings);
        }

        public void SetTorrentLabel(string hash, string label, QBittorrentSettings settings)
@@ -101,7 +113,7 @@ namespace NzbDrone.Core.Download.Clients.QBittorrent
                                                        .AddFormParameter("category", label);
            try
            {
-                ProcessRequest<object>(setCategoryRequest, settings);
+                ProcessRequest(setCategoryRequest, settings);
            }
            catch(DownloadClientException ex)
            {
@@ -112,7 +124,8 @@ namespace NzbDrone.Core.Download.Clients.QBittorrent
                                                                .Post()
                                                                .AddFormParameter("hashes", hash)
                                                                .AddFormParameter("label", label);
-                    ProcessRequest<object>(setLabelRequest, settings);
+
+                    ProcessRequest(setLabelRequest, settings);
                }
            }
        }
@@ -125,7 +138,7 @@ namespace NzbDrone.Core.Download.Clients.QBittorrent

            try
            {
-                var response = ProcessRequest<object>(request, settings);
+                ProcessRequest(request, settings);
            }
            catch (DownloadClientException ex)
            {
@@ -152,6 +165,13 @@ namespace NzbDrone.Core.Download.Clients.QBittorrent

        private TResult ProcessRequest<TResult>(HttpRequestBuilder requestBuilder, QBittorrentSettings settings)
            where TResult : new()
+        {
+            var responseContent = ProcessRequest(requestBuilder, settings);
+
+            return Json.Deserialize<TResult>(responseContent);
+        }
+
+        private string ProcessRequest(HttpRequestBuilder requestBuilder, QBittorrentSettings settings)
        {
            AuthenticateClient(requestBuilder, settings);

@@ -185,7 +205,7 @@ namespace NzbDrone.Core.Download.Clients.QBittorrent
                throw new DownloadClientException("Failed to connect to qBitTorrent, please check your settings.", ex);
            }

-            return Json.Deserialize<TResult>(response.Content);
+            return response.Content;
        }

        private void AuthenticateClient(HttpRequestBuilder requestBuilder, QBittorrentSettings settings, bool reauthenticate = false)
--- a/src/NzbDrone.Core/Download/Clients/Sabnzbd/Sabnzbd.cs
+++ b/src/NzbDrone.Core/Download/Clients/Sabnzbd/Sabnzbd.cs
@@ -315,6 +315,11 @@ namespace NzbDrone.Core.Download.Clients.Sabnzbd

        private Version ParseVersion(string version)
        {
+            if (version.IsNullOrWhiteSpace())
+            {
+                return null;
+            }
+
            var parsed = VersionRegex.Match(version);

            int major;
@@ -352,7 +357,7 @@ namespace NzbDrone.Core.Download.Clients.Sabnzbd

                if (version == null)
                {
-                    return new ValidationFailure("Version", "Unknown Version: " + version);
+                    return new ValidationFailure("Version", "Unknown Version: " + rawVersion);
                }

                if (rawVersion.Equals("develop", StringComparison.InvariantCultureIgnoreCase))
--- a/src/NzbDrone.Core/Download/Pending/PendingReleaseService.cs
+++ b/src/NzbDrone.Core/Download/Pending/PendingReleaseService.cs
@@ -86,7 +86,7 @@ namespace NzbDrone.Core.Download.Pending
                {
                    if (matchingReport.Reason != reason)
                    {
-                        _logger.Debug("This release is already pending with reason {0}, changing to {1}", matchingReport.Reason, reason);
+                        _logger.Debug("The release {0} is already pending with reason {1}, changing to {2}", decision.RemoteEpisode, matchingReport.Reason, reason);
                        matchingReport.Reason = reason;
                        _repository.Update(matchingReport);
                        sameReason = false;
@@ -95,12 +95,12 @@ namespace NzbDrone.Core.Download.Pending

                if (sameReason)
                {
-                    _logger.Debug("This release is already pending with reason {0}, not adding again", reason);
+                    _logger.Debug("The release {0} is already pending with reason {1}, not adding again", decision.RemoteEpisode, reason);
                    return;
                }
            }

-            _logger.Debug("Adding release to pending releases with reason {0}", reason);
+            _logger.Debug("Adding release {0} to pending releases with reason {1}", decision.RemoteEpisode, reason);
            Insert(decision, reason);
        }

--- a/src/NzbDrone.Core/Download/ProcessDownloadDecisions.cs
+++ b/src/NzbDrone.Core/Download/ProcessDownloadDecisions.cs
@@ -78,7 +78,7 @@ namespace NzbDrone.Core.Download
                {
                    if (ex is DownloadClientUnavailableException || ex is DownloadClientAuthenticationException)
                    {
-                        _logger.Debug("Failed to send release to download client, storing until later");
+                        _logger.Debug(ex, "Failed to send release to download client, storing until later. " + remoteEpisode);
                        failed.Add(report);

                        if (downloadProtocol == DownloadProtocol.Usenet)
--- a/src/NzbDrone.Core/Download/TrackedDownloads/TrackedDownloadService.cs
+++ b/src/NzbDrone.Core/Download/TrackedDownloads/TrackedDownloadService.cs
@@ -43,6 +43,8 @@ namespace NzbDrone.Core.Download.TrackedDownloads

            if (existingItem != null && existingItem.State != TrackedDownloadStage.Downloading)
            {
+                LogItemChange(existingItem, existingItem.DownloadItem, downloadItem);
+
                existingItem.DownloadItem = downloadItem;
                return existingItem;
            }
@@ -87,6 +89,8 @@ namespace NzbDrone.Core.Download.TrackedDownloads

                if (trackedDownload.RemoteEpisode == null)
                {
+                    _logger.Trace("No Episode found for download '{0}', not tracking.", trackedDownload.DownloadItem.Title);
+
                    return null;
                }
            }
@@ -96,10 +100,29 @@ namespace NzbDrone.Core.Download.TrackedDownloads
                return null;
            }

+            LogItemChange(trackedDownload, existingItem?.DownloadItem, trackedDownload.DownloadItem);
+
            _cache.Set(trackedDownload.DownloadItem.DownloadId, trackedDownload);
            return trackedDownload;
        }

+        private void LogItemChange(TrackedDownload trackedDownload, DownloadClientItem existingItem, DownloadClientItem downloadItem)
+        {
+            if (existingItem == null ||
+                existingItem.Status != downloadItem.Status ||
+                existingItem.CanBeRemoved != downloadItem.CanBeRemoved ||
+                existingItem.CanMoveFiles != downloadItem.CanMoveFiles)
+            {
+                _logger.Debug("Tracking '{0}:{1}': ClientState={2}{3} SonarrStage={4} Episode='{5}' OutputPath={6}.",
+                    downloadItem.DownloadClient, downloadItem.Title,
+                    downloadItem.Status, downloadItem.CanBeRemoved ? "" :
+                                         downloadItem.CanMoveFiles ? " (busy)" : " (readonly)",
+                    trackedDownload.State,
+                    trackedDownload.RemoteEpisode?.ParsedEpisodeInfo,
+                    downloadItem.OutputPath);
+            }
+        }
+
        private static TrackedDownloadStage GetStateFromHistory(HistoryEventType eventType)
        {
            switch (eventType)
--- a/src/NzbDrone.Core/Extras/ExistingExtraFileService.cs
+++ b/src/NzbDrone.Core/Extras/ExistingExtraFileService.cs
@@ -41,7 +41,7 @@ namespace NzbDrone.Core.Extras
            _logger.Debug("Looking for existing extra files in {0}", series.Path);

            var filesOnDisk = _diskScanService.GetNonVideoFiles(series.Path);
-            var possibleExtraFiles = _diskScanService.FilterFiles(series, filesOnDisk);
+            var possibleExtraFiles = _diskScanService.FilterFiles(series.Path, filesOnDisk);

            var filteredFiles = possibleExtraFiles;
            var importedFiles = new List<string>();
--- a/src/NzbDrone.Core/Extras/Metadata/Consumers/Roksbox/RoksboxMetadata.cs
+++ b/src/NzbDrone.Core/Extras/Metadata/Consumers/Roksbox/RoksboxMetadata.cs
@@ -180,6 +180,11 @@ namespace NzbDrone.Core.Extras.Metadata.Consumers.Roksbox

        public override List<ImageFileResult> SeriesImages(Series series)
        {
+            if (!Settings.SeriesImages)
+            {
+                return new List<ImageFileResult>();
+            }
+
            var image = series.Images.SingleOrDefault(c => c.CoverType == MediaCoverTypes.Poster) ?? series.Images.FirstOrDefault();
            if (image == null)
            {
@@ -195,6 +200,11 @@ namespace NzbDrone.Core.Extras.Metadata.Consumers.Roksbox

        public override List<ImageFileResult> SeasonImages(Series series, Season season)
        {
+            if (!Settings.SeasonImages)
+            {
+                return new List<ImageFileResult>();
+            }
+
            var seasonFolders = GetSeasonFolders(series);

            string seasonFolder;
@@ -220,6 +230,11 @@ namespace NzbDrone.Core.Extras.Metadata.Consumers.Roksbox

        public override List<ImageFileResult> EpisodeImages(Series series, EpisodeFile episodeFile)
        {
+            if (!Settings.EpisodeImages)
+            {
+                return new List<ImageFileResult>();
+            }
+
            var screenshot = episodeFile.Episodes.Value.First().Images.SingleOrDefault(i => i.CoverType == MediaCoverTypes.Screenshot);

            if (screenshot == null)
--- a/src/NzbDrone.Core/Extras/Metadata/Consumers/Xbmc/XbmcMetadata.cs
+++ b/src/NzbDrone.Core/Extras/Metadata/Consumers/Xbmc/XbmcMetadata.cs
@@ -242,13 +242,15 @@ namespace NzbDrone.Core.Extras.Metadata.Consumers.Xbmc

                    if (episodeFile.MediaInfo != null)
                    {
+                        var sceneName = episodeFile.GetSceneOrFileName();
+
                        var fileInfo = new XElement("fileinfo");
                        var streamDetails = new XElement("streamdetails");

                        var video = new XElement("video");
                        video.Add(new XElement("aspect", (float)episodeFile.MediaInfo.Width / (float)episodeFile.MediaInfo.Height));
                        video.Add(new XElement("bitrate", episodeFile.MediaInfo.VideoBitrate));
-                        video.Add(new XElement("codec", MediaInfoFormatter.FormatVideoCodec(episodeFile.MediaInfo, episodeFile.SceneName)));
+                        video.Add(new XElement("codec", MediaInfoFormatter.FormatVideoCodec(episodeFile.MediaInfo, sceneName)));
                        video.Add(new XElement("framerate", episodeFile.MediaInfo.VideoFps));
                        video.Add(new XElement("height", episodeFile.MediaInfo.Height));
                        video.Add(new XElement("scantype", episodeFile.MediaInfo.ScanType));
@@ -265,7 +267,7 @@ namespace NzbDrone.Core.Extras.Metadata.Consumers.Xbmc
                        var audio = new XElement("audio");
                        audio.Add(new XElement("bitrate", episodeFile.MediaInfo.AudioBitrate));
                        audio.Add(new XElement("channels", episodeFile.MediaInfo.AudioChannels));
-                        audio.Add(new XElement("codec", MediaInfoFormatter.FormatAudioCodec(episodeFile.MediaInfo)));
+                        audio.Add(new XElement("codec", MediaInfoFormatter.FormatAudioCodec(episodeFile.MediaInfo, sceneName)));
                        audio.Add(new XElement("language", episodeFile.MediaInfo.AudioLanguages));
                        streamDetails.Add(audio);

--- a/src/NzbDrone.Core/HealthCheck/Checks/MonoTlsCheck.cs
+++ b/src/NzbDrone.Core/HealthCheck/Checks/MonoTlsCheck.cs
@@ -28,42 +28,14 @@ namespace NzbDrone.Core.HealthCheck.Checks

            if (monoVersion >= new Version("5.0.0") && Environment.GetEnvironmentVariable("MONO_TLS_PROVIDER") == "legacy")
            {
-                _logger.Debug("Mono version 5.0.0 or higher and legacy TLS provider is selected, recommending user to switch to btls.");
-                return new HealthCheck(GetType(), HealthCheckResult.Warning, "Sonarr now supports Mono 5.x with btls enabled, consider removing MONO_TLS_PROVIDER=legacy option");
+                // Mono 5.0 still has issues in combination with libmediainfo, so disabling this check for now.
+                //_logger.Debug("Mono version 5.0.0 or higher and legacy TLS provider is selected, recommending user to switch to btls.");
+                //return new HealthCheck(GetType(), HealthCheckResult.Warning, "Sonarr now supports Mono 5.x with btls enabled, consider removing MONO_TLS_PROVIDER=legacy option");
            }

            return new HealthCheck(GetType());
        }

        public override bool CheckOnSchedule => false;
-
-        private bool HasMonoBug18599()
-        {
-            _logger.Debug("mono version 3.4.0, checking for mono bug #18599.");
-            var numberFormatterType = Type.GetType("System.NumberFormatter");
-
-            if (numberFormatterType == null)
-            {
-                _logger.Debug("Couldn't find System.NumberFormatter. Aborting test.");
-                return false;
-            }
-
-            var fieldInfo = numberFormatterType.GetField("userFormatProvider",
-                BindingFlags.Static | BindingFlags.NonPublic);
-
-            if (fieldInfo == null)
-            {
-                _logger.Debug("userFormatProvider field not found, version likely preceeds the official v3.4.0.");
-                return false;
-            }
-
-            if (fieldInfo.GetCustomAttributes(false).Any(v => v is ThreadStaticAttribute))
-            {
-                _logger.Debug("userFormatProvider field doesn't contain the ThreadStatic Attribute, version is affected by the critical bug #18599.");
-                return true;
-            }
-
-            return false;
-        }
    }
 }
--- a/src/NzbDrone.Core/History/History.cs
+++ b/src/NzbDrone.Core/History/History.cs
@@ -36,6 +36,7 @@ namespace NzbDrone.Core.History
        SeriesFolderImported = 2,
        DownloadFolderImported = 3,
        DownloadFailed = 4,
-        EpisodeFileDeleted = 5
+        EpisodeFileDeleted = 5,
+        EpisodeFileRenamed = 6
    }
 }
--- a/src/NzbDrone.Core/History/HistoryService.cs
+++ b/src/NzbDrone.Core/History/HistoryService.cs
@@ -32,6 +32,7 @@ namespace NzbDrone.Core.History
                                  IHandle<EpisodeImportedEvent>,
                                  IHandle<DownloadFailedEvent>,
                                  IHandle<EpisodeFileDeletedEvent>,
+                                  IHandle<EpisodeFileRenamedEvent>,
                                  IHandle<SeriesDeletedEvent>
    {
        private readonly IHistoryRepository _historyRepository;
@@ -257,6 +258,34 @@ namespace NzbDrone.Core.History
            }
        }

+        public void Handle(EpisodeFileRenamedEvent message)
+        {
+            var sourcePath = message.OriginalPath;
+            var sourceRelativePath = message.Series.Path.GetRelativePath(message.OriginalPath);
+            var path = Path.Combine(message.Series.Path, message.EpisodeFile.RelativePath);
+            var relativePath = message.EpisodeFile.RelativePath;
+
+            foreach (var episode in message.EpisodeFile.Episodes.Value)
+            {
+                var history = new History
+                {
+                    EventType = HistoryEventType.EpisodeFileRenamed,
+                    Date = DateTime.UtcNow,
+                    Quality = message.EpisodeFile.Quality,
+                    SourceTitle = message.OriginalPath,
+                    SeriesId = message.EpisodeFile.SeriesId,
+                    EpisodeId = episode.Id,
+                };
+
+                history.Data.Add("SourcePath", sourcePath);
+                history.Data.Add("SourceRelativePath", sourceRelativePath);
+                history.Data.Add("Path", path);
+                history.Data.Add("RelativePath", relativePath);
+
+                _historyRepository.Insert(history);
+            }
+        }
+
        public void Handle(SeriesDeletedEvent message)
        {
            _historyRepository.DeleteForSeries(message.Series.Id);
--- a/src/NzbDrone.Core/IndexerSearch/Definitions/SearchCriteriaBase.cs
+++ b/src/NzbDrone.Core/IndexerSearch/Definitions/SearchCriteriaBase.cs
@@ -19,7 +19,7 @@ namespace NzbDrone.Core.IndexerSearch.Definitions
        public virtual bool MonitoredEpisodesOnly { get; set; }
        public virtual bool UserInvokedSearch { get; set; }

-        public List<string> QueryTitles => SceneTitles.Select(GetQueryTitle).ToList();
+        public List<string> QueryTitles => SceneTitles.Select(GetQueryTitle).Distinct().ToList();

        public static string GetQueryTitle(string title)
        {
@@ -37,4 +37,4 @@ namespace NzbDrone.Core.IndexerSearch.Definitions
            return cleanTitle.Trim('+', ' ');
        }
    }
-}
+}
--- a/src/NzbDrone.Core/IndexerSearch/NzbSearchService.cs
+++ b/src/NzbDrone.Core/IndexerSearch/NzbSearchService.cs
@@ -237,9 +237,12 @@ namespace NzbDrone.Core.IndexerSearch
                                                           episodes.Select(e => e.SeasonNumber).Distinct().ToList(),
                                                           episodes.Select(e => e.SceneSeasonNumber ?? e.SeasonNumber).Distinct().ToList());

-            spec.Episodes = episodes;
+            if (!spec.SceneTitles.Contains(series.Title))
+            {
+                spec.SceneTitles.Add(series.Title);
+            }

-            spec.SceneTitles.Add(series.Title);
+            spec.Episodes = episodes;
            spec.UserInvokedSearch = userInvokedSearch;

            return spec;
--- a/src/NzbDrone.Core/Indexers/Newznab/Newznab.cs
+++ b/src/NzbDrone.Core/Indexers/Newznab/Newznab.cs
@@ -102,7 +102,7 @@ namespace NzbDrone.Core.Indexers.Newznab
        protected override void Test(List<ValidationFailure> failures)
        {
            base.Test(failures);
-
+            if (failures.Any()) return;
            failures.AddIfNotNull(TestCapabilities());
        }

--- a/src/NzbDrone.Core/Indexers/Newznab/NewznabCapabilitiesProvider.cs
+++ b/src/NzbDrone.Core/Indexers/Newznab/NewznabCapabilitiesProvider.cs
@@ -68,14 +68,14 @@ namespace NzbDrone.Core.Indexers.Newznab
            }
            catch (XmlException ex)
            {
-                _logger.Debug(ex, "Failed to parse newznab api capabilities for {0}.", indexerSettings.BaseUrl);
+                _logger.Debug(ex, "Failed to parse newznab api capabilities for {0}", indexerSettings.BaseUrl);

                ex.WithData(response);
                throw;
            }
            catch (Exception ex)
            {
-                _logger.Error(ex, "Failed to determine newznab api capabilities for {0}, using the defaults instead till Sonarr restarts.", indexerSettings.BaseUrl);
+                _logger.Error(ex, "Failed to determine newznab api capabilities for {0}, using the defaults instead till Sonarr restarts", indexerSettings.BaseUrl);
            }

            return capabilities;
@@ -85,7 +85,19 @@ namespace NzbDrone.Core.Indexers.Newznab
        {
            var capabilities = new NewznabCapabilities();

-            var xmlRoot = XDocument.Parse(response.Content).Element("caps");
+            var xDoc = XDocument.Parse(response.Content);
+
+            if (xDoc == null)
+            {
+                throw new XmlException("Invalid XML");
+            }
+
+            var xmlRoot = xDoc.Element("caps");
+
+            if (xmlRoot == null)
+            {
+                throw new XmlException("Unexpected XML");
+            }

            var xmlLimits = xmlRoot.Element("limits");
            if (xmlLimits != null)
--- a/src/NzbDrone.Core/Indexers/Torznab/Torznab.cs
+++ b/src/NzbDrone.Core/Indexers/Torznab/Torznab.cs
@@ -91,7 +91,7 @@ namespace NzbDrone.Core.Indexers.Torznab
        protected override void Test(List<ValidationFailure> failures)
        {
            base.Test(failures);
-
+            if (failures.Any()) return;
            failures.AddIfNotNull(TestCapabilities());
        }

--- a/src/NzbDrone.Core/MediaFiles/DiskScanService.cs
+++ b/src/NzbDrone.Core/MediaFiles/DiskScanService.cs
@@ -24,7 +24,7 @@ namespace NzbDrone.Core.MediaFiles
        void Scan(Series series);
        string[] GetVideoFiles(string path, bool allDirectories = true);
        string[] GetNonVideoFiles(string path, bool allDirectories = true);
-        List<string> FilterFiles(Series series, IEnumerable<string> files);
+        List<string> FilterFiles(string basePath, IEnumerable<string> files);
    }

    public class DiskScanService :
@@ -60,8 +60,8 @@ namespace NzbDrone.Core.MediaFiles
            _logger = logger;
        }

-        private static readonly Regex ExcludedSubFoldersRegex = new Regex(@"(?:\\|\/|^)(extras|@eadir|extrafanart|plex\sversions|\..+)(?:\\|\/)", RegexOptions.Compiled | RegexOptions.IgnoreCase);
-        private static readonly Regex ExcludedFilesRegex = new Regex(@"^\._|Thumbs\.db", RegexOptions.Compiled | RegexOptions.IgnoreCase);
+        private static readonly Regex ExcludedSubFoldersRegex = new Regex(@"(?:\\|\/|^)(?:extras|@eadir|extrafanart|plex versions|\.[^\\/]+)(?:\\|\/|$)", RegexOptions.Compiled | RegexOptions.IgnoreCase);
+        private static readonly Regex ExcludedFilesRegex = new Regex(@"^\._|^Thumbs\.db$", RegexOptions.Compiled | RegexOptions.IgnoreCase);

        public void Scan(Series series)
        {
@@ -101,7 +101,7 @@ namespace NzbDrone.Core.MediaFiles
            }

            var videoFilesStopwatch = Stopwatch.StartNew();
-            var mediaFileList = FilterFiles(series, GetVideoFiles(series.Path)).ToList();
+            var mediaFileList = FilterFiles(series.Path, GetVideoFiles(series.Path)).ToList();
            videoFilesStopwatch.Stop();
            _logger.Trace("Finished getting episode files for: {0} [{1}]", series, videoFilesStopwatch.Elapsed);

@@ -158,9 +158,9 @@ namespace NzbDrone.Core.MediaFiles
            return mediaFileList.ToArray();
        }

-        public List<string> FilterFiles(Series series, IEnumerable<string> files)
+        public List<string> FilterFiles(string basePath, IEnumerable<string> files)
        {
-            return files.Where(file => !ExcludedSubFoldersRegex.IsMatch(series.Path.GetRelativePath(file)))
+            return files.Where(file => !ExcludedSubFoldersRegex.IsMatch(basePath.GetRelativePath(file)))
                        .Where(file => !ExcludedFilesRegex.IsMatch(Path.GetFileName(file)))
                        .ToList();
        }
--- a/src/NzbDrone.Core/MediaFiles/DownloadedEpisodesImportService.cs
+++ b/src/NzbDrone.Core/MediaFiles/DownloadedEpisodesImportService.cs
@@ -164,7 +164,7 @@ namespace NzbDrone.Core.MediaFiles
                _logger.Debug("{0} folder quality: {1}", cleanedUpName, folderInfo.Quality);
            }

-            var videoFiles = _diskScanService.GetVideoFiles(directoryInfo.FullName);
+            var videoFiles = _diskScanService.FilterFiles(directoryInfo.FullName, _diskScanService.GetVideoFiles(directoryInfo.FullName));

            if (downloadClientItem == null)
            {
@@ -183,7 +183,12 @@ namespace NzbDrone.Core.MediaFiles
            var decisions = _importDecisionMaker.GetImportDecisions(videoFiles.ToList(), series, downloadClientItem, folderInfo, true);
            var importResults = _importApprovedEpisodes.Import(decisions, true, downloadClientItem, importMode);

-            if ((downloadClientItem == null || downloadClientItem.CanMoveFiles) &&
+            if (importMode == ImportMode.Auto)
+            {
+                importMode = (downloadClientItem == null || downloadClientItem.CanMoveFiles) ? ImportMode.Move : ImportMode.Copy;
+            }
+
+            if (importMode == ImportMode.Move &&
                importResults.Any(i => i.Result == ImportResultType.Imported) &&
                ShouldDeleteFolder(directoryInfo, series))
            {
--- a/src/NzbDrone.Core/MediaFiles/EpisodeFile.cs
+++ b/src/NzbDrone.Core/MediaFiles/EpisodeFile.cs
@@ -5,6 +5,7 @@ using NzbDrone.Core.Datastore;
 using NzbDrone.Core.Qualities;
 using NzbDrone.Core.Tv;
 using NzbDrone.Core.MediaFiles.MediaInfo;
+using NzbDrone.Common.Extensions;

 namespace NzbDrone.Core.MediaFiles
 {
@@ -27,5 +28,20 @@ namespace NzbDrone.Core.MediaFiles
        {
            return string.Format("[{0}] {1}", Id, RelativePath);
        }
+
+        public string GetSceneOrFileName()
+        {
+            if (SceneName.IsNotNullOrWhiteSpace())
+            {
+                return SceneName;
+            }
+
+            if (RelativePath.IsNotNullOrWhiteSpace())
+            {
+                return System.IO.Path.GetFileName(RelativePath);
+            }
+
+            return string.Empty;
+        }
    }
-}
+}
--- a/src/NzbDrone.Core/MediaFiles/EpisodeImport/Manual/ManualImportService.cs
+++ b/src/NzbDrone.Core/MediaFiles/EpisodeImport/Manual/ManualImportService.cs
@@ -111,7 +111,7 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport.Manual

            if (series == null)
            {
-                var files = _diskScanService.GetVideoFiles(folder);
+                var files = _diskScanService.FilterFiles(folder, _diskScanService.GetVideoFiles(folder));

                return files.Select(file => ProcessFile(file, downloadId, folder)).Where(i => i != null).ToList();
            }
--- a/src/NzbDrone.Core/MediaFiles/Events/EpisodeFileRenamedEvent.cs
+++ b/src/NzbDrone.Core/MediaFiles/Events/EpisodeFileRenamedEvent.cs
@@ -0,0 +1,19 @@
+using NzbDrone.Common.Messaging;
+using NzbDrone.Core.Tv;
+
+namespace NzbDrone.Core.MediaFiles.Events
+{
+    public class EpisodeFileRenamedEvent : IEvent
+    {
+        public Series Series { get; private set; }
+        public EpisodeFile EpisodeFile { get; private set; }
+        public string OriginalPath { get; private set; }
+
+        public EpisodeFileRenamedEvent(Series series, EpisodeFile episodeFile, string originalPath)
+        {
+            Series = series;
+            EpisodeFile = episodeFile;
+            OriginalPath = originalPath;
+        }
+    }
+}
--- a/src/NzbDrone.Core/MediaFiles/MediaInfo/MediaInfoFormatter.cs
+++ b/src/NzbDrone.Core/MediaFiles/MediaInfo/MediaInfoFormatter.cs
@@ -3,8 +3,10 @@ using System.Globalization;
 using System.IO;
 using System.Linq;
 using NLog;
+using NLog.Fluent;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Common.Instrumentation;
+using NzbDrone.Common.Instrumentation.Extensions;

 namespace NzbDrone.Core.MediaFiles.MediaInfo
 {
@@ -40,55 +42,282 @@ namespace NzbDrone.Core.MediaFiles.MediaInfo
                                        .Sum(s => decimal.Parse(s, CultureInfo.InvariantCulture));
        }

-        public static string FormatAudioCodec(MediaInfoModel mediaInfo)
+        public static string FormatAudioCodec(MediaInfoModel mediaInfo, string sceneName)
        {
-            var audioFormat = mediaInfo.AudioFormat;
+            if (mediaInfo.AudioCodecID == null)
+            {
+                return FormatAudioCodecLegacy(mediaInfo, sceneName);
+            }

-            if (audioFormat == "AC-3")
+            var audioFormat = mediaInfo.AudioFormat;
+            var audioCodecID = mediaInfo.AudioCodecID ?? string.Empty;
+            var audioProfile = mediaInfo.AudioProfile ?? string.Empty;
+            var audioCodecLibrary = mediaInfo.AudioCodecLibrary ?? string.Empty;
+
+            if (audioFormat.IsNullOrWhiteSpace())
+            {
+                return string.Empty;
+            }
+
+            if (audioFormat.EqualsIgnoreCase("AC-3"))
            {
                return "AC3";
            }

-            if (audioFormat == "E-AC-3")
+            if (audioFormat.EqualsIgnoreCase("E-AC-3"))
            {
                return "EAC3";
            }

-            if (audioFormat == "AAC")
+            if (audioFormat.EqualsIgnoreCase("AAC"))
            {
+                if (audioCodecID == "A_AAC/MPEG4/LC/SBR")
+                {
+                    return "HE-AAC";
+                }
+
                return "AAC";
            }

-            if (audioFormat == "MPEG Audio")
-            {
-                return mediaInfo.AudioProfile == "Layer 3" ? "MP3" : audioFormat;
-            }
-
-            if (audioFormat == "DTS")
+            if (audioFormat.EqualsIgnoreCase("DTS"))
            {
                return "DTS";
            }

-            Logger.Error("Unknown audio format: {0}", audioFormat);
+            if (audioFormat.EqualsIgnoreCase("FLAC"))
+            {
+                return "FLAC";
+            }
+
+            if (audioFormat.Trim().EqualsIgnoreCase("mp3"))
+            {
+                return "MP3";
+            }
+
+            if (audioFormat.EqualsIgnoreCase("MPEG Audio"))
+            {
+                if (mediaInfo.AudioCodecID == "55" || mediaInfo.AudioCodecID == "A_MPEG/L3" || mediaInfo.AudioProfile == "Layer 3")
+                {
+                    return "MP3";
+                }
+
+                if (mediaInfo.AudioCodecID == "A_MPEG/L2" || mediaInfo.AudioProfile == "Layer 2")
+                {
+                    return "MP2";
+                }
+            }
+
+            if (audioFormat.EqualsIgnoreCase("Opus"))
+            {
+                return "Opus";
+            }
+
+            if (audioFormat.EqualsIgnoreCase("PCM"))
+            {
+                return "PCM";
+            }
+
+            if (audioFormat.EqualsIgnoreCase("TrueHD"))
+            {
+                return "TrueHD";
+            }
+
+            if (audioFormat.EqualsIgnoreCase("Vorbis"))
+            {
+                return "Vorbis";
+            }
+
+            if (audioFormat == "WMA")
+            {
+                return "WMA";
+            }
+
+            Logger.Debug()
+                  .Message("Unknown audio format: '{0}' in '{1}'.", string.Join(", ", audioFormat, audioCodecID, audioProfile, audioCodecLibrary), sceneName)
+                  .WriteSentryWarn("UnknownAudioFormat", mediaInfo.ContainerFormat, audioFormat, audioCodecID)
+                  .Write();
+
+            return audioFormat;
+        }
+
+        public static string FormatAudioCodecLegacy(MediaInfoModel mediaInfo, string sceneName)
+        {
+            var audioFormat = mediaInfo.AudioFormat;
+
+            if (audioFormat.IsNullOrWhiteSpace())
+            {
+                return audioFormat;
+            }
+
+            if (audioFormat.EqualsIgnoreCase("AC-3"))
+            {
+                return "AC3";
+            }
+
+            if (audioFormat.EqualsIgnoreCase("E-AC-3"))
+            {
+                return "EAC3";
+            }
+
+            if (audioFormat.EqualsIgnoreCase("AAC"))
+            {
+                return "AAC";
+            }
+
+            if (audioFormat.EqualsIgnoreCase("MPEG Audio") && mediaInfo.AudioProfile == "Layer 3")
+            {
+                return "MP3";
+            }
+
+            if (audioFormat.EqualsIgnoreCase("DTS"))
+            {
+                return "DTS";
+            }
+
+            if (audioFormat.EqualsIgnoreCase("TrueHD"))
+            {
+                return "TrueHD";
+            }
+
+            if (audioFormat.EqualsIgnoreCase("FLAC"))
+            {
+                return "FLAC";
+            }
+
+            if (audioFormat.EqualsIgnoreCase("Vorbis"))
+            {
+                return "Vorbis";
+            }
+
+            if (audioFormat.EqualsIgnoreCase("Opus"))
+            {
+                return "Opus";
+            }
+
            return audioFormat;
        }

        public static string FormatVideoCodec(MediaInfoModel mediaInfo, string sceneName)
+        {
+            if (mediaInfo.VideoFormat == null)
+            {
+                return FormatVideoCodecLegacy(mediaInfo, sceneName);
+            }
+
+            var videoFormat = mediaInfo.VideoFormat;
+            var videoCodecID = mediaInfo.VideoCodecID ?? string.Empty;
+            var videoProfile = mediaInfo.VideoProfile ?? string.Empty;
+            var videoCodecLibrary = mediaInfo.VideoCodecLibrary ?? string.Empty;
+
+            if (videoFormat.IsNullOrWhiteSpace())
+            {
+                return videoFormat;
+            }
+
+            if (videoFormat == "AVC" || videoFormat == "V.MPEG4/ISO/AVC")
+            {
+                if (videoCodecLibrary.StartsWithIgnoreCase("x264"))
+                {
+                    return "x264";
+                }
+
+                return GetSceneNameMatch(sceneName, "AVC", "h264");
+            }
+
+            if (videoFormat.EqualsIgnoreCase("DivX") || videoFormat.EqualsIgnoreCase("div3"))
+            {
+                return "DivX";
+            }
+
+            if (videoFormat == "HEVC")
+            {
+                if (videoCodecLibrary.StartsWithIgnoreCase("x265"))
+                {
+                    return "x265";
+                }
+
+                return GetSceneNameMatch(sceneName, "HEVC", "h265");
+            }
+
+            if (videoFormat == "MPEG Video")
+            {
+                if (videoCodecID == "2" || videoCodecID == "V_MPEG2")
+                {
+                    return "MPEG2";
+                }
+
+                if (videoCodecID.IsNullOrWhiteSpace())
+                {
+                    return "MPEG";
+                }
+            }
+
+            if (videoFormat == "MPEG-2 Video")
+            {
+                return "MPEG2";
+            }
+
+            if (videoFormat == "MPEG-4 Visual")
+            {
+                if (videoCodecID.ContainsIgnoreCase("XVID"))
+                {
+                    return "XviD";
+                }
+
+                if (videoCodecID.ContainsIgnoreCase("DIV3") ||
+                    videoCodecID.ContainsIgnoreCase("DIVX") ||
+                    videoCodecID.ContainsIgnoreCase("DX50"))
+                {
+                    return "DivX";
+                }
+            }
+
+            if (videoFormat == "VC-1")
+            {
+                return "VC1";
+            }
+
+            if (videoFormat.EqualsIgnoreCase("VP6") || videoFormat.EqualsIgnoreCase("VP7") ||
+                videoFormat.EqualsIgnoreCase("VP8") || videoFormat.EqualsIgnoreCase("VP9"))
+            {
+                return videoFormat.ToUpperInvariant();
+            }
+
+            if (videoFormat == "WMV2")
+            {
+                return "WMV";
+            }
+
+            if (videoFormat.EqualsIgnoreCase("XviD"))
+            {
+                return "XviD";
+            }
+
+            Logger.Debug()
+                  .Message("Unknown video format: '{0}' in '{1}'.", string.Join(", ", videoFormat, videoCodecID, videoProfile, videoCodecLibrary), sceneName)
+                  .WriteSentryWarn("UnknownVideoFormat", mediaInfo.ContainerFormat, videoFormat, videoCodecID)
+                  .Write();
+
+            return videoFormat;
+        }
+
+        public static string FormatVideoCodecLegacy(MediaInfoModel mediaInfo, string sceneName)
        {
            var videoCodec = mediaInfo.VideoCodec;

+            if (videoCodec.IsNullOrWhiteSpace())
+            {
+                return videoCodec;
+            }
+
            if (videoCodec == "AVC")
            {
-                return sceneName.IsNotNullOrWhiteSpace() && Path.GetFileNameWithoutExtension(sceneName).Contains("h264")
-                    ? "h264"
-                    : "x264";
+                return GetSceneNameMatch(sceneName, "AVC", "h264", "x264");
            }

-            if (videoCodec == "V_MPEGH/ISO/HEVC")
+            if (videoCodec == "V_MPEGH/ISO/HEVC" || videoCodec == "HEVC")
            {
-                return sceneName.IsNotNullOrWhiteSpace() && Path.GetFileNameWithoutExtension(sceneName).Contains("h265")
-                    ? "h265"
-                    : "x265";
+                return GetSceneNameMatch(sceneName, "HEVC", "h265", "x265");
            }

            if (videoCodec == "MPEG-2 Video")
@@ -96,8 +325,43 @@ namespace NzbDrone.Core.MediaFiles.MediaInfo
                return "MPEG2";
            }

-            Logger.Error("Unknown video codec: {0}", videoCodec);
+            if (videoCodec == "MPEG-4 Visual")
+            {
+                return GetSceneNameMatch(sceneName, "DivX", "XviD");
+            }
+
+            if (videoCodec.StartsWithIgnoreCase("XviD"))
+            {
+                return "XviD";
+            }
+
+            if (videoCodec.StartsWithIgnoreCase("DivX"))
+            {
+                return "DivX";
+            }
+
+            if (videoCodec.EqualsIgnoreCase("VC-1"))
+            {
+                return "VC1";
+            }
+
            return videoCodec;
        }
+
+        private static string GetSceneNameMatch(string sceneName, params string[] tokens)
+        {
+            sceneName = sceneName.IsNotNullOrWhiteSpace() ? Path.GetFileNameWithoutExtension(sceneName) : string.Empty;
+
+            foreach (var token in tokens)
+            {
+                if (sceneName.ContainsIgnoreCase(token))
+                {
+                    return token;
+                }
+            }
+
+            // Last token is the default.
+            return tokens.Last();
+        }
    }
 }
--- a/src/NzbDrone.Core/MediaFiles/MediaInfo/MediaInfoModel.cs
+++ b/src/NzbDrone.Core/MediaFiles/MediaInfo/MediaInfoModel.cs
@@ -9,12 +9,20 @@ namespace NzbDrone.Core.MediaFiles.MediaInfo
 {
    public class MediaInfoModel : IEmbeddedDocument
    {
+        public string ContainerFormat { get; set; }
+        // Deprecated according to MediaInfo
        public string VideoCodec { get; set; }
+        public string VideoFormat { get; set; }
+        public string VideoCodecID { get; set; }
+        public string VideoProfile { get; set; }
+        public string VideoCodecLibrary { get; set; }
        public int VideoBitrate { get; set; }
        public int VideoBitDepth { get; set; }
        public int Width { get; set; }
        public int Height { get; set; }
        public string AudioFormat { get; set; }
+        public string AudioCodecID { get; set; }
+        public string AudioCodecLibrary { get; set; }
        public int AudioBitrate { get; set; }
        public TimeSpan RunTime { get; set; }
        public int AudioStreamCount { get; set; }
--- a/src/NzbDrone.Core/MediaFiles/MediaInfo/UpdateMediaInfoService.cs
+++ b/src/NzbDrone.Core/MediaFiles/MediaInfo/UpdateMediaInfoService.cs
@@ -18,7 +18,8 @@ namespace NzbDrone.Core.MediaFiles.MediaInfo
        private readonly IConfigService _configService;
        private readonly Logger _logger;

-        private const int CURRENT_MEDIA_INFO_SCHEMA_REVISION = 3;
+        public const int MINIMUM_MEDIA_INFO_SCHEMA_REVISION = 3;
+        public const int CURRENT_MEDIA_INFO_SCHEMA_REVISION = 4;

        public UpdateMediaInfoService(IDiskProvider diskProvider,
                                IMediaFileService mediaFileService,
@@ -65,7 +66,7 @@ namespace NzbDrone.Core.MediaFiles.MediaInfo
            }

            var allMediaFiles = _mediaFileService.GetFilesBySeries(message.Series.Id);
-            var filteredMediaFiles = allMediaFiles.Where(c => c.MediaInfo == null || c.MediaInfo.SchemaRevision < CURRENT_MEDIA_INFO_SCHEMA_REVISION).ToList();
+            var filteredMediaFiles = allMediaFiles.Where(c => c.MediaInfo == null || c.MediaInfo.SchemaRevision < MINIMUM_MEDIA_INFO_SCHEMA_REVISION).ToList();

            UpdateMediaInfo(message.Series, filteredMediaFiles);
        }
--- a/src/NzbDrone.Core/MediaFiles/MediaInfo/VideoFileInfoReader.cs
+++ b/src/NzbDrone.Core/MediaFiles/MediaInfo/VideoFileInfoReader.cs
@@ -104,54 +104,44 @@ namespace NzbDrone.Core.MediaFiles.MediaInfo
                    int.TryParse(mediaInfo.Get(StreamKind.Audio, 0, "PlayTime"), out audioRuntime);
                    int.TryParse(mediaInfo.Get(StreamKind.General, 0, "PlayTime"), out generalRuntime);

-                    string aBitRate = mediaInfo.Get(StreamKind.Audio, 0, "BitRate");
-                    int aBindex = aBitRate.IndexOf(" /", StringComparison.InvariantCultureIgnoreCase);
-                    if (aBindex > 0)
-                    {
-                        aBitRate = aBitRate.Remove(aBindex);
-                    }
+                    string aBitRate = mediaInfo.Get(StreamKind.Audio, 0, "BitRate").Split(new string[] { " /" }, StringSplitOptions.None)[0].Trim();

                    int.TryParse(aBitRate, out audioBitRate);
                    int.TryParse(mediaInfo.Get(StreamKind.Audio, 0, "StreamCount"), out streamCount);


-                    string audioChannelsStr = mediaInfo.Get(StreamKind.Audio, 0, "Channel(s)");
-                    int aCindex = audioChannelsStr.IndexOf(" /", StringComparison.InvariantCultureIgnoreCase);
-
-                    if (aCindex > 0)
-                    {
-                        audioChannelsStr = audioChannelsStr.Remove(aCindex);
-                    }
+                    string audioChannelsStr = mediaInfo.Get(StreamKind.Audio, 0, "Channel(s)").Split(new string[] { " /" }, StringSplitOptions.None)[0].Trim();

                    var audioChannelPositions = mediaInfo.Get(StreamKind.Audio, 0, "ChannelPositions/String2");
                    var audioChannelPositionsText = mediaInfo.Get(StreamKind.Audio, 0, "ChannelPositions");

                    string audioLanguages = mediaInfo.Get(StreamKind.General, 0, "Audio_Language_List");
-                    string audioProfile = mediaInfo.Get(StreamKind.Audio, 0, "Format_Profile");

-                    int aPindex = audioProfile.IndexOf(" /", StringComparison.InvariantCultureIgnoreCase);
-
-                    if (aPindex > 0)
-                    {
-                        audioProfile = audioProfile.Remove(aPindex);
-                    }
+                    string videoProfile = mediaInfo.Get(StreamKind.Video, 0, "Format_Profile").Split(new string[] { " /" }, StringSplitOptions.None)[0].Trim();
+                    string audioProfile = mediaInfo.Get(StreamKind.Audio, 0, "Format_Profile").Split(new string[] { " /" }, StringSplitOptions.None)[0].Trim();

                    int.TryParse(audioChannelsStr, out audioChannels);
                    var mediaInfoModel = new MediaInfoModel
                    {
-                        VideoCodec = mediaInfo.Get(StreamKind.Video, 0, "Codec/String"),
+                        ContainerFormat = mediaInfo.Get(StreamKind.General, 0, "Format"),
+                        VideoFormat = mediaInfo.Get(StreamKind.Video, 0, "Format"),
+                        VideoCodecID = mediaInfo.Get(StreamKind.Video, 0, "CodecID"),
+                        VideoProfile = videoProfile,
+                        VideoCodecLibrary = mediaInfo.Get(StreamKind.Video, 0, "Encoded_Library"),
                        VideoBitrate = videoBitRate,
                        VideoBitDepth = videoBitDepth,
                        Height = height,
                        Width = width,
                        AudioFormat = mediaInfo.Get(StreamKind.Audio, 0, "Format"),
+                        AudioCodecID = mediaInfo.Get(StreamKind.Audio, 0, "CodecID"),
+                        AudioProfile = audioProfile,
+                        AudioCodecLibrary = mediaInfo.Get(StreamKind.Audio, 0, "Encoded_Library"),
                        AudioBitrate = audioBitRate,
                        RunTime = GetBestRuntime(audioRuntime, videoRuntime, generalRuntime),
                        AudioStreamCount = streamCount,
                        AudioChannels = audioChannels,
                        AudioChannelPositions = audioChannelPositions,
                        AudioChannelPositionsText = audioChannelPositionsText,
-                        AudioProfile = audioProfile.Trim(),
                        VideoFps = videoFrameRate,
                        AudioLanguages = audioLanguages,
                        Subtitles = subtitles,
--- a/src/NzbDrone.Core/MediaFiles/RecycleBinProvider.cs
+++ b/src/NzbDrone.Core/MediaFiles/RecycleBinProvider.cs
@@ -62,11 +62,7 @@ namespace NzbDrone.Core.MediaFiles
                _diskProvider.FolderSetLastWriteTime(destination, DateTime.UtcNow);
                foreach (var file in _diskProvider.GetFiles(destination, SearchOption.AllDirectories))
                {
-                    if (OsInfo.IsWindows)
-                    {
-                        //TODO: Better fix than this for non-Windows?
-                        _diskProvider.FileSetLastWriteTime(file, DateTime.UtcNow);
-                    }
+                    SetLastWriteTime(file, DateTime.UtcNow);
                }

                _logger.Debug("Folder has been moved to the recycling bin: {0}", destination);
@@ -123,12 +119,8 @@ namespace NzbDrone.Core.MediaFiles
                    _logger.Error(e, "Unable to move '{0}' to the recycling bin: '{1}'", path, destination);
                    throw;
                }
-                
-                //TODO: Better fix than this for non-Windows?
-                if (OsInfo.IsWindows)
-                {
-                    _diskProvider.FileSetLastWriteTime(destination, DateTime.UtcNow);
-                }
+
+                SetLastWriteTime(destination, DateTime.UtcNow);

                _logger.Debug("File has been moved to the recycling bin: {0}", destination);
            }
@@ -192,6 +184,18 @@ namespace NzbDrone.Core.MediaFiles
            _logger.Debug("Recycling Bin has been cleaned up.");
        }

+        private void SetLastWriteTime(string file, DateTime dateTime)
+        {
+            // Swallow any IOException that may be thrown due to "Invalid parameter"
+            try
+            {
+                _diskProvider.FileSetLastWriteTime(file, dateTime);
+            }
+            catch (IOException)
+            {
+            }
+        }
+
        public void Execute(CleanUpRecycleBinCommand message)
        {
            Cleanup();
--- a/src/NzbDrone.Core/MediaFiles/RenameEpisodeFileService.cs
+++ b/src/NzbDrone.Core/MediaFiles/RenameEpisodeFileService.cs
@@ -125,6 +125,8 @@ namespace NzbDrone.Core.MediaFiles
                    renamed.Add(episodeFile);

                    _logger.Debug("Renamed episode file: {0}", episodeFile);
+
+                    _eventAggregator.PublishEvent(new EpisodeFileRenamedEvent(series, episodeFile, episodeFilePath));
                }
                catch (SameFilenameException ex)
                {
--- a/src/NzbDrone.Core/Notifications/Slack/Payloads/SlackPayload.cs
+++ b/src/NzbDrone.Core/Notifications/Slack/Payloads/SlackPayload.cs
@@ -12,6 +12,9 @@ namespace NzbDrone.Core.Notifications.Slack.Payloads
        [JsonProperty("icon_emoji")]
        public string IconEmoji { get; set; }

+        [JsonProperty("icon_url")]
+        public string IconUrl { get; set; }
+
        public List<Attachment> Attachments { get; set; }
    }
 }
--- a/src/NzbDrone.Core/Notifications/Slack/Slack.cs
+++ b/src/NzbDrone.Core/Notifications/Slack/Slack.cs
@@ -3,6 +3,8 @@ using System.Collections.Generic;
 using FluentValidation.Results;
 using NLog;
 using NzbDrone.Common.Extensions;
+using NzbDrone.Common.Http;
+using NzbDrone.Common.Serializer;
 using NzbDrone.Core.Notifications.Slack.Payloads;
 using NzbDrone.Core.Rest;
 using NzbDrone.Core.Tv;
@@ -14,10 +16,12 @@ namespace NzbDrone.Core.Notifications.Slack
 {
    public class Slack : NotificationBase<SlackSettings>
    {
+        private readonly ISlackProxy _proxy;
        private readonly Logger _logger;

-        public Slack(Logger logger)
+        public Slack(ISlackProxy proxy, Logger logger)
        {
+            _proxy = proxy;
            _logger = logger;
        }

@@ -26,65 +30,51 @@ namespace NzbDrone.Core.Notifications.Slack

        public override void OnGrab(GrabMessage message)
        {
-            var payload = new SlackPayload
-            {
-                IconEmoji = Settings.Icon,
-                Username = Settings.Username,
-                Text = $"Grabbed: {message.Message}",
-                Attachments = new List<Attachment>
-                {
-                    new Attachment
-                    {
-                        Fallback = message.Message,
-                        Title = message.Series.Title,
-                        Text = message.Message,
-                        Color = "warning"
-                    }
-                }
-            };
+            var attachments = new List<Attachment>
+                              {
+                                  new Attachment
+                                  {
+                                      Fallback = message.Message,
+                                      Title = message.Series.Title,
+                                      Text = message.Message,
+                                      Color = "warning"
+                                  }
+                              };
+            var payload = CreatePayload($"Grabbed: {message.Message}", attachments);

-            NotifySlack(payload);
+            _proxy.SendPayload(payload, Settings);
        }

        public override void OnDownload(DownloadMessage message)
        {
-            var payload = new SlackPayload
-            {
-                IconEmoji = Settings.Icon,
-                Username = Settings.Username,
-                Text = $"Imported: {message.Message}",
-                Attachments = new List<Attachment>
-                {
-                    new Attachment
-                    {
-                        Fallback = message.Message,
-                        Title = message.Series.Title,
-                        Text = message.Message,
-                        Color = "good"
-                    }
-                }
-            };
+            var attachments = new List<Attachment>
+                              {
+                                  new Attachment
+                                  {
+                                      Fallback = message.Message,
+                                      Title = message.Series.Title,
+                                      Text = message.Message,
+                                      Color = "good"
+                                  }
+                              };
+            var payload = CreatePayload($"Imported: {message.Message}", attachments);

-            NotifySlack(payload);
+            _proxy.SendPayload(payload, Settings);
        }

        public override void OnRename(Series series)
        {
-            var payload = new SlackPayload
-            {
-                IconEmoji = Settings.Icon,
-                Username = Settings.Username,
-                Text = "Renamed",
-                Attachments = new List<Attachment>
-                {
-                    new Attachment
-                    {
-                        Title = series.Title,
-                    }
-                }
-            };
+            var attachments = new List<Attachment>
+                              {
+                                  new Attachment
+                                  {
+                                      Title = series.Title,
+                                  }
+                              };

-            NotifySlack(payload);
+            var payload = CreatePayload("Renamed", attachments);
+
+            _proxy.SendPayload(payload, Settings);
        }

        public override ValidationResult Test()
@@ -101,14 +91,9 @@ namespace NzbDrone.Core.Notifications.Slack
            try
            {
                var message = $"Test message from Sonarr posted at {DateTime.Now}";
-                var payload = new SlackPayload
-                {
-                    IconEmoji = Settings.Icon,
-                    Username = Settings.Username,
-                    Text = message
-                };
+                var payload = CreatePayload(message);

-                NotifySlack(payload);
+                _proxy.SendPayload(payload, Settings);

            }
            catch (SlackExeption ex)
@@ -119,24 +104,31 @@ namespace NzbDrone.Core.Notifications.Slack
            return null;
        }

-        private void NotifySlack(SlackPayload payload)
+        private SlackPayload CreatePayload(string message, List<Attachment> attachments = null)
        {
-            try
+            var icon = Settings.Icon;
+
+            var payload = new SlackPayload
            {
-                var client = RestClientFactory.BuildClient(Settings.WebHookUrl);
-                var request = new RestRequest(Method.POST)
+                Username = Settings.Username,
+                Text = message,
+                Attachments = attachments
+            };
+
+            if (icon.IsNotNullOrWhiteSpace())
+            {
+                // Set the correct icon based on the value
+                if (icon.StartsWith(":") && icon.EndsWith(":"))
                {
-                    RequestFormat = DataFormat.Json,
-                    JsonSerializer = new JsonNetSerializer()
-                };
-                request.AddBody(payload);
-                client.ExecuteAndValidate(request);
-            }
-            catch (RestException ex)
-            {
-                _logger.Error(ex, "Unable to post payload {0}", payload);
-                throw new SlackExeption("Unable to post payload", ex);
+                    payload.IconEmoji = icon;
+                }
+                else
+                {
+                    payload.IconUrl = icon;
+                }
            }
+
+            return payload;
        }
    }
 }
--- a/src/NzbDrone.Core/Notifications/Slack/SlackProxy.cs
+++ b/src/NzbDrone.Core/Notifications/Slack/SlackProxy.cs
@@ -0,0 +1,46 @@
+using NLog;
+using NzbDrone.Common.Http;
+using NzbDrone.Common.Serializer;
+using NzbDrone.Core.Notifications.Slack.Payloads;
+using NzbDrone.Core.Rest;
+
+namespace NzbDrone.Core.Notifications.Slack
+{
+    public interface ISlackProxy
+    {
+        void SendPayload(SlackPayload payload, SlackSettings settings);
+    }
+
+    public class SlackProxy : ISlackProxy
+    {
+        private readonly IHttpClient _httpClient;
+        private readonly Logger _logger;
+
+        public SlackProxy(IHttpClient httpClient, Logger logger)
+        {
+            _httpClient = httpClient;
+            _logger = logger;
+        }
+
+        public void SendPayload(SlackPayload payload, SlackSettings settings)
+        {
+            try
+            {
+                var request = new HttpRequestBuilder(settings.WebHookUrl)
+                    .Accept(HttpAccept.Json)
+                    .Build();
+
+                request.Method = HttpMethod.POST;
+                request.Headers.ContentType = "application/json";
+                request.SetContent(payload.ToJson());
+
+                _httpClient.Execute(request);
+            }
+            catch (RestException ex)
+            {
+                _logger.Error(ex, "Unable to post payload {0}", payload);
+                throw new SlackExeption("Unable to post payload", ex);
+            }
+        }
+    }
+}
--- a/src/NzbDrone.Core/Notifications/Slack/SlackSettings.cs
+++ b/src/NzbDrone.Core/Notifications/Slack/SlackSettings.cs
@@ -24,7 +24,7 @@ namespace NzbDrone.Core.Notifications.Slack
        [FieldDefinition(1, Label = "Username", HelpText = "Choose the username that this integration will post as", Type = FieldType.Textbox)]
        public string Username { get; set; }

-        [FieldDefinition(2, Label = "Icon", HelpText = "Change the icon that is used for messages from this integration", Type = FieldType.Textbox, HelpLink = "http://www.emoji-cheat-sheet.com/")]
+        [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; }

        public NzbDroneValidationResult Validate()
--- a/src/NzbDrone.Core/NzbDrone.Core.csproj
+++ b/src/NzbDrone.Core/NzbDrone.Core.csproj
@@ -124,6 +124,7 @@
    <Compile Include="Backup\Backup.cs" />
    <Compile Include="Backup\BackupCommand.cs" />
    <Compile Include="Backup\BackupService.cs" />
+    <Compile Include="Backup\MakeDatabaseBackup.cs" />
    <Compile Include="Blacklisting\Blacklist.cs" />
    <Compile Include="Blacklisting\BlacklistRepository.cs" />
    <Compile Include="Blacklisting\BlacklistService.cs" />
@@ -787,6 +788,7 @@
    <Compile Include="MediaFiles\EpisodeImport\Specifications\UnverifiedSceneNumberingSpecification.cs" />
    <Compile Include="MediaFiles\EpisodeImport\Specifications\UpgradeSpecification.cs" />
    <Compile Include="MediaFiles\Events\EpisodeFileAddedEvent.cs" />
+    <Compile Include="MediaFiles\Events\EpisodeFileRenamedEvent.cs" />
    <Compile Include="MediaFiles\Events\EpisodeFileDeletedEvent.cs" />
    <Compile Include="MediaFiles\Events\EpisodeFolderCreatedEvent.cs" />
    <Compile Include="MediaFiles\Events\EpisodeImportedEvent.cs" />
@@ -896,6 +898,7 @@
    <Compile Include="Notifications\Slack\Payloads\SlackPayload.cs" />
    <Compile Include="Notifications\Slack\Slack.cs" />
    <Compile Include="Notifications\Slack\SlackExeption.cs" />
+    <Compile Include="Notifications\Slack\SlackProxy.cs" />
    <Compile Include="Notifications\Slack\SlackSettings.cs" />
    <Compile Include="Notifications\Synology\SynologyException.cs" />
    <Compile Include="Notifications\Synology\SynologyIndexer.cs" />
--- a/src/NzbDrone.Core/Organizer/FileNameBuilder.cs
+++ b/src/NzbDrone.Core/Organizer/FileNameBuilder.cs
@@ -131,7 +131,7 @@ namespace NzbDrone.Core.Organizer
            AddEpisodeFileTokens(tokenHandlers, episodeFile);
            AddQualityTokens(tokenHandlers, series, episodeFile);
            AddMediaInfoTokens(tokenHandlers, episodeFile);
-            
+
            var fileName = ReplaceTokens(pattern, tokenHandlers, namingConfig).Trim();
            fileName = FileNameCleanupRegex.Replace(fileName, match => match.Captures[0].Value[0].ToString());
            fileName = TrimSeparatorsRegex.Replace(fileName, string.Empty);
@@ -454,8 +454,10 @@ namespace NzbDrone.Core.Organizer
        {
            if (episodeFile.MediaInfo == null) return;

-            var videoCodec =  MediaInfoFormatter.FormatVideoCodec(episodeFile.MediaInfo, episodeFile.SceneName);
-            var audioCodec =  MediaInfoFormatter.FormatAudioCodec(episodeFile.MediaInfo);
+            var sceneName = episodeFile.GetSceneOrFileName();
+
+            var videoCodec =  MediaInfoFormatter.FormatVideoCodec(episodeFile.MediaInfo, sceneName);
+            var audioCodec =  MediaInfoFormatter.FormatAudioCodec(episodeFile.MediaInfo, sceneName);
            var audioChannels = MediaInfoFormatter.FormatAudioChannels(episodeFile.MediaInfo);

            var mediaInfoAudioLanguages = GetLanguagesToken(episodeFile.MediaInfo.AudioLanguages);
--- a/src/NzbDrone.Host/Bootstrap.cs
+++ b/src/NzbDrone.Host/Bootstrap.cs
@@ -4,9 +4,11 @@ using System.Threading;
 using NLog;
 using NzbDrone.Common.Composition;
 using NzbDrone.Common.EnvironmentInfo;
+using NzbDrone.Common.Exceptions;
 using NzbDrone.Common.Instrumentation;
 using NzbDrone.Common.Processes;
 using NzbDrone.Common.Security;
+using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Datastore;
 using NzbDrone.Core.Instrumentation;

@@ -49,9 +51,13 @@ namespace NzbDrone.Host
                    SpinToExit(appMode);
                }
            }
-            catch (TerminateApplicationException e)
+            catch (InvalidConfigFileException ex)
            {
-                Logger.Info(e.Message);
+                throw new SonarrStartupException(ex);
+            }
+            catch (TerminateApplicationException ex)
+            {
+                Logger.Info(ex.Message);
                LogManager.Configuration = null;
            }
        }
--- a/src/NzbDrone.Integration.Test/ApiTests/ReleasePushFixture.cs
+++ b/src/NzbDrone.Integration.Test/ApiTests/ReleasePushFixture.cs
@@ -0,0 +1,31 @@
+using FluentAssertions;
+using NUnit.Framework;
+using NzbDrone.Api.Indexers;
+using System.Linq;
+using System.Net;
+using System.Collections.Generic;
+using System;
+using System.Globalization;
+
+namespace NzbDrone.Integration.Test.ApiTests
+{
+    [TestFixture]
+    public class ReleasePushFixture : IntegrationTest
+    {
+        [Test]
+        public void should_have_utc_date()
+        {
+            var body = new Dictionary<string, object>();
+            body.Add("guid", "sdfsdfsdf");
+            body.Add("title", "The.Series.S01E01");
+            body.Add("publishDate", DateTime.UtcNow.ToString("yyyy-MM-dd HH:mm:ssZ", CultureInfo.InvariantCulture));
+
+            var request = ReleasePush.BuildRequest();
+            request.AddBody(body);
+            var result = ReleasePush.Post<ReleaseResource>(request, HttpStatusCode.OK);
+
+            result.Should().NotBeNull();
+            result.AgeHours.Should().BeApproximately(0, 0.1);
+        }
+    }
+}
--- a/src/NzbDrone.Integration.Test/Client/ReleasePushClient.cs
+++ b/src/NzbDrone.Integration.Test/Client/ReleasePushClient.cs
@@ -0,0 +1,13 @@
+using NzbDrone.Api.Indexers;
+using RestSharp;
+
+namespace NzbDrone.Integration.Test.Client
+{
+    public class ReleasePushClient : ClientBase<ReleaseResource>
+    {
+        public ReleasePushClient(IRestClient restClient, string apiKey)
+            : base(restClient, apiKey, "release/push")
+        {
+        }
+    }
+}
--- a/src/NzbDrone.Integration.Test/IntegrationTestBase.cs
+++ b/src/NzbDrone.Integration.Test/IntegrationTestBase.cs
@@ -48,6 +48,7 @@ namespace NzbDrone.Integration.Test
        public NotificationClient Notifications;
        public ClientBase<ProfileResource> Profiles;
        public ReleaseClient Releases;
+        public ReleasePushClient ReleasePush;
        public ClientBase<RootFolderResource> RootFolders;
        public SeriesClient Series;
        public ClientBase<TagResource> Tags;
@@ -108,6 +109,7 @@ namespace NzbDrone.Integration.Test
            Notifications = new NotificationClient(RestClient, ApiKey);
            Profiles = new ClientBase<ProfileResource>(RestClient, ApiKey);
            Releases = new ReleaseClient(RestClient, ApiKey);
+            ReleasePush = new ReleasePushClient(RestClient, ApiKey);
            RootFolders = new ClientBase<RootFolderResource>(RestClient, ApiKey);
            Series = new SeriesClient(RestClient, ApiKey);
            Tags = new ClientBase<TagResource>(RestClient, ApiKey);
@@ -272,7 +274,7 @@ namespace NzbDrone.Integration.Test

                Commands.PostAndWait(new CommandResource { Name = "refreshseries", Body = new RefreshSeriesCommand(series.Id) });
                Commands.WaitAll();
-                
+
                result = Episodes.GetEpisodesInSeries(series.Id).Single(v => v.SeasonNumber == season && v.EpisodeNumber == episode);

                result.EpisodeFile.Should().NotBeNull();
--- a/src/NzbDrone.Integration.Test/NzbDrone.Integration.Test.csproj
+++ b/src/NzbDrone.Integration.Test/NzbDrone.Integration.Test.csproj
@@ -105,6 +105,7 @@
    <Compile Include="ApiTests\DownloadClientFixture.cs" />
    <Compile Include="ApiTests\EpisodeFileFixture.cs" />
    <Compile Include="ApiTests\FileSystemFixture.cs" />
+    <Compile Include="ApiTests\ReleasePushFixture.cs" />
    <Compile Include="ApiTests\SeriesLookupFixture.cs" />
    <Compile Include="ApiTests\WantedFixture.cs" />
    <Compile Include="Client\ClientBase.cs" />
@@ -113,6 +114,7 @@
    <Compile Include="Client\DownloadClientClient.cs" />
    <Compile Include="Client\NotificationClient.cs" />
    <Compile Include="Client\CommandClient.cs" />
+    <Compile Include="Client\ReleasePushClient.cs" />
    <Compile Include="Client\ReleaseClient.cs" />
    <Compile Include="Client\SeriesClient.cs" />
    <Compile Include="ApiTests\CommandFixture.cs" />
--- a/src/NzbDrone.SignalR/NzbDronePersistentConnection.cs
+++ b/src/NzbDrone.SignalR/NzbDronePersistentConnection.cs
@@ -1,5 +1,7 @@
-using Microsoft.AspNet.SignalR;
+using Microsoft.AspNet.SignalR;
 using Microsoft.AspNet.SignalR.Infrastructure;
+using NzbDrone.Common.Extensions;
+using NzbDrone.Core.Configuration;

 namespace NzbDrone.SignalR
 {
@@ -12,9 +14,28 @@ namespace NzbDrone.SignalR
    {
        private IPersistentConnectionContext Context => ((ConnectionManager)GlobalHost.ConnectionManager).GetConnection(GetType());

+        private static string API_KEY;
+
+        public NzbDronePersistentConnection(IConfigFileProvider configFileProvider)
+        {
+            API_KEY = configFileProvider.ApiKey;
+        }
+
        public void BroadcastMessage(SignalRMessage message)
        {
            Context.Connection.Broadcast(message);
        }
+
+        protected override bool AuthorizeRequest(IRequest request)
+        {
+            var apiKey = request.QueryString["apiKey"];
+
+            if (apiKey.IsNotNullOrWhiteSpace() && apiKey.Equals(API_KEY))
+            {
+                return true;
+            }
+
+            return false;
+        }
    }
 }
--- a/src/UI/Activity/History/Details/HistoryDetailsLayoutTemplate.hbs
+++ b/src/UI/Activity/History/Details/HistoryDetailsLayoutTemplate.hbs
@@ -8,6 +8,7 @@
                {{#if_eq eventType compare="downloadFailed"}}Download Failed{{/if_eq}}
                {{#if_eq eventType compare="downloadFolderImported"}}Episode Imported{{/if_eq}}
                {{#if_eq eventType compare="episodeFileDeleted"}}Episode File Deleted{{/if_eq}}
+                {{#if_eq eventType compare="episodeFileRenamed"}}Episode File Renamed{{/if_eq}}
            </h3>

        </div>
--- a/src/UI/Activity/History/Details/HistoryDetailsViewTemplate.hbs
+++ b/src/UI/Activity/History/Details/HistoryDetailsViewTemplate.hbs
@@ -100,4 +100,23 @@
    </dd>
    {{/with}}
 </dl>
-{{/if_eq}}
+{{/if_eq}}
+
+{{#if_eq eventType compare="episodeFileRenamed"}}
+<dl class="dl-horizontal">
+
+    <dt>Source Path:</dt>
+    <dd>{{sourceTitle}}</dd>
+
+    {{#with data}}
+    <dt>Source Relative Path:</dt>
+    <dd>{{sourceRelativePath}}</dd>
+
+    <dt>Path:</dt>
+    <dd>{{path}}</dd>
+
+    <dt>Relative Path:</dt>
+    <dd>{{relativePath}}</dd>
+    {{/with}}
+</dl>
+{{/if_eq}}
--- a/src/UI/Activity/History/HistoryCollection.js
+++ b/src/UI/Activity/History/HistoryCollection.js
@@ -46,6 +46,10 @@ var Collection = PageableCollection.extend({
        'deleted'  : [
            'eventType',
            '5'
+        ],
+        'renamed'  : [
+            'eventType',
+            '6'
        ]
    },

@@ -80,4 +84,4 @@ Collection = AsFilteredCollection.call(Collection);
 Collection = AsSortedCollection.call(Collection);
 Collection = AsPersistedStateCollection.call(Collection);

-module.exports = Collection;
+module.exports = Collection;
--- a/src/UI/Activity/History/HistoryLayout.js
+++ b/src/UI/Activity/History/HistoryLayout.js
@@ -129,6 +129,13 @@ module.exports = Marionette.Layout.extend({
                    tooltip  : 'Deleted',
                    icon     : 'icon-sonarr-deleted',
                    callback : this._setFilter
+                },
+                {
+                    key      : 'renamed',
+                    title    : '',
+                    tooltip  : 'Renamed',
+                    icon     : 'icon-sonarr-rename',
+                    callback : this._setFilter
                }
            ]
        };
--- a/src/UI/Cells/EventTypeCell.js
+++ b/src/UI/Cells/EventTypeCell.js
@@ -31,6 +31,10 @@ module.exports = NzbDroneCell.extend({
                    icon = 'icon-sonarr-deleted';
                    toolTip = 'Episode file deleted';
                    break;
+                case 'episodeFileRenamed':
+                    icon = 'icon-sonarr-rename';
+                    toolTip = 'Episode file renamed';
+                    break;
                default:
                    icon = 'icon-sonarr-unknown';
                    toolTip = 'unknown event';
@@ -41,4 +45,4 @@ module.exports = NzbDroneCell.extend({

        return this;
    }
-});
+});
--- a/src/UI/Content/icons.less
+++ b/src/UI/Content/icons.less
@@ -507,4 +507,4 @@

 .icon-sonarr-header-rejections {
  .fa-icon-content(@fa-var-exclamation-circle);
-}
+}
--- a/src/UI/Series/Details/InfoViewTemplate.hbs
+++ b/src/UI/Series/Details/InfoViewTemplate.hbs
@@ -37,10 +37,6 @@
                <a href="{{imdbUrl}}" class="label label-info">IMDB</a>
            {{/if}}

-            {{#if tvRageId}}
-                <a href="{{tvRageUrl}}" class="label label-info">TV Rage</a>
-            {{/if}}
-
            {{#if tvMazeId}}
                <a href="{{tvMazeUrl}}" class="label label-info">TV Maze</a>
            {{/if}}
--- a/src/UI/Shared/SignalRBroadcaster.js
+++ b/src/UI/Shared/SignalRBroadcaster.js
@@ -26,7 +26,7 @@ module.exports = {
        var tryingToReconnect = false;
        var messengerId = 'signalR';

-        this.signalRconnection = $.connection(StatusModel.get('urlBase') + '/signalr');
+        this.signalRconnection = $.connection(StatusModel.get('urlBase') + '/signalr', { apiKey: window.NzbDrone.ApiKey });

        this.signalRconnection.stateChanged(function(change) {
            console.debug('SignalR: [{0}]'.format(getStatus(change.newState)));
@@ -73,4 +73,4 @@ module.exports = {

        return this;
    }
-};
+};
Author	SHA1	Message	Date
Taloth Saldono	40e5626ddb	Added a few more codecs, not even halfway.	2017-08-03 19:26:14 +02:00
Taloth Saldono	1b9ccc319f	Fixed: TLS issue for OSX.	2017-08-03 16:53:15 +02:00
Taloth Saldono	89e804814b	Revert "Change default tls provider so users won't have to set TLS_PROVIDER explicitly." This reverts commit `8e63f7d436`. Only certain platforms need it and causes issues with OSX and cases where the user relies on btls.	2017-08-03 16:53:11 +02:00
Taloth Saldono	ce6a5713d1	Lets not take any risks here.	2017-08-03 00:20:48 +02:00
Taloth Saldono	ba01b636b9	Fixed: Recent changes to log messages prevented curl fallback from being triggered for tls1.2. fixes #2089	2017-08-02 23:19:26 +02:00
Taloth Saldono	970006a4fe	Added a bit more logging for Tracked Downloads.	2017-08-02 01:01:58 +02:00
Taloth Saldono	dbcfacbebe	Updated Sentry DSN.	2017-08-01 20:09:44 +02:00
Taloth Saldono	fdaa8fb0f5	Disable test on mono managed http.	2017-08-01 19:51:29 +02:00
Taloth Saldono	f305331565	Fixed: http->https redirects do not use the tls1.2 curl fallback. fixes #2082	2017-08-01 19:31:10 +02:00
Taloth Saldono	0ec64e7043	Fixed: DownloadedEpisodeScan API should delete source folder if ImportMode is Move.	2017-08-01 13:34:36 +02:00
Taloth Saldono	ac837c8f74	Added a bunch of extra MediaInfo formats.	2017-07-31 15:21:47 +02:00
Taloth Saldono	54d5ad4b71	Fixed unittests after MediaInfo change.	2017-07-30 23:04:10 +02:00
Taloth Saldono	27dca830cc	Updated MediaInfo schema and revised logic that Formats it. Also added logic to log events to Sentry.	2017-07-30 22:47:48 +02:00
Taloth Saldono	94f2473fbb	Fixed: Backup fails after recent develop release on certain platforms. (Trouble updating? see github issue #2080 ) fixes #2080	2017-07-29 22:33:54 +02:00
Taloth Saldono	432666b2da	Default to filename if there is no SceneName. And added Opus and MPEG-4 Visual.	2017-07-29 19:50:57 +02:00
Taloth Saldono	f91e1a3576	Tweaked error message when TransferFile destination already exists.	2017-07-29 15:34:23 +02:00
Taloth Saldono	e16e4091f1	VideoCodec formatter HEVC.	2017-07-29 15:09:29 +02:00
Taloth Saldono	b02d0a33b1	Better error message for DNS exceptions on mono.	2017-07-29 13:06:21 +02:00
Taloth Saldono	1cb25525ab	Added additional codecs and more complete error message.	2017-07-29 12:33:21 +02:00
Taloth Saldono	c7d30ae703	Include releaseTitle in InvalidSceneMappingException.	2017-07-29 11:35:39 +02:00
Taloth Saldono	8e63f7d436	Change default tls provider so users won't have to set TLS_PROVIDER explicitly.	2017-07-29 11:35:10 +02:00
Taloth Saldono	36e4075629	Fixed: Improved database backup journal handling.	2017-07-29 00:38:58 +02:00
Taloth Saldono	84d2d6a1d5	Fixed: Slower daemon startup loop if Sonarr runs into non-recoverable errors such as unwritable pid/appfolder/config file.	2017-07-28 23:40:12 +02:00
Taloth Saldono	f7f155be1f	Minor fixes from Sentry.	2017-07-28 20:01:45 +02:00
Taloth Saldono	1b6d6c26d5	Fixed HttpUri parsing of domain names with underscores.	2017-07-28 20:01:29 +02:00
Taloth Saldono	f8be5c9cb9	Disabled TLS health check warning.	2017-07-27 22:07:05 +02:00
Taloth Saldono	24eb196336	Added License and Copyright file for completeness.	2017-07-27 22:04:57 +02:00
Taloth Saldono	54cc19c688	Fixed error in regex.	2017-07-27 19:50:00 +02:00
Taloth Saldono	6fc4ea614d	Fixed: Ignore '.unwanted' directory when importing. fixes #2072	2017-07-27 15:49:45 +02:00
Taloth Saldono	90a42bcbad	Abort indexer Test if connection failed. fixes #2055	2017-07-27 11:25:55 +02:00
Taloth Saldono	792773323c	Check for whitespace in IsValidUrl. closes #2020	2017-07-26 22:57:38 +02:00
Mark McDowall	4b9f2e0ff7	Guard against null reference exception when parsing newznab capabilities Closes #2054	2017-07-26 07:28:34 -07:00
Mark McDowall	5efff4d481	Cleanup exception messages Closes #2054	2017-07-26 07:28:34 -07:00
Mark McDowall	d257b926dc	API Key for signalR connections	2017-07-26 07:28:33 -07:00
Indrek Ardel	5c4dc9ccb1	Fixed: Duplicate scene titles causes unnecessary indexer queries. fixes #2068	2017-07-26 16:14:10 +02:00
Taloth Saldono	126b849c27	Fixed: Changed qbitTorrent 3.3.14 api. fixes #1956	2017-07-22 17:01:34 +02:00
Mark McDowall	9312f0a462	New: Store episode renames in History Closes #1541	2017-07-19 20:23:06 -07:00
Taloth Saldono	f293b9a44e	Fixed: Added FLAC to MediaInfo renamer audio codecs.	2017-07-19 10:34:48 +02:00
Mark McDowall	fbcc0b76bf	Fixed: Try to set last write time on files moved to recycle bin Closes #2057	2017-07-18 23:45:03 -07:00
Mark McDowall	6d0a3b1ca4	Fixed: Remove TVRage URL Link Closes #2048	2017-07-18 23:44:41 -07:00
Taloth Saldono	2e2f79503c	Sonarr stuck if Deluge didn't return an infohash. Also updated some logging.	2017-07-18 10:33:34 +02:00
Taloth Saldono	a4f51aeef9	Added XviD to MediaInfoFormatter.	2017-07-17 11:07:01 +02:00
Taloth Saldono	c68ef626d2	Fixed: Calculates wrong age for releases pushed via ReleasePush api. closes Zymest/autodl-curl-sonarr#3	2017-07-13 17:41:37 +02:00
Mark McDowall	d4e771117d	Fixed: Reject full bluray disc releases Closes #1995	2017-07-09 22:17:04 -07:00
Mark McDowall	6bbdefb11e	Fixed: Roksbox metadata images being generated when settings are off Fixes #2031	2017-07-09 16:01:03 -07:00
Mark McDowall	197febe9db	Fixed: Sending Slack notifications without an icon	2017-07-05 09:16:50 -07:00
Mark McDowall	e10717f6bb	Slack improvements New: Slack icon can be an emoji or a URL Fixed: Icon for MatterMost Slack notifications	2017-07-04 18:59:07 -07:00