Fixed MediaCover endpoint.

This reverts commit 32b1f75eb3.

.gitchangelog.rc

@@ -0,0 +1,293 @@
+# -*- coding: utf-8; mode: python -*-
+##
+## Format
+##
+##   ACTION: [AUDIENCE:] COMMIT_MSG [!TAG ...]
+##
+## Description
+##
+##   ACTION is one of 'chg', 'fix', 'new'
+##
+##       Is WHAT the change is about.
+##
+##       'chg' is for refactor, small improvement, cosmetic changes...
+##       'fix' is for bug fixes
+##       'new' is for new features, big improvement
+##
+##   AUDIENCE is optional and one of 'dev', 'usr', 'pkg', 'test', 'doc'
+##
+##       Is WHO is concerned by the change.
+##
+##       'dev'  is for developpers (API changes, refactors...)
+##       'usr'  is for final users (UI changes)
+##       'pkg'  is for packagers   (packaging changes)
+##       'test' is for testers     (test only related changes)
+##       'doc'  is for doc guys    (doc only changes)
+##
+##   COMMIT_MSG is ... well ... the commit message itself.
+##
+##   TAGs are additionnal adjective as 'refactor' 'minor' 'cosmetic'
+##
+##       They are preceded with a '!' or a '@' (prefer the former, as the
+##       latter is wrongly interpreted in github.) Commonly used tags are:
+##
+##       'refactor' is obviously for refactoring code only
+##       'minor' is for a very meaningless change (a typo, adding a comment)
+##       'cosmetic' is for cosmetic driven change (re-indentation, 80-col...)
+##       'wip' is for partial functionality but complete subfunctionality.
+##
+## Example:
+##
+##   new: usr: support of bazaar implemented
+##   chg: re-indentend some lines !cosmetic
+##   new: dev: updated code to be compatible with last version of killer lib.
+##   fix: pkg: updated year of licence coverage.
+##   new: test: added a bunch of test around user usability of feature X.
+##   fix: typo in spelling my name in comment. !minor
+##
+##   Please note that multi-line commit message are supported, and only the
+##   first line will be considered as the "summary" of the commit message. So
+##   tags, and other rules only applies to the summary.  The body of the commit
+##   message will be displayed in the changelog without reformatting.
+
+
+##
+## ``ignore_regexps`` is a line of regexps
+##
+## Any commit having its full commit message matching any regexp listed here
+## will be ignored and won't be reported in the changelog.
+##
+ignore_regexps = [
+    r'@minor', r'!minor',
+    r'@cosmetic', r'!cosmetic',
+    r'@refactor', r'!refactor',
+    r'@wip', r'!wip',
+    r'^([cC]hg|[fF]ix|[nN]ew)\s*:\s*[p|P]kg:',
+    r'^([cC]hg|[fF]ix|[nN]ew)\s*:\s*[d|D]ev:',
+    r'^(.{3,3}\s*:)?\s*[fF]irst commit.?\s*$',
+    r'^$',  ## ignore commits with empty messages
+]
+
+
+## ``section_regexps`` is a list of 2-tuples associating a string label and a
+## list of regexp
+##
+## Commit messages will be classified in sections thanks to this. Section
+## titles are the label, and a commit is classified under this section if any
+## of the regexps associated is matching.
+##
+## Please note that ``section_regexps`` will only classify commits and won't
+## make any changes to the contents. So you'll probably want to go check
+## ``subject_process`` (or ``body_process``) to do some changes to the subject,
+## whenever you are tweaking this variable.
+##
+section_regexps = [
+    ('**New features**', [
+        r'^[aA]dded?\s*:?\s*((dev|use?r|pkg|test|doc)\s*:\s*)?([^\n]*)$',
+        r'^[uU]pdated?\s*:?\s*((dev|use?r|pkg|test|doc)\s*:\s*)?([^\n]*)$',
+        r'^[cC]hanged?\s*:?\s*((dev|use?r|pkg|test|doc)\s*:\s*)?([^\n]*)$',
+     ]),
+    ('**Fixes**', [
+        r'^(?![mM]erge\s*)'
+    ]
+    ),
+
+]
+
+
+## ``body_process`` is a callable
+##
+## This callable will be given the original body and result will
+## be used in the changelog.
+##
+## Available constructs are:
+##
+##   - any python callable that take one txt argument and return txt argument.
+##
+##   - ReSub(pattern, replacement): will apply regexp substitution.
+##
+##   - Indent(chars="  "): will indent the text with the prefix
+##     Please remember that template engines gets also to modify the text and
+##     will usually indent themselves the text if needed.
+##
+##   - Wrap(regexp=r"\n\n"): re-wrap text in separate paragraph to fill 80-Columns
+##
+##   - noop: do nothing
+##
+##   - ucfirst: ensure the first letter is uppercase.
+##     (usually used in the ``subject_process`` pipeline)
+##
+##   - final_dot: ensure text finishes with a dot
+##     (usually used in the ``subject_process`` pipeline)
+##
+##   - strip: remove any spaces before or after the content of the string
+##
+##   - SetIfEmpty(msg="No commit message."): will set the text to
+##     whatever given ``msg`` if the current text is empty.
+##
+## Additionally, you can `pipe` the provided filters, for instance:
+#body_process = Wrap(regexp=r'\n(?=\w+\s*:)') | Indent(chars="  ")
+#body_process = Wrap(regexp=r'\n(?=\w+\s*:)')
+#body_process = noop
+body_process = ReSub(r'((^|\n)[A-Z]\w+(-\w+)*: .*(\n\s+.*)*)+$', r'') | strip
+
+
+## ``subject_process`` is a callable
+##
+## This callable will be given the original subject and result will
+## be used in the changelog.
+##
+## Available constructs are those listed in ``body_process`` doc.
+subject_process = (strip |
+    ReSub(r'^([cC]hanged|[fF]ixed|[aA]dded|[uU]pdated)\s*:\s*((dev|use?r|pkg|test|doc)\s*:\s*)?([^\n@]*)(@[a-z]+\s+)*$', r'\4') |
+    SetIfEmpty("No commit message.") | ucfirst | final_dot)
+
+
+## ``tag_filter_regexp`` is a regexp
+##
+## Tags that will be used for the changelog must match this regexp.
+##
+tag_filter_regexp = r'^v[0]+\.[2-9]+\.[0-9]+\.[0-9]+$'
+
+
+## ``unreleased_version_label`` is a string or a callable that outputs a string
+##
+## This label will be used as the changelog Title of the last set of changes
+## between last valid tag and HEAD if any.
+unreleased_version_label = "(unreleased)"
+
+
+## ``output_engine`` is a callable
+##
+## This will change the output format of the generated changelog file
+##
+## Available choices are:
+##
+##   - rest_py
+##
+##        Legacy pure python engine, outputs ReSTructured text.
+##        This is the default.
+##
+##   - mustache(<template_name>)
+##
+##        Template name could be any of the available templates in
+##        ``templates/mustache/*.tpl``.
+##        Requires python package ``pystache``.
+##        Examples:
+##           - mustache("markdown")
+##           - mustache("restructuredtext")
+##
+##   - makotemplate(<template_name>)
+##
+##        Template name could be any of the available templates in
+##        ``templates/mako/*.tpl``.
+##        Requires python package ``mako``.
+##        Examples:
+##           - makotemplate("restructuredtext")
+##
+#output_engine = rest_py
+#output_engine = mustache("restructuredtext")
+output_engine = mustache("changelog.tpl")
+#output_engine = makotemplate("restructuredtext")
+
+
+## ``include_merge`` is a boolean
+##
+## This option tells git-log whether to include merge commits in the log.
+## The default is to include them.
+include_merge = False
+
+
+## ``log_encoding`` is a string identifier
+##
+## This option tells gitchangelog what encoding is outputed by ``git log``.
+## The default is to be clever about it: it checks ``git config`` for
+## ``i18n.logOutputEncoding``, and if not found will default to git's own
+## default: ``utf-8``.
+#log_encoding = 'utf-8'
+
+
+## ``publish`` is a callable
+##
+## Sets what ``gitchangelog`` should do with the output generated by
+## the output engine. ``publish`` is a callable taking one argument
+## that is an interator on lines from the output engine.
+##
+## Some helper callable are provided:
+##
+## Available choices are:
+##
+##   - stdout
+##
+##        Outputs directly to standard output
+##        (This is the default)
+##
+##   - FileInsertAtFirstRegexMatch(file, pattern, idx=lamda m: m.start())
+##
+##        Creates a callable that will parse given file for the given
+##        regex pattern and will insert the output in the file.
+##        ``idx`` is a callable that receive the matching object and
+##        must return a integer index point where to insert the
+##        the output in the file. Default is to return the position of
+##        the start of the matched string.
+##
+##   - FileRegexSubst(file, pattern, replace, flags)
+##
+##        Apply a replace inplace in the given file. Your regex pattern must
+##        take care of everything and might be more complex. Check the README
+##        for a complete copy-pastable example.
+##
+# publish = FileInsertIntoFirstRegexMatch(
+#     "CHANGELOG.rst",
+#     r'/(?P<rev>[0-9]+\.[0-9]+(\.[0-9]+)?)\s+\([0-9]+-[0-9]{2}-[0-9]{2}\)\n--+\n/',
+#     idx=lambda m: m.start(1)
+# )
+#publish = stdout
+
+def write_to_file(content):
+  with open("CHANGELOG.md", "w+") as f:
+    for chunk in content:
+      f.write(chunk)
+
+publish = write_to_file
+
+
+## ``revs`` is a list of callable or a list of string
+##
+## callable will be called to resolve as strings and allow dynamical
+## computation of these. The result will be used as revisions for
+## gitchangelog (as if directly stated on the command line). This allows
+## to filter exaclty which commits will be read by gitchangelog.
+##
+## To get a full documentation on the format of these strings, please
+## refer to the ``git rev-list`` arguments. There are many examples.
+##
+## Using callables is especially useful, for instance, if you
+## are using gitchangelog to generate incrementally your changelog.
+##
+## Some helpers are provided, you can use them::
+##
+##   - FileFirstRegexMatch(file, pattern): will return a callable that will
+##     return the first string match for the given pattern in the given file.
+##     If you use named sub-patterns in your regex pattern, it'll output only
+##     the string matching the regex pattern named "rev".
+##
+##   - Caret(rev): will return the rev prefixed by a "^", which is a
+##     way to remove the given revision and all its ancestor.
+##
+## Please note that if you provide a rev-list on the command line, it'll
+## replace this value (which will then be ignored).
+##
+## If empty, then ``gitchangelog`` will act as it had to generate a full
+## changelog.
+##
+## The default is to use all commits to make the changelog.
+#revs = ["^1.0.3", ]
+#revs = [
+#    Caret(
+#        FileFirstRegexMatch(
+#            "CHANGELOG.rst",
+#            r"(?P<rev>[0-9]+\.[0-9]+(\.[0-9]+)?)\s+\([0-9]+-[0-9]{2}-[0-9]{2}\)\n--+\n")),
+#    "HEAD"
+#]
+revs = []

.github/ISSUE_TEMPLATE.md

@@ -1,7 +1,16 @@
+**Description:**
+
+Check first that your problem is not listed in our wiki section:
+* https://github.com/Radarr/Radarr/wiki/Common-Problems
+* https://github.com/Radarr/Radarr/wiki/FAQ
+
+Provide a description of the feature request or bug here, the more details the better. 
+Please also try to include the following if you are reporting a bug
+
+**Radarr Version:**
+
+**Logs:**
 
 
-
+Please use the search bar and make sure you are not submitting an already submitted issue.
-Provide a description of the feature request or bug, the more details the better.
+Visit our [Discord server](https://discord.gg/NWYch8M) for support or longer discussions.
-When possible include a log!
-
-Please use our [Discord server](https://discord.gg/NWYch8M) for support or longer discussions.

.github/PULL_REQUEST_TEMPLATE.md

@@ -2,13 +2,11 @@
 YES | NO
 
 #### Description
-A few sentences describing the overall goals of the pull request's commits.
+
 
 #### Todos
 - [ ] Tests
-- [ ] Documentation
-
 
 #### Issues Fixed or Closed by this PR
 
-* 
+* #

.gitignore

@@ -150,3 +150,6 @@ Thumbs.db
 # AppVeyor
 /tools-cake/
 /_artifacts/
+
+# Cake
+/tools/Addins/*

.idea/Sonarr.iml

@@ -20,6 +20,5 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Sonarr node_modules" level="project" />
   </component>
 </module>

.idea/jsLibraryMappings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="JavaScriptLibraryMappings">
-    <includedPredefinedLibrary name="ECMAScript 6" />
+    <excludedPredefinedLibrary name="Radarr/node_modules" />
   </component>
 </project>

.idea/libraries/Sonarr_node_modules.xml

@@ -1,14 +0,0 @@
-<component name="libraryTable">
-  <library name="Sonarr node_modules" type="javaScript">
-    <properties>
-      <option name="frameworkName" value="node_modules" />
-      <sourceFilesUrls>
-        <item url="file://$PROJECT_DIR$/node_modules" />
-      </sourceFilesUrls>
-    </properties>
-    <CLASSES>
-      <root url="file://$PROJECT_DIR$/node_modules" />
-    </CLASSES>
-    <SOURCES />
-  </library>
-</component>

.travis.yml

@@ -4,7 +4,7 @@ addons:
   apt:
     packages:
       - nodejs
-      - npm
+#      - npm apparently not needed anymore.
 script:
   - ./build.sh
   - chmod +x test.sh

LICENSE

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

README.md

@@ -1,3 +1,41 @@
+<p align="center">
+<img src="/Logo/text256.png" alt="Radarr">
+</p>
+
+Radarr is an __independent__ fork of [Sonarr](https://github.com/Sonarr/Sonarr) reworked for automatically downloading movies via Usenet and BitTorrent.
+
+The project was inspired by other Usenet/BitTorrent movie downloaders such as CouchPotato.
+
+## Getting Started
+
+[![Installation](https://img.shields.io/badge/wiki-installation-brightgreen.svg?maxAge=60&style=flat-square)](https://github.com/Radarr/Radarr/wiki/Installation)
+[![Docker](https://img.shields.io/badge/wiki-docker-1488C6.svg?maxAge=60&style=flat-square)](https://github.com/Radarr/Radarr/wiki/Docker)
+[![Setup Guide](https://img.shields.io/badge/wiki-setup_guide-orange.svg?maxAge=60&style=flat-square)](https://github.com/Radarr/Radarr/wiki/Setup-Guide)
+[![FAQ](https://img.shields.io/badge/wiki-FAQ-BF55EC.svg?maxAge=60&style=flat-square)](https://github.com/Radarr/Radarr/wiki/FAQ)
+
+* [Install Radarr for your desired OS](https://github.com/Radarr/Radarr/wiki/Installation) *or* use [Docker](https://github.com/Radarr/Radarr/wiki/Docker)
+* *For Linux users*, run `radarr` and *optionally* have [Radarr start automatically](https://github.com/Radarr/Radarr/wiki/Autostart-on-Linux)
+* Connect to the UI through <http://localhost:7878> or <http://your-ip:7878> in your web browser
+* See the [Setup Guide](https://github.com/Radarr/Radarr/wiki/Setup-Guide) for further configuration
+
+## Downloads
+
+[![GitHub Releases](https://img.shields.io/badge/downloads-releases-brightgreen.svg?maxAge=60&style=flat-square)](https://github.com/Radarr/Radarr/releases)
+[![AppVeyor Builds](https://img.shields.io/badge/downloads-continuous-green.svg?maxAge=60&style=flat-square)](https://ci.appveyor.com/project/galli-leo/radarr-usby1/branch/develop/artifacts)
+
+[![Docker release](https://img.shields.io/badge/docker-release-blue.svg?colorB=1488C6&maxAge=60&style=flat-square)](https://store.docker.com/community/images/linuxserver/radarr)
+[![Docker nightly](https://img.shields.io/badge/docker-release/nightly-blue.svg?colorB=1488C6&maxAge=60&style=flat-square)](https://store.docker.com/community/images/hotio/suitarr)
+[![Docker armhf](https://img.shields.io/badge/docker-armhf-blue.svg?colorB=1488C6&maxAge=60&style=flat-square)](https://store.docker.com/community/images/lsioarmhf/radarr)
+[![Docker aarch64](https://img.shields.io/badge/docker-aarch64-blue.svg?colorB=1488C6&maxAge=60&style=flat-square)](https://store.docker.com/community/images/lsioarmhf/radarr-aarch64)
+
+## Support
+
+[![Discord](https://img.shields.io/badge/discord-chat-7289DA.svg?maxAge=60&style=flat-square)](https://discord.gg/AD3UP37)
+[![Reddit](https://img.shields.io/badge/reddit-discussion-FF4500.svg?maxAge=60&style=flat-square)](https://www.reddit.com/r/radarr)
+[![Feathub](https://img.shields.io/badge/feathub-requests-lightgrey.svg?maxAge=60&style=flat-square)](http://feathub.com/Radarr/Radarr)
+[![GitHub](https://img.shields.io/badge/github-issues-red.svg?maxAge=60&style=flat-square)](https://github.com/Radarr/Radarr/issues)
+[![GitHub Wiki](https://img.shields.io/badge/github-wiki-181717.svg?maxAge=60&style=flat-square)](https://github.com/Radarr/Radarr/wiki)
+
 ## Status
 
 [![GitHub issues](https://img.shields.io/github/issues/radarr/radarr.svg?maxAge=60&style=flat-square)](https://github.com/Radarr/Radarr/issues)
@@ -12,57 +50,53 @@
 | AppVeyor | [![AppVeyor](https://img.shields.io/appveyor/ci/galli-leo/Radarr/master.svg?maxAge=60&style=flat-square)](https://ci.appveyor.com/project/galli-leo/Radarr) | [![AppVeyor](https://img.shields.io/appveyor/ci/galli-leo/Radarr-usby1/develop.svg?maxAge=60&style=flat-square)](https://ci.appveyor.com/project/galli-leo/Radarr-usby1) |
 | Travis   | [![Travis](https://img.shields.io/travis/Radarr/Radarr/master.svg?maxAge=60&style=flat-square)](https://travis-ci.org/Radarr/Radarr) | [![Travis](https://img.shields.io/travis/Radarr/Radarr/develop.svg?maxAge=60&style=flat-square)](https://travis-ci.org/Radarr/Radarr) |
 
-This fork of Sonarr aims to turn it into something like CouchPotato.
+### [Site and API Status](https://status.radarr.video)
 
-## Downloads
+| API | Updates | Sites  |
+|-------|:----:|:----:|
+| [![API V2](http://status.radarr.video/component/1/shield?style=flat-square)](https://api.radarr.video/v2/) | [![Update Server](http://status.radarr.video/component/4/shield?style=flat-square)](https://radarr.aeonlucid.com) | [![Radarr Mappings](http://status.radarr.video/component/6/shield?style=flat-square)](https://mappings.radarr.video/)
+| [![API Staging](http://status.radarr.video/component/2/shield?style=flat-square)](https://staging.api.radarr.video/) | [![Github Updates](http://status.radarr.video/component/5/shield?style=flat-square)](https://api.github.com/v3/) | [![Main Site](http://status.radarr.video/component/7/shield?style=flat-square)](https://radarr.video/)
 
-[![GitHub Releases](https://img.shields.io/badge/downloads-releases-brightgreen.svg?maxAge=60&style=flat-square)](https://github.com/Radarr/Radarr/releases)
+Radarr is currently undergoing rapid development and pull requests are actively added into the repository.
-
-[![AppVeyor Builds](https://img.shields.io/badge/downloads-continuous-green.svg?maxAge=60&style=flat-square)](https://ci.appveyor.com/project/galli-leo/radarr-usby1/build/artifacts)
-
-[![Docker x64](https://img.shields.io/badge/docker-x64-blue.svg?colorB=1488C6&maxAge=60&style=flat-square)](https://store.docker.com/community/images/linuxserver/radarr)
-[![Docker armhf](https://img.shields.io/badge/docker-armhf-blue.svg?colorB=1488C6&maxAge=60&style=flat-square)](https://store.docker.com/community/images/lsioarmhf/radarr)
-[![Docker aarch64](https://img.shields.io/badge/docker-aarch64-blue.svg?colorB=1488C6&maxAge=60&style=flat-square)](https://store.docker.com/community/images/lsioarmhf/radarr-aarch64)
-
-To connect to the UI, fire up your browser and open <http://localhost:7878> or <http://your-ip:7878>.
-
-## Support
-
-[![Discord](https://img.shields.io/badge/discord-chat-7289DA.svg?maxAge=60&style=flat-square)](https://discord.gg/AD3UP37)
-[![Reddit](https://img.shields.io/badge/reddit-discussion-FF4500.svg?maxAge=60&style=flat-square)](https://www.reddit.com/r/radarr)
-[![GitHub](https://img.shields.io/badge/github-issues-181717.svg?maxAge=60&style=flat-square)](https://github.com/Radarr/Radarr/issues)
 
 ## Features
 
-### Currently Working
+### Current Features
-
-* Adding new movies
-* Manually searching for releases of movies
-* Automatically searching for releases
-* Automatically importing downloaded movies
-* Recognizing Special Editions, Director's Cut, etc.
-* Identifying releases with hardcoded subs
-* Rarbg.to, Torznab and Newznab Indexer
-* QBittorrent and Deluge download client (Other clients are coming)
-* New TorrentPotato Indexer (Works well with [Jackett](https://github.com/Jackett/Jackett))
-
-### Planned Features
-
-* Scanning PreDB to know when a new release is available
-* Fixing the other Indexers and download clients
-* Importing of Sonarr config
-
-### Major Features
 
+* Adding new movies with lots of information, such as trailers, ratings, etc.
 * Support for major platforms: Windows, Linux, macOS, Raspberry Pi, etc.
 * Can watch for better quality of the movies you have and do an automatic upgrade. *eg. from DVD to Blu-Ray*
 * Automatic failed download handling will try another release if one fails
 * Manual search so you can pick any release or to see why a release was not downloaded automatically
 * Full integration with SABnzbd and NZBGet
-* Full integration with Kodi, Plex (notification, library update, metadata)
+* Automatically searching for releases as well as RSS Sync
+* Automatically importing downloaded movies
+* Recognizing Special Editions, Director's Cut, etc.
+* Identifying releases with hardcoded subs
+* All indexers supported by Sonarr also supported
+* New PassThePopcorn Indexer
+* QBittorrent, Deluge, rTorrent, Transmission and uTorrent download client (Other clients are coming)
+* New TorrentPotato Indexer
+* Torznab Indexer now supports Movies (Works well with [Jackett](https://github.com/Jackett/Jackett))
+* Scanning PreDB to know when a new release is available
+* Importing movies from various online sources, such as IMDb Watchlists (A complete list can be found [here](https://github.com/Radarr/Radarr/issues/114))
+* Full integration with Kodi, Plex (notification, library update)
 * And a beautiful UI
 
-## Configuring Development Environment
+### Planned Features
+
+* Downloading Metadata such as trailers or subtitles (\*)
+* Adding metadata such as posters and information for Kodi and others to use (\*)
+* Dynamically renaming folders with quality info, etc. (\*)
+* Supporting custom folder structures, such as all movie files in one folder (\*)
+* Supporting multiple editions per movies (waiting on The Movie Database to finish their implementation)
+* Supporting collections of movies, such as James Bond
+
+**Note:** All features marked with (\*) are set to be in the first release of Radarr.
+
+#### [Feature Requests](http://feathub.com/Radarr/Radarr)
+
+## Configuring the Development Environment
 
 ### Requirements
 
@@ -81,14 +115,19 @@ To connect to the UI, fire up your browser and open <http://localhost:7878> or <
 > **Notice**  
 > Gulp must be running at all times while you are working with Radarr client source files.
 
+### Build
+
+* To build run `sh build.sh`
+
+**Note:** Windows users must have bash available to do this. [cmder](http://cmder.net/) which is a console emulator for windows has bash as part of it's default installation.
+
 ### Development
 
 * Open `NzbDrone.sln` in Visual Studio or run the build.sh script, if Mono is installed
 * Make sure `NzbDrone.Console` is set as the startup project
+* Run `build.sh` before running
 
-## Sponsors
+### License
 
-[JetBrains](http://www.jetbrains.com) for providing us with free licenses to their great tools:
+* [GNU GPL v3](http://www.gnu.org/licenses/gpl.html)
-* [ReSharper](http://www.jetbrains.com/resharper)
+* Copyright 2010-2017
-* [WebStorm](http://www.jetbrains.com/webstorm)
-* [TeamCity](http://www.jetbrains.com/teamcity)

appveyor.yml

@@ -1,9 +1,5 @@
 version: '0.2.0.{build}'
 
-branches:
-  only:
-  - develop
-
 assembly_info:
   patch: true
   file: 'src\NzbDrone.Common\Properties\SharedAssemblyInfo.cs'
@@ -21,16 +17,17 @@ build_script:
   - ps: ./build-appveyor.ps1
 
 test: off
-# test:
+#test:
-#   assemblies:
+#  assemblies:
-#     - '_tests\*Test.dll'
+#    - '_tests\*Test.dll'
-#   categories:
+#  categories:
-#     except:
+#    except:
-#       - IntegrationTest
+#      - IntegrationTest
-#       - AutomationTest
+#      - AutomationTest
 
 artifacts:
   - path: '_artifacts\*.zip'
+  - path: '_artifacts\*.exe'
   - path: '_artifacts\*.tar.gz'
 
 cache:
@@ -40,9 +37,17 @@ cache:
 pull_requests:
   do_not_increment_build_number: true
 
+on_failure:
+  - ps: Get-ChildItem .\_artifacts\*.zip | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name }
+  - ps: Get-ChildItem .\_artifacts\*.exe | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name }
+  - ps: Get-ChildItem .\_artifacts\*.tar.gz | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name }
+
 only_commits:
   files:
     - src/
     - osx/
     - gulp/
     - logo/
+    - setup/
+    - appveyor.yml
+    - build-appveyor.cake

build-appveyor.cake

@@ -104,11 +104,13 @@ Task("Compile").Does(() => {
 });
 
 Task("Gulp").Does(() => {
-	Npm
+	NpmInstall(new NpmInstallSettings {
-		.WithLogLevel(NpmLogLevel.Silent)
+		LogLevel = NpmLogLevel.Silent,
-		.FromPath(".")
+		WorkingDirectory = "./",
-			.Install()
+		Production = true
-			.RunScript("build");
+	});
+	
+	NpmRunScript("build");
 });
 
 Task("PackageMono").Does(() => {
@@ -166,8 +168,14 @@ Task("PackageOsx").Does(() => {
 	// Adding MediaInfo dylib
 	CopyFiles(sourceFolder + "/Libraries/MediaInfo/*.dylib", outputFolderOsx);
 
+	// Chmod as executable
+	StartProcess(@"C:\cygwin64\bin\chmod.exe", new ProcessSettings()
+		.WithArguments(args => args
+			.Append("+x")
+			.Append(outputFolderOsx + "/Radarr")));
+	
 	// Adding Startup script
-	CopyFile("./osx/Sonarr", outputFolderOsx + "/Sonarr");
+	CopyFile("./osx/Radarr", outputFolderOsx + "/Radarr");
 });
 
 Task("PackageOsxApp").Does(() => {
@@ -264,6 +272,13 @@ Task("ArtifactsWindows").Does(() => {
 	CopyDirectory(outputFolder, artifactsFolderWindows + "/Radarr");
 });
 
+Task("ArtifactsWindowsInstaller").Does(() => {
+	InnoSetup("./setup/nzbdrone.iss", new InnoSetupSettings {
+		OutputDirectory = artifactsFolder,
+		ToolPath = "./setup/inno/ISCC.exe"
+    });
+});
+
 Task("ArtifactsLinux").Does(() => {
 	CopyDirectory(outputFolderMono, artifactsFolderLinux + "/Radarr");
 });
@@ -280,7 +295,7 @@ Task("CompressArtifacts").Does(() => {
 	var prefix = "";
 
 	if (AppVeyor.IsRunningOnAppVeyor) {
-		prefix += AppVeyor.Environment.Repository.Branch + ".";
+		prefix += AppVeyor.Environment.Repository.Branch.Replace("/", "-") + ".";
 		prefix += AppVeyor.Environment.Build.Version + ".";
 	}
 
@@ -293,6 +308,7 @@ Task("CompressArtifacts").Does(() => {
 Task("Artifacts")
 	.IsDependentOn("CleanArtifacts")
 	.IsDependentOn("ArtifactsWindows")
+	.IsDependentOn("ArtifactsWindowsInstaller")
 	.IsDependentOn("ArtifactsLinux")
 	.IsDependentOn("ArtifactsOsx")
 	.IsDependentOn("ArtifactsOsxApp")
@@ -300,4 +316,4 @@ Task("Artifacts")
 
 // Run
 RunTarget("Build");
-RunTarget("Artifacts");
+RunTarget("Artifacts");

build.sh

@@ -181,7 +181,7 @@ PackageOsx()
     cp $sourceFolder/Libraries/MediaInfo/*.dylib $outputFolderOsx
 
     echo "Adding Startup script"
-    cp  ./osx/Sonarr $outputFolderOsx
+    cp  ./osx/Radarr $outputFolderOsx
 
     echo "##teamcity[progressFinish 'Creating OS X Package']"
 }
@@ -208,9 +208,9 @@ PackageTests()
     find $sourceFolder -path $testSearchPattern -exec cp -r -u -T "{}" $testPackageFolder \;
 
     if [ $runtime = "dotnet" ] ; then
-        $nuget install NUnit.ConsoleRunner -Version 3.2.0 -Output $testPackageFolder
+        $nuget install NUnit.Runners -Version 3.2.1 -Output $testPackageFolder
     else
-        mono $nuget install NUnit.ConsoleRunner -Version 3.2.0 -Output $testPackageFolder
+        mono $nuget install NUnit.Runners -Version 3.2.1 -Output $testPackageFolder
     fi
 
     cp $outputFolder/*.dll $testPackageFolder

changelog.tpl

@@ -0,0 +1,14 @@
+# Changelog
+
+{{#versions}}
+## {{{label}}}
+
+{{#sections}}
+### {{{label}}}
+{{#commits}}
+- {{{subject}}} [{{{author}}}]
+{{/commits}}
+
+{{/sections}}
+
+{{/versions}}

create_test_cases.py

@@ -0,0 +1,44 @@
+input1 = """Prometheus.Special.Edition.Fan Edit.2012..BRRip.x264.AAC-m2g
+Star Wars Episode IV - A New Hope (Despecialized) 1999.mkv
+Prometheus.(Special.Edition.Remastered).2012.[Bluray-1080p].mkv
+Prometheus Extended 2012
+Prometheus Extended Directors Cut Fan Edit 2012
+Prometheus Director's Cut 2012
+Prometheus Directors Cut 2012
+Prometheus.(Extended.Theatrical.Version.IMAX).BluRay.1080p.2012.asdf
+2001 A Space Odyssey Director's Cut (1968).mkv
+2001: A Space Odyssey (Extended Directors Cut FanEdit) Bluray 1080p 1968
+A Fake Movie 2035 Directors 2012.mkv
+Blade Runner Director's Cut 2049.mkv
+Prometheus 50th Anniversary Edition 2012.mkv
+Movie 2in1 2012.mkv
+Movie IMAX 2012.mkv"""
+
+output1 = """Special.Edition.Fan Edit     BRRip.x264.AAC-m2g
+Despecialized     mkv
+Special.Edition.Remastered     Bluray-1080p].mkv
+Extended     mkv
+Extended Directors Cut Fan Edit     mkv
+Director's Cut     mkv
+Directors Cut     mkv
+Extended.Theatrical.Version.IMAX     asdf
+Director's Cut     mkv
+Extended Directors Cut FanEdit     mkv
+Directors     mkv
+Director's Cut     mkv
+50th Anniversary Edition     mkv
+2in1     mkv
+IMAX     mkv"""
+
+inputs = input1.split("\n")
+outputs = output1.split("\n")
+real_o = []
+for output in outputs:
+    real_o.append(output.split("   ")[0].replace(".", " ").strip())
+
+count = 0
+
+for inp in inputs:
+    o = real_o[count]
+    print "[TestCase(\"{0}\", \"{1}\")]".format(inp, o)
+    count += 1

gulp/copy.js

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

gulp/less.js

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

osx/Radarr

@@ -5,7 +5,7 @@ DIR=$(cd "$(dirname "$0")"; pwd)
 
 #change these values to match your app
 EXE_PATH="$DIR/Radarr.exe"
-APPNAME="Sonarr"
+APPNAME="Radarr"
 
 #set up environment
 if [[ -x '/opt/local/bin/mono' ]]; then

osx/Radarr.app/Contents/Info.plist

@@ -11,11 +11,11 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleExecutable</key>
-	<string>Sonarr</string>
+	<string>Radarr</string>
 	<key>CFBundleIconFile</key>
 	<string>radarr.icns</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.osx.sonarr.tv</string>
+	<string>com.osx.radarr.video</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>

package.json

@@ -1,7 +1,7 @@
 {
-  "name": "Sonarr",
+  "name": "Radarr",
   "version": "2.0.0",
-  "description": "Sonarr",
+  "description": "Radarr",
   "main": "main.js",
   "scripts": {
     "build": "gulp build",
@@ -9,7 +9,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git://github.com/Sonarr/Sonarr.git"
+    "url": "git://github.com/Radarr/Radarr.git"
   },
   "author": "",
   "license": "GPL-3.0",
@@ -20,6 +20,7 @@
     "del": "1.2.0",
     "gulp": "3.9.0",
     "gulp-cached": "1.1.0",
+    "gulp-clean-css": "^3.0.4",
     "gulp-concat": "2.6.0",
     "gulp-declare": "0.3.0",
     "gulp-handlebars": "3.0.1",
@@ -40,6 +41,7 @@
     "run-sequence": "1.1.1",
     "streamqueue": "1.1.0",
     "tar.gz": "0.1.1",
+    "url-search-params": "^0.6.1",
     "webpack": "1.12.0",
     "webpack-stream": "2.1.0"
   }

package.sh

@@ -17,26 +17,25 @@ case "$(uname -s)" in
 esac
 
 if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then
-  VERSION="`date +%H:%M:%S`"
+  VERSION="$(date +%H:%M:%S)"
-  YEAR="`date +%Y`"
+  YEAR="$(date +%Y)"
-  MONTH="`date +%m`"
+  MONTH="$(date +%m)"
-  DAY="`date +%d`"
+  DAY="$(date +%d)"
 else
   VERSION=$1
+  BRANCH=$2
+  BRANCH=${BRANCH#refs\/heads\/}
+  BRANCH=${BRANCH//\//-}
 fi
 outputFolder='./_output'
 outputFolderMono='./_output_mono'
 outputFolderOsx='./_output_osx'
 outputFolderOsxApp='./_output_osx_app'
 
-tr -d "\r" < $outputFolderOsxApp/Radarr.app/Contents/MacOS/Sonarr > $outputFolderOsxApp/Radarr.app/Contents/MacOS/Sonarr2
+tr -d "\r" < $outputFolderOsxApp/Radarr.app/Contents/MacOS/Radarr > $outputFolderOsxApp/Radarr.app/Contents/MacOS/Radarr2
-rm $outputFolderOsxApp/Radarr.app/Contents/MacOS/Sonarr
+rm $outputFolderOsxApp/Radarr.app/Contents/MacOS/Radarr
-chmod +x $outputFolderOsxApp/Radarr.app/Contents/MacOS/Sonarr2
+chmod +x $outputFolderOsxApp/Radarr.app/Contents/MacOS/Radarr2
-mv $outputFolderOsxApp/Radarr.app/Contents/MacOS/Sonarr2 $outputFolderOsxApp/Radarr.app/Contents/MacOS/Sonarr >& error.log
+mv $outputFolderOsxApp/Radarr.app/Contents/MacOS/Radarr2 $outputFolderOsxApp/Radarr.app/Contents/MacOS/Radarr >& error.log
-
-cp -r $outputFolder/ Radarr_Windows_$VERSION
-cp -r $outputFolderMono/ Radarr_Mono_$VERSION
-cp -r $outputFolderOsxApp/ Radarr_OSX_$VERSION
 
 if [ $runtime = "dotnet" ] ; then
   ./7za.exe a Radarr_Windows_$VERSION.zip ./Radarr_Windows_$VERSION/*
@@ -44,25 +43,35 @@ if [ $runtime = "dotnet" ] ; then
   ./7za.exe a -ttar -so Radarr_OSX_$VERSION.tar ./_output_osx/* | ./7za.exe a -si Radarr_OSX_$VERSION.tar.gz
   ./7za.exe a -ttar -so Radarr_OSX_App_$VERSION.tar ./_output_osx_app/* | ./7za.exe a -si Radarr_OSX_App_$VERSION.tar.gz
 else
-zip -r Radarr_Windows_$VERSION.zip Radarr_Windows_$VERSION/* >& /dev/null
+  cp -r $outputFolder/ Radarr
-zip -r Radarr_Mono_$VERSION.zip Radarr_Mono_$VERSION/* >& /dev/null #TODO update for tar.gz
+  zip -r Radarr.$BRANCH.$VERSION.windows.zip Radarr
-zip -r Radarr_OSX_$VERSION_App.zip Radarr_OSX_$VERSION/* >& /dev/null
+  rm -rf Radarr
+  cp -r $outputFolderMono/ Radarr
+  tar -zcvf Radarr.$BRANCH.$VERSION.linux.tar.gz Radarr
+  rm -rf Radarr
+  cp -r $outputFolderOsx/ Radarr
+  tar -zcvf Radarr.$BRANCH.$VERSION.osx.tar.gz Radarr
+  rm -rf Radarr
+  #TODO update for tar.gz
+
+  cd _output_osx_app/
+  zip -r ../Radarr.$BRANCH.$VERSION.osx-app.zip *
 fi
-ftp -n ftp.leonardogalli.ch << END_SCRIPT
+# ftp -n ftp.leonardogalli.ch << END_SCRIPT
-passive
+# passive
-quote USER $FTP_USER
+# quote USER $FTP_USER
-quote PASS $FTP_PASS
+# quote PASS $FTP_PASS
-mkdir builds
+# mkdir builds
-cd builds
+# cd builds
-mkdir $YEAR
+# mkdir $YEAR
-cd $YEAR
+# cd $YEAR
-mkdir $MONTH
+# mkdir $MONTH
-cd $MONTH
+# cd $MONTH
-mkdir $DAY
+# mkdir $DAY
-cd $DAY
+# cd $DAY
-binary
+# binary
-put Radarr_Windows_$VERSION.zip
+# put Radarr_Windows_$VERSION.zip
-put Radarr_Mono_$VERSION.zip
+# put Radarr_Mono_$VERSION.zip
-put Radarr_OSX_$VERSION.zip
+# put Radarr_OSX_$VERSION.zip
-quit
+# quit
-END_SCRIPT
+# END_SCRIPT

setup/nzbdrone.iss

@@ -1,35 +1,35 @@
 ; Script generated by the Inno Setup Script Wizard.
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
-#define AppName "Sonarr"
+#define AppName "Radarr"
-#define AppPublisher "Team Sonarr"
+#define AppPublisher "Team Radarr"
-#define AppURL "https://sonarr.tv/"
+#define AppURL "https://radarr.video/"
-#define ForumsURL "https://forums.sonarr.tv/"
+#define ForumsURL "https://github.com/Radarr/Radarr/issues"
-#define AppExeName "NzbDrone.exe"
+#define AppExeName "Radarr.exe"
 #define BuildNumber "2.0"
-#define BuildNumber GetEnv('BUILD_NUMBER')
+#define BuildVersion GetEnv('APPVEYOR_BUILD_VERSION')
-#define BranchName GetEnv('branch')
+#define BranchName GetEnv('APPVEYOR_REPO_BRANCH')
 
 [Setup]
 ; NOTE: The value of AppId uniquely identifies this application.
 ; Do not use the same AppId value in installers for other applications.
 ; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
-AppId={{56C1065D-3523-4025-B76D-6F73F67F7F71}
+AppId={{56C1065D-3523-4025-B76D-6F73F67F7F82}
 AppName={#AppName}
-AppVersion=2.0
+AppVersion=0.2
 AppPublisher={#AppPublisher}
 AppPublisherURL={#AppURL}
 AppSupportURL={#ForumsURL}
 AppUpdatesURL={#AppURL}
-DefaultDirName={commonappdata}\NzbDrone\bin
+DefaultDirName={commonappdata}\Radarr\bin
 DisableDirPage=yes
 DefaultGroupName={#AppName}
 DisableProgramGroupPage=yes
-OutputBaseFilename=NzbDrone.{#BranchName}.{#BuildNumber}
+OutputBaseFilename=Radarr.{#BranchName}.{#BuildVersion}.installer
 SolidCompression=yes
 AppCopyright=Creative Commons 3.0 License
 AllowUNCPath=False
-UninstallDisplayIcon={app}\NzbDrone.exe
+UninstallDisplayIcon={app}\Radarr.exe
 DisableReadyPage=True
 CompressionThreads=2
 Compression=lzma2/normal
@@ -44,7 +44,7 @@ Name: "english"; MessagesFile: "compiler:Default.isl"
 Name: "windowsService"; Description: "Install as a Windows Service"
 
 [Files]
-Source: "..\_output\NzbDrone.exe"; DestDir: "{app}"; Flags: ignoreversion  
+Source: "..\_output\Radarr.exe"; DestDir: "{app}"; Flags: ignoreversion  
 Source: "..\_output\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
@@ -53,8 +53,8 @@ Name: "{group}\{#AppName}"; Filename: "{app}\{#AppExeName}"; Parameters: "/icon"
 Name: "{commondesktop}\{#AppName}"; Filename: "{app}\{#AppExeName}"; Parameters: "/icon"
 
 [Run]
-Filename: "{app}\nzbdrone.console.exe"; Parameters: "/u"; Flags: waituntilterminated;
+Filename: "{app}\radarr.console.exe"; Parameters: "/u"; Flags: waituntilterminated;
-Filename: "{app}\nzbdrone.console.exe"; Parameters: "/i"; Flags: waituntilterminated; Tasks: windowsService
+Filename: "{app}\radarr.console.exe"; Parameters: "/i"; Flags: waituntilterminated; Tasks: windowsService
 
 [UninstallRun]
-Filename: "{app}\nzbdrone.console.exe"; Parameters: "/u"; Flags: waituntilterminated skipifdoesntexist
+Filename: "{app}\radarr.console.exe"; Parameters: "/u"; Flags: waituntilterminated skipifdoesntexist

src/.idea/.idea.NzbDrone/.idea/.name

@@ -0,0 +1 @@
+NzbDrone

src/.idea/.idea.NzbDrone/.idea/contentModel.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RiderRiderContentModelStore">
+    <excludedPaths />
+  </component>
+</project>

src/.idea/.idea.NzbDrone/.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/.idea.NzbDrone/riderModule.iml" filepath="$PROJECT_DIR$/.idea/.idea.NzbDrone/riderModule.iml" />
+    </modules>
+  </component>
+</project>

src/.idea/.idea.NzbDrone/riderModule.iml

@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="RIDER_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$/../../../Logo/1024.png">
+      <sourceFolder url="file://$MODULE_DIR$/../../../Logo/1024.png" isTestSource="false" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../../Logo/64.png">
+      <sourceFolder url="file://$MODULE_DIR$/../../../Logo/64.png" isTestSource="false" />
+    </content>
+    <content url="file://$MODULE_DIR$/../..">
+      <sourceFolder url="file://$MODULE_DIR$/../../.nuget/NuGet.exe" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../Common/CommonAssemblyInfo.cs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../Common/CommonVersionInfo.cs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../Common/GlobalSuppressions.cs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../ExternalModules/CurlSharp/CurlSharp" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../Libraries/MediaInfo/libmediainfo.0.dylib" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../Libraries/MediaInfo/MediaInfo.dll" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../Libraries/Sqlite/libsqlite3.0.dylib" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../Libraries/Sqlite/sqlite3.dll" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../LogentriesCore" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../LogentriesNLog" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../Marr.Data" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../Microsoft.AspNet.SignalR.Core" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../Microsoft.AspNet.SignalR.Owin" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../MonoTorrent" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../NzbDrone" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../NzbDrone.Api" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../NzbDrone.Api.Test" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../NzbDrone.App.Test" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../NzbDrone.Automation.Test" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../NzbDrone.Common" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../NzbDrone.Common.Test" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../NzbDrone.Console" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../NzbDrone.Core" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../NzbDrone.Core.Test" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../NzbDrone.Host" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../NzbDrone.Integration.Test" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../NzbDrone.Libraries.Test" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../NzbDrone.Mono" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../NzbDrone.Mono.Test" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../NzbDrone.SignalR" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../NzbDrone.Test.Common" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../NzbDrone.Test.Dummy" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../NzbDrone.Update" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../NzbDrone.Update.Test" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../NzbDrone.Windows" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../NzbDrone.Windows.Test" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../ServiceHelpers/ServiceInstall" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../ServiceHelpers/ServiceUninstall" isTestSource="false" />
+      <excludeFolder url="file://$MODULE_DIR$/../../ExternalModules/CurlSharp/CurlSharp/bin" />
+      <excludeFolder url="file://$MODULE_DIR$/../../ExternalModules/CurlSharp/CurlSharp/obj" />
+      <excludeFolder url="file://$MODULE_DIR$/../../LogentriesCore/bin" />
+      <excludeFolder url="file://$MODULE_DIR$/../../LogentriesCore/obj" />
+      <excludeFolder url="file://$MODULE_DIR$/../../LogentriesNLog/bin" />
+      <excludeFolder url="file://$MODULE_DIR$/../../LogentriesNLog/obj" />
+      <excludeFolder url="file://$MODULE_DIR$/../../Marr.Data/obj" />
+      <excludeFolder url="file://$MODULE_DIR$/../../Microsoft.AspNet.SignalR.Core/bin" />
+      <excludeFolder url="file://$MODULE_DIR$/../../Microsoft.AspNet.SignalR.Core/obj" />
+      <excludeFolder url="file://$MODULE_DIR$/../../Microsoft.AspNet.SignalR.Owin/bin" />
+      <excludeFolder url="file://$MODULE_DIR$/../../Microsoft.AspNet.SignalR.Owin/obj" />
+      <excludeFolder url="file://$MODULE_DIR$/../../MonoTorrent/obj" />
+      <excludeFolder url="file://$MODULE_DIR$/../../NzbDrone.Api.Test/bin" />
+      <excludeFolder url="file://$MODULE_DIR$/../../NzbDrone.Api.Test/obj" />
+      <excludeFolder url="file://$MODULE_DIR$/../../NzbDrone.Api/obj" />
+      <excludeFolder url="file://$MODULE_DIR$/../../NzbDrone.App.Test/bin" />
+      <excludeFolder url="file://$MODULE_DIR$/../../NzbDrone.App.Test/obj" />
+      <excludeFolder url="file://$MODULE_DIR$/../../NzbDrone.Automation.Test/bin" />
+      <excludeFolder url="file://$MODULE_DIR$/../../NzbDrone.Automation.Test/obj" />
+      <excludeFolder url="file://$MODULE_DIR$/../../NzbDrone.Common.Test/bin" />
+      <excludeFolder url="file://$MODULE_DIR$/../../NzbDrone.Common.Test/obj" />
+      <excludeFolder url="file://$MODULE_DIR$/../../NzbDrone.Common/obj" />
+      <excludeFolder url="file://$MODULE_DIR$/../../NzbDrone.Console/obj" />
+      <excludeFolder url="file://$MODULE_DIR$/../../NzbDrone.Core.Test/bin" />
+      <excludeFolder url="file://$MODULE_DIR$/../../NzbDrone.Core.Test/obj" />
+      <excludeFolder url="file://$MODULE_DIR$/../../NzbDrone.Core/obj" />
+      <excludeFolder url="file://$MODULE_DIR$/../../NzbDrone.Host/obj" />
+      <excludeFolder url="file://$MODULE_DIR$/../../NzbDrone.Integration.Test/bin" />
+      <excludeFolder url="file://$MODULE_DIR$/../../NzbDrone.Integration.Test/obj" />
+      <excludeFolder url="file://$MODULE_DIR$/../../NzbDrone.Libraries.Test/bin" />
+      <excludeFolder url="file://$MODULE_DIR$/../../NzbDrone.Libraries.Test/obj" />
+      <excludeFolder url="file://$MODULE_DIR$/../../NzbDrone.Mono.Test/bin" />
+      <excludeFolder url="file://$MODULE_DIR$/../../NzbDrone.Mono.Test/obj" />
+      <excludeFolder url="file://$MODULE_DIR$/../../NzbDrone.Mono/obj" />
+      <excludeFolder url="file://$MODULE_DIR$/../../NzbDrone.SignalR/obj" />
+      <excludeFolder url="file://$MODULE_DIR$/../../NzbDrone.Test.Common/bin" />
+      <excludeFolder url="file://$MODULE_DIR$/../../NzbDrone.Test.Common/obj" />
+      <excludeFolder url="file://$MODULE_DIR$/../../NzbDrone.Test.Dummy/bin" />
+      <excludeFolder url="file://$MODULE_DIR$/../../NzbDrone.Test.Dummy/obj" />
+      <excludeFolder url="file://$MODULE_DIR$/../../NzbDrone.Update.Test/bin" />
+      <excludeFolder url="file://$MODULE_DIR$/../../NzbDrone.Update.Test/obj" />
+      <excludeFolder url="file://$MODULE_DIR$/../../NzbDrone.Update/obj" />
+      <excludeFolder url="file://$MODULE_DIR$/../../NzbDrone.Windows.Test/bin" />
+      <excludeFolder url="file://$MODULE_DIR$/../../NzbDrone.Windows.Test/obj" />
+      <excludeFolder url="file://$MODULE_DIR$/../../NzbDrone.Windows/obj" />
+      <excludeFolder url="file://$MODULE_DIR$/../../NzbDrone/obj" />
+      <excludeFolder url="file://$MODULE_DIR$/../../ServiceHelpers/ServiceInstall/obj" />
+      <excludeFolder url="file://$MODULE_DIR$/../../ServiceHelpers/ServiceUninstall/obj" />
+      <excludeFolder url="file://$MODULE_DIR$/../../_ReSharper.Caches/ReSharperHost8.NzbDrone.00" />
+      <excludeFolder url="file://$MODULE_DIR$/../../packages" />
+    </content>
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

src/Marr.Data/Parameters/ParameterChainMethods.cs

@@ -14,8 +14,10 @@ You should have received a copy of the GNU Lesser General Public
 License along with this library. If not, see <http://www.gnu.org/licenses/>. */
 
 using System;
+using System.Collections.Generic;
 using System.Data;
 using System.Data.Common;
+using System.Runtime.InteropServices.ComTypes;
 using Marr.Data.Converters;
 
 namespace Marr.Data.Parameters
@@ -42,15 +44,25 @@ namespace Marr.Data.Parameters
             Type valueType = value.GetType();
 
             // Check for a registered IConverter
-            IConverter converter = MapRepository.Instance.GetConverter(valueType);
+            //If we have a list of ints, we ignore the converter since we want to do an in statement!
-            if (converter != null)
+            var list = value as List<int>;
+            if (list != null)
             {
-                Parameter.Value = converter.ToDB(value);
+                Parameter.Value = $"{string.Join(",", list)}";
             }
             else
             {
-                Parameter.Value = value;
+                IConverter converter = MapRepository.Instance.GetConverter(valueType);
-            } 
+                if (converter != null)
+                {
+                    Parameter.Value = converter.ToDB(value);
+                }
+                else
+                {
+                    Parameter.Value = value;
+                } 
+            }
+            
 
             //// Determine the correct DbType based on the passed in value type
             //IDbTypeBuilder typeBuilder = MapRepository.Instance.DbTypeBuilder;

src/Marr.Data/QGen/Dialects/Dialect.cs

@@ -68,5 +68,13 @@ namespace Marr.Data.QGen.Dialects
         {
             get { return "({0} LIKE '%' + {1} + '%')"; }
         }
+
+        public virtual string InFormat
+        {
+            get
+            {
+                return "({0} in ({1}))";
+            }
+        }
     }
 }

src/Marr.Data/QGen/SelectQuery.cs

@@ -1,4 +1,5 @@
-using System.Text;
+using System.Linq;
+using System.Text;
 using Marr.Data.Mapping;
 using Marr.Data.QGen.Dialects;
 
@@ -129,7 +130,16 @@ namespace Marr.Data.QGen
         public void BuildOrderClause(StringBuilder sql)
         {
             sql.Append(OrderBy.ToString());
-        }       
+        }
+       
+        public void BuildGroupBy(StringBuilder sql)
+        {
+            var baseTable = this.Tables.First();
+            var primaryKeyColumn = baseTable.Columns.Single(c => c.ColumnInfo.IsPrimaryKey);
+
+            string token = this.Dialect.CreateToken(string.Concat(baseTable.Alias, ".", primaryKeyColumn.ColumnInfo.Name));
+            sql.AppendFormat(" GROUP BY {0}", token);
+        }
 
         private string TranslateJoin(JoinType join)
         {

src/Marr.Data/QGen/SqliteRowCountQueryDecorator.cs

@@ -14,8 +14,22 @@ namespace Marr.Data.QGen
         public string Generate()
         {
             StringBuilder sql = new StringBuilder();
-
+            
             BuildSelectCountClause(sql);
+
+            if (_innerQuery.IsJoin)
+            {
+                sql.Append(" FROM (");
+                _innerQuery.BuildSelectClause(sql);
+                _innerQuery.BuildFromClause(sql);
+                _innerQuery.BuildJoinClauses(sql);
+                _innerQuery.BuildWhereClause(sql);
+                _innerQuery.BuildGroupBy(sql);
+                sql.Append(") ");
+
+                return sql.ToString();
+            }
+            
             _innerQuery.BuildFromClause(sql);
             _innerQuery.BuildJoinClauses(sql);
             _innerQuery.BuildWhereClause(sql);

src/Marr.Data/QGen/WhereBuilder.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Text;
 using System.Linq.Expressions;
 using System.Data.Common;
@@ -92,6 +93,10 @@ namespace Marr.Data.QGen
                 case "EndsWith":
                     Write_EndsWith(expression);
                     break;
+                    
+                case "In":
+                    Write_In(expression);
+                    break;
 
                 default:
                     string msg = string.Format("'{0}' expressions are not yet implemented in the where clause expression tree parser.", method);
@@ -140,31 +145,47 @@ namespace Marr.Data.QGen
             return expression;
         }
 
-        private object GetRightValue(Expression rightExpression)
+        private object GetRightValue(Expression expression)
         {
             object rightValue = null;
-
+			
-            var right = rightExpression as ConstantExpression;
+            var simpleConstExp = expression as ConstantExpression;
-            if (right == null) // Value is not directly passed in as a constant
+            if (simpleConstExp == null) // Value is not directly passed in as a constant
             {
-                var rightMemberExp = (rightExpression as MemberExpression);
+                MemberExpression memberExp = expression as MemberExpression;
-                var parentMemberExpression = rightMemberExp.Expression as MemberExpression;
+                ConstantExpression constExp = null;
-                if (parentMemberExpression != null) // Value is passed in as a property on a parent entity
+
+                // Value may be nested in multiple levels of objects/properties, so traverse the MemberExpressions 
+                // until a ConstantExpression property value is found, and then unwind the stack to get the value.
+                var memberNames = new Stack<string>();
+
+                while (memberExp != null)
                 {
-                    string entityName = (rightMemberExp.Expression as MemberExpression).Member.Name;
+                    memberNames.Push(memberExp.Member.Name);
-                    var container = ((rightMemberExp.Expression as MemberExpression).Expression as ConstantExpression).Value;
+
-                    var entity = _repos.ReflectionStrategy.GetFieldValue(container, entityName);
+                    // Function calls are not supported - user needs to simplify their Where expression.
-                    rightValue = _repos.ReflectionStrategy.GetFieldValue(entity, rightMemberExp.Member.Name);
+                    var methodExp = memberExp.Expression as MethodCallExpression;
+                    if (methodExp != null)
+                    {
+                        var errMsg = string.Format("Function calls are not supported by the Where clause expression parser.  Please evaluate your function call, '{0}', manually and then use the resulting paremeter value in your Where expression.",  methodExp.Method.Name);
+                        throw new NotSupportedException(errMsg);
+                    }
+
+                    constExp = memberExp.Expression as ConstantExpression;
+                    memberExp = memberExp.Expression as MemberExpression;
                 }
-                else // Value is passed in as a variable
+
+                object entity = constExp.Value;
+                while (memberNames.Count > 0)
                 {
-                    var parent = (rightMemberExp.Expression as ConstantExpression).Value;
+                    string entityName = memberNames.Pop();
-                    rightValue = _repos.ReflectionStrategy.GetFieldValue(parent, rightMemberExp.Member.Name);
+                    entity = _repos.ReflectionStrategy.GetFieldValue(entity, entityName);
                 }
+                rightValue = entity;
             }
             else // Value is passed in directly as a constant
             {
-                rightValue = right.Value;
+                rightValue = simpleConstExp.Value;
             }
 
             return rightValue;
@@ -238,6 +259,17 @@ namespace Marr.Data.QGen
             _sb.AppendFormat(_dialect.ContainsFormat, fqColumn, paramName);
         }
 
+        private void Write_In(MethodCallExpression body)
+        {
+            object value = GetRightValue(body.Arguments[1]);
+            //string paramName = string.Concat(_paramPrefix, "P", _command.Parameters.Count.ToString());
+            //var parameter = new ParameterChainMethods(_command, paramName, value).Parameter;
+
+            MemberExpression memberExp = (body.Arguments[0] as MemberExpression);
+            string fqColumn = GetFullyQualifiedColumnName(memberExp.Member, memberExp.Expression.Type);
+            _sb.AppendFormat(_dialect.InFormat, fqColumn, string.Join(",", value as List<int>));
+        }
+
         private void Write_StartsWith(MethodCallExpression body)
         {
             // Add parameter to Command.Parameters

src/NzbDrone.Api/Authentication/EnableAuthInNancy.cs

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

src/NzbDrone.Api/Blacklist/BlacklistResource.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using NzbDrone.Api.Movie;
 using NzbDrone.Api.REST;
 using NzbDrone.Core.Qualities;
 using NzbDrone.Api.Series;
@@ -11,13 +12,14 @@ namespace NzbDrone.Api.Blacklist
     {
         public int SeriesId { get; set; }
         public List<int> EpisodeIds { get; set; }
+        public int MovieId { get; set; }
         public string SourceTitle { get; set; }
         public QualityModel Quality { get; set; }
         public DateTime Date { get; set; }
         public DownloadProtocol Protocol { get; set; }
         public string Indexer { get; set; }
         public string Message { get; set; }
-
+        public MovieResource Movie { get; set; }
         public SeriesResource Series { get; set; }
     }
 
@@ -30,7 +32,7 @@ namespace NzbDrone.Api.Blacklist
             return new BlacklistResource
             {
                 Id = model.Id,
-
+                MovieId = model.MovieId,
                 SeriesId = model.SeriesId,
                 EpisodeIds = model.EpisodeIds,
                 SourceTitle = model.SourceTitle,
@@ -39,7 +41,7 @@ namespace NzbDrone.Api.Blacklist
                 Protocol = model.Protocol,
                 Indexer = model.Indexer,
                 Message = model.Message,
-
+                Movie = model.Movie.ToResource(),
                 Series = model.Series.ToResource()
             };
         }

src/NzbDrone.Api/Calendar/CalendarFeedModule.cs

@@ -1,9 +1,10 @@
-using Nancy;
+using Nancy;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using Ical.Net;
 using Ical.Net.DataTypes;
+using Ical.Net.General;
 using Ical.Net.Interfaces.Serialization;
 using Ical.Net.Serialization;
 using Ical.Net.Serialization.iCalendar.Factory;
@@ -16,13 +17,13 @@ namespace NzbDrone.Api.Calendar
 {
     public class CalendarFeedModule : NzbDroneFeedModule
     {
-        private readonly IEpisodeService _episodeService;
+        private readonly IMovieService _movieService;
         private readonly ITagService _tagService;
 
-        public CalendarFeedModule(IEpisodeService episodeService, ITagService tagService)
+        public CalendarFeedModule(IMovieService movieService, ITagService tagService)
             : base("calendar")
         {
-            _episodeService = episodeService;
+            _movieService = movieService;
             _tagService = tagService;
 
             Get["/NzbDrone.ics"] = options => GetCalendarFeed();
@@ -37,7 +38,7 @@ namespace NzbDrone.Api.Calendar
             var start = DateTime.Today.AddDays(-pastDays);
             var end = DateTime.Today.AddDays(futureDays);
             var unmonitored = false;
-            var premiersOnly = false;
+            //var premiersOnly = false;
             var tags = new List<int>();
 
             // TODO: Remove start/end parameters in v3, they don't work well for iCal
@@ -46,7 +47,7 @@ namespace NzbDrone.Api.Calendar
             var queryPastDays = Request.Query.PastDays;
             var queryFutureDays = Request.Query.FutureDays;
             var queryUnmonitored = Request.Query.Unmonitored;
-            var queryPremiersOnly = Request.Query.PremiersOnly;
+            // var queryPremiersOnly = Request.Query.PremiersOnly;
             var queryTags = Request.Query.Tags;
 
             if (queryStart.HasValue) start = DateTime.Parse(queryStart.Value);
@@ -69,10 +70,10 @@ namespace NzbDrone.Api.Calendar
                 unmonitored = bool.Parse(queryUnmonitored.Value);
             }
 
-            if (queryPremiersOnly.HasValue)
+            //if (queryPremiersOnly.HasValue)
-            {
+            //{
-                premiersOnly = bool.Parse(queryPremiersOnly.Value);
+            //    premiersOnly = bool.Parse(queryPremiersOnly.Value);
-            }
+            //}
 
             if (queryTags.HasValue)
             {
@@ -80,43 +81,62 @@ namespace NzbDrone.Api.Calendar
                 tags.AddRange(tagInput.Split(',').Select(_tagService.GetTag).Select(t => t.Id));
             }
 
-            var episodes = _episodeService.EpisodesBetweenDates(start, end, unmonitored);
+            var movies = _movieService.GetMoviesBetweenDates(start, end, unmonitored);
             var calendar = new Ical.Net.Calendar
             {
-                ProductId = "-//sonarr.tv//Sonarr//EN"
+                ProductId = "-//radarr.video//Radarr//EN"
             };
 
+            var calendarName = "Radarr Movies Calendar";
+            calendar.AddProperty(new CalendarProperty("NAME", calendarName));
+            calendar.AddProperty(new CalendarProperty("X-WR-CALNAME", calendarName));
 
-
+            foreach (var movie in movies.OrderBy(v => v.Added))
-            foreach (var episode in episodes.OrderBy(v => v.AirDateUtc.Value))
             {
-                if (premiersOnly && (episode.SeasonNumber == 0 || episode.EpisodeNumber != 1))
+                if (tags.Any() && tags.None(movie.Tags.Contains))
-                {
-                    continue;
-                }
-
-                if (tags.Any() && tags.None(episode.Series.Tags.Contains))
                 {
                     continue;
                 }
 
                 var occurrence = calendar.Create<Event>();
-                occurrence.Uid = "NzbDrone_episode_" + episode.Id;
+                occurrence.Uid = "NzbDrone_movie_" + movie.Id;
-                occurrence.Status = episode.HasFile ? EventStatus.Confirmed : EventStatus.Tentative;
+                occurrence.Status = movie.HasFile ? EventStatus.Confirmed : EventStatus.Tentative;
-                occurrence.Start = new CalDateTime(episode.AirDateUtc.Value) { HasTime = true };
-                occurrence.End = new CalDateTime(episode.AirDateUtc.Value.AddMinutes(episode.Series.Runtime)) { HasTime = true };
-                occurrence.Description = episode.Overview;
-                occurrence.Categories = new List<string>() { episode.Series.Network };
 
-                switch (episode.Series.SeriesType)
+                switch (movie.Status)
                 {
-                    case SeriesTypes.Daily:
+                    case MovieStatusType.PreDB:
-                        occurrence.Summary = $"{episode.Series.Title} - {episode.Title}";
+                        if (movie.PhysicalRelease != null)
+                        {
+                            occurrence.Start = new CalDateTime(movie.PhysicalRelease.Value) { HasTime = true };
+                            occurrence.End = new CalDateTime(movie.PhysicalRelease.Value.AddMinutes(movie.Runtime)) { HasTime = true };
+                        }
                         break;
+
+                    case MovieStatusType.InCinemas:
+                        if (movie.InCinemas != null)
+                        {
+                            occurrence.Start = new CalDateTime(movie.InCinemas.Value) { HasTime = true };
+                            occurrence.End = new CalDateTime(movie.InCinemas.Value.AddMinutes(movie.Runtime)) { HasTime = true };
+                        }
+                        break;
+
+                    case MovieStatusType.Announced:
+                        continue; // no date
+
                     default:
-                        occurrence.Summary =$"{episode.Series.Title} - {episode.SeasonNumber}x{episode.EpisodeNumber:00} - {episode.Title}";
+                        if (movie.PhysicalRelease != null)
+                        {
+                            occurrence.Start = new CalDateTime(movie.PhysicalRelease.Value) { HasTime = true };
+                            occurrence.End = new CalDateTime(movie.PhysicalRelease.Value.AddMinutes(movie.Runtime)) { HasTime = true };
+                        }
                         break;
                 }
+
+                occurrence.Description = movie.Overview;
+                occurrence.Categories = new List<string>() { movie.Studio };
+
+                occurrence.Summary = $"{movie.Title}";
+
             }
 
             var serializer = (IStringSerializer) new SerializerFactory().Build(calendar.GetType(), new SerializationContext());

src/NzbDrone.Api/Calendar/CalendarModule.cs

@@ -1,8 +1,10 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Nancy;
 using NzbDrone.Api.Episodes;
 using NzbDrone.Api.Movie;
+using NzbDrone.Api.Series;
 using NzbDrone.Core.Datastore.Events;
 using NzbDrone.Core.MediaCover;
 using NzbDrone.Core.MediaFiles;

src/NzbDrone.Api/ClientSchema/SchemaBuilder.cs

@@ -1,11 +1,14 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 using Newtonsoft.Json.Linq;
 using NzbDrone.Common.EnsureThat;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Common.Reflection;
 using NzbDrone.Core.Annotations;
+using NzbDrone.Core.Qualities;
+using NzbDrone.Core.Profiles;
 
 namespace NzbDrone.Api.ClientSchema
 {
@@ -43,7 +46,7 @@ namespace NzbDrone.Api.ClientSchema
                         field.Value = value;
                     }
 
-                    if (fieldAttribute.Type == FieldType.Select)
+                    if (fieldAttribute.Type == FieldType.Select || fieldAttribute.Type == FieldType.Tag)
                     {
                         field.SelectOptions = GetSelectOptions(fieldAttribute.SelectOptions);
                     }
@@ -73,14 +76,14 @@ namespace NzbDrone.Api.ClientSchema
 
                     if (propertyInfo.PropertyType == typeof(int))
                     {
-                        var value = Convert.ToInt32(field.Value);
+                        var value = field.Value.ToString().ParseInt32();
-                        propertyInfo.SetValue(target, value, null);
+                        propertyInfo.SetValue(target, value ?? 0, null);
                     }
 
                     else if (propertyInfo.PropertyType == typeof(long))
                     {
-                        var value = Convert.ToInt64(field.Value);
+                        var value = field.Value.ToString().ParseInt64();
-                        propertyInfo.SetValue(target, value, null);
+                        propertyInfo.SetValue(target, value ?? 0, null);
                     }
 
                     else if (propertyInfo.PropertyType == typeof(int?))
@@ -147,10 +150,22 @@ namespace NzbDrone.Api.ClientSchema
 
         private static List<SelectOption> GetSelectOptions(Type selectOptions)
         {
+            if (selectOptions == null || selectOptions == typeof(Profile))
+            {
+                return new List<SelectOption>();
+            }
+
+            if (selectOptions == typeof(Quality))
+            {
+                var qOptions = from Quality q in selectOptions.GetProperties(BindingFlags.Static | BindingFlags.Public)
+                    select new SelectOption {Name = q.Name, Value = q.Id};
+                return qOptions.OrderBy(o => o.Value).ToList();
+            }
+
             var options = from Enum e in Enum.GetValues(selectOptions)
                           select new SelectOption { Value = Convert.ToInt32(e), Name = e.ToString() };
 
-            return options.OrderBy(o => o.Value).ToList();
+            return options.OrderBy(o => o.Name).ToList();
         }
     }
 }

src/NzbDrone.Api/Commands/CommandModule.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using NLog;
 using NzbDrone.Api.Extensions;
 using NzbDrone.Api.Validation;
 using NzbDrone.Common;
@@ -17,14 +18,17 @@ namespace NzbDrone.Api.Commands
     {
         private readonly IManageCommandQueue _commandQueueManager;
         private readonly IServiceFactory _serviceFactory;
+        private readonly Logger _logger;
 
         public CommandModule(IManageCommandQueue commandQueueManager,
                              IBroadcastSignalRMessage signalRBroadcaster,
-                             IServiceFactory serviceFactory)
+                             IServiceFactory serviceFactory,
+                             Logger logger)
             : base(signalRBroadcaster)
         {
             _commandQueueManager = commandQueueManager;
             _serviceFactory = serviceFactory;
+            _logger = logger;
 
             GetResourceById = GetCommand;
             CreateResource = StartCommand;
@@ -41,7 +45,13 @@ namespace NzbDrone.Api.Commands
         private int StartCommand(CommandResource commandResource)
         {
             var commandType = _serviceFactory.GetImplementations(typeof(Command))
-                                             .Single(c => c.Name.Replace("Command", "").Equals(commandResource.Name, StringComparison.InvariantCultureIgnoreCase));
+                                             .SingleOrDefault(c => c.Name.Replace("Command", "").Equals(commandResource.Name, StringComparison.InvariantCultureIgnoreCase));
+
+            if (commandType == null)
+            {
+                _logger.Error("Found no matching command for {0}", commandResource.Name);
+                return 0;
+            }
 
             dynamic command = Request.Body.FromJson(commandType);
             command.Trigger = CommandTrigger.Manual;

src/NzbDrone.Api/Config/DownloadClientConfigModule.cs

@@ -12,13 +12,13 @@ namespace NzbDrone.Api.Config
                                           MappedNetworkDriveValidator mappedNetworkDriveValidator)
             : base(configService)
         {
-            SharedValidator.RuleFor(c => c.DownloadedEpisodesFolder)
+            SharedValidator.RuleFor(c => c.DownloadedMoviesFolder)
                            .Cascade(CascadeMode.StopOnFirstFailure)
                            .IsValidPath()
                            .SetValidator(rootFolderValidator)
                            .SetValidator(mappedNetworkDriveValidator)
                            .SetValidator(pathExistsValidator)
-                           .When(c => !string.IsNullOrWhiteSpace(c.DownloadedEpisodesFolder));
+                           .When(c => !string.IsNullOrWhiteSpace(c.DownloadedMoviesFolder));
         }
 
         protected override DownloadClientConfigResource ToResource(IConfigService model)

src/NzbDrone.Api/Config/DownloadClientConfigResource.cs

@@ -5,9 +5,9 @@ namespace NzbDrone.Api.Config
 {
     public class DownloadClientConfigResource : RestResource
     {
-        public string DownloadedEpisodesFolder { get; set; }
+        public string DownloadedMoviesFolder { get; set; }
         public string DownloadClientWorkingFolders { get; set; }
-        public int DownloadedEpisodesScanInterval { get; set; }
+        public int DownloadedMoviesScanInterval { get; set; }
 
         public bool EnableCompletedDownloadHandling { get; set; }
         public bool RemoveCompletedDownloads { get; set; }
@@ -22,9 +22,9 @@ namespace NzbDrone.Api.Config
         {
             return new DownloadClientConfigResource
             {
-                DownloadedEpisodesFolder = model.DownloadedEpisodesFolder,
+                DownloadedMoviesFolder = model.DownloadedMoviesFolder,
                 DownloadClientWorkingFolders = model.DownloadClientWorkingFolders,
-                DownloadedEpisodesScanInterval = model.DownloadedEpisodesScanInterval,
+                DownloadedMoviesScanInterval = model.DownloadedMoviesScanInterval,
 
                 EnableCompletedDownloadHandling = model.EnableCompletedDownloadHandling,
                 RemoveCompletedDownloads = model.RemoveCompletedDownloads,

src/NzbDrone.Api/Config/IndexerConfigResource.cs

@@ -1,5 +1,6 @@
 using NzbDrone.Api.REST;
 using NzbDrone.Core.Configuration;
+using NzbDrone.Core.Parser;
 
 namespace NzbDrone.Api.Config
 {
@@ -8,6 +9,11 @@ namespace NzbDrone.Api.Config
         public int MinimumAge { get; set; }
         public int Retention { get; set; }
         public int RssSyncInterval { get; set; }
+        public bool PreferIndexerFlags { get; set; }
+		public int AvailabilityDelay { get; set; }
+		public bool AllowHardcodedSubs { get; set; }
+		public string WhitelistedHardcodedSubs { get; set; }
+        public ParsingLeniencyType ParsingLeniency { get; set; }
     }
 
     public static class IndexerConfigResourceMapper
@@ -19,6 +25,11 @@ namespace NzbDrone.Api.Config
                 MinimumAge = model.MinimumAge,
                 Retention = model.Retention,
                 RssSyncInterval = model.RssSyncInterval,
+                PreferIndexerFlags = model.PreferIndexerFlags,
+				AvailabilityDelay = model.AvailabilityDelay,
+				AllowHardcodedSubs = model.AllowHardcodedSubs,
+				WhitelistedHardcodedSubs = model.WhitelistedHardcodedSubs,
+                ParsingLeniency = model.ParsingLeniency,
             };
         }
     }

src/NzbDrone.Api/Config/MediaManagementConfigResource.cs

@@ -11,6 +11,8 @@ namespace NzbDrone.Api.Config
         public bool AutoDownloadPropers { get; set; }
         public bool CreateEmptySeriesFolders { get; set; }
         public FileDateType FileDate { get; set; }
+        public bool AutoRenameFolders { get; set; }
+        public bool PathsDefaultStatic { get; set; }
 
         public bool SetPermissionsLinux { get; set; }
         public string FileChmod { get; set; }
@@ -35,6 +37,8 @@ namespace NzbDrone.Api.Config
                 AutoDownloadPropers = model.AutoDownloadPropers,
                 CreateEmptySeriesFolders = model.CreateEmptySeriesFolders,
                 FileDate = model.FileDate,
+                AutoRenameFolders = model.AutoRenameFolders,
+                PathsDefaultStatic = model.PathsDefaultStatic,
 
                 SetPermissionsLinux = model.SetPermissionsLinux,
                 FileChmod = model.FileChmod,

src/NzbDrone.Api/Config/NetImportConfigModule.cs

@@ -0,0 +1,22 @@
+using FluentValidation;
+using NzbDrone.Api.Validation;
+using NzbDrone.Core.Configuration;
+
+namespace NzbDrone.Api.Config
+{
+    public class NetImportConfigModule : NzbDroneConfigModule<NetImportConfigResource>
+    {
+
+        public NetImportConfigModule(IConfigService configService)
+            : base(configService)
+        {
+            SharedValidator.RuleFor(c => c.NetImportSyncInterval)
+               .IsValidNetImportSyncInterval();
+        }
+
+        protected override NetImportConfigResource ToResource(IConfigService model)
+        {
+            return NetImportConfigResourceMapper.ToResource(model);
+        }
+    }
+}

src/NzbDrone.Api/Config/NetImportConfigResource.cs

@@ -0,0 +1,31 @@
+using NzbDrone.Api.REST;
+using NzbDrone.Core.Configuration;
+
+namespace NzbDrone.Api.Config
+{
+    public class NetImportConfigResource : RestResource
+    {
+        public int NetImportSyncInterval { get; set; }
+	public string ListSyncLevel { get; set; }
+	public string ImportExclusions { get; set; }
+	public string TraktAuthToken { get; set; }
+	public string TraktRefreshToken { get; set; }
+	public int TraktTokenExpiry { get; set; }
+    }
+
+    public static class NetImportConfigResourceMapper
+    {
+        public static NetImportConfigResource ToResource(IConfigService model)
+        {
+            return new NetImportConfigResource
+            {
+                NetImportSyncInterval = model.NetImportSyncInterval,
+		ListSyncLevel = model.ListSyncLevel,
+		ImportExclusions = model.ImportExclusions,
+	        TraktAuthToken = model.TraktAuthToken,
+	        TraktRefreshToken = model.TraktRefreshToken,
+	        TraktTokenExpiry = model.TraktTokenExpiry,
+            };
+        }
+    }
+}

src/NzbDrone.Api/EpisodeFiles/EpisodeFileModule.cs

@@ -71,7 +71,7 @@ namespace NzbDrone.Api.EpisodeFiles
 
         private void DeleteEpisodeFile(int id)
         {
-            var episodeFile = _mediaFileService.Get(id);
+			var episodeFile = _mediaFileService.Get(id);
             var series = _seriesService.GetSeries(episodeFile.SeriesId);
             var fullPath = Path.Combine(series.Path, episodeFile.RelativePath);
 

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

@@ -23,6 +23,8 @@ namespace NzbDrone.Api.Extensions.Pipelines
 
         private void Handle(NancyContext context)
         {
+            if (context.Request.Method == "OPTIONS") return;
+
             if (_cacheableSpecification.IsCacheable(context))
             {
                 context.Response.Headers.EnableCache();
@@ -33,4 +35,4 @@ namespace NzbDrone.Api.Extensions.Pipelines
             }
         }
     }
-}
+}

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

@@ -2,6 +2,7 @@
 using System.Linq;
 using Nancy;
 using Nancy.Bootstrapper;
+using NzbDrone.Common.Extensions;
 
 namespace NzbDrone.Api.Extensions.Pipelines
 {
@@ -11,10 +12,25 @@ namespace NzbDrone.Api.Extensions.Pipelines
 
         public void Register(IPipelines pipelines)
         {
-            pipelines.AfterRequest.AddItemToEndOfPipeline((Action<NancyContext>) Handle);
+            pipelines.BeforeRequest.AddItemToEndOfPipeline(HandleRequest);
+            pipelines.AfterRequest.AddItemToEndOfPipeline(HandleResponse);
         }
 
-        private void Handle(NancyContext context)
+        private Response HandleRequest(NancyContext context)
+        {
+            if (context == null || context.Request.Method != "OPTIONS")
+            {
+                return null;
+            }
+
+            var response = new Response()
+                .WithStatusCode(HttpStatusCode.OK)
+                .WithContentType("");
+            ApplyResponseHeaders(response, context.Request);
+            return response;
+        }
+
+        private void HandleResponse(NancyContext context)
         {
             if (context == null || context.Response.Headers.ContainsKey(AccessControlHeaders.AllowOrigin))
             {
@@ -26,21 +42,39 @@ namespace NzbDrone.Api.Extensions.Pipelines
 
         private static void ApplyResponseHeaders(Response response, Request request)
         {
-            var allowedMethods = "GET, OPTIONS, PATCH, POST, PUT, DELETE";
+            if (request.IsApiRequest())
-
-            if (response.Headers.ContainsKey("Allow"))
             {
-                allowedMethods = response.Headers["Allow"];
+                // Allow Cross-Origin access to the API since it's protected with the apikey, and nothing else.
+                ApplyCorsResponseHeaders(response, request, "*", "GET, OPTIONS, PATCH, POST, PUT, DELETE");
             }
-            
+            else if (request.IsSharedContentRequest())
-            var requestedHeaders = string.Join(", ", request.Headers[AccessControlHeaders.RequestHeaders]);
-
-            response.Headers.Add(AccessControlHeaders.AllowOrigin, "*");
-            response.Headers.Add(AccessControlHeaders.AllowMethods, allowedMethods);
-
-            if (request.Headers[AccessControlHeaders.RequestHeaders].Any())
             {
-                response.Headers.Add(AccessControlHeaders.AllowHeaders, requestedHeaders);
+                // Allow Cross-Origin access to specific shared content such as mediacovers and images.
+                ApplyCorsResponseHeaders(response, request, "*", "GET, OPTIONS");
+            }
+
+            // Disallow Cross-Origin access for any other route.
+        }
+
+        private static void ApplyCorsResponseHeaders(Response response, Request request, string allowOrigin, string allowedMethods)
+        {
+            response.Headers.Add(AccessControlHeaders.AllowOrigin, allowOrigin);
+
+            if (request.Method == "OPTIONS")
+            {
+                if (response.Headers.ContainsKey("Allow"))
+                {
+                    allowedMethods = response.Headers["Allow"];
+                }
+
+                response.Headers.Add(AccessControlHeaders.AllowMethods, allowedMethods);
+
+                if (request.Headers[AccessControlHeaders.RequestHeaders].Any())
+                {
+                    var requestedHeaders = string.Join(", ", request.Headers[AccessControlHeaders.RequestHeaders]);
+
+                    response.Headers.Add(AccessControlHeaders.AllowHeaders, requestedHeaders);
+                }
             }
         }
     }

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

@@ -33,7 +33,8 @@ namespace NzbDrone.Api.Extensions.Pipelines
             try
             {
                 if (
-                   !response.ContentType.Contains("image")
+                   response.Contents != Response.NoBody
+                && !response.ContentType.Contains("image")
                 && !response.ContentType.Contains("font")
                 && request.Headers.AcceptEncoding.Any(x => x.Contains("gzip"))
                 && !AlreadyGzipEncoded(response)
@@ -80,4 +81,4 @@ namespace NzbDrone.Api.Extensions.Pipelines
             return false;
         }
     }
-}
+}

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

@@ -66,13 +66,9 @@ namespace NzbDrone.Api.Extensions.Pipelines
         private Response LogError(NancyContext context, Exception exception)
         {
             var response = _errorPipeline.HandleException(context, exception);
-
             context.Response = response;
-
             LogEnd(context);
-
             context.Response = null;
-
             return response;
         }
 
@@ -80,12 +76,9 @@ namespace NzbDrone.Api.Extensions.Pipelines
         {
             if (request.Url.Query.IsNotNullOrWhiteSpace())
             {
-                return string.Concat(request.Url.Path, "?", request.Url.Query);
+                return string.Concat(request.Url.Path, request.Url.Query);
-            }
-            else
-            {
-                return request.Url.Path;
             }
+            return request.Url.Path;
         }
     }
 }

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

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

src/NzbDrone.Api/Extensions/RequestExtensions.cs

@@ -36,5 +36,11 @@ namespace NzbDrone.Api.Extensions
         {
             return request.Path.StartsWith("/Content/", StringComparison.InvariantCultureIgnoreCase);
         }
+
+        public static bool IsSharedContentRequest(this Request request)
+        {
+            return request.Path.StartsWith("/MediaCover/", StringComparison.InvariantCultureIgnoreCase) ||
+                   request.Path.StartsWith("/Content/Images/", StringComparison.InvariantCultureIgnoreCase);
+        }
     }
 }

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

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Text.RegularExpressions;
 using Nancy;
@@ -17,7 +17,7 @@ namespace NzbDrone.Api.Frontend.Mappers
         private readonly IAnalyticsService _analyticsService;
         private readonly Func<ICacheBreakerProvider> _cacheBreakProviderFactory;
         private readonly string _indexPath;
-        private static readonly Regex ReplaceRegex = new Regex(@"(?:(?<attribute>href|src)=\"")(?<path>.*?(?<extension>css|js|png|ico|ics))(?:\"")(?:\s(?<nohash>data-no-hash))?", RegexOptions.Compiled | RegexOptions.IgnoreCase);
+        private static readonly Regex ReplaceRegex = new Regex(@"(?:(?<attribute>href|src|content)=\"")(?<path>.*?(?<extension>css|js|png|ico|ics|svg|json|xml))(?:\"")(?:\s(?<nohash>data-no-hash))?", RegexOptions.Compiled | RegexOptions.IgnoreCase);
 
         private static string API_KEY;
         private static string URL_BASE;
@@ -49,7 +49,12 @@ namespace NzbDrone.Api.Frontend.Mappers
 
         public override bool CanHandle(string resourceUrl)
         {
-            return !resourceUrl.Contains(".") && !resourceUrl.StartsWith("/login");
+            resourceUrl = resourceUrl.ToLowerInvariant();
+
+            return !resourceUrl.StartsWith("/content") &&
+                   !resourceUrl.StartsWith("/mediacover") &&
+                   !resourceUrl.Contains(".") &&
+                   !resourceUrl.StartsWith("/login");
         }
 
         public override Response GetResponse(string resourceUrl)
@@ -113,4 +118,4 @@ namespace NzbDrone.Api.Frontend.Mappers
             return _generatedContent;
         }
     }
-}
+}

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

@@ -1,3 +1,4 @@
+using System;
 using System.IO;
 using System.Text.RegularExpressions;
 using NLog;
@@ -42,7 +43,7 @@ namespace NzbDrone.Api.Frontend.Mappers
 
         public override bool CanHandle(string resourceUrl)
         {
-            return resourceUrl.StartsWith("/MediaCover");
+            return resourceUrl.StartsWith("/MediaCover", StringComparison.InvariantCultureIgnoreCase);
         }
     }
-}
+}

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

@@ -1,3 +1,4 @@
+using System;
 using System.IO;
 using NLog;
 using NzbDrone.Common.Disk;
@@ -28,7 +29,9 @@ namespace NzbDrone.Api.Frontend.Mappers
 
         public override bool CanHandle(string resourceUrl)
         {
-            return resourceUrl.StartsWith("/Content") ||
+            resourceUrl = resourceUrl.ToLowerInvariant();
+
+            return resourceUrl.StartsWith("/content") ||
                    resourceUrl.EndsWith(".js") ||
                    resourceUrl.EndsWith(".map") ||
                    resourceUrl.EndsWith(".css") ||
@@ -37,4 +40,4 @@ namespace NzbDrone.Api.Frontend.Mappers
                    resourceUrl.EndsWith("oauth.html");
         }
     }
-}
+}

src/NzbDrone.Api/Frontend/StaticResourceModule.cs

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

src/NzbDrone.Api/History/HistoryModule.cs

@@ -1,8 +1,6 @@
 using System;
 using Nancy;
-using NzbDrone.Api.Episodes;
 using NzbDrone.Api.Extensions;
-using NzbDrone.Api.Series;
 using NzbDrone.Api.Movie;
 using NzbDrone.Core.Datastore;
 using NzbDrone.Core.DecisionEngine;
@@ -32,16 +30,8 @@ namespace NzbDrone.Api.History
         protected HistoryResource MapToResource(Core.History.History model)
         {
             var resource = model.ToResource();
-
-            resource.Series = model.Series.ToResource();
-            resource.Episode = model.Episode.ToResource();
             resource.Movie = model.Movie.ToResource();
 
-            if (model.Series != null)
-            {
-                resource.QualityCutoffNotMet = _qualityUpgradableSpecification.CutoffNotMet(model.Series.Profile.Value, model.Quality);
-            }
-
             if (model.Movie != null)
             {
                 resource.QualityCutoffNotMet = _qualityUpgradableSpecification.CutoffNotMet(model.Movie.Profile.Value, model.Quality);
@@ -52,8 +42,6 @@ namespace NzbDrone.Api.History
 
         private PagingResource<HistoryResource> GetHistory(PagingResource<HistoryResource> pagingResource)
         {
-            var episodeId = Request.Query.EpisodeId;
-
             var movieId = Request.Query.MovieId;
 
             var pagingSpec = pagingResource.MapToPagingSpec<HistoryResource, Core.History.History>("date", SortDirection.Descending);
@@ -64,12 +52,6 @@ namespace NzbDrone.Api.History
                 pagingSpec.FilterExpression = v => v.EventType == filterValue;
             }
 
-            if (episodeId.HasValue)
-            {
-                int i = (int)episodeId;
-                pagingSpec.FilterExpression = h => h.EpisodeId == i;
-            }
-
             if (movieId.HasValue)
             {
                 int i = (int)movieId;

src/NzbDrone.Api/Indexers/ReleaseModule.cs

@@ -46,7 +46,7 @@ namespace NzbDrone.Api.Indexers
             GetResourceAll = GetReleases;
             Post["/"] = x => DownloadRelease(this.Bind<ReleaseResource>());
 
-            PostValidator.RuleFor(s => s.DownloadAllowed).Equal(true);
+            //PostValidator.RuleFor(s => s.DownloadAllowed).Equal(true);
             PostValidator.RuleFor(s => s.Guid).NotEmpty();
 
             _remoteEpisodeCache = cacheManager.GetCache<RemoteEpisode>(GetType(), "remoteEpisodes");
@@ -70,7 +70,7 @@ namespace NzbDrone.Api.Indexers
 
                 try
                 {
-                    _downloadService.DownloadReport(remoteMovie);
+                    _downloadService.DownloadReport(remoteMovie, false);
                 }
                 catch (ReleaseDownloadException ex)
                 {

src/NzbDrone.Api/Indexers/ReleaseModuleBase.cs

@@ -25,9 +25,9 @@ namespace NzbDrone.Api.Indexers
 
             release.ReleaseWeight = initialWeight;
 
-            if (decision.RemoteEpisode.Series != null)
+            if (decision.RemoteMovie.Movie != null)
             {
-                release.QualityWeight = decision.RemoteEpisode.Series
+                release.QualityWeight = decision.RemoteMovie.Movie
                                                               .Profile.Value
                                                               .Items.FindIndex(v => v.Quality == release.Quality.Quality) * 100;
             }

src/NzbDrone.Api/Indexers/ReleaseResource.cs

@@ -8,6 +8,7 @@ using NzbDrone.Core.Indexers;
 using NzbDrone.Core.Parser.Model;
 using NzbDrone.Core.DecisionEngine;
 using System.Linq;
+using NzbDrone.Core.Datastore.Migration;
 
 namespace NzbDrone.Api.Indexers
 {
@@ -29,8 +30,8 @@ namespace NzbDrone.Api.Indexers
         public bool FullSeason { get; set; }
         public int SeasonNumber { get; set; }
         public Language Language { get; set; }
-        public string AirDate { get; set; }
+        public int Year { get; set; }
-        public string SeriesTitle { get; set; }
+        public string MovieTitle { get; set; }
         public int[] EpisodeNumbers { get; set; }
         public int[] AbsoluteEpisodeNumbers { get; set; }
         public bool Approved { get; set; }
@@ -43,9 +44,11 @@ namespace NzbDrone.Api.Indexers
         public string CommentUrl { get; set; }
         public string DownloadUrl { get; set; }
         public string InfoUrl { get; set; }
-        public bool DownloadAllowed { get; set; }
+        public MappingResultType MappingResult { get; set; }
         public int ReleaseWeight { get; set; }
+        public int SuspectedMovieId { get; set; }
 
+	public IEnumerable<string> IndexerFlags { get; set; }
 
         public string MagnetUrl { get; set; }
         public string InfoHash { get; set; }
@@ -87,11 +90,12 @@ namespace NzbDrone.Api.Indexers
             var parsedEpisodeInfo = model.RemoteEpisode.ParsedEpisodeInfo;
             var remoteEpisode = model.RemoteEpisode;
             var torrentInfo = (model.RemoteEpisode.Release as TorrentInfo) ?? new TorrentInfo();
-            var downloadAllowed = model.RemoteEpisode.DownloadAllowed;
+            var mappingResult = MappingResultType.Success;
             if (model.IsForMovie)
             {
-                downloadAllowed = model.RemoteMovie.DownloadAllowed;
+                mappingResult = model.RemoteMovie.MappingResult;
                 var parsedMovieInfo = model.RemoteMovie.ParsedMovieInfo;
+                var movieId = model.RemoteMovie.Movie?.Id ?? 0;
 
                 return new ReleaseResource
                 {
@@ -110,8 +114,8 @@ namespace NzbDrone.Api.Indexers
                     //FullSeason = parsedMovieInfo.FullSeason,
                     //SeasonNumber = parsedMovieInfo.SeasonNumber,
                     Language = parsedMovieInfo.Language,
-                    AirDate = "",
+                    Year = parsedMovieInfo.Year,
-                    SeriesTitle = parsedMovieInfo.MovieTitle,
+                    MovieTitle = parsedMovieInfo.MovieTitle,
                     EpisodeNumbers = new int[0],
                     AbsoluteEpisodeNumbers = new int[0],
                     Approved = model.Approved,
@@ -124,15 +128,17 @@ namespace NzbDrone.Api.Indexers
                     CommentUrl = releaseInfo.CommentUrl,
                     DownloadUrl = releaseInfo.DownloadUrl,
                     InfoUrl = releaseInfo.InfoUrl,
-                    DownloadAllowed = downloadAllowed,
+                    MappingResult = mappingResult,
                     //ReleaseWeight
+                    
+                    SuspectedMovieId = movieId,
 
                     MagnetUrl = torrentInfo.MagnetUrl,
                     InfoHash = torrentInfo.InfoHash,
                     Seeders = torrentInfo.Seeders,
                     Leechers = (torrentInfo.Peers.HasValue && torrentInfo.Seeders.HasValue) ? (torrentInfo.Peers.Value - torrentInfo.Seeders.Value) : (int?)null,
                     Protocol = releaseInfo.DownloadProtocol,
-
+		IndexerFlags = torrentInfo.IndexerFlags.ToString().Split(new string[] { ", " }, StringSplitOptions.None),
                     Edition = parsedMovieInfo.Edition,
 
                     IsDaily = false,
@@ -160,8 +166,8 @@ namespace NzbDrone.Api.Indexers
                 FullSeason = parsedEpisodeInfo.FullSeason,
                 SeasonNumber = parsedEpisodeInfo.SeasonNumber,
                 Language = parsedEpisodeInfo.Language,
-                AirDate = parsedEpisodeInfo.AirDate,
+                //AirDate = parsedEpisodeInfo.AirDate,
-                SeriesTitle = parsedEpisodeInfo.SeriesTitle,
+                //SeriesTitle = parsedEpisodeInfo.SeriesTitle,
                 EpisodeNumbers = parsedEpisodeInfo.EpisodeNumbers,
                 AbsoluteEpisodeNumbers = parsedEpisodeInfo.AbsoluteEpisodeNumbers,
                 Approved = model.Approved,
@@ -174,7 +180,7 @@ namespace NzbDrone.Api.Indexers
                 CommentUrl = releaseInfo.CommentUrl,
                 DownloadUrl = releaseInfo.DownloadUrl,
                 InfoUrl = releaseInfo.InfoUrl,
-                DownloadAllowed = downloadAllowed,
+                //DownloadAllowed = downloadAllowed,
                 //ReleaseWeight
 
                 MagnetUrl = torrentInfo.MagnetUrl,

src/NzbDrone.Api/Movies/AlternativeTitleModule.cs

@@ -0,0 +1,57 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Marr.Data;
+using Nancy;
+using NzbDrone.Api;
+using NzbDrone.Api.Movie;
+using NzbDrone.Common.Cache;
+using NzbDrone.Common.Extensions;
+using NzbDrone.Core.MediaCover;
+using NzbDrone.Core.MediaFiles;
+using NzbDrone.Core.MediaFiles.EpisodeImport;
+using NzbDrone.Core.Messaging.Events;
+using NzbDrone.Core.MetadataSource;
+using NzbDrone.Core.MetadataSource.RadarrAPI;
+using NzbDrone.Core.Movies.AlternativeTitles;
+using NzbDrone.Core.RootFolders;
+using NzbDrone.Core.Tv;
+using NzbDrone.Core.Tv.Events;
+
+namespace NzbDrone.Api.Movie
+{
+    public class AlternativeTitleModule : NzbDroneRestModule<AlternativeTitleResource>
+    {
+        private readonly IAlternativeTitleService _altTitleService;
+        private readonly IMovieService _movieService;
+        private readonly IRadarrAPIClient _radarrApi;
+        private readonly IEventAggregator _eventAggregator;
+
+        public AlternativeTitleModule(IAlternativeTitleService altTitleService, IMovieService movieService, IRadarrAPIClient radarrApi, IEventAggregator eventAggregator)
+            : base("/alttitle")
+        {
+            _altTitleService = altTitleService;
+            _movieService = movieService;
+            _radarrApi = radarrApi;
+            CreateResource = AddTitle;
+            GetResourceById = GetTitle;
+            _eventAggregator = eventAggregator;
+        }
+
+        private int AddTitle(AlternativeTitleResource altTitle)
+        {
+            var title = altTitle.ToModel();
+            var movie = _movieService.GetMovie(altTitle.MovieId);
+            var newTitle = _radarrApi.AddNewAlternativeTitle(title, movie.TmdbId);
+
+            var addedTitle = _altTitleService.AddAltTitle(newTitle, movie);
+            _eventAggregator.PublishEvent(new MovieUpdatedEvent(movie));
+            return addedTitle.Id;
+        }
+
+        private AlternativeTitleResource GetTitle(int id)
+        {
+            return _altTitleService.GetById(id).ToResource();
+        }
+    }
+}

src/NzbDrone.Api/Movies/AlternativeYearModule.cs

@@ -0,0 +1,63 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Marr.Data;
+using Nancy;
+using NzbDrone.Api;
+using NzbDrone.Api.Movie;
+using NzbDrone.Common.Cache;
+using NzbDrone.Common.Extensions;
+using NzbDrone.Common.Messaging;
+using NzbDrone.Core.MediaCover;
+using NzbDrone.Core.MediaFiles;
+using NzbDrone.Core.MediaFiles.EpisodeImport;
+using NzbDrone.Core.Messaging.Events;
+using NzbDrone.Core.MetadataSource;
+using NzbDrone.Core.MetadataSource.RadarrAPI;
+using NzbDrone.Core.Movies.AlternativeTitles;
+using NzbDrone.Core.RootFolders;
+using NzbDrone.Core.Tv;
+using NzbDrone.Core.Tv.Events;
+
+namespace NzbDrone.Api.Movie
+{
+    public class AlternativeYearModule : NzbDroneRestModule<AlternativeYearResource>
+    {
+        private readonly IMovieService _movieService;
+        private readonly IRadarrAPIClient _radarrApi;
+        private readonly ICached<int> _yearCache;
+        private readonly IEventAggregator _eventAggregator;
+
+        public AlternativeYearModule(IMovieService movieService, IRadarrAPIClient radarrApi, ICacheManager cacheManager, IEventAggregator eventAggregator)
+            : base("/altyear")
+        {
+            _movieService = movieService;
+            _radarrApi = radarrApi;
+            CreateResource = AddYear;
+            GetResourceById = GetYear;
+            _yearCache = cacheManager.GetCache<int>(GetType(), "altYears");
+            _eventAggregator = eventAggregator;
+        }
+
+        private int AddYear(AlternativeYearResource altYear)
+        {
+            var id = new Random().Next();
+            _yearCache.Set(id.ToString(), altYear.Year, TimeSpan.FromMinutes(1));
+            var movie = _movieService.GetMovie(altYear.MovieId);
+            var newYear = _radarrApi.AddNewAlternativeYear(altYear.Year, movie.TmdbId);
+            movie.SecondaryYear = newYear.Year;
+            movie.SecondaryYearSourceId = newYear.SourceId;
+            _movieService.UpdateMovie(movie);
+            _eventAggregator.PublishEvent(new MovieUpdatedEvent(movie));
+            return id;
+        }
+
+        private AlternativeYearResource GetYear(int id)
+        {
+            return new AlternativeYearResource
+            {
+                Year = _yearCache.Find(id.ToString())
+            };
+        }
+    }
+}

src/NzbDrone.Api/Movies/AlternativeYearResource.cs

@@ -0,0 +1,75 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using NzbDrone.Api.REST;
+using NzbDrone.Core.MediaCover;
+using NzbDrone.Core.Tv;
+using NzbDrone.Core.Qualities;
+using NzbDrone.Api.Series;
+using NzbDrone.Core.MediaFiles;
+using NzbDrone.Core.Movies.AlternativeTitles;
+using NzbDrone.Core.Parser;
+
+namespace NzbDrone.Api.Movie
+{
+    public class AlternativeYearResource : RestResource
+    {
+        public AlternativeYearResource()
+        {
+            
+        }
+
+        //Todo: Sorters should be done completely on the client
+        //Todo: Is there an easy way to keep IgnoreArticlesWhenSorting in sync between, Series, History, Missing?
+        //Todo: We should get the entire Profile instead of ID and Name separately
+
+        public int MovieId { get; set; }
+        public int Year { get; set; }
+
+        //TODO: Add series statistics as a property of the series (instead of individual properties)
+    }
+
+    /*public static class AlternativeYearResourceMapper
+    {
+        /*public static AlternativeYearResource ToResource(this AlternativeTitle model)
+        {
+            if (model == null) return null;
+
+            AlternativeTitleResource resource = null;
+
+            return new AlternativeTitleResource
+            {
+                Id = model.Id,
+                SourceType = model.SourceType,
+                MovieId = model.MovieId,
+                Title = model.Title,
+                SourceId = model.SourceId,
+                Votes = model.Votes,
+                VoteCount = model.VoteCount,
+                Language = model.Language
+            };
+        }
+
+        public static AlternativeTitle ToModel(this AlternativeTitleResource resource)
+        {
+            if (resource == null) return null;
+
+            return new AlternativeTitle
+            {
+                Id = resource.Id,
+                SourceType = resource.SourceType,
+                MovieId = resource.MovieId,
+                Title = resource.Title,
+                SourceId = resource.SourceId,
+                Votes = resource.Votes,
+                VoteCount = resource.VoteCount,
+                Language = resource.Language
+            };
+        }
+
+        public static List<AlternativeTitleResource> ToResource(this IEnumerable<AlternativeTitle> movies)
+        {
+            return movies.Select(ToResource).ToList();
+        }
+    }*/
+}

src/NzbDrone.Api/Movies/MovieBulkImportModule.cs

@@ -0,0 +1,175 @@
+using System.Collections;
+using System.Collections.Generic;
+using Nancy;
+using NzbDrone.Api.Extensions;
+using NzbDrone.Core.MediaCover;
+using NzbDrone.Core.MetadataSource;
+using NzbDrone.Core.Parser;
+using System.Linq;
+using System;
+using Marr.Data;
+using NzbDrone.Common.Extensions;
+using NzbDrone.Core.Datastore;
+using NzbDrone.Core.MediaFiles;
+using NzbDrone.Core.MediaFiles.EpisodeImport;
+using NzbDrone.Core.RootFolders;
+using NzbDrone.Common.Cache;
+using NzbDrone.Core.Tv;
+
+namespace NzbDrone.Api.Movie
+{
+
+    public class UnmappedComparer : IComparer<UnmappedFolder>
+    {
+        public int Compare(UnmappedFolder a, UnmappedFolder b)
+        {
+            return a.Name.CompareTo(b.Name);
+        }
+    }
+
+    public class MovieBulkImportModule : NzbDroneRestModule<MovieResource>
+    {
+        private readonly ISearchForNewMovie _searchProxy;
+        private readonly IRootFolderService _rootFolderService;
+        private readonly IMakeImportDecision _importDecisionMaker;
+        private readonly IDiskScanService _diskScanService;
+		private readonly ICached<Core.Tv.Movie> _mappedMovies;
+        private readonly IMovieService _movieService;
+
+        public MovieBulkImportModule(ISearchForNewMovie searchProxy, IRootFolderService rootFolderService, IMakeImportDecision importDecisionMaker,
+		                             IDiskScanService diskScanService, ICacheManager cacheManager, IMovieService movieService)
+            : base("/movies/bulkimport")
+        {
+            _searchProxy = searchProxy;
+            _rootFolderService = rootFolderService;
+            _importDecisionMaker = importDecisionMaker;
+            _diskScanService = diskScanService;
+			_mappedMovies = cacheManager.GetCache<Core.Tv.Movie>(GetType(), "mappedMoviesCache");
+            _movieService = movieService;
+            Get["/"] = x => Search();
+        }
+
+
+        private Response Search()
+        {
+            if (Request.Query.Id == 0)
+            {
+                //Todo error handling
+            }
+
+            RootFolder rootFolder = _rootFolderService.Get(Request.Query.Id);
+
+            int page = Request.Query.page;
+            int per_page = Request.Query.per_page;
+
+            int min = (page - 1) * per_page;
+
+            int max = page * per_page;
+
+            var unmapped = rootFolder.UnmappedFolders.OrderBy(f => f.Name).ToList();
+
+            int total_count = unmapped.Count;
+
+            if (Request.Query.total_entries.HasValue)
+            {
+                total_count = Request.Query.total_entries;
+            }
+
+            max = total_count >= max ? max : total_count;
+
+            var paged = unmapped.GetRange(min, max-min);
+
+            var mapped = paged.Select(f =>
+			{
+				Core.Tv.Movie m = null;
+
+				var mappedMovie = _mappedMovies.Find(f.Name);
+
+				if (mappedMovie != null)
+				{
+					return mappedMovie;
+				}
+
+				var parsedTitle = Parser.ParseMoviePath(f.Name, false);
+				if (parsedTitle == null)
+				{
+					m = new Core.Tv.Movie
+					{
+						Title = f.Name.Replace(".", " ").Replace("-", " "),
+						Path = f.Path,
+					};
+				}
+				else
+				{
+					m = new Core.Tv.Movie
+					{
+						Title = parsedTitle.MovieTitle,
+						Year = parsedTitle.Year,
+						ImdbId = parsedTitle.ImdbId,
+						Path = f.Path
+					};
+				}
+
+				var files = _diskScanService.GetVideoFiles(f.Path);
+
+				var decisions = _importDecisionMaker.GetImportDecisions(files.ToList(), m, true);
+
+				var decision = decisions.Where(d => d.Approved && !d.Rejections.Any()).FirstOrDefault();
+
+				if (decision != null)
+				{
+					var local = decision.LocalMovie;
+
+					m.MovieFile = new LazyLoaded<MovieFile>(new MovieFile
+					{
+						Path = local.Path,
+						Edition = local.ParsedMovieInfo.Edition,
+						Quality = local.Quality,
+						MediaInfo = local.MediaInfo,
+						ReleaseGroup = local.ParsedMovieInfo.ReleaseGroup,
+						RelativePath = f.Path.GetRelativePath(local.Path)
+					});
+				}
+
+				mappedMovie = _searchProxy.MapMovieToTmdbMovie(m);
+
+				if (mappedMovie != null)
+				{
+					mappedMovie.Monitored = true;
+
+					_mappedMovies.Set(f.Name, mappedMovie, TimeSpan.FromDays(2));
+
+					return mappedMovie;
+				}
+
+				return null;
+            });
+            
+            return new PagingResource<MovieResource>
+            {
+                Page = page,
+                PageSize = per_page,
+                SortDirection = SortDirection.Ascending,
+                SortKey = Request.Query.sort_by,
+                TotalRecords = total_count - mapped.Where(m => m == null).Count(),
+                Records = MapToResource(mapped.Where(m => m != null)).ToList()
+            }.AsResponse();
+        }
+
+
+        private static IEnumerable<MovieResource> MapToResource(IEnumerable<Core.Tv.Movie> movies)
+        {
+            foreach (var currentMovie in movies)
+            {
+                var resource = currentMovie.ToResource();
+                var poster = currentMovie.Images.FirstOrDefault(c => c.CoverType == MediaCoverTypes.Poster);
+                if (poster != null)
+                {
+                    resource.RemotePoster = poster.Url;
+                }
+
+                yield return resource;
+            }
+        }
+    }
+}

src/NzbDrone.Api/Movies/MovieEditorModule.cs

@@ -1,7 +1,10 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Linq;
 using Nancy;
+using Nancy.Responses;
 using NzbDrone.Api.Extensions;
+using NzbDrone.Api.REST;
 using NzbDrone.Core.Tv;
 
 namespace NzbDrone.Api.Movie
@@ -15,6 +18,7 @@ namespace NzbDrone.Api.Movie
         {
             _movieService = movieService;
             Put["/"] = Movie => SaveAll();
+            Put["/delete"] = Movie => DeleteSelected();
         }
 
         private Response SaveAll()
@@ -27,5 +31,33 @@ namespace NzbDrone.Api.Movie
                                  .ToResource()
                                  .AsResponse(HttpStatusCode.Accepted);
         }
+
+        private Response DeleteSelected()
+        {
+            var deleteFiles = false;
+            var addExclusion = false;
+            var deleteFilesQuery = Request.Query.deleteFiles;
+            var addExclusionQuery = Request.Query.addExclusion;
+
+            if (deleteFilesQuery.HasValue)
+            {
+                deleteFiles = Convert.ToBoolean(deleteFilesQuery.Value);
+            }
+            if (addExclusionQuery.HasValue)
+            {
+                addExclusion = Convert.ToBoolean(addExclusionQuery.Value);
+            }
+            var ids = Request.Body.FromJson<List<int>>();
+
+            foreach (var id in ids)
+            {
+                _movieService.DeleteMovie(id, deleteFiles, addExclusion);
+            }
+
+            return new Response
+            {
+                StatusCode = HttpStatusCode.Accepted
+            };
+        }
     }
 }

src/NzbDrone.Api/Movies/MovieFileModule.cs

@@ -13,77 +13,63 @@ using NzbDrone.SignalR;
 
 namespace NzbDrone.Api.EpisodeFiles
 {
-    public class MovieFileModule : NzbDroneRestModuleWithSignalR<MovieFileResource, MovieFile>
+    public class MovieFileModule : NzbDroneRestModuleWithSignalR<MovieFileResource, MovieFile>, IHandle<MovieFileAddedEvent>
-                                 //IHandle<EpisodeFileAddedEvent>
     {
         private readonly IMediaFileService _mediaFileService;
         private readonly IRecycleBinProvider _recycleBinProvider;
-        private readonly IMovieService _seriesService;
+        private readonly IMovieService _movieService;
         private readonly IQualityUpgradableSpecification _qualityUpgradableSpecification;
         private readonly Logger _logger;
 
         public MovieFileModule(IBroadcastSignalRMessage signalRBroadcaster,
                              IMediaFileService mediaFileService,
                              IRecycleBinProvider recycleBinProvider,
-                             IMovieService seriesService,
+                             IMovieService movieService,
                              IQualityUpgradableSpecification qualityUpgradableSpecification,
                              Logger logger)
             : base(signalRBroadcaster)
         {
             _mediaFileService = mediaFileService;
             _recycleBinProvider = recycleBinProvider;
-            _seriesService = seriesService;
+            _movieService = movieService;
             _qualityUpgradableSpecification = qualityUpgradableSpecification;
             _logger = logger;
-            /*GetResourceById = GetEpisodeFile;
+            GetResourceById = GetMovieFile;
-            GetResourceAll = GetEpisodeFiles;
+            UpdateResource = SetQuality;
-            UpdateResource = SetQuality;*/
+            DeleteResource = DeleteMovieFile;
-            DeleteResource = DeleteEpisodeFile;
         }
 
-        /*private EpisodeFileResource GetEpisodeFile(int id)
+        private MovieFileResource GetMovieFile(int id)
         {
-            var episodeFile = _mediaFileService.Get(id);
+            var movie = _mediaFileService.GetMovie(id);
-            var series = _seriesService.GetSeries(episodeFile.SeriesId);
 
-            return episodeFile.ToResource(series, _qualityUpgradableSpecification);
+            return movie.ToResource();
         }
 
-        private List<EpisodeFileResource> GetEpisodeFiles()
-        {
-            if (!Request.Query.SeriesId.HasValue)
-            {
-                throw new BadRequestException("seriesId is missing");
-            }
 
-            var seriesId = (int)Request.Query.SeriesId;
+        private void SetQuality(MovieFileResource movieFileResource)
+        {  
+            var movieFile = _mediaFileService.GetMovie(movieFileResource.Id);
+            movieFile.Quality = movieFileResource.Quality;
+            _mediaFileService.Update(movieFile);
 
-            var series = _seriesService.GetSeries(seriesId);
+            BroadcastResourceChange(ModelAction.Updated, movieFile.Id);
-
-            return _mediaFileService.GetFilesBySeries(seriesId).ConvertAll(f => f.ToResource(series, _qualityUpgradableSpecification));
         }
 
-        private void SetQuality(EpisodeFileResource episodeFileResource)
+        private void DeleteMovieFile(int id)
         {
-            var episodeFile = _mediaFileService.Get(episodeFileResource.Id);
+            var movieFile = _mediaFileService.GetMovie(id);
-            episodeFile.Quality = episodeFileResource.Quality;
+            var movie = _movieService.GetMovie(movieFile.MovieId);
-            _mediaFileService.Update(episodeFile);
+            var fullPath = Path.Combine(movie.Path, movieFile.RelativePath);
-        }*/
 
-        private void DeleteEpisodeFile(int id)
+            _logger.Info("Deleting movie file: {0}", fullPath);
-        {
-            var episodeFile = _mediaFileService.GetMovie(id);
-            var series = _seriesService.GetMovie(episodeFile.MovieId);
-            var fullPath = Path.Combine(series.Path, episodeFile.RelativePath);
-
-            _logger.Info("Deleting episode file: {0}", fullPath);
             _recycleBinProvider.DeleteFile(fullPath);
-            _mediaFileService.Delete(episodeFile, DeleteMediaFileReason.Manual);
+            _mediaFileService.Delete(movieFile, DeleteMediaFileReason.Manual);
         }
 
-        public void Handle(EpisodeFileAddedEvent message)
+        public void Handle(MovieFileAddedEvent message)
         {
-            BroadcastResourceChange(ModelAction.Updated, message.EpisodeFile.Id);
+            BroadcastResourceChange(ModelAction.Updated, message.MovieFile.Id);
         }
     }
 }

src/NzbDrone.Api/Movies/MovieModuleWithSignalR.cs

@@ -0,0 +1,78 @@
+using NzbDrone.Api.Movie;
+using NzbDrone.Core.Datastore.Events;
+using NzbDrone.Core.DecisionEngine;
+using NzbDrone.Core.Download;
+using NzbDrone.Core.MediaFiles.Events;
+using NzbDrone.Core.Messaging.Events;
+using NzbDrone.Core.Tv;
+using NzbDrone.SignalR;
+
+namespace NzbDrone.Api.Movies
+{
+    public abstract class MovieModuleWithSignalR : NzbDroneRestModuleWithSignalR<MovieResource, Core.Tv.Movie>,
+        IHandle<MovieGrabbedEvent>,
+        IHandle<MovieDownloadedEvent>
+    {
+        protected readonly IMovieService _movieService;
+        protected readonly IQualityUpgradableSpecification _qualityUpgradableSpecification;
+
+        protected MovieModuleWithSignalR(IMovieService movieService,
+                                           IQualityUpgradableSpecification qualityUpgradableSpecification,
+                                           IBroadcastSignalRMessage signalRBroadcaster)
+            : base(signalRBroadcaster)
+        {
+            _movieService = movieService;
+            _qualityUpgradableSpecification = qualityUpgradableSpecification;
+
+            GetResourceById = GetMovie;
+        }
+
+        protected MovieModuleWithSignalR(IMovieService movieService,
+                                           IQualityUpgradableSpecification qualityUpgradableSpecification,
+                                           IBroadcastSignalRMessage signalRBroadcaster,
+                                           string resource)
+            : base(signalRBroadcaster, resource)
+        {
+            _movieService = movieService;
+            _qualityUpgradableSpecification = qualityUpgradableSpecification;
+
+            GetResourceById = GetMovie;
+        }
+
+        protected MovieResource GetMovie(int id)
+        {
+            var movie = _movieService.GetMovie(id);
+            var resource = MapToResource(movie, true);
+            return resource;
+        }
+
+        protected MovieResource MapToResource(Core.Tv.Movie episode, bool includeSeries)
+        {
+            var resource = episode.ToResource();
+
+            if (includeSeries)
+            {
+                var series = episode ?? _movieService.GetMovie(episode.Id);
+                resource = series.ToResource();
+            }
+
+            return resource;
+        }
+
+        public void Handle(MovieGrabbedEvent message)
+        {
+            var resource = message.Movie.Movie.ToResource();
+
+            //add a grabbed field in MovieResource?
+            //resource.Grabbed = true;
+
+            BroadcastResourceChange(ModelAction.Updated, resource);
+        }
+
+        public void Handle(MovieDownloadedEvent message)
+        {
+            var resource = message.Movie.Movie.ToResource();
+            BroadcastResourceChange(ModelAction.Updated, resource);
+        }
+    }
+}

src/NzbDrone.Api/NancyBootstrapper.cs

@@ -34,7 +34,6 @@ namespace NzbDrone.Api
             RegisterPipelines(pipelines);
 
             container.Resolve<DatabaseTarget>().Register();
-            container.Resolve<IEventAggregator>().PublishEvent(new ApplicationStartedEvent());
         }
 
         private void RegisterPipelines(IPipelines pipelines)
@@ -56,4 +55,4 @@ namespace NzbDrone.Api
 
         protected override byte[] FavIcon => null;
     }
-}
+}

src/NzbDrone.Api/NetImport/ImportExclusionsModule.cs

@@ -0,0 +1,45 @@
+using System.Collections.Generic;
+using FluentValidation;
+using NzbDrone.Api.ClientSchema;
+using NzbDrone.Core.NetImport;
+using NzbDrone.Core.NetImport.ImportExclusions;
+using NzbDrone.Core.Validation.Paths;
+
+namespace NzbDrone.Api.NetImport
+{
+    public class ImportExclusionsModule : NzbDroneRestModule<ImportExclusionsResource>
+    {
+        private readonly IImportExclusionsService _exclusionService;
+
+        public ImportExclusionsModule(NetImportFactory netImportFactory, IImportExclusionsService exclusionService) : base("exclusions")
+        {
+            _exclusionService = exclusionService;
+            GetResourceAll = GetAll;
+            CreateResource = AddExclusion;
+            DeleteResource = RemoveExclusion;
+            GetResourceById = GetById;
+        }
+
+        public List<ImportExclusionsResource> GetAll()
+        {
+            return _exclusionService.GetAllExclusions().ToResource();
+        }
+
+        public ImportExclusionsResource GetById(int id)
+        {
+            return _exclusionService.GetById(id).ToResource();
+        }
+       
+        public int AddExclusion(ImportExclusionsResource exclusionResource)
+        {
+            var model = exclusionResource.ToModel();
+
+            return _exclusionService.AddExclusion(model).Id;
+        }
+
+        public void RemoveExclusion (int id)
+        {
+            _exclusionService.RemoveExclusion(new ImportExclusion { Id = id });
+        }
+    }
+}

src/NzbDrone.Api/NetImport/ImportExclusionsResource.cs

@@ -0,0 +1,46 @@
+using System.Collections.Generic;
+using System.Linq;
+using NzbDrone.Core.NetImport;
+using NzbDrone.Core.Tv;
+
+namespace NzbDrone.Api.NetImport
+{
+    public class ImportExclusionsResource : ProviderResource
+    {
+        //public int Id { get; set; }
+        public int TmdbId { get; set; }
+        public string MovieTitle { get; set; }
+        public int MovieYear { get; set; }
+    }
+
+    public static class ImportExclusionsResourceMapper
+    {
+        public static ImportExclusionsResource ToResource(this Core.NetImport.ImportExclusions.ImportExclusion model)
+        {
+            if (model == null) return null;
+
+            return new ImportExclusionsResource
+            {
+                Id = model.Id,
+                TmdbId = model.TmdbId,
+                MovieTitle = model.MovieTitle,
+                MovieYear = model.MovieYear
+            };
+        }
+
+        public static List<ImportExclusionsResource> ToResource(this IEnumerable<Core.NetImport.ImportExclusions.ImportExclusion> exclusions)
+        {
+            return exclusions.Select(ToResource).ToList();
+        }
+
+        public static Core.NetImport.ImportExclusions.ImportExclusion ToModel(this ImportExclusionsResource resource)
+        {
+            return new Core.NetImport.ImportExclusions.ImportExclusion
+            {
+                TmdbId = resource.TmdbId,
+                MovieTitle = resource.MovieTitle,
+                MovieYear = resource.MovieYear
+            };
+        }
+    }
+}

src/NzbDrone.Api/NetImport/ListImportModule.cs

@@ -0,0 +1,34 @@
+using System.Collections.Generic;
+using System.Linq;
+using Nancy;
+using Nancy.Extensions;
+using NzbDrone.Api.Extensions;
+using NzbDrone.Api.Movie;
+using NzbDrone.Core.MetadataSource;
+using NzbDrone.Core.Tv;
+
+namespace NzbDrone.Api.NetImport
+{
+    public class ListImportModule : NzbDroneApiModule
+    {
+        private readonly IMovieService _movieService;
+        private readonly ISearchForNewMovie _movieSearch;
+
+        public ListImportModule(IMovieService movieService, ISearchForNewMovie movieSearch)
+            : base("/movie/import")
+        {
+            _movieService = movieService;
+            _movieSearch = movieSearch;
+            Put["/"] = Movie => SaveAll();
+        }
+
+        private Response SaveAll()
+        {
+            var resources = Request.Body.FromJson<List<MovieResource>>();
+
+            var Movies = resources.Select(MovieResource => _movieSearch.MapMovieToTmdbMovie(MovieResource.ToModel())).Where(m => m != null).DistinctBy(m => m.TmdbId).ToList();
+
+            return _movieService.AddMovies(Movies).ToResource().AsResponse(HttpStatusCode.Accepted);
+        }
+    }
+}

src/NzbDrone.Api/NetImport/NetImportModule.cs

@@ -0,0 +1,47 @@
+using FluentValidation;
+using NzbDrone.Api.ClientSchema;
+using NzbDrone.Core.NetImport;
+using NzbDrone.Core.Validation.Paths;
+
+namespace NzbDrone.Api.NetImport
+{
+    public class NetImportModule : ProviderModuleBase<NetImportResource, INetImport, NetImportDefinition>
+    {
+        public NetImportModule(NetImportFactory netImportFactory) : base(netImportFactory, "netimport")
+        {
+            PostValidator.RuleFor(c => c.RootFolderPath).IsValidPath();
+            PostValidator.RuleFor(c => c.MinimumAvailability).NotNull();
+            PostValidator.RuleFor(c => c.ProfileId).NotNull();
+        }
+
+        protected override void MapToResource(NetImportResource resource, NetImportDefinition definition)
+        {
+            base.MapToResource(resource, definition);
+
+            resource.Enabled = definition.Enabled;
+            resource.EnableAuto = definition.EnableAuto;
+            resource.ProfileId = definition.ProfileId;
+            resource.RootFolderPath = definition.RootFolderPath;
+            resource.ShouldMonitor = definition.ShouldMonitor;
+            resource.MinimumAvailability = definition.MinimumAvailability;
+        }
+
+        protected override void MapToModel(NetImportDefinition definition, NetImportResource resource)
+        {
+            base.MapToModel(definition, resource);
+
+            definition.Enabled = resource.Enabled;
+            definition.EnableAuto = resource.EnableAuto;
+            definition.ProfileId = resource.ProfileId;
+            definition.RootFolderPath = resource.RootFolderPath;
+            definition.ShouldMonitor = resource.ShouldMonitor;
+            definition.MinimumAvailability = resource.MinimumAvailability;
+        }
+
+        protected override void Validate(NetImportDefinition definition, bool includeWarnings)
+        {
+            if (!definition.Enable) return;
+            base.Validate(definition, includeWarnings);
+        }
+    }
+}

src/NzbDrone.Api/NetImport/NetImportResource.cs

@@ -0,0 +1,15 @@
+using NzbDrone.Core.NetImport;
+using NzbDrone.Core.Tv;
+
+namespace NzbDrone.Api.NetImport
+{
+    public class NetImportResource : ProviderResource
+    {
+        public bool Enabled { get; set; }
+        public bool EnableAuto { get; set; }
+        public bool ShouldMonitor { get; set; }
+        public string RootFolderPath { get; set; }
+        public int ProfileId { get; set; }
+        public MovieStatusType MinimumAvailability { get; set; }
+    }
+}

src/NzbDrone.Api/NzbDrone.Api.csproj

@@ -109,18 +109,29 @@
     <Compile Include="ClientSchema\SelectOption.cs" />
     <Compile Include="Commands\CommandModule.cs" />
     <Compile Include="Commands\CommandResource.cs" />
+    <Compile Include="Config\NetImportConfigModule.cs" />
+    <Compile Include="Config\NetImportConfigResource.cs" />
     <Compile Include="Extensions\AccessControlHeaders.cs" />
     <Compile Include="Extensions\Pipelines\CorsPipeline.cs" />
+    <Compile Include="Extensions\Pipelines\UrlBasePipeline.cs" />
     <Compile Include="Extensions\Pipelines\RequestLoggingPipeline.cs" />
     <Compile Include="Frontend\Mappers\LoginHtmlMapper.cs" />
     <Compile Include="Frontend\Mappers\RobotsTxtMapper.cs" />
     <Compile Include="Indexers\ReleaseModuleBase.cs" />
     <Compile Include="Indexers\ReleasePushModule.cs" />
+    <Compile Include="Movies\AlternativeTitleModule.cs" />
+    <Compile Include="Movies\AlternativeYearResource.cs" />
+    <Compile Include="Movies\AlternativeYearModule.cs" />
+    <Compile Include="Movies\MovieModuleWithSignalR.cs" />
+    <Compile Include="Movies\MovieBulkImportModule.cs" />
     <Compile Include="Movies\MovieFileModule.cs" />
-    <Compile Include="Movies\MovieModule.cs" />
+    <Compile Include="Series\MovieModule.cs" />
     <Compile Include="Movies\RenameMovieModule.cs" />
     <Compile Include="Movies\RenameMovieResource.cs" />
     <Compile Include="Movies\MovieEditorModule.cs" />
+    <Compile Include="NetImport\ListImportModule.cs" />
+    <Compile Include="NetImport\NetImportModule.cs" />
+    <Compile Include="NetImport\NetImportResource.cs" />
     <Compile Include="Parse\ParseModule.cs" />
     <Compile Include="Parse\ParseResource.cs" />
     <Compile Include="ManualImport\ManualImportModule.cs" />
@@ -232,14 +243,14 @@
     <Compile Include="RootFolders\RootFolderModule.cs" />
     <Compile Include="RootFolders\RootFolderResource.cs" />
     <Compile Include="SeasonPass\SeasonPassResource.cs" />
-    <Compile Include="Series\AlternateTitleResource.cs" />
+    <Compile Include="Series\AlternativeTitleResource.cs" />
     <Compile Include="Series\MovieFileResource.cs" />
+    <Compile Include="Series\FetchMovieListModule.cs" />
     <Compile Include="Series\SeasonResource.cs" />
     <Compile Include="SeasonPass\SeasonPassModule.cs" />
     <Compile Include="Series\SeriesEditorModule.cs" />
     <Compile Include="Series\MovieLookupModule.cs" />
     <Compile Include="Series\SeriesLookupModule.cs" />
-    <Compile Include="Series\MovieModule.cs" />
     <Compile Include="Series\SeriesModule.cs" />
     <Compile Include="Series\MovieResource.cs" />
     <Compile Include="Series\SeriesResource.cs" />
@@ -254,12 +265,18 @@
     <Compile Include="TinyIoCNancyBootstrapper.cs" />
     <Compile Include="Update\UpdateModule.cs" />
     <Compile Include="Update\UpdateResource.cs" />
+    <Compile Include="Validation\NetImportSyncIntervalValidator.cs" />
     <Compile Include="Validation\RssSyncIntervalValidator.cs" />
     <Compile Include="Validation\EmptyCollectionValidator.cs" />
     <Compile Include="Validation\RuleBuilderExtensions.cs" />
     <Compile Include="Wanted\CutoffModule.cs" />
     <Compile Include="Wanted\LegacyMissingModule.cs" />
     <Compile Include="Wanted\MissingModule.cs" />
+    <Compile Include="Wanted\MovieCutoffModule.cs" />
+    <Compile Include="Wanted\MovieMissingModule.cs" />
+    <Compile Include="Series\MovieDiscoverModule.cs" />
+    <Compile Include="NetImport\ImportExclusionsModule.cs" />
+    <Compile Include="NetImport\ImportExclusionsResource.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
@@ -287,11 +304,11 @@
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
-       Other similar extension points exist, see Microsoft.Common.targets.
+			 Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
+	<Target Name="BeforeBuild">
-  </Target>
+	</Target>
-  <Target Name="AfterBuild">
+	<Target Name="AfterBuild">
-  </Target>
+	</Target>
-  -->
+	-->
 </Project>

src/NzbDrone.Api/PagingResource.cs

@@ -1,4 +1,6 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
+using System.Linq.Expressions;
 using NzbDrone.Core.Datastore;
 
 namespace NzbDrone.Api
@@ -11,6 +13,7 @@ namespace NzbDrone.Api
         public SortDirection SortDirection { get; set; }
         public string FilterKey { get; set; }
         public string FilterValue { get; set; }
+        public string FilterType { get; set;  }
         public int TotalRecords { get; set; }
         public List<TResource> Records { get; set; }
     }
@@ -38,5 +41,14 @@ namespace NzbDrone.Api
 
             return pagingSpec;
         }
+
+		/*public static Expression<Func<TModel, object>> CreateFilterExpression<TModel>(string filterKey, string filterValue)
+		{
+			Type type = typeof(TModel);
+			ParameterExpression parameterExpression = Expression.Parameter(type, "x");
+			Expression expressionBody = parameterExpression;
+
+			return expressionBody;
+		}*/
     }
 }

src/NzbDrone.Api/Profiles/ProfileResource.cs

@@ -11,6 +11,7 @@ namespace NzbDrone.Api.Profiles
     {
         public string Name { get; set; }
         public Quality Cutoff { get; set; }
+        public string PreferredTags { get; set; }
         public List<ProfileQualityItemResource> Items { get; set; }
         public Language Language { get; set; }
     }
@@ -33,6 +34,7 @@ namespace NzbDrone.Api.Profiles
 
                 Name = model.Name,
                 Cutoff = model.Cutoff,
+                PreferredTags = model.PreferredTags != null ? string.Join(",", model.PreferredTags) : "",
                 Items = model.Items.ConvertAll(ToResource),
                 Language = model.Language
             };
@@ -59,6 +61,7 @@ namespace NzbDrone.Api.Profiles
 
                 Name = resource.Name,
                 Cutoff = (Quality)resource.Cutoff.Id,
+                PreferredTags = resource.PreferredTags.Split(',').ToList(),
                 Items = resource.Items.ConvertAll(ToModel),
                 Language = resource.Language
             };

src/NzbDrone.Api/ProviderModuleBase.cs

@@ -119,7 +119,7 @@ namespace NzbDrone.Api
 
             resource.Fields = SchemaBuilder.ToSchema(definition.Settings);
 
-            resource.InfoLink = string.Format("https://github.com/Sonarr/Sonarr/wiki/Supported-{0}#{1}",
+            resource.InfoLink = string.Format("https://github.com/Radarr/Radarr/wiki/Supported-{0}#{1}",
                 typeof(TProviderResource).Name.Replace("Resource", "s"),
                 definition.Implementation.ToLower());
         }

src/NzbDrone.Api/Queue/QueueActionModule.cs

@@ -105,7 +105,7 @@ namespace NzbDrone.Api.Queue
                 throw new NotFoundException();
             }
 
-            _downloadService.DownloadReport(pendingRelease.RemoteEpisode);
+            _downloadService.DownloadReport(pendingRelease.RemoteMovie, false);
 
             return resource.AsResponse();
         }

src/NzbDrone.Api/REST/RestModule.cs

@@ -123,7 +123,13 @@ namespace NzbDrone.Api.REST
 
                 Get[ROOT_ROUTE] = options =>
                 {
-                    var resource = GetResourcePaged(ReadPagingResourceFromRequest());
+					var pagingSpec = ReadPagingResourceFromRequest();
+					if ((pagingSpec.Page == 0 && pagingSpec.PageSize == 0) || pagingSpec.PageSize == -1)
+					{
+						var all = GetResourceAll();
+						return all.AsResponse();
+					}
+                    var resource = GetResourcePaged(pagingSpec);
                     return resource.AsResponse();
                 };
             }
@@ -214,12 +220,10 @@ namespace NzbDrone.Api.REST
         private PagingResource<TResource> ReadPagingResourceFromRequest()
         {
             int pageSize;
-            int.TryParse(Request.Query.PageSize.ToString(), out pageSize);
+	      	int.TryParse(Request.Query.PageSize.ToString(), out pageSize);
-            if (pageSize == 0) pageSize = 10;
 
             int page;
             int.TryParse(Request.Query.Page.ToString(), out page);
-            if (page == 0) page = 1;
 
 
             var pagingResource = new PagingResource<TResource>
@@ -249,9 +253,16 @@ namespace NzbDrone.Api.REST
                 {
                     pagingResource.FilterValue = Request.Query.FilterValue.ToString();
                 }
+
+                if (Request.Query.FilterType != null)
+                {
+                    pagingResource.FilterType = Request.Query.FilterType.ToString();
+                }
             }
 
+
+
             return pagingResource;
         }
     }
-}
+}

src/NzbDrone.Api/RootFolders/RootFolderResource.cs

@@ -38,8 +38,8 @@ namespace NzbDrone.Api.RootFolders
                 Id = resource.Id,
 
                 Path = resource.Path,
-                //FreeSpace
+                FreeSpace = resource.FreeSpace,
-                //UnmappedFolders
+                UnmappedFolders = resource.UnmappedFolders
             };
         }
 

src/NzbDrone.Api/Series/AlternateTitleResource.cs

@@ -1,9 +0,0 @@
-namespace NzbDrone.Api.Series
-{
-    public class AlternateTitleResource
-    {
-        public string Title { get; set; }
-        public int? SeasonNumber { get; set; }
-        public int? SceneSeasonNumber { get; set; }
-    }
-}

src/NzbDrone.Api/Series/AlternativeTitleResource.cs

@@ -0,0 +1,81 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using NzbDrone.Api.REST;
+using NzbDrone.Core.MediaCover;
+using NzbDrone.Core.Tv;
+using NzbDrone.Core.Qualities;
+using NzbDrone.Api.Series;
+using NzbDrone.Core.MediaFiles;
+using NzbDrone.Core.Movies.AlternativeTitles;
+using NzbDrone.Core.Parser;
+
+namespace NzbDrone.Api.Movie
+{
+    public class AlternativeTitleResource : RestResource
+    {
+        public AlternativeTitleResource()
+        {
+            
+        }
+
+        //Todo: Sorters should be done completely on the client
+        //Todo: Is there an easy way to keep IgnoreArticlesWhenSorting in sync between, Series, History, Missing?
+        //Todo: We should get the entire Profile instead of ID and Name separately
+
+        public SourceType SourceType { get; set; }
+        public int MovieId { get; set; }
+        public string Title { get; set; }
+        public string CleanTitle { get; set; }
+        public int SourceId { get; set; }
+        public int Votes { get; set; }
+        public int VoteCount { get; set; }
+        public Language Language { get; set; }
+
+        //TODO: Add series statistics as a property of the series (instead of individual properties)
+    }
+
+    public static class AlternativeTitleResourceMapper
+    {
+        public static AlternativeTitleResource ToResource(this AlternativeTitle model)
+        {
+            if (model == null) return null;
+
+            AlternativeTitleResource resource = null;
+
+            return new AlternativeTitleResource
+            {
+                Id = model.Id,
+                SourceType = model.SourceType,
+                MovieId = model.MovieId,
+                Title = model.Title,
+                SourceId = model.SourceId,
+                Votes = model.Votes,
+                VoteCount = model.VoteCount,
+                Language = model.Language
+            };
+        }
+
+        public static AlternativeTitle ToModel(this AlternativeTitleResource resource)
+        {
+            if (resource == null) return null;
+
+            return new AlternativeTitle
+            {
+                Id = resource.Id,
+                SourceType = resource.SourceType,
+                MovieId = resource.MovieId,
+                Title = resource.Title,
+                SourceId = resource.SourceId,
+                Votes = resource.Votes,
+                VoteCount = resource.VoteCount,
+                Language = resource.Language
+            };
+        }
+
+        public static List<AlternativeTitleResource> ToResource(this IEnumerable<AlternativeTitle> movies)
+        {
+            return movies.Select(ToResource).ToList();
+        }
+    }
+}

src/NzbDrone.Api/Series/FetchMovieListModule.cs

@@ -0,0 +1,60 @@
+using System.Collections.Generic;
+using Nancy;
+using NzbDrone.Api.Extensions;
+using NzbDrone.Core.MediaCover;
+using NzbDrone.Core.MetadataSource;
+using System.Linq;
+using NzbDrone.Core.NetImport;
+
+namespace NzbDrone.Api.Movie
+{
+    public class FetchMovieListModule : NzbDroneRestModule<MovieResource>
+    {
+        private readonly IFetchNetImport _fetchNetImport;
+        private readonly ISearchForNewMovie _movieSearch;
+
+        public FetchMovieListModule(IFetchNetImport netImport, ISearchForNewMovie movieSearch)
+            : base("/netimport/movies")
+        {
+            _fetchNetImport = netImport;
+            _movieSearch = movieSearch;
+            Get["/"] = x => Search();
+        }
+
+
+        private Response Search()
+        {
+            var results = _fetchNetImport.FetchAndFilter((int) Request.Query.listId, false);
+
+            List<Core.Tv.Movie> realResults = new List<Core.Tv.Movie>();
+
+            /*foreach (var movie in results)
+            {
+                var mapped = _movieSearch.MapMovieToTmdbMovie(movie);
+
+                if (mapped != null)
+                {
+                    realResults.Add(mapped);
+                }
+            }*/
+
+            return MapToResource(results).AsResponse();
+        }
+
+
+        private static IEnumerable<MovieResource> MapToResource(IEnumerable<Core.Tv.Movie> movies)
+        {
+            foreach (var currentSeries in movies)
+            {
+                var resource = currentSeries.ToResource();
+                var poster = currentSeries.Images.FirstOrDefault(c => c.CoverType == MediaCoverTypes.Poster);
+                if (poster != null)
+                {
+                    resource.RemotePoster = poster.Url;
+                }
+
+                yield return resource;
+            }
+        }
+    }
+}

src/NzbDrone.Api/Series/MovieDiscoverModule.cs

@@ -0,0 +1,63 @@
+using System.Collections.Generic;
+using Nancy;
+using NzbDrone.Api.Extensions;
+using NzbDrone.Core.MediaCover;
+using NzbDrone.Core.MetadataSource;
+using System.Linq;
+using System;
+using NzbDrone.Api.REST;
+using NzbDrone.Core.NetImport;
+using NzbDrone.Api.NetImport;
+
+namespace NzbDrone.Api.Movie
+{
+    public class MovieDiscoverModule : NzbDroneRestModule<MovieResource>
+    {
+        private readonly IDiscoverNewMovies _searchProxy;
+        private readonly INetImportFactory _netImportFactory;
+
+        public MovieDiscoverModule(IDiscoverNewMovies searchProxy, INetImportFactory netImportFactory)
+            : base("/movies/discover")
+        {
+            _searchProxy = searchProxy;
+            _netImportFactory = netImportFactory;
+            Get["/lists"] = x => GetLists();
+            Get["/{action?recommendations}"] = x => Search(x.action);
+        }
+
+        private Response Search(string action)
+        {
+            var imdbResults = _searchProxy.DiscoverNewMovies(action);
+            return MapToResource(imdbResults).AsResponse();
+        }
+
+        private Response GetLists()
+        {
+            var lists = _netImportFactory.Discoverable();
+
+            return lists.Select(definition => {
+                var resource = new NetImportResource();
+                resource.Id = definition.Definition.Id;
+
+                resource.Name = definition.Definition.Name;
+
+                return resource;
+            }).AsResponse();
+        }
+
+        private static IEnumerable<MovieResource> MapToResource(IEnumerable<Core.Tv.Movie> movies)
+        {
+            foreach (var currentSeries in movies)
+            {
+                var resource = currentSeries.ToResource();
+                var poster = currentSeries.Images.FirstOrDefault(c => c.CoverType == MediaCoverTypes.Poster);
+                if (poster != null)
+                {
+                    resource.RemotePoster = poster.Url;
+                }
+
+                yield return resource;
+            }
+        }
+    }
+}

src/NzbDrone.Api/Series/MovieFileResource.cs

@@ -44,14 +44,14 @@ namespace NzbDrone.Api.Movie
 
             MovieResource movie = null;
 
-            if (model.Movie != null)
+            /*if (model.Movie != null)
             {
-                model.Movie.LazyLoad();
+                //model.Movie.LazyLoad();
                 if (model.Movie.Value != null)
                 {
                     //movie = model.Movie.Value.ToResource();
                 }
-            }
+            }*/
 
             return new MovieFileResource
             {
@@ -60,6 +60,7 @@ namespace NzbDrone.Api.Movie
                 Path = model.Path,
                 Size = model.Size,
                 DateAdded = model.DateAdded,
+                SceneName = model.SceneName,
                 ReleaseGroup = model.ReleaseGroup,
                 Quality = model.Quality,
                 Movie = movie,

src/NzbDrone.Api/Series/MovieLookupModule.cs

@@ -4,20 +4,44 @@ using NzbDrone.Api.Extensions;
 using NzbDrone.Core.MediaCover;
 using NzbDrone.Core.MetadataSource;
 using System.Linq;
+using System;
+using NzbDrone.Api.REST;
 
 namespace NzbDrone.Api.Movie
 {
     public class MovieLookupModule : NzbDroneRestModule<MovieResource>
     {
         private readonly ISearchForNewMovie _searchProxy;
+        private readonly IProvideMovieInfo _movieInfo;
 
-        public MovieLookupModule(ISearchForNewMovie searchProxy)
+        public MovieLookupModule(ISearchForNewMovie searchProxy, IProvideMovieInfo movieInfo)
             : base("/movies/lookup")
         {
+            _movieInfo = movieInfo;
             _searchProxy = searchProxy;
             Get["/"] = x => Search();
+            Get["/tmdb"] = x => SearchByTmdbId();
+            Get["/imdb"] = x => SearchByImdbId();
         }
 
+        private Response SearchByTmdbId()
+        {
+            int tmdbId = -1;
+            if(Int32.TryParse(Request.Query.tmdbId, out tmdbId))
+            {
+                var result = _movieInfo.GetMovieInfo(tmdbId, null, true);
+                return result.ToResource().AsResponse();
+            }
+
+            throw new BadRequestException("Tmdb Id was not valid");
+        }
+
+        private Response SearchByImdbId()
+        {
+            string imdbId = Request.Query.imdbId;
+            var result = _movieInfo.GetMovieInfo(imdbId);
+            return result.ToResource().AsResponse();
+        }
 
         private Response Search()
         {
@@ -25,7 +49,6 @@ namespace NzbDrone.Api.Movie
             return MapToResource(imdbResults).AsResponse();
         }
 
-
         private static IEnumerable<MovieResource> MapToResource(IEnumerable<Core.Tv.Movie> movies)
         {
             foreach (var currentSeries in movies)