Fixed: AwesomeHD failing on an empty imdbid.

Fixes #2810

.gitchangelog.rc

@@ -86,6 +86,7 @@ section_regexps = [
         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]*)$',
+        r'^[nN]ew?\s*:?\s*((dev|use?r|pkg|test|doc)\s*:\s*)?([^\n]*)$',
      ]),
     ('**Fixes**', [
         r'^(?![mM]erge\s*)'
@@ -136,10 +137,21 @@ body_process = ReSub(r'((^|\n)[A-Z]\w+(-\w+)*: .*(\n\s+.*)*)+$', r'') | strip
 ##
 ## This callable will be given the original subject and result will
 ## be used in the changelog.
-##
+## subject_process = (strip |
+##    ReSub(r'^([aA]dd(ed?)?|[nN]ew)(\s?:?\s)(.*)$', r'![New](https://img.shields.io/badge/-- -New-brightgreen.svg?style=flat-square) \4') |
+##    ReSub(r'^([cC]hang(ed?)?)(\s?:?\s)(.*)$', r'![Changed](https://img.shields.io/badge/-- -Changed-orange.svg?style=flat-square) \4') |
+##    ReSub(r'^([fF]ix(ed?)?)(\s?:?\s)(.*)$', r'![Fixed](https://img.shields.io/badge/-- -Fixed-red.svg?style=flat-square) \4') |
+##    ReSub(r'^([uU]pdat(ed?)?)(\s?:?\s)(.*)$', r'![Updated](https://img.shields.io/badge/-- -Updated-blue.svg?style=flat-square) \4') |
+##    ReSub(r'#(\d{3,4})', r'[#\1](https://github.com/Radarr/Radarr/issues/\1)') |
+##    SetIfEmpty("No commit message.") | ucfirst | final_dot)
+
 ## 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') |
+    ReSub(r'^([aA]dd(ed?)?|[nN]ew)(\s?:?\s)(.*)$', r'![New](https://img.shields.io/badge/--%20-New-brightgreen.svg?style=flat-square) \4') |
+    ReSub(r'^([cC]hang(ed?)?)(\s?:?\s)(.*)$', r'![Changed](https://img.shields.io/badge/--%20-Changed-orange.svg?style=flat-square) \4') |
+    ReSub(r'^([fF]ix(ed?)?)(\s?:?\s)(.*)$', r'![Fixed](https://img.shields.io/badge/--%20-Fixed-red.svg?style=flat-square) \4') |
+    ReSub(r'^([uU]pdat(ed?)?)(\s?:?\s)(.*)$', r'![Updated](https://img.shields.io/badge/--%20-Updated-blue.svg?style=flat-square) \4') |
+    ReSub(r'#(\d{3,4})', r'[#\1](https://github.com/Radarr/Radarr/issues/\1)') |
     SetIfEmpty("No commit message.") | ucfirst | final_dot)
 
 
@@ -147,7 +159,7 @@ subject_process = (strip |
 ##
 ## Tags that will be used for the changelog must match this regexp.
 ##
-tag_filter_regexp = r'^v[0]+\.[2-9]+\.[0-9]+\.[0-9]+$'
+tag_filter_regexp = r'^v[0]+\.[2-9]+\.[0-9]+\.[0-9]{3,4}$'
 
 
 ## ``unreleased_version_label`` is a string or a callable that outputs a string
@@ -290,4 +302,4 @@ publish = write_to_file
 #            r"(?P<rev>[0-9]+\.[0-9]+(\.[0-9]+)?)\s+\([0-9]+-[0-9]{2}-[0-9]{2}\)\n--+\n")),
 #    "HEAD"
 #]
-revs = []
+revs = ["v0.2.0.134..."]

.gitchangelog.rc.release

@@ -0,0 +1,311 @@
+# -*- 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]*)$',
+        r'^[nN]ew?\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.
+## subject_process = (strip |
+##    ReSub(r'^([aA]dd(ed?)?|[nN]ew)(\s?:?\s)(.*)$', r'![New](https://img.shields.io/badge/-- -New-brightgreen.svg?style=flat-square) \4') |
+##    ReSub(r'^([cC]hang(ed?)?)(\s?:?\s)(.*)$', r'![Changed](https://img.shields.io/badge/-- -Changed-orange.svg?style=flat-square) \4') |
+##    ReSub(r'^([fF]ix(ed?)?)(\s?:?\s)(.*)$', r'![Fixed](https://img.shields.io/badge/-- -Fixed-red.svg?style=flat-square) \4') |
+##    ReSub(r'^([uU]pdat(ed?)?)(\s?:?\s)(.*)$', r'![Updated](https://img.shields.io/badge/-- -Updated-blue.svg?style=flat-square) \4') |
+##    ReSub(r'#(\d{3,4})', r'[#\1](https://github.com/Radarr/Radarr/issues/\1)') |
+##    SetIfEmpty("No commit message.") | ucfirst | final_dot)
+
+## Available constructs are those listed in ``body_process`` doc.
+subject_process = (strip |
+    ReSub(r'^([aA]dd(ed?)?|[nN]ew)(\s?:?\s)(.*)$', r'\4') |
+    ReSub(r'^([cC]hang(ed?)?)(\s?:?\s)(.*)$', r'\4') |
+    ReSub(r'^([fF]ix(ed?)?)(\s?:?\s)(.*)$', r'\4') |
+    ReSub(r'^([uU]pdat(ed?)?)(\s?:?\s)(.*)$', r'\4') |
+    ReSub(r'#(\d{3,4})', r'<a href="https://github.com/Radarr/Radarr/issues/\1">\1</a>') |
+    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_release.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"
+#]
+# Gets the latest annoted tag and uses that as a base for new changes.
+
+import subprocess
+
+proc = subprocess.Popen(["git", "describe", "--abbrev=0", "--tags"], stdout=subprocess.PIPE)
+out = str(proc.communicate()[0].strip(), "utf-8")
+revs = [out+"..."]

.github/ISSUE_TEMPLATE.md

@@ -1,6 +1,6 @@
 **Description:**
 
-Check first that your problem is not listed in our wiki section:
+<!-- 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
 
@@ -9,7 +9,7 @@ Check first that your problem is not listed in our wiki section:
 Visit our [Discord server](https://discord.gg/NWYch8M) or [Subreddit](https://reddit.com/r/radarr) for support or longer discussions. Support questions posed on here will be closed immediately.
 
 Provide a description of the feature request or bug here, the more details the better. 
-Please also include the following if you are reporting a bug. If you do not include it, the issue will probably be closed as we cannot help you.
+Please also include the following if you are reporting a bug. If you do not include it, the issue will probably be closed as we cannot help you. -->
 
 **Radarr Version:**
 
@@ -17,4 +17,6 @@ Please also include the following if you are reporting a bug. If you do not incl
 
 **Debug Logs:**
 
-Please use the search bar and make sure you are not submitting an already submitted issue.
+# Do not remove anything from your logs and post the full logs! If not everything fits in here use a service like https://pastebin.com to upload them.
+
+<!-- Please use the search bar (make sure to include closed issues as well) and make sure you are not submitting an already submitted issue. -->

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,31 @@
+---
+name: Bug report
+about: Support requests will be closed immediately, if you are unsure go to our Discord
+  or Subreddit first. Exceptions do not mean you found a bug!
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. Windows]
+ - Mono Version: [e.g. Mono 5.8] (Only needed under Linux and Mac, found under System -> Status)
+ - Browser and Version [e.g. chrome, safari] (Only needed for UI issues)
+ - Version [e.g. 22]
+
+**Debug Logs**
+Turn on debug logs under Settings -> General and wait for the bug to occur again. **Upload the full log file here (or another site and link it). Issues will be closed, if they do not include this!**

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,17 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/config.yml

@@ -0,0 +1,2 @@
+todo:
+  keyword: "TODO"

.github/stale.yml

@@ -0,0 +1,16 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 60
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 7
+# Issues with these labels will never be considered stale
+exemptLabels:
+  - feature request
+  - parser
+  - confirmed
+# Label to use when marking an issue as stale
+staleLabel: stale
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had recent activity. Please verify that this is still an issue with the latest version of Radarr and report back. Otherwise this issue will be closed.
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: false

.github/support.yml

@@ -0,0 +1,13 @@
+# Configuration for support-requests - https://github.com/dessant/support-requests
+
+# Label used to mark issues as support requests
+supportLabel: support
+# Comment to post on issues marked as support requests. Add a link
+# to a support page, or set to `false` to disable
+supportComment: >
+  We use the issue tracker exclusively for bug reports and feature requests.
+  However, this issue appears to be a support request. Please hop over onto our [Discord](https://discord.gg/ZDmT7qb) or [Subreddit](https://reddit.com/r/radarr)
+# Whether to close issues marked as support requests
+close: true
+# Whether to lock issues marked as support requests
+lock: false

.gitignore

@@ -148,8 +148,9 @@ _temp_*/**/*
 Thumbs.db
 
 # AppVeyor
-/tools-cake/
+/tools/cake/
 /_artifacts/
 
 # Cake
-/tools/Addins/*
+/tools/Addins/*
+packages.config.md5sum

README.md

@@ -54,8 +54,8 @@ The project was inspired by other Usenet/BitTorrent movie downloaders such as Co
 
 | 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/)
+| [![API V2 (develop)](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 (nightly)](http://status.radarr.video/component/2/shield?style=flat-square)](https://staging.api.radarr.video/) | [![Github Updates](http://status.radarr.video/component/5/shield?style=flat-square)](https://api.github.com/v3/) | [![Main Site](http://status.radarr.video/component/7/shield?style=flat-square)](https://radarr.video/)
 
 Radarr is currently undergoing rapid development and pull requests are actively added into the repository.
 
@@ -82,15 +82,15 @@ Radarr is currently undergoing rapid development and pull requests are actively
 * 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
+* Importing Metadata such as trailers or subtitles
+* Adding metadata such as posters and information for Kodi and others to use
 
 ### Planned Features
 
-* Importing 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. (\*)
+* Dynamically renaming folders with quality info, etc. (Currently working partially.) (\*)
 * 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
+* Supporting multiple editions per movies (\*)
+* Supporting collections of movies, such as James Bond (\*)
 
 **Note:** All features marked with (\*) are set to be in the first release of Radarr.
 
@@ -127,7 +127,21 @@ Radarr is currently undergoing rapid development and pull requests are actively
 * Make sure `NzbDrone.Console` is set as the startup project
 * Run `build.sh` before running
 
-### License
+## Supporters
+
+This project would not be possible without the support by these amazing folks. [**Become a sponsor or backer**](https://opencollective.com/radarr) to help us out!
+
+[![Sponsors](https://opencollective.com/radarr/tiers/sponsor.svg?avatarHeight=36)](https://opencollective.com/radarr/order/3851)
+
+---
+
+[![Flexible Sponsors](https://opencollective.com/radarr/tiers/flexible-sponsor.svg?avatarHeight=36)](https://opencollective.com/radarr/order/3856)
+
+---
+
+[![Backers](https://opencollective.com/radarr/tiers/backer.svg?avatarHeight=36)](https://opencollective.com/radarr/order/3850)
+
+## License
 
 * [GNU GPL v3](http://www.gnu.org/licenses/gpl.html)
 * Copyright 2010-2017

build-appveyor.cake

@@ -1,6 +1,6 @@
-#addin "Cake.Npm"
-#addin "SharpZipLib"
-#addin "Cake.Compression"
+#addin nuget:?package=Cake.Npm&version=0.12.1
+#addin nuget:?package=SharpZipLib&version=0.86.0
+#addin nuget:?package=Cake.Compression&version=0.1.4
 
 // Build variables
 var outputFolder = "./_output";

build-appveyor.ps1

@@ -81,8 +81,8 @@ if(!$PSScriptRoot){
     $PSScriptRoot = Split-Path $MyInvocation.MyCommand.Path -Parent
 }
 
-$TOOLS_DIR = Join-Path $PSScriptRoot "tools-cake"
-$NUGET_EXE = Join-Path $TOOLS_DIR "nuget.exe"
+$TOOLS_DIR = Join-Path $PSScriptRoot "tools"
+$NUGET_EXE = Join-Path $TOOLS_DIR "nuget/nuget.exe"
 $CAKE_EXE = Join-Path $TOOLS_DIR "Cake/Cake.exe"
 $NUGET_URL = "https://dist.nuget.org/win-x86-commandline/latest/nuget.exe"
 $PACKAGES_CONFIG = Join-Path $TOOLS_DIR "packages.config"
@@ -156,7 +156,12 @@ if(-Not $SkipToolPackageRestore.IsPresent) {
     if((!(Test-Path $PACKAGES_CONFIG_MD5)) -Or
       ($md5Hash -ne (Get-Content $PACKAGES_CONFIG_MD5 ))) {
         Write-Verbose -Message "Missing or changed package.config hash..."
-        Remove-Item * -Recurse -Exclude packages.config,nuget.exe
+        Get-ChildItem -Path $TOOLS_DIR -Recurse -Exclude packages.config |
+        Select -ExpandProperty FullName |
+        Where {$_ -notlike (Join-Path $TOOLS_DIR "pdb2mdb*")} |
+        Where {$_ -notlike (Join-Path $TOOLS_DIR "nuget*")} |
+        sort length -Descending |
+        Remove-Item -Recurse 
     }
 
     Write-Verbose -Message "Restoring tools from NuGet..."
@@ -181,4 +186,4 @@ if (!(Test-Path $CAKE_EXE)) {
 # Start Cake
 Write-Host "Running build script..."
 Invoke-Expression "& `"$CAKE_EXE`" `"$Script`" -target=`"$Target`" -configuration=`"$Configuration`" -verbosity=`"$Verbosity`" $UseMono $UseDryRun $UseExperimental $ScriptArgs"
-exit $LASTEXITCODE
+exit $LASTEXITCODE

changelog.tpl

@@ -6,7 +6,7 @@
 {{#sections}}
 ### {{{label}}}
 {{#commits}}
-- {{{subject}}} [{{{author}}}]
+- {{{subject}}} [<a href="https://github.com/{{{author}}}">{{{author}}}</a>]
 {{/commits}}
 
 {{/sections}}

changelog_release.tpl

@@ -0,0 +1,15 @@
+**To receive further Pre-Release updates, please change the branch to develop. (Settings -> General (Show Advanced Settings) -> Updates -> Branch)**
+
+{{#versions}}
+
+{{#sections}}
+{{{label}}}
+{{#commits}}
+- {{{subject}}} [<a href="https://github.com/{{{author}}}">{{{author}}}</a>]
+{{/commits}}
+
+{{/sections}}
+
+{{/versions}}
+
+**Note**: The OSX version does not automatically launch the browser. You have to go to http://localhost:7878 by yourself in a browser of your choice.

package-lock.json

@@ -422,6 +422,7 @@
       "requires": {
         "anymatch": "1.3.2",
         "async-each": "1.0.1",
+        "fsevents": "1.1.3",
         "glob-parent": "2.0.0",
         "inherits": "2.0.3",
         "is-binary-path": "1.0.1",
@@ -1034,6 +1035,795 @@
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
       "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
     },
+    "fsevents": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.1.3.tgz",
+      "integrity": "sha512-WIr7iDkdmdbxu/Gh6eKEZJL6KPE74/5MEsf2whTOFNxbIoIixogroLdKYqB6FDav4Wavh/lZdzzd3b2KxIXC5Q==",
+      "optional": true,
+      "requires": {
+        "nan": "2.10.0",
+        "node-pre-gyp": "0.6.39"
+      },
+      "dependencies": {
+        "abbrev": {
+          "version": "1.1.0",
+          "bundled": true,
+          "optional": true
+        },
+        "ajv": {
+          "version": "4.11.8",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "co": "4.6.0",
+            "json-stable-stringify": "1.0.1"
+          }
+        },
+        "ansi-regex": {
+          "version": "2.1.1",
+          "bundled": true
+        },
+        "aproba": {
+          "version": "1.1.1",
+          "bundled": true,
+          "optional": true
+        },
+        "are-we-there-yet": {
+          "version": "1.1.4",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "delegates": "1.0.0",
+            "readable-stream": "2.2.9"
+          }
+        },
+        "asn1": {
+          "version": "0.2.3",
+          "bundled": true,
+          "optional": true
+        },
+        "assert-plus": {
+          "version": "0.2.0",
+          "bundled": true,
+          "optional": true
+        },
+        "asynckit": {
+          "version": "0.4.0",
+          "bundled": true,
+          "optional": true
+        },
+        "aws-sign2": {
+          "version": "0.6.0",
+          "bundled": true,
+          "optional": true
+        },
+        "aws4": {
+          "version": "1.6.0",
+          "bundled": true,
+          "optional": true
+        },
+        "balanced-match": {
+          "version": "0.4.2",
+          "bundled": true
+        },
+        "bcrypt-pbkdf": {
+          "version": "1.0.1",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "tweetnacl": "0.14.5"
+          }
+        },
+        "block-stream": {
+          "version": "0.0.9",
+          "bundled": true,
+          "requires": {
+            "inherits": "2.0.3"
+          }
+        },
+        "boom": {
+          "version": "2.10.1",
+          "bundled": true,
+          "requires": {
+            "hoek": "2.16.3"
+          }
+        },
+        "brace-expansion": {
+          "version": "1.1.7",
+          "bundled": true,
+          "requires": {
+            "balanced-match": "0.4.2",
+            "concat-map": "0.0.1"
+          }
+        },
+        "buffer-shims": {
+          "version": "1.0.0",
+          "bundled": true
+        },
+        "caseless": {
+          "version": "0.12.0",
+          "bundled": true,
+          "optional": true
+        },
+        "co": {
+          "version": "4.6.0",
+          "bundled": true,
+          "optional": true
+        },
+        "code-point-at": {
+          "version": "1.1.0",
+          "bundled": true
+        },
+        "combined-stream": {
+          "version": "1.0.5",
+          "bundled": true,
+          "requires": {
+            "delayed-stream": "1.0.0"
+          }
+        },
+        "concat-map": {
+          "version": "0.0.1",
+          "bundled": true
+        },
+        "console-control-strings": {
+          "version": "1.1.0",
+          "bundled": true
+        },
+        "core-util-is": {
+          "version": "1.0.2",
+          "bundled": true
+        },
+        "cryptiles": {
+          "version": "2.0.5",
+          "bundled": true,
+          "requires": {
+            "boom": "2.10.1"
+          }
+        },
+        "dashdash": {
+          "version": "1.14.1",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "assert-plus": "1.0.0"
+          },
+          "dependencies": {
+            "assert-plus": {
+              "version": "1.0.0",
+              "bundled": true,
+              "optional": true
+            }
+          }
+        },
+        "debug": {
+          "version": "2.6.8",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "deep-extend": {
+          "version": "0.4.2",
+          "bundled": true,
+          "optional": true
+        },
+        "delayed-stream": {
+          "version": "1.0.0",
+          "bundled": true
+        },
+        "delegates": {
+          "version": "1.0.0",
+          "bundled": true,
+          "optional": true
+        },
+        "detect-libc": {
+          "version": "1.0.2",
+          "bundled": true,
+          "optional": true
+        },
+        "ecc-jsbn": {
+          "version": "0.1.1",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "jsbn": "0.1.1"
+          }
+        },
+        "extend": {
+          "version": "3.0.1",
+          "bundled": true,
+          "optional": true
+        },
+        "extsprintf": {
+          "version": "1.0.2",
+          "bundled": true
+        },
+        "forever-agent": {
+          "version": "0.6.1",
+          "bundled": true,
+          "optional": true
+        },
+        "form-data": {
+          "version": "2.1.4",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "asynckit": "0.4.0",
+            "combined-stream": "1.0.5",
+            "mime-types": "2.1.15"
+          }
+        },
+        "fs.realpath": {
+          "version": "1.0.0",
+          "bundled": true
+        },
+        "fstream": {
+          "version": "1.0.11",
+          "bundled": true,
+          "requires": {
+            "graceful-fs": "4.1.11",
+            "inherits": "2.0.3",
+            "mkdirp": "0.5.1",
+            "rimraf": "2.6.1"
+          }
+        },
+        "fstream-ignore": {
+          "version": "1.0.5",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "fstream": "1.0.11",
+            "inherits": "2.0.3",
+            "minimatch": "3.0.4"
+          }
+        },
+        "gauge": {
+          "version": "2.7.4",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "aproba": "1.1.1",
+            "console-control-strings": "1.1.0",
+            "has-unicode": "2.0.1",
+            "object-assign": "4.1.1",
+            "signal-exit": "3.0.2",
+            "string-width": "1.0.2",
+            "strip-ansi": "3.0.1",
+            "wide-align": "1.1.2"
+          }
+        },
+        "getpass": {
+          "version": "0.1.7",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "assert-plus": "1.0.0"
+          },
+          "dependencies": {
+            "assert-plus": {
+              "version": "1.0.0",
+              "bundled": true,
+              "optional": true
+            }
+          }
+        },
+        "glob": {
+          "version": "7.1.2",
+          "bundled": true,
+          "requires": {
+            "fs.realpath": "1.0.0",
+            "inflight": "1.0.6",
+            "inherits": "2.0.3",
+            "minimatch": "3.0.4",
+            "once": "1.4.0",
+            "path-is-absolute": "1.0.1"
+          }
+        },
+        "graceful-fs": {
+          "version": "4.1.11",
+          "bundled": true
+        },
+        "har-schema": {
+          "version": "1.0.5",
+          "bundled": true,
+          "optional": true
+        },
+        "har-validator": {
+          "version": "4.2.1",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "ajv": "4.11.8",
+            "har-schema": "1.0.5"
+          }
+        },
+        "has-unicode": {
+          "version": "2.0.1",
+          "bundled": true,
+          "optional": true
+        },
+        "hawk": {
+          "version": "3.1.3",
+          "bundled": true,
+          "requires": {
+            "boom": "2.10.1",
+            "cryptiles": "2.0.5",
+            "hoek": "2.16.3",
+            "sntp": "1.0.9"
+          }
+        },
+        "hoek": {
+          "version": "2.16.3",
+          "bundled": true
+        },
+        "http-signature": {
+          "version": "1.1.1",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "assert-plus": "0.2.0",
+            "jsprim": "1.4.0",
+            "sshpk": "1.13.0"
+          }
+        },
+        "inflight": {
+          "version": "1.0.6",
+          "bundled": true,
+          "requires": {
+            "once": "1.4.0",
+            "wrappy": "1.0.2"
+          }
+        },
+        "inherits": {
+          "version": "2.0.3",
+          "bundled": true
+        },
+        "ini": {
+          "version": "1.3.4",
+          "bundled": true,
+          "optional": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "1.0.0",
+          "bundled": true,
+          "requires": {
+            "number-is-nan": "1.0.1"
+          }
+        },
+        "is-typedarray": {
+          "version": "1.0.0",
+          "bundled": true,
+          "optional": true
+        },
+        "isarray": {
+          "version": "1.0.0",
+          "bundled": true
+        },
+        "isstream": {
+          "version": "0.1.2",
+          "bundled": true,
+          "optional": true
+        },
+        "jodid25519": {
+          "version": "1.0.2",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "jsbn": "0.1.1"
+          }
+        },
+        "jsbn": {
+          "version": "0.1.1",
+          "bundled": true,
+          "optional": true
+        },
+        "json-schema": {
+          "version": "0.2.3",
+          "bundled": true,
+          "optional": true
+        },
+        "json-stable-stringify": {
+          "version": "1.0.1",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "jsonify": "0.0.0"
+          }
+        },
+        "json-stringify-safe": {
+          "version": "5.0.1",
+          "bundled": true,
+          "optional": true
+        },
+        "jsonify": {
+          "version": "0.0.0",
+          "bundled": true,
+          "optional": true
+        },
+        "jsprim": {
+          "version": "1.4.0",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "assert-plus": "1.0.0",
+            "extsprintf": "1.0.2",
+            "json-schema": "0.2.3",
+            "verror": "1.3.6"
+          },
+          "dependencies": {
+            "assert-plus": {
+              "version": "1.0.0",
+              "bundled": true,
+              "optional": true
+            }
+          }
+        },
+        "mime-db": {
+          "version": "1.27.0",
+          "bundled": true
+        },
+        "mime-types": {
+          "version": "2.1.15",
+          "bundled": true,
+          "requires": {
+            "mime-db": "1.27.0"
+          }
+        },
+        "minimatch": {
+          "version": "3.0.4",
+          "bundled": true,
+          "requires": {
+            "brace-expansion": "1.1.7"
+          }
+        },
+        "minimist": {
+          "version": "0.0.8",
+          "bundled": true
+        },
+        "mkdirp": {
+          "version": "0.5.1",
+          "bundled": true,
+          "requires": {
+            "minimist": "0.0.8"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "bundled": true,
+          "optional": true
+        },
+        "node-pre-gyp": {
+          "version": "0.6.39",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "detect-libc": "1.0.2",
+            "hawk": "3.1.3",
+            "mkdirp": "0.5.1",
+            "nopt": "4.0.1",
+            "npmlog": "4.1.0",
+            "rc": "1.2.1",
+            "request": "2.81.0",
+            "rimraf": "2.6.1",
+            "semver": "5.3.0",
+            "tar": "2.2.1",
+            "tar-pack": "3.4.0"
+          }
+        },
+        "nopt": {
+          "version": "4.0.1",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "abbrev": "1.1.0",
+            "osenv": "0.1.4"
+          }
+        },
+        "npmlog": {
+          "version": "4.1.0",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "are-we-there-yet": "1.1.4",
+            "console-control-strings": "1.1.0",
+            "gauge": "2.7.4",
+            "set-blocking": "2.0.0"
+          }
+        },
+        "number-is-nan": {
+          "version": "1.0.1",
+          "bundled": true
+        },
+        "oauth-sign": {
+          "version": "0.8.2",
+          "bundled": true,
+          "optional": true
+        },
+        "object-assign": {
+          "version": "4.1.1",
+          "bundled": true,
+          "optional": true
+        },
+        "once": {
+          "version": "1.4.0",
+          "bundled": true,
+          "requires": {
+            "wrappy": "1.0.2"
+          }
+        },
+        "os-homedir": {
+          "version": "1.0.2",
+          "bundled": true,
+          "optional": true
+        },
+        "os-tmpdir": {
+          "version": "1.0.2",
+          "bundled": true,
+          "optional": true
+        },
+        "osenv": {
+          "version": "0.1.4",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "os-homedir": "1.0.2",
+            "os-tmpdir": "1.0.2"
+          }
+        },
+        "path-is-absolute": {
+          "version": "1.0.1",
+          "bundled": true
+        },
+        "performance-now": {
+          "version": "0.2.0",
+          "bundled": true,
+          "optional": true
+        },
+        "process-nextick-args": {
+          "version": "1.0.7",
+          "bundled": true
+        },
+        "punycode": {
+          "version": "1.4.1",
+          "bundled": true,
+          "optional": true
+        },
+        "qs": {
+          "version": "6.4.0",
+          "bundled": true,
+          "optional": true
+        },
+        "rc": {
+          "version": "1.2.1",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "deep-extend": "0.4.2",
+            "ini": "1.3.4",
+            "minimist": "1.2.0",
+            "strip-json-comments": "2.0.1"
+          },
+          "dependencies": {
+            "minimist": {
+              "version": "1.2.0",
+              "bundled": true,
+              "optional": true
+            }
+          }
+        },
+        "readable-stream": {
+          "version": "2.2.9",
+          "bundled": true,
+          "requires": {
+            "buffer-shims": "1.0.0",
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "1.0.0",
+            "process-nextick-args": "1.0.7",
+            "string_decoder": "1.0.1",
+            "util-deprecate": "1.0.2"
+          }
+        },
+        "request": {
+          "version": "2.81.0",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "aws-sign2": "0.6.0",
+            "aws4": "1.6.0",
+            "caseless": "0.12.0",
+            "combined-stream": "1.0.5",
+            "extend": "3.0.1",
+            "forever-agent": "0.6.1",
+            "form-data": "2.1.4",
+            "har-validator": "4.2.1",
+            "hawk": "3.1.3",
+            "http-signature": "1.1.1",
+            "is-typedarray": "1.0.0",
+            "isstream": "0.1.2",
+            "json-stringify-safe": "5.0.1",
+            "mime-types": "2.1.15",
+            "oauth-sign": "0.8.2",
+            "performance-now": "0.2.0",
+            "qs": "6.4.0",
+            "safe-buffer": "5.0.1",
+            "stringstream": "0.0.5",
+            "tough-cookie": "2.3.2",
+            "tunnel-agent": "0.6.0",
+            "uuid": "3.0.1"
+          }
+        },
+        "rimraf": {
+          "version": "2.6.1",
+          "bundled": true,
+          "requires": {
+            "glob": "7.1.2"
+          }
+        },
+        "safe-buffer": {
+          "version": "5.0.1",
+          "bundled": true
+        },
+        "semver": {
+          "version": "5.3.0",
+          "bundled": true,
+          "optional": true
+        },
+        "set-blocking": {
+          "version": "2.0.0",
+          "bundled": true,
+          "optional": true
+        },
+        "signal-exit": {
+          "version": "3.0.2",
+          "bundled": true,
+          "optional": true
+        },
+        "sntp": {
+          "version": "1.0.9",
+          "bundled": true,
+          "requires": {
+            "hoek": "2.16.3"
+          }
+        },
+        "sshpk": {
+          "version": "1.13.0",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "asn1": "0.2.3",
+            "assert-plus": "1.0.0",
+            "bcrypt-pbkdf": "1.0.1",
+            "dashdash": "1.14.1",
+            "ecc-jsbn": "0.1.1",
+            "getpass": "0.1.7",
+            "jodid25519": "1.0.2",
+            "jsbn": "0.1.1",
+            "tweetnacl": "0.14.5"
+          },
+          "dependencies": {
+            "assert-plus": {
+              "version": "1.0.0",
+              "bundled": true,
+              "optional": true
+            }
+          }
+        },
+        "string_decoder": {
+          "version": "1.0.1",
+          "bundled": true,
+          "requires": {
+            "safe-buffer": "5.0.1"
+          }
+        },
+        "string-width": {
+          "version": "1.0.2",
+          "bundled": true,
+          "requires": {
+            "code-point-at": "1.1.0",
+            "is-fullwidth-code-point": "1.0.0",
+            "strip-ansi": "3.0.1"
+          }
+        },
+        "stringstream": {
+          "version": "0.0.5",
+          "bundled": true,
+          "optional": true
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "bundled": true,
+          "requires": {
+            "ansi-regex": "2.1.1"
+          }
+        },
+        "strip-json-comments": {
+          "version": "2.0.1",
+          "bundled": true,
+          "optional": true
+        },
+        "tar": {
+          "version": "2.2.1",
+          "bundled": true,
+          "requires": {
+            "block-stream": "0.0.9",
+            "fstream": "1.0.11",
+            "inherits": "2.0.3"
+          }
+        },
+        "tar-pack": {
+          "version": "3.4.0",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "debug": "2.6.8",
+            "fstream": "1.0.11",
+            "fstream-ignore": "1.0.5",
+            "once": "1.4.0",
+            "readable-stream": "2.2.9",
+            "rimraf": "2.6.1",
+            "tar": "2.2.1",
+            "uid-number": "0.0.6"
+          }
+        },
+        "tough-cookie": {
+          "version": "2.3.2",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "punycode": "1.4.1"
+          }
+        },
+        "tunnel-agent": {
+          "version": "0.6.0",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "safe-buffer": "5.0.1"
+          }
+        },
+        "tweetnacl": {
+          "version": "0.14.5",
+          "bundled": true,
+          "optional": true
+        },
+        "uid-number": {
+          "version": "0.0.6",
+          "bundled": true,
+          "optional": true
+        },
+        "util-deprecate": {
+          "version": "1.0.2",
+          "bundled": true
+        },
+        "uuid": {
+          "version": "3.0.1",
+          "bundled": true,
+          "optional": true
+        },
+        "verror": {
+          "version": "1.3.6",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "extsprintf": "1.0.2"
+          }
+        },
+        "wide-align": {
+          "version": "1.1.2",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "string-width": "1.0.2"
+          }
+        },
+        "wrappy": {
+          "version": "1.0.2",
+          "bundled": true
+        }
+      }
+    },
     "fstream": {
       "version": "0.1.31",
       "resolved": "https://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz",
@@ -2783,6 +3573,12 @@
         "duplexer2": "0.0.2"
       }
     },
+    "nan": {
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz",
+      "integrity": "sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA==",
+      "optional": true
+    },
     "natives": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/natives/-/natives-1.1.0.tgz",

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

@@ -578,17 +578,6 @@
           <e p="DownloadClientModule.cs" t="Include" />
           <e p="DownloadClientResource.cs" t="Include" />
         </e>
-        <e p="EpisodeFiles" t="Include">
-          <e p="EpisodeFileModule.cs" t="Include" />
-          <e p="EpisodeFileResource.cs" t="Include" />
-        </e>
-        <e p="Episodes" t="Include">
-          <e p="EpisodeModule.cs" t="Include" />
-          <e p="EpisodeModuleWithSignalR.cs" t="Include" />
-          <e p="EpisodeResource.cs" t="Include" />
-          <e p="RenameEpisodeModule.cs" t="Include" />
-          <e p="RenameEpisodeResource.cs" t="Include" />
-        </e>
         <e p="ErrorManagement" t="Include">
           <e p="ApiException.cs" t="Include" />
           <e p="ErrorHandler.cs" t="Include" />
@@ -614,6 +603,10 @@
           <e p="ReqResExtensions.cs" t="Include" />
           <e p="RequestExtensions.cs" t="Include" />
         </e>
+        <e p="ExtraFiles" t="Include">
+          <e p="ExtraFileModule.cs" t="Include" />
+          <e p="ExtraFileResource.cs" t="Include" />
+        </e>
         <e p="FileSystem" t="Include">
           <e p="FileSystemModule.cs" t="Include" />
         </e>
@@ -670,14 +663,23 @@
           <e p="MetadataModule.cs" t="Include" />
           <e p="MetadataResource.cs" t="Include" />
         </e>
+        <e p="MovieFiles" t="Include">
+          <e p="MovieFileModule.cs" t="Include" />
+          <e p="MovieFileResource.cs" t="Include" />
+        </e>
         <e p="Movies" t="Include">
           <e p="AlternativeTitleModule.cs" t="Include" />
+          <e p="AlternativeTitleResource.cs" t="Include" />
           <e p="AlternativeYearModule.cs" t="Include" />
           <e p="AlternativeYearResource.cs" t="Include" />
+          <e p="FetchMovieListModule.cs" t="Include" />
           <e p="MovieBulkImportModule.cs" t="Include" />
+          <e p="MovieDiscoverModule.cs" t="Include" />
           <e p="MovieEditorModule.cs" t="Include" />
-          <e p="MovieFileModule.cs" t="Include" />
+          <e p="MovieLookupModule.cs" t="Include" />
+          <e p="MovieModule.cs" t="Include" />
           <e p="MovieModuleWithSignalR.cs" t="Include" />
+          <e p="MovieResource.cs" t="Include" />
           <e p="RenameMovieModule.cs" t="Include" />
           <e p="RenameMovieResource.cs" t="Include" />
         </e>
@@ -755,22 +757,7 @@
           <e p="RootFolderModule.cs" t="Include" />
           <e p="RootFolderResource.cs" t="Include" />
         </e>
-        <e p="SeasonPass" t="Include">
-          <e p="SeasonPassModule.cs" t="Include" />
-          <e p="SeasonPassResource.cs" t="Include" />
-        </e>
         <e p="Series" t="Include">
-          <e p="AlternativeTitleResource.cs" t="Include" />
-          <e p="FetchMovieListModule.cs" t="Include" />
-          <e p="MovieDiscoverModule.cs" t="Include" />
-          <e p="MovieFileResource.cs" t="Include" />
-          <e p="MovieLookupModule.cs" t="Include" />
-          <e p="MovieModule.cs" t="Include" />
-          <e p="MovieResource.cs" t="Include" />
-          <e p="SeasonResource.cs" t="Include" />
-          <e p="SeasonStatisticsResource.cs" t="Include" />
-          <e p="SeriesEditorModule.cs" t="Include" />
-          <e p="SeriesLookupModule.cs" t="Include" />
           <e p="SeriesModule.cs" t="Include" />
           <e p="SeriesResource.cs" t="Include" />
         </e>
@@ -801,9 +788,7 @@
           <e p="RuleBuilderExtensions.cs" t="Include" />
         </e>
         <e p="Wanted" t="Include">
-          <e p="CutoffModule.cs" t="Include" />
           <e p="LegacyMissingModule.cs" t="Include" />
-          <e p="MissingModule.cs" t="Include" />
           <e p="MovieCutoffModule.cs" t="Include" />
           <e p="MovieMissingModule.cs" t="Include" />
         </e>
@@ -1053,6 +1038,7 @@
           <e p="HttpUriConverter.cs" t="Include" />
           <e p="IntConverter.cs" t="Include" />
           <e p="JSON.cs" t="Include" />
+          <e p="UnderscoreStringEnumConverter.cs" t="Include" />
         </e>
         <e p="ServiceFactory.cs" t="Include" />
         <e p="ServiceProvider.cs" t="Include" />
@@ -1154,6 +1140,7 @@
           <e p="Backup.cs" t="Include" />
           <e p="BackupCommand.cs" t="Include" />
           <e p="BackupService.cs" t="Include" />
+          <e p="MakeDatabaseBackup.cs" t="Include" />
         </e>
         <e p="Blacklisting" t="Include">
           <e p="Blacklist.cs" t="Include" />
@@ -1174,23 +1161,6 @@
           <e p="InvalidConfigFileException.cs" t="Include" />
           <e p="ResetApiKeyCommand.cs" t="Include" />
         </e>
-        <e p="DataAugmentation" t="Include">
-          <e p="DailySeries" t="Include">
-            <e p="DailySeries.cs" t="Include" />
-            <e p="DailySeriesDataProxy.cs" t="Include" />
-            <e p="DailySeriesService.cs" t="Include" />
-          </e>
-          <e p="Scene" t="Include">
-            <e p="ISceneMappingProvider.cs" t="Include" />
-            <e p="SceneMapping.cs" t="Include" />
-            <e p="SceneMappingProxy.cs" t="Include" />
-            <e p="SceneMappingRepository.cs" t="Include" />
-            <e p="SceneMappingService.cs" t="Include" />
-            <e p="SceneMappingsUpdatedEvent.cs" t="Include" />
-            <e p="ServicesProvider.cs" t="Include" />
-            <e p="UpdateSceneMappingCommand.cs" t="Include" />
-          </e>
-        </e>
         <e p="Datastore" t="Include">
           <e p="BasicRepository.cs" t="Include" />
           <e p="ConnectionStringFactory.cs" t="Include" />
@@ -1361,6 +1331,12 @@
             <e p="139_fix_indexer_baseurl.cs" t="Include" />
             <e p="140_add_alternative_titles_table.cs" t="Include" />
             <e p="141_fix_duplicate_alt_titles.cs" t="Include" />
+            <e p="142_movie_extras.cs" t="Include" />
+            <e p="143_clean_core_tv.cs" t="Include" />
+            <e p="144_add_cookies_to_indexer_status.cs" t="Include" />
+            <e p="145_banner_to_fanart.cs" t="Include" />
+            <e p="146_naming_config_colon_replacement_format.cs" t="Include" />
+            <e p="148_remove_extra_naming_config.cs" t="Include" />
             <e p="Framework" t="Include">
               <e p="MigrationContext.cs" t="Include" />
               <e p="MigrationController.cs" t="Include" />
@@ -1393,14 +1369,13 @@
           <e p="QualityUpgradableSpecification.cs" t="Include" />
           <e p="Rejection.cs" t="Include" />
           <e p="RejectionType.cs" t="Include" />
-          <e p="SameEpisodesSpecification.cs" t="Include" />
           <e p="Specifications" t="Include">
             <e p="AcceptableSizeSpecification.cs" t="Include" />
             <e p="AnimeVersionUpgradeSpecification.cs" t="Include" />
             <e p="BlacklistSpecification.cs" t="Include" />
             <e p="CutoffSpecification.cs" t="Include" />
-            <e p="FullSeasonSpecification.cs" t="Include" />
             <e p="LanguageSpecification.cs" t="Include" />
+            <e p="MaximumSizeSpecification.cs" t="Include" />
             <e p="MinimumAgeSpecification.cs" t="Include" />
             <e p="NotSampleSpecification.cs" t="Include" />
             <e p="ProtocolSpecification.cs" t="Include" />
@@ -1414,16 +1389,12 @@
               <e p="AvailabilitySpecification.cs" t="Include" />
               <e p="DelaySpecification.cs" t="Include" />
               <e p="HistorySpecification.cs" t="Include" />
-              <e p="MonitoredEpisodeSpecification.cs" t="Include" />
+              <e p="MonitoredMovieSpecification.cs" t="Include" />
               <e p="ProperSpecification.cs" t="Include" />
             </e>
-            <e p="SameEpisodesGrabSpecification.cs" t="Include" />
             <e p="Search" t="Include">
               <e p="DailyEpisodeMatchSpecification.cs" t="Include" />
-              <e p="EpisodeRequestedSpecification.cs" t="Include" />
-              <e p="SeasonMatchSpecification.cs" t="Include" />
-              <e p="SeriesSpecification.cs" t="Include" />
-              <e p="SingleEpisodeSearchMatchSpecification.cs" t="Include" />
+              <e p="MovieSpecification.cs" t="Include" />
             </e>
             <e p="TorrentSeedingSpecification.cs" t="Include" />
             <e p="UpgradeDiskSpecification.cs" t="Include" />
@@ -1633,7 +1604,6 @@
           <e p="DownloadFailedEvent.cs" t="Include" />
           <e p="DownloadItemStatus.cs" t="Include" />
           <e p="DownloadService.cs" t="Include" />
-          <e p="EpisodeGrabbedEvent.cs" t="Include" />
           <e p="FailedDownloadService.cs" t="Include" />
           <e p="IDownloadClient.cs" t="Include" />
           <e p="MovieGrabbedEvent.cs" t="Include" />
@@ -1662,7 +1632,6 @@
           <e p="MovieNotFoundExceptions.cs" t="Include" />
           <e p="NzbDroneClientException.cs" t="Include" />
           <e p="ReleaseDownloadException.cs" t="Include" />
-          <e p="SeriesNotFoundException.cs" t="Include" />
           <e p="StatusCodeToExceptions.cs" t="Include" />
         </e>
         <e p="Extras" t="Include">
@@ -1694,6 +1663,7 @@
               <e p="Xbmc" t="Include">
                 <e p="XbmcMetadata.cs" t="Include" />
                 <e p="XbmcMetadataSettings.cs" t="Include" />
+                <e p="XbmcNfoDetector.cs" t="Include" />
               </e>
             </e>
             <e p="ExistingMetadataImporter.cs" t="Include" />
@@ -1716,6 +1686,7 @@
           <e p="Others" t="Include">
             <e p="ExistingOtherExtraImporter.cs" t="Include" />
             <e p="OtherExtraFile.cs" t="Include" />
+            <e p="OtherExtraFileRenamer.cs" t="Include" />
             <e p="OtherExtraFileRepository.cs" t="Include" />
             <e p="OtherExtraFileService.cs" t="Include" />
             <e p="OtherExtraService.cs" t="Include" />
@@ -1767,18 +1738,17 @@
             <e p="CleanupDuplicateMetadataFiles.cs" t="Include" />
             <e p="CleanupOrphanedAlternativeTitles.cs" t="Include" />
             <e p="CleanupOrphanedBlacklist.cs" t="Include" />
-            <e p="CleanupOrphanedEpisodeFiles.cs" t="Include" />
-            <e p="CleanupOrphanedEpisodes.cs" t="Include" />
             <e p="CleanupOrphanedHistoryItems.cs" t="Include" />
             <e p="CleanupOrphanedIndexerStatus.cs" t="Include" />
             <e p="CleanupOrphanedMetadataFiles.cs" t="Include" />
+            <e p="CleanupOrphanedMovieFiles.cs" t="Include" />
             <e p="CleanupOrphanedPendingReleases.cs" t="Include" />
             <e p="CleanupUnusedTags.cs" t="Include" />
             <e p="DeleteBadMediaCovers.cs" t="Include" />
             <e p="FixFutureRunScheduledTasks.cs" t="Include" />
             <e p="FixWronglyMatchedMovieFiles.cs" t="Include" />
             <e p="TrimLogDatabase.cs" t="Include" />
-            <e p="UpdateCleanTitleForSeries.cs" t="Include" />
+            <e p="UpdateCleanTitleForMovies.cs" t="Include" />
           </e>
           <e p="HousekeepingCommand.cs" t="Include" />
           <e p="HousekeepingService.cs" t="Include" />
@@ -1911,25 +1881,13 @@
         <e p="IndexerSearch" t="Include">
           <e p="CutoffUnmetMoviesSearchCommand.cs" t="Include" />
           <e p="Definitions" t="Include">
-            <e p="AnimeEpisodeSearchCriteria.cs" t="Include" />
-            <e p="DailyEpisodeSearchCriteria.cs" t="Include" />
             <e p="MovieSearchCriteria.cs" t="Include" />
             <e p="SearchCriteriaBase.cs" t="Include" />
-            <e p="SeasonSearchCriteria.cs" t="Include" />
-            <e p="SingleEpisodeSearchCriteria.cs" t="Include" />
-            <e p="SpecialEpisodeSearchCriteria.cs" t="Include" />
           </e>
-          <e p="EpisodeSearchCommand.cs" t="Include" />
-          <e p="EpisodeSearchService.cs" t="Include" />
-          <e p="MissingEpisodeSearchCommand.cs" t="Include" />
           <e p="MissingMoviesSearchCommand.cs" t="Include" />
           <e p="MoviesSearchCommand.cs" t="Include" />
           <e p="MoviesSearchService.cs" t="Include" />
           <e p="NzbSearchService.cs" t="Include" />
-          <e p="SeasonSearchCommand.cs" t="Include" />
-          <e p="SeasonSearchService.cs" t="Include" />
-          <e p="SeriesSearchCommand.cs" t="Include" />
-          <e p="SeriesSearchService.cs" t="Include" />
         </e>
         <e p="Instrumentation" t="Include">
           <e p="Commands" t="Include">
@@ -1976,52 +1934,13 @@
             <e p="RenameMovieCommand.cs" t="Include" />
             <e p="RenameMovieFilesCommand.cs" t="Include" />
             <e p="RenameMovieFolderCommand.cs" t="Include" />
-            <e p="RenameSeriesCommand.cs" t="Include" />
             <e p="RescanMovieCommand.cs" t="Include" />
-            <e p="RescanSeriesCommand.cs" t="Include" />
           </e>
           <e p="DeleteMediaFileReason.cs" t="Include" />
           <e p="DiskScanService.cs" t="Include" />
           <e p="DownloadedMovieCommandService.cs" t="Include" />
           <e p="DownloadedMovieImportService.cs" t="Include" />
-          <e p="EpisodeFile.cs" t="Include" />
-          <e p="EpisodeFileMoveResult.cs" t="Include" />
-          <e p="EpisodeFileMovingService.cs" t="Include" />
-          <e p="EpisodeImport" t="Include">
-            <e p="DetectSample.cs" t="Include" />
-            <e p="IImportDecisionEngineSpecification.cs" t="Include" />
-            <e p="ImportApprovedEpisodes.cs" t="Include" />
-            <e p="ImportApprovedMovie.cs" t="Include" />
-            <e p="ImportDecision.cs" t="Include" />
-            <e p="ImportDecisionMaker.cs" t="Include" />
-            <e p="ImportMode.cs" t="Include" />
-            <e p="ImportResult.cs" t="Include" />
-            <e p="ImportResultType.cs" t="Include" />
-            <e p="Manual" t="Include">
-              <e p="ManualImportCommand.cs" t="Include" />
-              <e p="ManualImportFile.cs" t="Include" />
-              <e p="ManualImportItem.cs" t="Include" />
-              <e p="ManualImportService.cs" t="Include" />
-              <e p="ManuallyImportedFile.cs" t="Include" />
-            </e>
-            <e p="Specifications" t="Include">
-              <e p="FreeSpaceSpecification.cs" t="Include" />
-              <e p="FullSeasonSpecification.cs" t="Include" />
-              <e p="GrabbedReleaseQualitySpecification.cs" t="Include" />
-              <e p="MatchesFolderSpecification.cs" t="Include" />
-              <e p="NotSampleSpecification.cs" t="Include" />
-              <e p="NotUnpackingSpecification.cs" t="Include" />
-              <e p="SameEpisodesImportSpecification.cs" t="Include" />
-              <e p="UnverifiedSceneNumberingSpecification.cs" t="Include" />
-              <e p="UpgradeSpecification.cs" t="Include" />
-            </e>
-          </e>
           <e p="Events" t="Include">
-            <e p="EpisodeDownloadedEvent.cs" t="Include" />
-            <e p="EpisodeFileAddedEvent.cs" t="Include" />
-            <e p="EpisodeFileDeletedEvent.cs" t="Include" />
-            <e p="EpisodeFolderCreatedEvent.cs" t="Include" />
-            <e p="EpisodeImportedEvent.cs" t="Include" />
             <e p="MovieDownloadedEvent.cs" t="Include" />
             <e p="MovieFileAddedEvent.cs" t="Include" />
             <e p="MovieFileDeletedEvent.cs" t="Include" />
@@ -2031,9 +1950,6 @@
             <e p="MovieRenamedEvent.cs" t="Include" />
             <e p="MovieScannedEvent.cs" t="Include" />
             <e p="MovieScanSkippedEvent.cs" t="Include" />
-            <e p="SeriesRenamedEvent.cs" t="Include" />
-            <e p="SeriesScannedEvent.cs" t="Include" />
-            <e p="SeriesScanSkippedEvent.cs" t="Include" />
           </e>
           <e p="FileDateType.cs" t="Include" />
           <e p="MediaFileAttributeService.cs" t="Include" />
@@ -2050,17 +1966,40 @@
           <e p="MovieFile.cs" t="Include" />
           <e p="MovieFileMoveResult.cs" t="Include" />
           <e p="MovieFileMovingService.cs" t="Include" />
-          <e p="MovieFileRepository.cs" t="Include" />
+          <e p="MovieImport" t="Include">
+            <e p="DetectSample.cs" t="Include" />
+            <e p="IImportDecisionEngineSpecification.cs" t="Include" />
+            <e p="ImportApprovedMovie.cs" t="Include" />
+            <e p="ImportDecision.cs" t="Include" />
+            <e p="ImportDecisionMaker.cs" t="Include" />
+            <e p="ImportMode.cs" t="Include" />
+            <e p="ImportResult.cs" t="Include" />
+            <e p="ImportResultType.cs" t="Include" />
+            <e p="Manual" t="Include">
+              <e p="ManualImportCommand.cs" t="Include" />
+              <e p="ManualImportFile.cs" t="Include" />
+              <e p="ManualImportItem.cs" t="Include" />
+              <e p="ManualImportService.cs" t="Include" />
+              <e p="ManuallyImportedFile.cs" t="Include" />
+            </e>
+            <e p="Specifications" t="Include">
+              <e p="FreeSpaceSpecification.cs" t="Include" />
+              <e p="GrabbedReleaseQualitySpecification.cs" t="Include" />
+              <e p="MatchesFolderSpecification.cs" t="Include" />
+              <e p="NotSampleSpecification.cs" t="Include" />
+              <e p="NotUnpackingSpecification.cs" t="Include" />
+              <e p="SameFileSpecification.cs" t="Include" />
+              <e p="UnverifiedSceneNumberingSpecification.cs" t="Include" />
+              <e p="UpgradeSpecification.cs" t="Include" />
+            </e>
+          </e>
           <e p="RecycleBinProvider.cs" t="Include" />
-          <e p="RenameEpisodeFilePreview.cs" t="Include" />
-          <e p="RenameEpisodeFileService.cs" t="Include" />
           <e p="RenameMovieFilePreview.cs" t="Include" />
           <e p="RenameMovieFileService.cs" t="Include" />
           <e p="SameFilenameException.cs" t="Include" />
           <e p="TorrentInfo" t="Include">
             <e p="TorrentFileInfoReader.cs" t="Include" />
           </e>
-          <e p="UpdateEpisodeFileService.cs" t="Include" />
           <e p="UpdateMovieFileService.cs" t="Include" />
           <e p="UpgradeMediaFileService.cs" t="Include" />
         </e>
@@ -2096,9 +2035,7 @@
         <e p="MetadataSource" t="Include">
           <e p="IDiscoverNewMovies.cs" t="Include" />
           <e p="IProvideMovieInfo.cs" t="Include" />
-          <e p="IProvideSeriesInfo.cs" t="Include" />
           <e p="ISearchForNewMovie.cs" t="Include" />
-          <e p="ISearchForNewSeries.cs" t="Include" />
           <e p="PreDB" t="Include">
             <e p="PreDBResult.cs" t="Include" />
             <e p="PreDBService.cs" t="Include" />
@@ -2109,7 +2046,7 @@
             <e p="RadarrAPIClient.cs" t="Include" />
             <e p="RadarrResources.cs" t="Include" />
           </e>
-          <e p="SearchSeriesComparer.cs" t="Include" />
+          <e p="SearchMovieComparer.cs" t="Include" />
           <e p="SkyHook" t="Include">
             <e p="Resource" t="Include">
               <e p="ActorResource.cs" t="Include" />
@@ -2129,17 +2066,40 @@
           <e p="TmdbConfigurationService.cs" t="Include" />
         </e>
         <e p="Movies" t="Include">
+          <e p="Actor.cs" t="Include" />
+          <e p="AddMovieOptions.cs" t="Include" />
           <e p="AlternativeTitles" t="Include">
             <e p="AlternativeTitle.cs" t="Include" />
             <e p="AlternativeTitleRepository.cs" t="Include" />
             <e p="AlternativeTitleService.cs" t="Include" />
           </e>
-        </e>
-        <e p="MovieStats" t="Include">
-          <e p="MovieStatistics.cs" t="Include" />
-          <e p="MovieStatisticsRepository.cs" t="Include" />
-          <e p="MovieStatisticsService.cs" t="Include" />
-          <e p="SeasonStatistics.cs" t="Include" />
+          <e p="Commands" t="Include">
+            <e p="MoveMovieCommand.cs" t="Include" />
+            <e p="RefreshMovieCommand.cs" t="Include" />
+          </e>
+          <e p="Events" t="Include">
+            <e p="MovieAddedEvent.cs" t="Include" />
+            <e p="MovieDeletedEvent.cs" t="Include" />
+            <e p="MovieEditedEvent.cs" t="Include" />
+            <e p="MovieMovedEvent.cs" t="Include" />
+            <e p="MovieRefreshStartingEvent.cs" t="Include" />
+            <e p="MovieUpdateEvent.cs" t="Include" />
+          </e>
+          <e p="MonitoringOptions.cs" t="Include" />
+          <e p="MoveMovieService.cs" t="Include" />
+          <e p="Movie.cs" t="Include" />
+          <e p="MovieAddedHandler.cs" t="Include" />
+          <e p="MovieCutoffService.cs" t="Include" />
+          <e p="MovieEditedService.cs" t="Include" />
+          <e p="MovieRepository.cs" t="Include" />
+          <e p="MovieScannedHandler.cs" t="Include" />
+          <e p="MovieService.cs" t="Include" />
+          <e p="MovieStatusType.cs" t="Include" />
+          <e p="MovieTitleNormalizer.cs" t="Include" />
+          <e p="QueryExtensions.cs" t="Include" />
+          <e p="Ratings.cs" t="Include" />
+          <e p="RefreshMovieService.cs" t="Include" />
+          <e p="ShouldRefreshMovie.cs" t="Include" />
         </e>
         <e p="NetImport" t="Include">
           <e p="CouchPotato" t="Include">
@@ -2403,12 +2363,9 @@
           <e p="Language.cs" t="Include" />
           <e p="LanguageParser.cs" t="Include" />
           <e p="Model" t="Include">
-            <e p="LocalEpisode.cs" t="Include" />
             <e p="LocalMovie.cs" t="Include" />
-            <e p="ParsedEpisodeInfo.cs" t="Include" />
             <e p="ParsedMovieInfo.cs" t="Include" />
             <e p="ReleaseInfo.cs" t="Include" />
-            <e p="RemoteEpisode.cs" t="Include" />
             <e p="RemoteMovie.cs" t="Include" />
             <e p="SeriesTitleInfo.cs" t="Include" />
             <e p="TorrentInfo.cs" t="Include" />
@@ -2491,12 +2448,6 @@
           <e p="UnmappedFolder.cs" t="Include" />
         </e>
         <e p="Security.cs" t="Include" />
-        <e p="SeriesStats" t="Include">
-          <e p="SeasonStatistics.cs" t="Include" />
-          <e p="SeriesStatistics.cs" t="Include" />
-          <e p="SeriesStatisticsRepository.cs" t="Include" />
-          <e p="SeriesStatisticsService.cs" t="Include" />
-        </e>
         <e p="Tags" t="Include">
           <e p="Tag.cs" t="Include" />
           <e p="TagRepository.cs" t="Include" />
@@ -2520,63 +2471,6 @@
           <e p="ProviderRepository.cs" t="Include" />
         </e>
         <e p="TinyTwitter.cs" t="Include" />
-        <e p="Tv" t="Include">
-          <e p="Actor.cs" t="Include" />
-          <e p="AddSeriesOptions.cs" t="Include" />
-          <e p="Commands" t="Include">
-            <e p="MoveSeriesCommand.cs" t="Include" />
-            <e p="RefreshMovieCommand.cs" t="Include" />
-            <e p="RefreshSeriesCommand.cs" t="Include" />
-          </e>
-          <e p="Episode.cs" t="Include" />
-          <e p="EpisodeAddedService.cs" t="Include" />
-          <e p="EpisodeCutoffService.cs" t="Include" />
-          <e p="EpisodeMonitoredService.cs" t="Include" />
-          <e p="EpisodeRepository.cs" t="Include" />
-          <e p="EpisodeService.cs" t="Include" />
-          <e p="Events" t="Include">
-            <e p="EpisodeInfoRefreshedEvent.cs" t="Include" />
-            <e p="MovieAddedEvent.cs" t="Include" />
-            <e p="MovieDeletedEvent.cs" t="Include" />
-            <e p="MovieEditedEvent.cs" t="Include" />
-            <e p="MovieRefreshStartingEvent.cs" t="Include" />
-            <e p="MovieUpdateEvent.cs" t="Include" />
-            <e p="SeriesAddedEvent.cs" t="Include" />
-            <e p="SeriesDeletedEvent.cs" t="Include" />
-            <e p="SeriesEditedEvent.cs" t="Include" />
-            <e p="SeriesMovedEvent.cs" t="Include" />
-            <e p="SeriesRefreshStartingEvent.cs" t="Include" />
-            <e p="SeriesUpdatedEvent.cs" t="Include" />
-          </e>
-          <e p="MonitoringOptions.cs" t="Include" />
-          <e p="MoveSeriesService.cs" t="Include" />
-          <e p="Movie.cs" t="Include" />
-          <e p="MovieAddedHandler.cs" t="Include" />
-          <e p="MovieCutoffService.cs" t="Include" />
-          <e p="MovieEditedService.cs" t="Include" />
-          <e p="MovieRepository.cs" t="Include" />
-          <e p="MovieScannedHandler.cs" t="Include" />
-          <e p="MovieService.cs" t="Include" />
-          <e p="MovieStatusType.cs" t="Include" />
-          <e p="MovieTitleNormalizer.cs" t="Include" />
-          <e p="QueryExtensions.cs" t="Include" />
-          <e p="Ratings.cs" t="Include" />
-          <e p="RefreshEpisodeService.cs" t="Include" />
-          <e p="RefreshMovieService.cs" t="Include" />
-          <e p="RefreshSeriesService.cs" t="Include" />
-          <e p="Season.cs" t="Include" />
-          <e p="Series.cs" t="Include" />
-          <e p="SeriesAddedHandler.cs" t="Include" />
-          <e p="SeriesEditedService.cs" t="Include" />
-          <e p="SeriesRepository.cs" t="Include" />
-          <e p="SeriesScannedHandler.cs" t="Include" />
-          <e p="SeriesService.cs" t="Include" />
-          <e p="SeriesStatusType.cs" t="Include" />
-          <e p="SeriesTitleNormalizer.cs" t="Include" />
-          <e p="SeriesTypes.cs" t="Include" />
-          <e p="ShouldRefreshMovie.cs" t="Include" />
-          <e p="ShouldRefreshSeries.cs" t="Include" />
-        </e>
         <e p="Update" t="Include">
           <e p="Commands" t="Include">
             <e p="ApplicationUpdateCommand.cs" t="Include" />
@@ -2612,9 +2506,6 @@
             <e p="PathExistsValidator.cs" t="Include" />
             <e p="PathValidator.cs" t="Include" />
             <e p="RootFolderValidator.cs" t="Include" />
-            <e p="SeriesAncestorValidator.cs" t="Include" />
-            <e p="SeriesExistsValidator.cs" t="Include" />
-            <e p="SeriesPathValidator.cs" t="Include" />
             <e p="StartupFolderValidator.cs" t="Include" />
           </e>
           <e p="ProfileExistsValidator.cs" t="Include" />
@@ -2635,16 +2526,6 @@
           <e p="ConfigCachingFixture.cs" t="Include" />
           <e p="ConfigServiceFixture.cs" t="Include" />
         </e>
-        <e p="DataAugmentation" t="Include">
-          <e p="DailySeries" t="Include">
-            <e p="DailySeriesDataProxyFixture.cs" t="Include" />
-          </e>
-          <e p="Scene" t="Include">
-            <e p="SceneMappingProxyFixture.cs" t="Include" />
-            <e p="SceneMappingServiceFixture.cs" t="Include" />
-          </e>
-          <e p="SceneNumbering" t="Include" />
-        </e>
         <e p="Datastore" t="Include">
           <e p="BasicRepositoryFixture.cs" t="Include" />
           <e p="Converters" t="Include">
@@ -2684,14 +2565,13 @@
         </e>
         <e p="DecisionEngineTests" t="Include">
           <e p="AcceptableSizeSpecificationFixture.cs" t="Include" />
-          <e p="AnimeVersionUpgradeSpecificationFixture.cs" t="Include" />
           <e p="CutoffSpecificationFixture.cs" t="Include" />
           <e p="DownloadDecisionMakerFixture.cs" t="Include" />
-          <e p="FullSeasonSpecificationFixture.cs" t="Include" />
           <e p="HistorySpecificationFixture.cs" t="Include" />
           <e p="LanguageSpecificationFixture.cs" t="Include" />
+          <e p="MaximumSizeSpecificationFixture.cs" t="Include" />
           <e p="MinimumAgeSpecificationFixture.cs" t="Include" />
-          <e p="MonitoredEpisodeSpecificationFixture.cs" t="Include" />
+          <e p="MonitoredMovieSpecificationFixture.cs" t="Include" />
           <e p="PrioritizeDownloadDecisionFixture.cs" t="Include" />
           <e p="ProtocolSpecificationFixture.cs" t="Include" />
           <e p="QualityAllowedByProfileSpecificationFixture.cs" t="Include" />
@@ -2704,9 +2584,8 @@
             <e p="DelaySpecificationFixture.cs" t="Include" />
             <e p="ProperSpecificationFixture.cs" t="Include" />
           </e>
-          <e p="SameEpisodesSpecificationFixture.cs" t="Include" />
           <e p="Search" t="Include">
-            <e p="SeriesSpecificationFixture.cs" t="Include" />
+            <e p="MovieSpecificationFixture.cs" t="Include" />
             <e p="TorrentSeedingSpecificationFixture.cs" t="Include" />
           </e>
           <e p="UpgradeDiskSpecificationFixture.cs" t="Include" />
@@ -2727,6 +2606,7 @@
             </e>
             <e p="DownloadClientFixtureBase.cs" t="Include" />
             <e p="DownloadStationTests" t="Include">
+              <e p="DownloadStationsTaskStatusJsonConverterFixture.cs" t="Include" />
               <e p="SerialNumberProviderFixture.cs" t="Include" />
               <e p="SharedFolderResolverFixture.cs" t="Include" />
               <e p="TorrentDownloadStationFixture.cs" t="Include" />
@@ -2780,6 +2660,21 @@
             <e p="TrackedDownloadServiceFixture.cs" t="Include" />
           </e>
         </e>
+        <e p="Extras" t="Include">
+          <e p="Metadata" t="Include">
+            <e p="Consumers" t="Include">
+              <e p="Roksbox" t="Include">
+                <e p="FindMetadataFileFixture.cs" t="Include" />
+              </e>
+              <e p="Wdtv" t="Include">
+                <e p="FindMetadataFileFixture.cs" t="Include" />
+              </e>
+              <e p="Xbmc" t="Include">
+                <e p="FindMetadataFileFixture.cs" t="Include" />
+              </e>
+            </e>
+          </e>
+        </e>
         <e p="Files" t="Include">
           <e p="ArabicRomanNumeralDictionary.JSON" t="Include" />
           <e p="couchpotato_movie_list.json" t="Include" />
@@ -2834,6 +2729,7 @@
               <e p="AnimeTosho_NoSize.xml" t="Include" />
               <e p="AwesomeHD.xml" t="Include" />
               <e p="BitHdtv.xml" t="Include" />
+              <e p="DanishBits.xml" t="Include" />
               <e p="Doki.xml" t="Include" />
               <e p="ExtraTorrents.xml" t="Include" />
               <e p="Ezrss.xml" t="Include" />
@@ -2908,11 +2804,10 @@
             <e p="CleanupAdditionalUsersFixture.cs" t="Include" />
             <e p="CleanupDuplicateMetadataFilesFixture.cs" t="Include" />
             <e p="CleanupOrphanedBlacklistFixture.cs" t="Include" />
-            <e p="CleanupOrphanedEpisodeFilesFixture.cs" t="Include" />
-            <e p="CleanupOrphanedEpisodesFixture.cs" t="Include" />
             <e p="CleanupOrphanedHistoryItemsFixture.cs" t="Include" />
             <e p="CleanupOrphanedIndexerStatusFixture.cs" t="Include" />
             <e p="CleanupOrphanedMetadataFilesFixture.cs" t="Include" />
+            <e p="CleanupOrphanedMovieFilesFixture.cs" t="Include" />
             <e p="CleanupOrphanedPendingReleasesFixture.cs" t="Include" />
             <e p="CleanupUnusedTagsFixture.cs" t="Include" />
             <e p="FixFutureRunScheduledTasksFixture.cs" t="Include" />
@@ -2923,9 +2818,7 @@
           <e p="TorCacheHttpRequestInterceptorFixture.cs" t="Include" />
         </e>
         <e p="IndexerSearchTests" t="Include">
-          <e p="NzbSearchServiceFixture.cs" t="Include" />
           <e p="SearchDefinitionFixture.cs" t="Include" />
-          <e p="SeriesSearchServiceFixture.cs" t="Include" />
         </e>
         <e p="IndexerTests" t="Include">
           <e p="BasicRssParserFixture.cs" t="Include" />
@@ -2958,7 +2851,6 @@
           <e p="RarbgTests" t="Include">
             <e p="RarbgFixture.cs" t="Include" />
           </e>
-          <e p="SeasonSearchFixture.cs" t="Include" />
           <e p="TestIndexer.cs" t="Include" />
           <e p="TestIndexerSettings.cs" t="Include" />
           <e p="TorrentRssIndexerTests" t="Include">
@@ -2994,18 +2886,6 @@
           <e p="EpisodeFileMovingServiceTests" t="Include">
             <e p="MoveEpisodeFileFixture.cs" t="Include" />
           </e>
-          <e p="EpisodeImport" t="Include">
-            <e p="ImportDecisionMakerFixture.cs" t="Include" />
-            <e p="SampleServiceFixture.cs" t="Include" />
-            <e p="Specifications" t="Include">
-              <e p="FreeSpaceSpecificationFixture.cs" t="Include" />
-              <e p="FullSeasonSpecificationFixture.cs" t="Include" />
-              <e p="MatchesFolderSpecificationFixture.cs" t="Include" />
-              <e p="NotSampleSpecificationFixture.cs" t="Include" />
-              <e p="NotUnpackingSpecificationFixture.cs" t="Include" />
-              <e p="UpgradeSpecificationFixture.cs" t="Include" />
-            </e>
-          </e>
           <e p="ImportApprovedEpisodesFixture.cs" t="Include" />
           <e p="MediaFileRepositoryFixture.cs" t="Include" />
           <e p="MediaFileServiceTests" t="Include">
@@ -3016,7 +2896,19 @@
             <e p="UpdateMediaInfoServiceFixture.cs" t="Include" />
             <e p="VideoFileInfoReaderFixture.cs" t="Include" />
           </e>
-          <e p="RenameEpisodeFileServiceFixture.cs" t="Include" />
+          <e p="MovieImport" t="Include">
+            <e p="ImportDecisionMakerFixture.cs" t="Include" />
+            <e p="SampleServiceFixture.cs" t="Include" />
+            <e p="Specifications" t="Include">
+              <e p="FreeSpaceSpecificationFixture.cs" t="Include" />
+              <e p="MatchesFolderSpecificationFixture.cs" t="Include" />
+              <e p="NotSampleSpecificationFixture.cs" t="Include" />
+              <e p="NotUnpackingSpecificationFixture.cs" t="Include" />
+              <e p="SameFileSpecificationFixture.cs" t="Include" />
+              <e p="UpgradeSpecificationFixture.cs" t="Include" />
+            </e>
+          </e>
+          <e p="RenameMovieFileServiceFixture.cs" t="Include" />
           <e p="UpgradeMediaFileServiceFixture.cs" t="Include" />
         </e>
         <e p="Messaging" t="Include">
@@ -3029,23 +2921,27 @@
             <e p="EventAggregatorFixture.cs" t="Include" />
           </e>
         </e>
-        <e p="Metadata" t="Include">
-          <e p="Consumers" t="Include">
-            <e p="Roksbox" t="Include">
-              <e p="FindMetadataFileFixture.cs" t="Include" />
-            </e>
-            <e p="Wdtv" t="Include">
-              <e p="FindMetadataFileFixture.cs" t="Include" />
-            </e>
-          </e>
-        </e>
         <e p="MetadataSource" t="Include">
-          <e p="SearchSeriesComparerFixture.cs" t="Include" />
+          <e p="SearchMovieComparerFixture.cs" t="Include" />
           <e p="SkyHook" t="Include">
             <e p="SkyHookProxyFixture.cs" t="Include" />
             <e p="SkyHookProxySearchFixture.cs" t="Include" />
           </e>
         </e>
+        <e p="MovieTests" t="Include">
+          <e p="MoveMovieServiceFixture.cs" t="Include" />
+          <e p="MovieRepositoryTests" t="Include">
+            <e p="MovieRepositoryFixture.cs" t="Include" />
+          </e>
+          <e p="MovieServiceTests" t="Include">
+            <e p="AddMovieFixture.cs" t="Include" />
+            <e p="UpdateMovieFixture.cs" t="Include" />
+            <e p="UpdateMultipleMoviesFixture.cs" t="Include" />
+          </e>
+          <e p="MovieTitleNormalizerFixture.cs" t="Include" />
+          <e p="RefreshMovieServiceFixture.cs" t="Include" />
+          <e p="ShouldRefreshMovieFixture.cs" t="Include" />
+        </e>
         <e p="NetImport" t="Include">
           <e p="CouchPotato" t="Include">
             <e p="CouchPotatoParserFixture.cs" t="Include" />
@@ -3068,35 +2964,23 @@
         <e p="NzbDrone.Core.Test.csproj" t="IncludeRecursive" />
         <e p="obj" t="ExcludeRecursive" />
         <e p="OrganizerTests" t="Include">
-          <e p="BuildFilePathFixture.cs" t="Include" />
           <e p="CleanFixture.cs" t="Include" />
           <e p="FileNameBuilderTests" t="Include">
             <e p="CleanTitleFixture.cs" t="Include" />
-            <e p="EpisodeTitleCollapseFixture.cs" t="Include" />
             <e p="FileNameBuilderFixture.cs" t="Include" />
-            <e p="MultiEpisodeFixture.cs" t="Include" />
           </e>
           <e p="GetMovieFolderFixture.cs" t="Include" />
-          <e p="GetSeasonFolderFixture.cs" t="Include" />
-          <e p="GetSeriesFolderFixture.cs" t="Include" />
         </e>
         <e p="packages.config" t="Include" />
         <e p="ParserTests" t="Include">
-          <e p="AbsoluteEpisodeNumberParserFixture.cs" t="Include" />
-          <e p="AnimeMetadataParserFixture.cs" t="Include" />
           <e p="CrapParserFixture.cs" t="Include" />
-          <e p="DailyEpisodeParserFixture.cs" t="Include" />
           <e p="ExtendedQualityParserRegex.cs" t="Include" />
           <e p="HashedReleaseFixture.cs" t="Include" />
-          <e p="IsPossibleSpecialEpisodeFixture.cs" t="Include" />
           <e p="LanguageParserFixture.cs" t="Include" />
-          <e p="MiniSeriesEpisodeParserFixture.cs" t="Include" />
-          <e p="MultiEpisodeParserFixture.cs" t="Include" />
           <e p="NormalizeTitleFixture.cs" t="Include" />
           <e p="ParserFixture.cs" t="Include" />
           <e p="ParsingServiceTests" t="Include">
-            <e p="GetEpisodesFixture.cs" t="Include" />
-            <e p="GetSeriesFixture.cs" t="Include" />
+            <e p="GetMovieFixture.cs" t="Include" />
             <e p="MapFixture.cs" t="Include" />
           </e>
           <e p="PathParserFixture.cs" t="Include" />
@@ -3106,7 +2990,6 @@
             <e p="RomanNumeralConversionFixture.cs" t="Include" />
           </e>
           <e p="SceneCheckerFixture.cs" t="Include" />
-          <e p="SeasonParserFixture.cs" t="Include" />
           <e p="SeriesTitleInfoFixture.cs" t="Include" />
           <e p="SingleEpisodeParserFixture.cs" t="Include" />
         </e>
@@ -3148,46 +3031,12 @@
         <e p="RootFolderTests" t="Include">
           <e p="RootFolderServiceFixture.cs" t="Include" />
         </e>
-        <e p="SeriesStatsTests" t="Include">
-          <e p="SeriesStatisticsFixture.cs" t="Include" />
-        </e>
         <e p="ThingiProvider" t="Include">
           <e p="ProviderBaseFixture.cs" t="Include" />
         </e>
         <e p="ThingiProviderTests" t="Include">
           <e p="NullConfigFixture.cs" t="Include" />
         </e>
-        <e p="TvTests" t="Include">
-          <e p="EpisodeMonitoredServiceTests" t="Include">
-            <e p="SetEpisodeMontitoredFixture.cs" t="Include" />
-          </e>
-          <e p="EpisodeRepositoryTests" t="Include">
-            <e p="ByAirDateFixture.cs" t="Include" />
-            <e p="EpisodesBetweenDatesFixture.cs" t="Include" />
-            <e p="EpisodesRepositoryReadFixture.cs" t="Include" />
-            <e p="EpisodesWhereCutoffUnmetFixture.cs" t="Include" />
-            <e p="EpisodesWithFilesFixture.cs" t="Include" />
-            <e p="EpisodesWithoutFilesFixture.cs" t="Include" />
-            <e p="FindEpisodeFixture.cs" t="Include" />
-          </e>
-          <e p="EpisodeServiceTests" t="Include">
-            <e p="FindEpisodeByTitleFixture.cs" t="Include" />
-            <e p="HandleEpisodeFileDeletedFixture.cs" t="Include" />
-          </e>
-          <e p="MoveSeriesServiceFixture.cs" t="Include" />
-          <e p="RefreshEpisodeServiceFixture.cs" t="Include" />
-          <e p="RefreshSeriesServiceFixture.cs" t="Include" />
-          <e p="SeriesRepositoryTests" t="Include">
-            <e p="SeriesRepositoryFixture.cs" t="Include" />
-          </e>
-          <e p="SeriesServiceTests" t="Include">
-            <e p="AddSeriesFixture.cs" t="Include" />
-            <e p="UpdateMultipleSeriesFixture.cs" t="Include" />
-            <e p="UpdateSeriesFixture.cs" t="Include" />
-          </e>
-          <e p="SeriesTitleNormalizerFixture.cs" t="Include" />
-          <e p="ShouldRefreshSeriesFixture.cs" t="Include" />
-        </e>
         <e p="UpdateTests" t="Include">
           <e p="UpdatePackageProviderFixture.cs" t="Include" />
           <e p="UpdateServiceFixture.cs" t="Include" />
@@ -3207,6 +3056,7 @@
         <e p="ApplicationServer.cs" t="Include" />
         <e p="Bootstrap.cs" t="Include" />
         <e p="BrowserService.cs" t="Include" />
+        <e p="CancelHandler.cs" t="Include" />
         <e p="IUserAlert.cs" t="Include" />
         <e p="MainAppContainerBuilder.cs" t="Include" />
         <e p="NzbDrone.Host.csproj" t="IncludeRecursive" />
@@ -3243,18 +3093,17 @@
           <e p="CommandFixture.cs" t="Include" />
           <e p="DiskSpaceFixture.cs" t="Include" />
           <e p="DownloadClientFixture.cs" t="Include" />
-          <e p="EpisodeFileFixture.cs" t="Include" />
-          <e p="EpisodeFixture.cs" t="Include" />
           <e p="FileSystemFixture.cs" t="Include" />
           <e p="HistoryFixture.cs" t="Include" />
           <e p="IndexerFixture.cs" t="Include" />
+          <e p="MovieEditorFixture.cs" t="Include" />
+          <e p="MovieFileFixture.cs" t="Include" />
+          <e p="MovieFixture.cs" t="Include" />
+          <e p="MovieLookupFixture.cs" t="Include" />
           <e p="NamingConfigFixture.cs" t="Include" />
           <e p="NotificationFixture.cs" t="Include" />
           <e p="ReleaseFixture.cs" t="Include" />
           <e p="RootFolderFixture.cs" t="Include" />
-          <e p="SeriesEditorFixture.cs" t="Include" />
-          <e p="SeriesFixture.cs" t="Include" />
-          <e p="SeriesLookupFixture.cs" t="Include" />
           <e p="WantedFixture.cs" t="Include" />
         </e>
         <e p="bin" t="ExcludeRecursive" />
@@ -3262,11 +3111,10 @@
           <e p="ClientBase.cs" t="Include" />
           <e p="CommandClient.cs" t="Include" />
           <e p="DownloadClientClient.cs" t="Include" />
-          <e p="EpisodeClient.cs" t="Include" />
           <e p="IndexerClient.cs" t="Include" />
+          <e p="MovieClient.cs" t="Include" />
           <e p="NotificationClient.cs" t="Include" />
           <e p="ReleaseClient.cs" t="Include" />
-          <e p="SeriesClient.cs" t="Include" />
         </e>
         <e p="CorsFixture.cs" t="Include" />
         <e p="HttpLogFixture.cs" t="Include" />

src/.idea/.idea.NzbDrone/.idea/vcs.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/ExternalModules/CurlSharp" vcs="Git" />
+  </component>
+</project>

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

@@ -1,103 +1,9 @@
 <?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>
+    <content url="file://$MODULE_DIR$/../../../Logo/1024.png" />
+    <content url="file://$MODULE_DIR$/../../../Logo/64.png" />
+    <content url="file://$MODULE_DIR$/../.." />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>

src/LogentriesNLog/LogentriesNLog.csproj

@@ -1,96 +1,100 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{9DC31DE3-79FF-47A8-96B4-6BA18F6BB1CB}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>LogentriesNLog</RootNamespace>
-    <AssemblyName>LogentriesNLog</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x86\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <OutputPath>bin\x86\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c">
-      <HintPath>..\packages\NLog.4.4.12\lib\net40\NLog.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="fastJSON\Getters.cs" />
-    <Compile Include="fastJSON\JSON.cs" />
-    <Compile Include="fastJSON\JsonParser.cs" />
-    <Compile Include="fastJSON\JsonSerializer.cs" />
-    <Compile Include="fastJSON\SafeDictionary.cs" />
-    <Compile Include="LogentriesTarget.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\LogentriesCore\LogentriesCore.csproj">
-      <Project>{90D6E9FC-7B88-4E1B-B018-8FA742274558}</Project>
-      <Name>LogentriesCore</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="fastJSON\license.txt" />
-    <None Include="packages.config" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{9DC31DE3-79FF-47A8-96B4-6BA18F6BB1CB}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>LogentriesNLog</RootNamespace>
+    <AssemblyName>LogentriesNLog</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+    <RestorePackages>true</RestorePackages>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x86\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <OutputPath>bin\x86\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+      <HintPath>..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel" />
+    <Reference Include="System.Transactions" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="fastJSON\Getters.cs" />
+    <Compile Include="fastJSON\JSON.cs" />
+    <Compile Include="fastJSON\JsonParser.cs" />
+    <Compile Include="fastJSON\JsonSerializer.cs" />
+    <Compile Include="fastJSON\SafeDictionary.cs" />
+    <Compile Include="LogentriesTarget.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\LogentriesCore\LogentriesCore.csproj">
+      <Project>{90D6E9FC-7B88-4E1B-B018-8FA742274558}</Project>
+      <Name>LogentriesCore</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="fastJSON\license.txt" />
+    <None Include="packages.config" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
   <!-- 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.
   <Target Name="BeforeBuild">
   </Target>
   <Target Name="AfterBuild">
   </Target>
-  -->
+  -->
 </Project>

src/LogentriesNLog/packages.config

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="NLog" version="4.4.12" targetFramework="net40" />
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="NLog" version="4.5.0-rc06" targetFramework="net40" />
 </packages>

src/NzbDrone.Api/Blacklist/BlacklistResource.cs

@@ -31,8 +31,6 @@ namespace NzbDrone.Api.Blacklist
             {
                 Id = model.Id,
                 MovieId = model.MovieId,
-                SeriesId = model.SeriesId,
-                EpisodeIds = model.EpisodeIds,
                 SourceTitle = model.SourceTitle,
                 Quality = model.Quality,
                 Date = model.Date,

src/NzbDrone.Api/Calendar/CalendarFeedModule.cs

@@ -8,7 +8,7 @@ using Ical.Net.General;
 using Ical.Net.Interfaces.Serialization;
 using Ical.Net.Serialization;
 using Ical.Net.Serialization.iCalendar.Factory;
-using NzbDrone.Core.Tv;
+using NzbDrone.Core.Movies;
 using Nancy.Responses;
 using NzbDrone.Core.Tags;
 using NzbDrone.Common.Extensions;
@@ -98,44 +98,8 @@ namespace NzbDrone.Api.Calendar
                     continue;
                 }
 
-                var occurrence = calendar.Create<Event>();
-                occurrence.Uid = "NzbDrone_movie_" + movie.Id;
-                occurrence.Status = movie.HasFile ? EventStatus.Confirmed : EventStatus.Tentative;
-
-                switch (movie.Status)
-                {
-                    case MovieStatusType.PreDB:
-                        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:
-                        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}";
+                CreateEvent(calendar, movie, true);
+                CreateEvent(calendar, movie, false);
 
             }
 
@@ -144,5 +108,30 @@ namespace NzbDrone.Api.Calendar
 
             return new TextResponse(icalendar, "text/calendar");
         }
+
+        private void CreateEvent(Ical.Net.Calendar calendar, Movie movie, bool cinemasRelease)
+        {
+            var date = cinemasRelease ? movie.InCinemas : movie.PhysicalRelease;
+            if (!date.HasValue)
+            {
+                return;
+            }
+            
+            var occurrence = calendar.Create<Event>();
+            occurrence.Uid = "NzbDrone_movie_" + movie.Id + (cinemasRelease ? "_cinemas" : "_physical");
+            occurrence.Status = movie.Status == MovieStatusType.Announced ? EventStatus.Tentative : EventStatus.Confirmed;
+            
+            occurrence.Start = new CalDateTime(date.Value);
+            occurrence.End = occurrence.Start;
+            occurrence.IsAllDay = true;
+
+            occurrence.Description = movie.Overview;
+            occurrence.Categories = new List<string>() { movie.Studio };
+
+            var physicalText = movie.PhysicalReleaseNote.IsNotNullOrWhiteSpace()
+                ? $"(Physical Release, {movie.PhysicalReleaseNote})"
+                : "(Physical Release)";
+            occurrence.Summary = $"{movie.Title} " + (cinemasRelease ? "(Theatrical Release)" : physicalText);
+        }
     }
 }

src/NzbDrone.Api/Calendar/CalendarModule.cs

@@ -8,11 +8,9 @@ using NzbDrone.Core.MediaCover;
 using NzbDrone.Core.MediaFiles;
 using NzbDrone.Core.MediaFiles.Events;
 using NzbDrone.Core.Messaging.Events;
-using NzbDrone.Core.MovieStats;
-using NzbDrone.Core.Tv;
-using NzbDrone.Core.Tv.Events;
+using NzbDrone.Core.Movies;
+using NzbDrone.Core.Movies.Events;
 using NzbDrone.Core.Validation.Paths;
-using NzbDrone.Core.DataAugmentation.Scene;
 using NzbDrone.Core.Validation;
 using NzbDrone.Core.DecisionEngine;
 using NzbDrone.SignalR;
@@ -23,10 +21,8 @@ namespace NzbDrone.Api.Calendar
     {
         public CalendarModule(IBroadcastSignalRMessage signalR,
                             IMovieService moviesService,
-                            IMovieStatisticsService moviesStatisticsService,
-                            ISceneMappingService sceneMappingService,
                             IMapCoversToLocal coverMapper)
-            : base(signalR, moviesService, moviesStatisticsService, sceneMappingService, coverMapper, "calendar")
+            : base(signalR, moviesService, coverMapper, "calendar")
         {
             
             GetResourceAll = GetCalendar;

src/NzbDrone.Api/Config/IndexerConfigModule.cs

@@ -1,4 +1,4 @@
-using FluentValidation;
+using FluentValidation;
 using NzbDrone.Api.Validation;
 using NzbDrone.Core.Configuration;
 
@@ -13,6 +13,9 @@ namespace NzbDrone.Api.Config
             SharedValidator.RuleFor(c => c.MinimumAge)
                            .GreaterThanOrEqualTo(0);
 
+            SharedValidator.RuleFor(c => c.MaximumSize)
+                           .GreaterThanOrEqualTo(0);
+
             SharedValidator.RuleFor(c => c.Retention)
                            .GreaterThanOrEqualTo(0);
 
@@ -25,4 +28,4 @@ namespace NzbDrone.Api.Config
             return IndexerConfigResourceMapper.ToResource(model);
         }
     }
-}
+}

src/NzbDrone.Api/Config/IndexerConfigResource.cs

@@ -1,4 +1,4 @@
-using NzbDrone.Api.REST;
+using NzbDrone.Api.REST;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Parser;
 
@@ -7,6 +7,7 @@ namespace NzbDrone.Api.Config
     public class IndexerConfigResource : RestResource
     {
         public int MinimumAge { get; set; }
+        public int MaximumSize { get; set; }
         public int Retention { get; set; }
         public int RssSyncInterval { get; set; }
         public bool PreferIndexerFlags { get; set; }
@@ -23,6 +24,7 @@ namespace NzbDrone.Api.Config
             return new IndexerConfigResource
             {
                 MinimumAge = model.MinimumAge,
+                MaximumSize = model.MaximumSize,
                 Retention = model.Retention,
                 RssSyncInterval = model.RssSyncInterval,
                 PreferIndexerFlags = model.PreferIndexerFlags,

src/NzbDrone.Api/Config/NamingConfigModule.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using FluentValidation;
 using FluentValidation.Results;
@@ -34,11 +34,6 @@ namespace NzbDrone.Api.Config
             Get["/samples"] = x => GetExamples(this.Bind<NamingConfigResource>());
 
             SharedValidator.RuleFor(c => c.MultiEpisodeStyle).InclusiveBetween(0, 5);
-            /*SharedValidator.RuleFor(c => c.StandardEpisodeFormat).ValidEpisodeFormat();
-            SharedValidator.RuleFor(c => c.DailyEpisodeFormat).ValidDailyEpisodeFormat();
-            SharedValidator.RuleFor(c => c.AnimeEpisodeFormat).ValidAnimeEpisodeFormat();
-            SharedValidator.RuleFor(c => c.SeriesFolderFormat).ValidSeriesFolderFormat();
-            SharedValidator.RuleFor(c => c.SeasonFolderFormat).ValidSeasonFolderFormat();*/
             SharedValidator.RuleFor(c => c.StandardMovieFormat).ValidMovieFormat();
             SharedValidator.RuleFor(c => c.MovieFolderFormat).ValidMovieFolderFormat();
         }
@@ -56,12 +51,6 @@ namespace NzbDrone.Api.Config
             var nameSpec = _namingConfigService.GetConfig();
             var resource = nameSpec.ToResource();
 
-            //if (resource.StandardEpisodeFormat.IsNotNullOrWhiteSpace())
-            //{
-            //    var basicConfig = _filenameBuilder.GetBasicNamingConfig(nameSpec);
-            //    basicConfig.AddToResource(resource);
-            //}
-
             if (resource.StandardMovieFormat.IsNotNullOrWhiteSpace())
             {
                 var basicConfig = _filenameBuilder.GetBasicNamingConfig(nameSpec);
@@ -80,48 +69,13 @@ namespace NzbDrone.Api.Config
         {
             var nameSpec = config.ToModel();
             var sampleResource = new NamingSampleResource();
-            
-            //var singleEpisodeSampleResult = _filenameSampleService.GetStandardSample(nameSpec);
-            //var multiEpisodeSampleResult = _filenameSampleService.GetMultiEpisodeSample(nameSpec);
-            //var dailyEpisodeSampleResult = _filenameSampleService.GetDailySample(nameSpec);
-            //var animeEpisodeSampleResult = _filenameSampleService.GetAnimeSample(nameSpec);
-            //var animeMultiEpisodeSampleResult = _filenameSampleService.GetAnimeMultiEpisodeSample(nameSpec);
 
             var movieSampleResult = _filenameSampleService.GetMovieSample(nameSpec);
-            
-
-            //sampleResource.SingleEpisodeExample = _filenameValidationService.ValidateStandardFilename(singleEpisodeSampleResult) != null
-            //        ? "Invalid format"
-            //        : singleEpisodeSampleResult.FileName;
-
-            //sampleResource.MultiEpisodeExample = _filenameValidationService.ValidateStandardFilename(multiEpisodeSampleResult) != null
-            //        ? "Invalid format"
-            //        : multiEpisodeSampleResult.FileName;
-
-            //sampleResource.DailyEpisodeExample = _filenameValidationService.ValidateDailyFilename(dailyEpisodeSampleResult) != null
-            //        ? "Invalid format"
-            //        : dailyEpisodeSampleResult.FileName;
-
-            //sampleResource.AnimeEpisodeExample = _filenameValidationService.ValidateAnimeFilename(animeEpisodeSampleResult) != null
-            //        ? "Invalid format"
-            //        : animeEpisodeSampleResult.FileName;
-
-            //sampleResource.AnimeMultiEpisodeExample = _filenameValidationService.ValidateAnimeFilename(animeMultiEpisodeSampleResult) != null
-            //        ? "Invalid format"
-            //        : animeMultiEpisodeSampleResult.FileName;
 
             sampleResource.MovieExample = nameSpec.StandardMovieFormat.IsNullOrWhiteSpace()
                 ? "Invalid Format"
                 : movieSampleResult.FileName;
 
-            //sampleResource.SeriesFolderExample = nameSpec.SeriesFolderFormat.IsNullOrWhiteSpace()
-            //    ? "Invalid format"
-            //    : _filenameSampleService.GetSeriesFolderSample(nameSpec);
-
-            //sampleResource.SeasonFolderExample = nameSpec.SeasonFolderFormat.IsNullOrWhiteSpace()
-            //    ? "Invalid format"
-            //    : _filenameSampleService.GetSeasonFolderSample(nameSpec);
-
             sampleResource.MovieFolderExample = nameSpec.MovieFolderFormat.IsNullOrWhiteSpace()
                 ? "Invalid format"
                 : _filenameSampleService.GetMovieFolderSample(nameSpec);
@@ -131,30 +85,12 @@ namespace NzbDrone.Api.Config
 
         private void ValidateFormatResult(NamingConfig nameSpec)
         {
-            var singleEpisodeSampleResult = _filenameSampleService.GetStandardSample(nameSpec);
-            var multiEpisodeSampleResult = _filenameSampleService.GetMultiEpisodeSample(nameSpec);
-            var dailyEpisodeSampleResult = _filenameSampleService.GetDailySample(nameSpec);
-            var animeEpisodeSampleResult = _filenameSampleService.GetAnimeSample(nameSpec);
-            var animeMultiEpisodeSampleResult = _filenameSampleService.GetAnimeMultiEpisodeSample(nameSpec);
-
             var movieSampleResult = _filenameSampleService.GetMovieSample(nameSpec);
 
-            var singleEpisodeValidationResult = _filenameValidationService.ValidateStandardFilename(singleEpisodeSampleResult);
-            var multiEpisodeValidationResult = _filenameValidationService.ValidateStandardFilename(multiEpisodeSampleResult);
-            var dailyEpisodeValidationResult = _filenameValidationService.ValidateDailyFilename(dailyEpisodeSampleResult);
-            var animeEpisodeValidationResult = _filenameValidationService.ValidateAnimeFilename(animeEpisodeSampleResult);
-            var animeMultiEpisodeValidationResult = _filenameValidationService.ValidateAnimeFilename(animeMultiEpisodeSampleResult);
-
             //var standardMovieValidationResult = _filenameValidationService.ValidateMovieFilename(movieSampleResult); For now, let's hope the user is not stupid enough :/
 
             var validationFailures = new List<ValidationFailure>();
 
-            //validationFailures.AddIfNotNull(singleEpisodeValidationResult);
-            //validationFailures.AddIfNotNull(multiEpisodeValidationResult);
-            //validationFailures.AddIfNotNull(dailyEpisodeValidationResult);
-            //validationFailures.AddIfNotNull(animeEpisodeValidationResult);
-            //validationFailures.AddIfNotNull(animeMultiEpisodeValidationResult);
-
             //validationFailures.AddIfNotNull(standardMovieValidationResult);
 
             if (validationFailures.Any())

src/NzbDrone.Api/Config/NamingConfigResource.cs

@@ -1,4 +1,4 @@
-using NzbDrone.Api.REST;
+using NzbDrone.Api.REST;
 using NzbDrone.Core.Organizer;
 
 namespace NzbDrone.Api.Config
@@ -7,14 +7,10 @@ namespace NzbDrone.Api.Config
     {
         public bool RenameEpisodes { get; set; }
         public bool ReplaceIllegalCharacters { get; set; }
+        public ColonReplacementFormat ColonReplacementFormat { get; set; }
         public string StandardMovieFormat { get; set; }
         public string MovieFolderFormat { get; set; }
         public int MultiEpisodeStyle { get; set; }
-        public string StandardEpisodeFormat { get; set; }
-        public string DailyEpisodeFormat { get; set; }
-        public string AnimeEpisodeFormat { get; set; }
-        public string SeriesFolderFormat { get; set; }
-        public string SeasonFolderFormat { get; set; }
         public bool IncludeSeriesTitle { get; set; }
         public bool IncludeEpisodeTitle { get; set; }
         public bool IncludeQuality { get; set; }
@@ -33,12 +29,8 @@ namespace NzbDrone.Api.Config
 
                 RenameEpisodes = model.RenameEpisodes,
                 ReplaceIllegalCharacters = model.ReplaceIllegalCharacters,
+                ColonReplacementFormat = model.ColonReplacementFormat,
                 MultiEpisodeStyle = model.MultiEpisodeStyle,
-                StandardEpisodeFormat = model.StandardEpisodeFormat,
-                DailyEpisodeFormat = model.DailyEpisodeFormat,
-                AnimeEpisodeFormat = model.AnimeEpisodeFormat,
-                SeriesFolderFormat = model.SeriesFolderFormat,
-                SeasonFolderFormat = model.SeasonFolderFormat,
                 StandardMovieFormat = model.StandardMovieFormat,
                 MovieFolderFormat = model.MovieFolderFormat
                 //IncludeSeriesTitle
@@ -68,15 +60,10 @@ namespace NzbDrone.Api.Config
 
                 RenameEpisodes = resource.RenameEpisodes,
                 ReplaceIllegalCharacters = resource.ReplaceIllegalCharacters,
-                //MultiEpisodeStyle = resource.MultiEpisodeStyle,
-                //StandardEpisodeFormat = resource.StandardEpisodeFormat,
-                //DailyEpisodeFormat = resource.DailyEpisodeFormat,
-                //AnimeEpisodeFormat = resource.AnimeEpisodeFormat,
-                //SeriesFolderFormat = resource.SeriesFolderFormat,
-                //SeasonFolderFormat = resource.SeasonFolderFormat,
+                ColonReplacementFormat = resource.ColonReplacementFormat,
                 StandardMovieFormat = resource.StandardMovieFormat,
                 MovieFolderFormat = resource.MovieFolderFormat
             };
         }
     }
-}
+}

src/NzbDrone.Api/Indexers/ReleaseModule.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using FluentValidation;
 using Nancy;
@@ -24,8 +24,7 @@ namespace NzbDrone.Api.Indexers
         private readonly IPrioritizeDownloadDecision _prioritizeDownloadDecision;
         private readonly IDownloadService _downloadService;
         private readonly Logger _logger;
-
-        private readonly ICached<RemoteEpisode> _remoteEpisodeCache;
+        
         private readonly ICached<RemoteMovie> _remoteMovieCache;
 
         public ReleaseModule(IFetchAndParseRss rssFetcherAndParser,
@@ -48,44 +47,23 @@ namespace NzbDrone.Api.Indexers
 
             //PostValidator.RuleFor(s => s.DownloadAllowed).Equal(true);
             PostValidator.RuleFor(s => s.Guid).NotEmpty();
-
-            _remoteEpisodeCache = cacheManager.GetCache<RemoteEpisode>(GetType(), "remoteEpisodes");
+            
             _remoteMovieCache = cacheManager.GetCache<RemoteMovie>(GetType(), "remoteMovies");
         }
 
         private Response DownloadRelease(ReleaseResource release)
         {
-            var remoteEpisode = _remoteEpisodeCache.Find(release.Guid);
+            var remoteMovie = _remoteMovieCache.Find(release.Guid);
 
-            if (remoteEpisode == null)
+            if (remoteMovie == null)
             {
                 _logger.Debug("Couldn't find requested release in cache, cache timeout probably expired.");
 
-                var remoteMovie = _remoteMovieCache.Find(release.Guid);
-
-                if (remoteMovie == null)
-                {
-                    return new NotFoundResponse();
-                }
-
-                try
-                {
-                    _downloadService.DownloadReport(remoteMovie, false);
-                }
-                catch (ReleaseDownloadException ex)
-                {
-                    _logger.Error(ex, ex.Message);
-                    throw new NzbDroneClientException(HttpStatusCode.Conflict, "Getting release from indexer failed");
-                }
-
-                return release.AsResponse();
-
-
+                return new NotFoundResponse();
             }
-
             try
             {
-                _downloadService.DownloadReport(remoteEpisode);
+                _downloadService.DownloadReport(remoteMovie, false);
             }
             catch (ReleaseDownloadException ex)
             {
@@ -98,11 +76,6 @@ namespace NzbDrone.Api.Indexers
 
         private List<ReleaseResource> GetReleases()
         {
-            if (Request.Query.episodeId != null)
-            {
-                return GetEpisodeReleases(Request.Query.episodeId);
-            }
-
             if (Request.Query.movieId != null)
             {
                 return GetMovieReleases(Request.Query.movieId);
@@ -111,23 +84,6 @@ namespace NzbDrone.Api.Indexers
             return GetRss();
         }
 
-        private List<ReleaseResource> GetEpisodeReleases(int episodeId)
-        {
-            try
-            {
-                var decisions = _nzbSearchService.EpisodeSearch(episodeId, true);
-                var prioritizedDecisions = _prioritizeDownloadDecision.PrioritizeDecisions(decisions);
-
-                return MapDecisions(prioritizedDecisions);
-            }
-            catch (Exception ex)
-            {
-                _logger.Error(ex, "Episode search failed: " + ex.Message);
-            }
-
-            return new List<ReleaseResource>();
-        }
-
         private List<ReleaseResource> GetMovieReleases(int movieId)
         {
             try
@@ -153,23 +109,17 @@ namespace NzbDrone.Api.Indexers
         {
             var reports = _rssFetcherAndParser.Fetch();
             var decisions = _downloadDecisionMaker.GetRssDecision(reports);
-            var prioritizedDecisions = _prioritizeDownloadDecision.PrioritizeDecisions(decisions);
+            var prioritizedDecisions = _prioritizeDownloadDecision.PrioritizeDecisionsForMovies(decisions);
 
             return MapDecisions(prioritizedDecisions);
         }
 
         protected override ReleaseResource MapDecision(DownloadDecision decision, int initialWeight)
         {
-            if (decision.IsForMovie)
-            {
-                _remoteMovieCache.Set(decision.RemoteMovie.Release.Guid, decision.RemoteMovie, TimeSpan.FromMinutes(30));
-            }
-            else
-            {
-                _remoteEpisodeCache.Set(decision.RemoteEpisode.Release.Guid, decision.RemoteEpisode, TimeSpan.FromMinutes(30));
-            }
+
+           _remoteMovieCache.Set(decision.RemoteMovie.Release.Guid, decision.RemoteMovie, TimeSpan.FromMinutes(30));
             
            return base.MapDecision(decision, initialWeight);
         }
     }
-}
+}

src/NzbDrone.Api/Indexers/ReleaseResource.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using Newtonsoft.Json;
 using NzbDrone.Api.REST;
@@ -48,7 +48,7 @@ namespace NzbDrone.Api.Indexers
         public int ReleaseWeight { get; set; }
         public int SuspectedMovieId { get; set; }
 
-	public IEnumerable<string> IndexerFlags { get; set; }
+        public IEnumerable<string> IndexerFlags { get; set; }
 
         public string MagnetUrl { get; set; }
         public string InfoHash { get; set; }
@@ -86,90 +86,31 @@ namespace NzbDrone.Api.Indexers
     {
         public static ReleaseResource ToResource(this DownloadDecision model)
         {
-            var releaseInfo = model.RemoteEpisode.Release;
-            var parsedEpisodeInfo = model.RemoteEpisode.ParsedEpisodeInfo;
-            var remoteEpisode = model.RemoteEpisode;
-            var torrentInfo = (model.RemoteEpisode.Release as TorrentInfo) ?? new TorrentInfo();
+            var releaseInfo = model.RemoteMovie.Release;
+            var remoteMovie = model.RemoteMovie;
+            var torrentInfo = (model.RemoteMovie.Release as TorrentInfo) ?? new TorrentInfo();
             var mappingResult = MappingResultType.Success;
-            if (model.IsForMovie)
-            {
-                mappingResult = model.RemoteMovie.MappingResult;
-                var parsedMovieInfo = model.RemoteMovie.ParsedMovieInfo;
-                var movieId = model.RemoteMovie.Movie?.Id ?? 0;
+            mappingResult = model.RemoteMovie.MappingResult;
+            var parsedMovieInfo = model.RemoteMovie.ParsedMovieInfo;
+            var movieId = model.RemoteMovie.Movie?.Id ?? 0; //Why not pull this out in frontend instead of passing another variable
 
-                return new ReleaseResource
-                {
-                    Guid = releaseInfo.Guid,
-                    Quality = parsedMovieInfo.Quality,
-                    QualityWeight = parsedMovieInfo.Quality.Quality.Id, //Id kinda hacky for wheight, but what you gonna do? TODO: Fix this shit!
-                    Age = releaseInfo.Age,
-                    AgeHours = releaseInfo.AgeHours,
-                    AgeMinutes = releaseInfo.AgeMinutes,
-                    Size = releaseInfo.Size,
-                    IndexerId = releaseInfo.IndexerId,
-                    Indexer = releaseInfo.Indexer,
-                    ReleaseGroup = parsedMovieInfo.ReleaseGroup,
-                    ReleaseHash = parsedMovieInfo.ReleaseHash,
-                    Title = releaseInfo.Title,
-                    //FullSeason = parsedMovieInfo.FullSeason,
-                    //SeasonNumber = parsedMovieInfo.SeasonNumber,
-                    Language = parsedMovieInfo.Language,
-                    Year = parsedMovieInfo.Year,
-                    MovieTitle = parsedMovieInfo.MovieTitle,
-                    EpisodeNumbers = new int[0],
-                    AbsoluteEpisodeNumbers = new int[0],
-                    Approved = model.Approved,
-                    TemporarilyRejected = model.TemporarilyRejected,
-                    Rejected = model.Rejected,
-                    TvdbId = releaseInfo.TvdbId,
-                    TvRageId = releaseInfo.TvRageId,
-                    Rejections = model.Rejections.Select(r => r.Reason).ToList(),
-                    PublishDate = releaseInfo.PublishDate,
-                    CommentUrl = releaseInfo.CommentUrl,
-                    DownloadUrl = releaseInfo.DownloadUrl,
-                    InfoUrl = releaseInfo.InfoUrl,
-                    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,
-                    IsAbsoluteNumbering = false,
-                    IsPossibleSpecialEpisode = false,
-                    //Special = parsedMovieInfo.Special,
-                };
-            }
-
-            // TODO: Clean this mess up. don't mix data from multiple classes, use sub-resources instead? (Got a huge Deja Vu, didn't we talk about this already once?)
             return new ReleaseResource
             {
                 Guid = releaseInfo.Guid,
-                Quality = parsedEpisodeInfo.Quality,
-                //QualityWeight
+                Quality = parsedMovieInfo.Quality,
+                QualityWeight = parsedMovieInfo.Quality.Quality.Id, //Id kinda hacky for wheight, but what you gonna do? TODO: Fix this shit!
                 Age = releaseInfo.Age,
                 AgeHours = releaseInfo.AgeHours,
                 AgeMinutes = releaseInfo.AgeMinutes,
                 Size = releaseInfo.Size,
                 IndexerId = releaseInfo.IndexerId,
                 Indexer = releaseInfo.Indexer,
-                ReleaseGroup = parsedEpisodeInfo.ReleaseGroup,
-                ReleaseHash = parsedEpisodeInfo.ReleaseHash,
+                ReleaseGroup = parsedMovieInfo.ReleaseGroup,
+                ReleaseHash = parsedMovieInfo.ReleaseHash,
                 Title = releaseInfo.Title,
-                FullSeason = parsedEpisodeInfo.FullSeason,
-                SeasonNumber = parsedEpisodeInfo.SeasonNumber,
-                Language = parsedEpisodeInfo.Language,
-                //AirDate = parsedEpisodeInfo.AirDate,
-                //SeriesTitle = parsedEpisodeInfo.SeriesTitle,
-                EpisodeNumbers = parsedEpisodeInfo.EpisodeNumbers,
-                AbsoluteEpisodeNumbers = parsedEpisodeInfo.AbsoluteEpisodeNumbers,
+                Language = parsedMovieInfo.Language,
+                Year = parsedMovieInfo.Year,
+                MovieTitle = parsedMovieInfo.MovieTitle,
                 Approved = model.Approved,
                 TemporarilyRejected = model.TemporarilyRejected,
                 Rejected = model.Rejected,
@@ -180,19 +121,20 @@ 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,
-
-                IsDaily = parsedEpisodeInfo.IsDaily,
-                IsAbsoluteNumbering = parsedEpisodeInfo.IsAbsoluteNumbering,
-                IsPossibleSpecialEpisode = parsedEpisodeInfo.IsPossibleSpecialEpisode,
-                Special = parsedEpisodeInfo.Special,
+                IndexerFlags = torrentInfo.IndexerFlags.ToString().Split(new string[] { ", " }, StringSplitOptions.None),
+                Edition = parsedMovieInfo.Edition,
+                
+                //Special = parsedMovieInfo.Special,
             };
 
         }
@@ -232,4 +174,4 @@ namespace NzbDrone.Api.Indexers
             return model;
         }
     }
-}
+}

src/NzbDrone.Api/ManualImport/ManualImportModule.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
-using NzbDrone.Core.MediaFiles.EpisodeImport.Manual;
+using NzbDrone.Core.MediaFiles.MovieImport.Manual;
 using NzbDrone.Core.Qualities;
 
 namespace NzbDrone.Api.ManualImport

src/NzbDrone.Api/ManualImport/ManualImportResource.cs

@@ -23,7 +23,7 @@ namespace NzbDrone.Api.ManualImport
 
     public static class ManualImportResourceMapper
     {
-        public static ManualImportResource ToResource(this Core.MediaFiles.EpisodeImport.Manual.ManualImportItem model)
+        public static ManualImportResource ToResource(this Core.MediaFiles.MovieImport.Manual.ManualImportItem model)
         {
             if (model == null) return null;
 
@@ -43,7 +43,7 @@ namespace NzbDrone.Api.ManualImport
             };
         }
 
-        public static List<ManualImportResource> ToResource(this IEnumerable<Core.MediaFiles.EpisodeImport.Manual.ManualImportItem> models)
+        public static List<ManualImportResource> ToResource(this IEnumerable<Core.MediaFiles.MovieImport.Manual.ManualImportItem> models)
         {
             return models.Select(ToResource).ToList();
         }

src/NzbDrone.Api/MovieFiles/MovieFileModule.cs

@@ -6,7 +6,7 @@ using NzbDrone.Core.Datastore.Events;
 using NzbDrone.Core.MediaFiles;
 using NzbDrone.Core.MediaFiles.Events;
 using NzbDrone.Core.Messaging.Events;
-using NzbDrone.Core.Tv;
+using NzbDrone.Core.Movies;
 using NzbDrone.Core.DecisionEngine;
 using NzbDrone.SignalR;
 

src/NzbDrone.Api/MovieFiles/MovieFileResource.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using NzbDrone.Api.REST;
 using NzbDrone.Api.Movies;
 using NzbDrone.Core.MediaCover;
-using NzbDrone.Core.Tv;
+using NzbDrone.Core.Movies;
 using NzbDrone.Core.Qualities;
 using NzbDrone.Core.MediaFiles;
 

src/NzbDrone.Api/Movies/AlternativeTitleModule.cs

@@ -8,14 +8,14 @@ using NzbDrone.Common.Cache;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Core.MediaCover;
 using NzbDrone.Core.MediaFiles;
-using NzbDrone.Core.MediaFiles.EpisodeImport;
+using NzbDrone.Core.MediaFiles.MovieImport;
 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;
+using NzbDrone.Core.Movies;
+using NzbDrone.Core.Movies.Events;
 
 namespace NzbDrone.Api.Movies
 {

src/NzbDrone.Api/Movies/AlternativeTitleResource.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using NzbDrone.Api.REST;
 using NzbDrone.Core.MediaCover;
-using NzbDrone.Core.Tv;
+using NzbDrone.Core.Movies;
 using NzbDrone.Core.Qualities;
 using NzbDrone.Core.MediaFiles;
 using NzbDrone.Core.Movies.AlternativeTitles;

src/NzbDrone.Api/Movies/AlternativeYearModule.cs

@@ -9,14 +9,14 @@ using NzbDrone.Common.Extensions;
 using NzbDrone.Common.Messaging;
 using NzbDrone.Core.MediaCover;
 using NzbDrone.Core.MediaFiles;
-using NzbDrone.Core.MediaFiles.EpisodeImport;
+using NzbDrone.Core.MediaFiles.MovieImport;
 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;
+using NzbDrone.Core.Movies;
+using NzbDrone.Core.Movies.Events;
 
 namespace NzbDrone.Api.Movies
 {

src/NzbDrone.Api/Movies/AlternativeYearResource.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using NzbDrone.Api.REST;
 using NzbDrone.Core.MediaCover;
-using NzbDrone.Core.Tv;
+using NzbDrone.Core.Movies;
 using NzbDrone.Core.Qualities;
 using NzbDrone.Core.MediaFiles;
 using NzbDrone.Core.Movies.AlternativeTitles;

src/NzbDrone.Api/Movies/FetchMovieListModule.cs

@@ -26,7 +26,7 @@ namespace NzbDrone.Api.Movies
         {
             var results = _fetchNetImport.FetchAndFilter((int) Request.Query.listId, false);
 
-            List<Core.Tv.Movie> realResults = new List<Core.Tv.Movie>();
+            List<Core.Movies.Movie> realResults = new List<Core.Movies.Movie>();
 
             /*foreach (var movie in results)
             {
@@ -42,7 +42,7 @@ namespace NzbDrone.Api.Movies
         }
 
 
-        private static IEnumerable<MovieResource> MapToResource(IEnumerable<Core.Tv.Movie> movies)
+        private static IEnumerable<MovieResource> MapToResource(IEnumerable<Core.Movies.Movie> movies)
         {
             foreach (var currentSeries in movies)
             {

src/NzbDrone.Api/Movies/MovieBulkImportModule.cs

@@ -10,10 +10,10 @@ using Marr.Data;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Core.Datastore;
 using NzbDrone.Core.MediaFiles;
-using NzbDrone.Core.MediaFiles.EpisodeImport;
+using NzbDrone.Core.MediaFiles.MovieImport;
 using NzbDrone.Core.RootFolders;
 using NzbDrone.Common.Cache;
-using NzbDrone.Core.Tv;
+using NzbDrone.Core.Movies;
 
 namespace NzbDrone.Api.Movies
 {
@@ -32,7 +32,7 @@ namespace NzbDrone.Api.Movies
         private readonly IRootFolderService _rootFolderService;
         private readonly IMakeImportDecision _importDecisionMaker;
         private readonly IDiskScanService _diskScanService;
-		private readonly ICached<Core.Tv.Movie> _mappedMovies;
+		private readonly ICached<Core.Movies.Movie> _mappedMovies;
         private readonly IMovieService _movieService;
 
         public MovieBulkImportModule(ISearchForNewMovie searchProxy, IRootFolderService rootFolderService, IMakeImportDecision importDecisionMaker,
@@ -43,7 +43,7 @@ namespace NzbDrone.Api.Movies
             _rootFolderService = rootFolderService;
             _importDecisionMaker = importDecisionMaker;
             _diskScanService = diskScanService;
-			_mappedMovies = cacheManager.GetCache<Core.Tv.Movie>(GetType(), "mappedMoviesCache");
+			_mappedMovies = cacheManager.GetCache<Core.Movies.Movie>(GetType(), "mappedMoviesCache");
             _movieService = movieService;
             Get["/"] = x => Search();
         }
@@ -80,7 +80,7 @@ namespace NzbDrone.Api.Movies
 
             var mapped = paged.Select(f =>
 			{
-				Core.Tv.Movie m = null;
+				Core.Movies.Movie m = null;
 
 				var mappedMovie = _mappedMovies.Find(f.Name);
 
@@ -92,7 +92,7 @@ namespace NzbDrone.Api.Movies
 				var parsedTitle = Parser.ParseMoviePath(f.Name, false);
 				if (parsedTitle == null)
 				{
-					m = new Core.Tv.Movie
+					m = new Core.Movies.Movie
 					{
 						Title = f.Name.Replace(".", " ").Replace("-", " "),
 						Path = f.Path,
@@ -100,7 +100,7 @@ namespace NzbDrone.Api.Movies
 				}
 				else
 				{
-					m = new Core.Tv.Movie
+					m = new Core.Movies.Movie
 					{
 						Title = parsedTitle.MovieTitle,
 						Year = parsedTitle.Year,
@@ -156,7 +156,7 @@ namespace NzbDrone.Api.Movies
         }
 
 
-        private static IEnumerable<MovieResource> MapToResource(IEnumerable<Core.Tv.Movie> movies)
+        private static IEnumerable<MovieResource> MapToResource(IEnumerable<Core.Movies.Movie> movies)
         {
             foreach (var currentMovie in movies)
             {

src/NzbDrone.Api/Movies/MovieDiscoverModule.cs

@@ -45,7 +45,7 @@ namespace NzbDrone.Api.Movies
             }).AsResponse();
         }
 
-        private static IEnumerable<MovieResource> MapToResource(IEnumerable<Core.Tv.Movie> movies)
+        private static IEnumerable<MovieResource> MapToResource(IEnumerable<Core.Movies.Movie> movies)
         {
             foreach (var currentSeries in movies)
             {

src/NzbDrone.Api/Movies/MovieEditorModule.cs

@@ -5,7 +5,7 @@ using Nancy;
 using Nancy.Responses;
 using NzbDrone.Api.Extensions;
 using NzbDrone.Api.REST;
-using NzbDrone.Core.Tv;
+using NzbDrone.Core.Movies;
 
 namespace NzbDrone.Api.Movies
 {

src/NzbDrone.Api/Movies/MovieLookupModule.cs

@@ -49,7 +49,7 @@ namespace NzbDrone.Api.Movies
             return MapToResource(imdbResults).AsResponse();
         }
 
-        private static IEnumerable<MovieResource> MapToResource(IEnumerable<Core.Tv.Movie> movies)
+        private static IEnumerable<MovieResource> MapToResource(IEnumerable<Core.Movies.Movie> movies)
         {
             foreach (var currentSeries in movies)
             {

src/NzbDrone.Api/Movies/MovieModule.cs

@@ -9,11 +9,9 @@ using NzbDrone.Core.MediaCover;
 using NzbDrone.Core.MediaFiles;
 using NzbDrone.Core.MediaFiles.Events;
 using NzbDrone.Core.Messaging.Events;
-using NzbDrone.Core.MovieStats;
-using NzbDrone.Core.Tv;
-using NzbDrone.Core.Tv.Events;
+using NzbDrone.Core.Movies;
+using NzbDrone.Core.Movies.Events;
 using NzbDrone.Core.Validation.Paths;
-using NzbDrone.Core.DataAugmentation.Scene;
 using NzbDrone.Core.Validation;
 using NzbDrone.SignalR;
 using NzbDrone.Core.Datastore;
@@ -22,9 +20,9 @@ using Nancy;
 
 namespace NzbDrone.Api.Movies
 {
-    public class MovieModule : NzbDroneRestModuleWithSignalR<MovieResource, Core.Tv.Movie>, 
-                                IHandle<EpisodeImportedEvent>, 
-                                IHandle<EpisodeFileDeletedEvent>,
+    public class MovieModule : NzbDroneRestModuleWithSignalR<MovieResource, Core.Movies.Movie>, 
+                                IHandle<MovieImportedEvent>,
+                                IHandle<MovieFileDeletedEvent>,
                                 IHandle<MovieUpdatedEvent>,       
                                 IHandle<MovieEditedEvent>,  
                                 IHandle<MovieDeletedEvent>,
@@ -33,15 +31,12 @@ namespace NzbDrone.Api.Movies
 
     {
         protected readonly IMovieService _moviesService;
-        private readonly IMovieStatisticsService _moviesStatisticsService;
         private readonly IMapCoversToLocal _coverMapper;
 
 		private const string TITLE_SLUG_ROUTE = "/titleslug/(?<slug>[^/]+)";
 
         public MovieModule(IBroadcastSignalRMessage signalRBroadcaster,
                             IMovieService moviesService,
-                            IMovieStatisticsService moviesStatisticsService,
-                            ISceneMappingService sceneMappingService,
                             IMapCoversToLocal coverMapper,
                             RootFolderValidator rootFolderValidator,
                             MoviePathValidator moviesPathValidator,
@@ -53,7 +48,6 @@ namespace NzbDrone.Api.Movies
             : base(signalRBroadcaster)
         {
             _moviesService = moviesService;
-            _moviesStatisticsService = moviesStatisticsService;
 
             _coverMapper = coverMapper;
 
@@ -93,14 +87,11 @@ namespace NzbDrone.Api.Movies
 
         public MovieModule(IBroadcastSignalRMessage signalRBroadcaster,
                             IMovieService moviesService,
-                            IMovieStatisticsService moviesStatisticsService,
-                            ISceneMappingService sceneMappingService,
                             IMapCoversToLocal coverMapper,
                             string resource)
             : base(signalRBroadcaster, resource)
         {
             _moviesService = moviesService;
-            _moviesStatisticsService = moviesStatisticsService;
 
             _coverMapper = coverMapper;
 
@@ -119,14 +110,14 @@ namespace NzbDrone.Api.Movies
 
 		private PagingResource<MovieResource> GetMoviePaged(PagingResource<MovieResource> pagingResource)
 		{
-			var pagingSpec = pagingResource.MapToPagingSpec<MovieResource, Core.Tv.Movie>();
+			var pagingSpec = pagingResource.MapToPagingSpec<MovieResource, Core.Movies.Movie>();
 
             pagingSpec.FilterExpression = _moviesService.ConstructFilterExpression(pagingResource.FilterKey, pagingResource.FilterValue, pagingResource.FilterType);
 
             return ApplyToPage(_moviesService.Paged, pagingSpec, MapToResource);
 		}
 
-        protected MovieResource MapToResource(Core.Tv.Movie movies)
+        protected MovieResource MapToResource(Core.Movies.Movie movies)
         {
             if (movies == null) return null;
 
@@ -140,11 +131,11 @@ namespace NzbDrone.Api.Movies
 
         private List<MovieResource> AllMovie()
         {
-            var moviesStats = _moviesStatisticsService.MovieStatistics();
+            //var moviesStats = _moviesStatisticsService.MovieStatistics();
             var moviesResources = _moviesService.GetAllMovies().ToResource();
 
             MapCoversToLocal(moviesResources.ToArray());
-            LinkMovieStatistics(moviesResources, moviesStats);
+            //LinkMovieStatistics(moviesResources, moviesStats);
             PopulateAlternateTitles(moviesResources);
 
             return moviesResources;
@@ -216,28 +207,28 @@ namespace NzbDrone.Api.Movies
             }
         }
 
-        private void FetchAndLinkMovieStatistics(MovieResource resource)
-        {
-            LinkMovieStatistics(resource, _moviesStatisticsService.MovieStatistics(resource.Id));
-        }
+        //private void FetchAndLinkMovieStatistics(MovieResource resource)
+        //{
+        //    LinkMovieStatistics(resource, _moviesStatisticsService.MovieStatistics(resource.Id));
+        //}
 
-        private void LinkMovieStatistics(List<MovieResource> resources, List<MovieStatistics> moviesStatistics)
-        {
-            var dictMovieStats = moviesStatistics.ToDictionary(v => v.MovieId);
+        //private void LinkMovieStatistics(List<MovieResource> resources, List<MovieStatistics> moviesStatistics)
+        //{
+        //    var dictMovieStats = moviesStatistics.ToDictionary(v => v.MovieId);
 
-            foreach (var movies in resources)
-            {
-                var stats = dictMovieStats.GetValueOrDefault(movies.Id);
-                if (stats == null) continue;
+        //    foreach (var movies in resources)
+        //    {
+        //        var stats = dictMovieStats.GetValueOrDefault(movies.Id);
+        //        if (stats == null) continue;
 
-                LinkMovieStatistics(movies, stats);
-            }
-        }
+        //        LinkMovieStatistics(movies, stats);
+        //    }
+        //}
 
-        private void LinkMovieStatistics(MovieResource resource, MovieStatistics moviesStatistics)
-        {
-            //resource.SizeOnDisk = 0;//TODO: incorporate movie statistics moviesStatistics.SizeOnDisk;
-        }
+        //private void LinkMovieStatistics(MovieResource resource, MovieStatistics moviesStatistics)
+        //{
+        //    //resource.SizeOnDisk = 0;//TODO: incorporate movie statistics moviesStatistics.SizeOnDisk;
+        //}
 
         private void PopulateAlternateTitles(List<MovieResource> resources)
         {
@@ -258,16 +249,16 @@ namespace NzbDrone.Api.Movies
             //resource.AlternateTitles = mappings.Select(v => new AlternateTitleResource { Title = v.Title, SeasonNumber = v.SeasonNumber, SceneSeasonNumber = v.SceneSeasonNumber }).ToList();
         }
 
-        public void Handle(EpisodeImportedEvent message)
+        public void Handle(MovieImportedEvent message)
         {
-            //BroadcastResourceChange(ModelAction.Updated, message.ImportedEpisode.MovieId);
+            BroadcastResourceChange(ModelAction.Updated, message.ImportedMovie.MovieId);
         }
 
-        public void Handle(EpisodeFileDeletedEvent message)
+        public void Handle(MovieFileDeletedEvent message)
         {
             if (message.Reason == DeleteMediaFileReason.Upgrade) return;
 
-            //BroadcastResourceChange(ModelAction.Updated, message.EpisodeFile.MovieId);
+            BroadcastResourceChange(ModelAction.Updated, message.MovieFile.MovieId);
         }
 
         public void Handle(MovieUpdatedEvent message)

src/NzbDrone.Api/Movies/MovieModuleWithSignalR.cs

@@ -4,12 +4,12 @@ using NzbDrone.Core.DecisionEngine;
 using NzbDrone.Core.Download;
 using NzbDrone.Core.MediaFiles.Events;
 using NzbDrone.Core.Messaging.Events;
-using NzbDrone.Core.Tv;
+using NzbDrone.Core.Movies;
 using NzbDrone.SignalR;
 
 namespace NzbDrone.Api.Movies
 {
-    public abstract class MovieModuleWithSignalR : NzbDroneRestModuleWithSignalR<MovieResource, Core.Tv.Movie>,
+    public abstract class MovieModuleWithSignalR : NzbDroneRestModuleWithSignalR<MovieResource, Core.Movies.Movie>,
         IHandle<MovieGrabbedEvent>,
         IHandle<MovieDownloadedEvent>
     {
@@ -46,7 +46,7 @@ namespace NzbDrone.Api.Movies
             return resource;
         }
 
-        protected MovieResource MapToResource(Core.Tv.Movie episode, bool includeSeries)
+        protected MovieResource MapToResource(Core.Movies.Movie episode, bool includeSeries)
         {
             var resource = episode.ToResource();
 

src/NzbDrone.Api/Movies/MovieResource.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using NzbDrone.Api.REST;
 using NzbDrone.Core.MediaCover;
-using NzbDrone.Core.Tv;
+using NzbDrone.Core.Movies;
 using NzbDrone.Api.MovieFiles;
 
 namespace NzbDrone.Api.Movies
@@ -88,7 +88,7 @@ namespace NzbDrone.Api.Movies
 
     public static class MovieResourceMapper
     {
-        public static MovieResource ToResource(this Core.Tv.Movie model)
+        public static MovieResource ToResource(this Core.Movies.Movie model)
         {
             if (model == null) return null;
 
@@ -171,11 +171,11 @@ namespace NzbDrone.Api.Movies
             };
         }
 
-        public static Core.Tv.Movie ToModel(this MovieResource resource)
+        public static Core.Movies.Movie ToModel(this MovieResource resource)
         {
             if (resource == null) return null;
 
-            return new Core.Tv.Movie
+            return new Core.Movies.Movie
             {
                 Id = resource.Id,
                 TmdbId = resource.TmdbId,
@@ -225,7 +225,7 @@ namespace NzbDrone.Api.Movies
             };
         }
 
-        public static Core.Tv.Movie ToModel(this MovieResource resource, Core.Tv.Movie movie)
+        public static Core.Movies.Movie ToModel(this MovieResource resource, Core.Movies.Movie movie)
         {
             movie.ImdbId = resource.ImdbId;
             movie.TmdbId = resource.TmdbId;
@@ -244,7 +244,7 @@ namespace NzbDrone.Api.Movies
             return movie;
         }
 
-        public static List<MovieResource> ToResource(this IEnumerable<Core.Tv.Movie> movies)
+        public static List<MovieResource> ToResource(this IEnumerable<Core.Movies.Movie> movies)
         {
             return movies.Select(ToResource).ToList();
         }

src/NzbDrone.Api/NetImport/ImportExclusionsResource.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using NzbDrone.Core.NetImport;
-using NzbDrone.Core.Tv;
+using NzbDrone.Core.Movies;
 
 namespace NzbDrone.Api.NetImport
 {

src/NzbDrone.Api/NetImport/ListImportModule.cs

@@ -5,7 +5,7 @@ using Nancy.Extensions;
 using NzbDrone.Api.Extensions;
 using NzbDrone.Api.Movies;
 using NzbDrone.Core.MetadataSource;
-using NzbDrone.Core.Tv;
+using NzbDrone.Core.Movies;
 
 namespace NzbDrone.Api.NetImport
 {

src/NzbDrone.Api/NetImport/NetImportResource.cs

@@ -1,4 +1,4 @@
-using NzbDrone.Core.Tv;
+using NzbDrone.Core.Movies;
 
 namespace NzbDrone.Api.NetImport
 {

src/NzbDrone.Api/NzbDrone.Api.csproj

@@ -1,300 +1,305 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProjectGuid>{FD286DF8-2D3A-4394-8AD5-443FADE55FB2}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>NzbDrone.Api</RootNamespace>
-    <AssemblyName>NzbDrone.Api</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
-    <TargetFrameworkProfile>
-    </TargetFrameworkProfile>
-    <ProductVersion>12.0.0</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>..\..\_output\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <WarningLevel>4</WarningLevel>
-    <Optimize>false</Optimize>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <OutputPath>..\..\_output\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="antlr.runtime, Version=2.7.6.2, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Ical.Net.2.2.25\lib\net40\antlr.runtime.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="FluentValidation, Version=6.2.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\FluentValidation.6.2.1.0\lib\portable-net40+sl50+wp80+win8+wpa81\FluentValidation.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Ical.Net, Version=2.1.0.30332, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Ical.Net.2.2.25\lib\net40\Ical.Net.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Ical.Net.Collections, Version=2.1.0.30331, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Ical.Net.2.2.25\lib\net40\Ical.Net.Collections.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Nancy, Version=1.4.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Nancy.1.4.3\lib\net40\Nancy.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Nancy.Authentication.Basic, Version=1.4.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Nancy.Authentication.Basic.1.4.1\lib\net40\Nancy.Authentication.Basic.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Nancy.Authentication.Forms, Version=1.4.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Nancy.Authentication.Forms.1.4.1\lib\net40\Nancy.Authentication.Forms.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Newtonsoft.Json.6.0.6\lib\net40\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c">
-      <HintPath>..\packages\NLog.4.4.12\lib\net40\NLog.dll</HintPath>
-    </Reference>
-    <Reference Include="NodaTime, Version=1.3.0.0, Culture=neutral, PublicKeyToken=4226afe0d9b296d1, processorArchitecture=MSIL">
-      <HintPath>..\packages\Ical.Net.2.2.25\lib\net40\NodaTime.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Data" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data.SQLite, Version=1.0.84.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\Libraries\Sqlite\System.Data.SQLite.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\NzbDrone.Common\Properties\SharedAssemblyInfo.cs">
-      <Link>Properties\SharedAssemblyInfo.cs</Link>
-    </Compile>
-    <Compile Include="Authentication\AuthenticationService.cs" />
-    <Compile Include="Authentication\EnableAuthInNancy.cs" />
-    <Compile Include="Authentication\AuthenticationModule.cs" />
-    <Compile Include="Authentication\LoginResource.cs" />
-    <Compile Include="Authentication\NzbDroneUser.cs" />
-    <Compile Include="Blacklist\BlacklistModule.cs" />
-    <Compile Include="Blacklist\BlacklistResource.cs" />
-    <Compile Include="Calendar\CalendarFeedModule.cs" />
-    <Compile Include="Calendar\CalendarModule.cs" />
-    <Compile Include="ClientSchema\Field.cs" />
-    <Compile Include="ClientSchema\FieldDefinitionAttribute.cs" />
-    <Compile Include="ClientSchema\SchemaBuilder.cs" />
-    <Compile Include="ClientSchema\SchemaDeserializer.cs" />
-    <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="ExtraFiles\ExtraFileResource.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="ExtraFiles\ExtraFileModule.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="MovieFiles\MovieFileModule.cs" />
-    <Compile Include="Movies\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" />
-    <Compile Include="ManualImport\ManualImportResource.cs" />
-    <Compile Include="Profiles\Delay\DelayProfileModule.cs" />
-    <Compile Include="Profiles\Delay\DelayProfileResource.cs" />
-    <Compile Include="Queue\QueueActionModule.cs" />
-    <Compile Include="RemotePathMappings\RemotePathMappingModule.cs" />
-    <Compile Include="RemotePathMappings\RemotePathMappingResource.cs" />
-    <Compile Include="Config\UiConfigModule.cs" />
-    <Compile Include="Config\UiConfigResource.cs" />
-    <Compile Include="Config\DownloadClientConfigModule.cs" />
-    <Compile Include="Config\DownloadClientConfigResource.cs" />
-    <Compile Include="Config\HostConfigModule.cs" />
-    <Compile Include="Config\HostConfigResource.cs" />
-    <Compile Include="Config\IndexerConfigModule.cs" />
-    <Compile Include="Config\IndexerConfigResource.cs" />
-    <Compile Include="Config\MediaManagementConfigModule.cs" />
-    <Compile Include="Config\MediaManagementConfigResource.cs" />
-    <Compile Include="Config\NamingConfigModule.cs" />
-    <Compile Include="Config\NamingConfigResource.cs" />
-    <Compile Include="Config\NamingSampleResource.cs" />
-    <Compile Include="Config\NzbDroneConfigModule.cs" />
-    <Compile Include="FileSystem\FileSystemModule.cs" />
-    <Compile Include="DiskSpace\DiskSpaceModule.cs" />
-    <Compile Include="DiskSpace\DiskSpaceResource.cs" />
-    <Compile Include="DownloadClient\DownloadClientModule.cs" />
-    <Compile Include="DownloadClient\DownloadClientResource.cs" />
-    <Compile Include="ErrorManagement\ApiException.cs" />
-    <Compile Include="ErrorManagement\ErrorHandler.cs" />
-    <Compile Include="ErrorManagement\ErrorModel.cs" />
-    <Compile Include="ErrorManagement\NzbDroneErrorPipeline.cs" />
-    <Compile Include="Exceptions\InvalidApiKeyException.cs" />
-    <Compile Include="Extensions\NancyJsonSerializer.cs" />
-    <Compile Include="Extensions\Pipelines\CacheHeaderPipeline.cs" />
-    <Compile Include="Extensions\Pipelines\GZipPipeline.cs" />
-    <Compile Include="Extensions\Pipelines\IfModifiedPipeline.cs" />
-    <Compile Include="Extensions\Pipelines\IRegisterNancyPipeline.cs" />
-    <Compile Include="Extensions\Pipelines\NzbDroneVersionPipeline.cs" />
-    <Compile Include="Extensions\ReqResExtensions.cs" />
-    <Compile Include="Extensions\RequestExtensions.cs" />
-    <Compile Include="Frontend\CacheableSpecification.cs" />
-    <Compile Include="Frontend\Mappers\BackupFileMapper.cs" />
-    <Compile Include="Frontend\Mappers\CacheBreakerProvider.cs" />
-    <Compile Include="Frontend\Mappers\FaviconMapper.cs" />
-    <Compile Include="Frontend\Mappers\IMapHttpRequestsToDisk.cs" />
-    <Compile Include="Frontend\Mappers\IndexHtmlMapper.cs" />
-    <Compile Include="Frontend\Mappers\LogFileMapper.cs" />
-    <Compile Include="Frontend\Mappers\MediaCoverMapper.cs" />
-    <Compile Include="Frontend\Mappers\StaticResourceMapper.cs" />
-    <Compile Include="Frontend\Mappers\StaticResourceMapperBase.cs" />
-    <Compile Include="Frontend\Mappers\UpdateLogFileMapper.cs" />
-    <Compile Include="Frontend\StaticResourceModule.cs" />
-    <Compile Include="Health\HealthModule.cs" />
-    <Compile Include="Health\HealthResource.cs" />
-    <Compile Include="History\HistoryModule.cs" />
-    <Compile Include="History\HistoryResource.cs" />
-    <Compile Include="Indexers\IndexerModule.cs" />
-    <Compile Include="Indexers\IndexerResource.cs" />
-    <Compile Include="Indexers\ReleaseModule.cs" />
-    <Compile Include="Indexers\ReleaseResource.cs" />
-    <Compile Include="Logs\LogFileModule.cs" />
-    <Compile Include="Logs\LogFileModuleBase.cs" />
-    <Compile Include="Logs\LogFileResource.cs" />
-    <Compile Include="Logs\LogModule.cs" />
-    <Compile Include="Logs\LogResource.cs" />
-    <Compile Include="Logs\UpdateLogFileModule.cs" />
-    <Compile Include="MediaCovers\MediaCoverModule.cs" />
-    <Compile Include="Metadata\MetadataModule.cs" />
-    <Compile Include="Metadata\MetadataResource.cs" />
-    <Compile Include="NancyBootstrapper.cs" />
-    <Compile Include="Notifications\NotificationModule.cs" />
-    <Compile Include="Notifications\NotificationResource.cs" />
-    <Compile Include="NzbDroneApiModule.cs" />
-    <Compile Include="NzbDroneFeedModule.cs" />
-    <Compile Include="NzbDroneRestModule.cs" />
-    <Compile Include="NzbDroneRestModuleWithSignalR.cs" />
-    <Compile Include="PagingResource.cs" />
-    <Compile Include="Profiles\Languages\LanguageModule.cs" />
-    <Compile Include="Profiles\Languages\LanguageResource.cs" />
-    <Compile Include="Profiles\LegacyProfileModule.cs" />
-    <Compile Include="Profiles\ProfileModule.cs" />
-    <Compile Include="Profiles\ProfileResource.cs" />
-    <Compile Include="Profiles\ProfileSchemaModule.cs" />
-    <Compile Include="Profiles\ProfileValidation.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="ProviderModuleBase.cs" />
-    <Compile Include="ProviderResource.cs" />
-    <Compile Include="Qualities\QualityDefinitionModule.cs" />
-    <Compile Include="Qualities\QualityDefinitionResource.cs" />
-    <Compile Include="Queue\QueueModule.cs" />
-    <Compile Include="Queue\QueueResource.cs" />
-    <Compile Include="ResourceChangeMessage.cs" />
-    <Compile Include="Restrictions\RestrictionModule.cs" />
-    <Compile Include="Restrictions\RestrictionResource.cs" />
-    <Compile Include="REST\NotFoundException.cs" />
-    <Compile Include="REST\BadRequestException.cs" />
-    <Compile Include="REST\MethodNotAllowedException.cs" />
-    <Compile Include="REST\ResourceValidator.cs" />
-    <Compile Include="REST\RestModule.cs" />
-    <Compile Include="REST\RestResource.cs" />
-    <Compile Include="RootFolders\RootFolderModule.cs" />
-    <Compile Include="RootFolders\RootFolderResource.cs" />
-    <Compile Include="Movies\AlternativeTitleResource.cs" />
-    <Compile Include="MovieFiles\MovieFileResource.cs" />
-    <Compile Include="Movies\FetchMovieListModule.cs" />
-    <Compile Include="Movies\MovieLookupModule.cs" />
-    <Compile Include="Series\SeriesModule.cs" />
-    <Compile Include="Movies\MovieResource.cs" />
-    <Compile Include="Series\SeriesResource.cs" />
-    <Compile Include="System\Backup\BackupModule.cs" />
-    <Compile Include="System\Backup\BackupResource.cs" />
-    <Compile Include="System\Tasks\TaskModule.cs" />
-    <Compile Include="System\Tasks\TaskResource.cs" />
-    <Compile Include="System\SystemModule.cs" />
-    <Compile Include="Tags\TagModule.cs" />
-    <Compile Include="Tags\TagResource.cs" />
-    <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\LegacyMissingModule.cs" />
-    <Compile Include="Wanted\MovieCutoffModule.cs" />
-    <Compile Include="Wanted\MovieMissingModule.cs" />
-    <Compile Include="Movies\MovieDiscoverModule.cs" />
-    <Compile Include="NetImport\ImportExclusionsModule.cs" />
-    <Compile Include="NetImport\ImportExclusionsResource.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="app.config" />
-    <None Include="packages.config">
-      <SubType>Designer</SubType>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Marr.Data\Marr.Data.csproj">
-      <Project>{F6FC6BE7-0847-4817-A1ED-223DC647C3D7}</Project>
-      <Name>Marr.Data</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\NzbDrone.Common\NzbDrone.Common.csproj">
-      <Project>{F2BE0FDF-6E47-4827-A420-DD4EF82407F8}</Project>
-      <Name>NzbDrone.Common</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\NzbDrone.Core\NzbDrone.Core.csproj">
-      <Project>{FF5EE3B6-913B-47CE-9CEB-11C51B4E1205}</Project>
-      <Name>NzbDrone.Core</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\NzbDrone.SignalR\NzbDrone.SignalR.csproj">
-      <Project>{7C2CC69F-5CA0-4E5C-85CB-983F9F6C3B36}</Project>
-      <Name>NzbDrone.SignalR</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup />
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <ProjectGuid>{FD286DF8-2D3A-4394-8AD5-443FADE55FB2}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>NzbDrone.Api</RootNamespace>
+    <AssemblyName>NzbDrone.Api</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+    <RestorePackages>true</RestorePackages>
+    <TargetFrameworkProfile>
+    </TargetFrameworkProfile>
+    <ProductVersion>12.0.0</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>..\..\_output\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <WarningLevel>4</WarningLevel>
+    <Optimize>false</Optimize>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <OutputPath>..\..\_output\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="antlr.runtime, Version=2.7.6.2, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Ical.Net.2.2.25\lib\net40\antlr.runtime.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="FluentValidation, Version=6.2.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\FluentValidation.6.2.1.0\lib\portable-net40+sl50+wp80+win8+wpa81\FluentValidation.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Ical.Net, Version=2.1.0.30332, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Ical.Net.2.2.25\lib\net40\Ical.Net.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Ical.Net.Collections, Version=2.1.0.30331, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Ical.Net.2.2.25\lib\net40\Ical.Net.Collections.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Nancy, Version=1.4.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Nancy.1.4.3\lib\net40\Nancy.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Nancy.Authentication.Basic, Version=1.4.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Nancy.Authentication.Basic.1.4.1\lib\net40\Nancy.Authentication.Basic.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Nancy.Authentication.Forms, Version=1.4.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Nancy.Authentication.Forms.1.4.1\lib\net40\Nancy.Authentication.Forms.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Newtonsoft.Json.6.0.6\lib\net40\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+      <HintPath>..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll</HintPath>
+    </Reference>
+    <Reference Include="NodaTime, Version=1.3.0.0, Culture=neutral, PublicKeyToken=4226afe0d9b296d1, processorArchitecture=MSIL">
+      <HintPath>..\packages\Ical.Net.2.2.25\lib\net40\NodaTime.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Data" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data.SQLite, Version=1.0.84.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\Libraries\Sqlite\System.Data.SQLite.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel" />
+    <Reference Include="System.Transactions" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\NzbDrone.Common\Properties\SharedAssemblyInfo.cs">
+      <Link>Properties\SharedAssemblyInfo.cs</Link>
+    </Compile>
+    <Compile Include="Authentication\AuthenticationService.cs" />
+    <Compile Include="Authentication\EnableAuthInNancy.cs" />
+    <Compile Include="Authentication\AuthenticationModule.cs" />
+    <Compile Include="Authentication\LoginResource.cs" />
+    <Compile Include="Authentication\NzbDroneUser.cs" />
+    <Compile Include="Blacklist\BlacklistModule.cs" />
+    <Compile Include="Blacklist\BlacklistResource.cs" />
+    <Compile Include="Calendar\CalendarFeedModule.cs" />
+    <Compile Include="Calendar\CalendarModule.cs" />
+    <Compile Include="ClientSchema\Field.cs" />
+    <Compile Include="ClientSchema\FieldDefinitionAttribute.cs" />
+    <Compile Include="ClientSchema\SchemaBuilder.cs" />
+    <Compile Include="ClientSchema\SchemaDeserializer.cs" />
+    <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="ExtraFiles\ExtraFileResource.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="ExtraFiles\ExtraFileModule.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="MovieFiles\MovieFileModule.cs" />
+    <Compile Include="Movies\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" />
+    <Compile Include="ManualImport\ManualImportResource.cs" />
+    <Compile Include="Profiles\Delay\DelayProfileModule.cs" />
+    <Compile Include="Profiles\Delay\DelayProfileResource.cs" />
+    <Compile Include="Queue\QueueActionModule.cs" />
+    <Compile Include="RemotePathMappings\RemotePathMappingModule.cs" />
+    <Compile Include="RemotePathMappings\RemotePathMappingResource.cs" />
+    <Compile Include="Config\UiConfigModule.cs" />
+    <Compile Include="Config\UiConfigResource.cs" />
+    <Compile Include="Config\DownloadClientConfigModule.cs" />
+    <Compile Include="Config\DownloadClientConfigResource.cs" />
+    <Compile Include="Config\HostConfigModule.cs" />
+    <Compile Include="Config\HostConfigResource.cs" />
+    <Compile Include="Config\IndexerConfigModule.cs" />
+    <Compile Include="Config\IndexerConfigResource.cs" />
+    <Compile Include="Config\MediaManagementConfigModule.cs" />
+    <Compile Include="Config\MediaManagementConfigResource.cs" />
+    <Compile Include="Config\NamingConfigModule.cs" />
+    <Compile Include="Config\NamingConfigResource.cs" />
+    <Compile Include="Config\NamingSampleResource.cs" />
+    <Compile Include="Config\NzbDroneConfigModule.cs" />
+    <Compile Include="FileSystem\FileSystemModule.cs" />
+    <Compile Include="DiskSpace\DiskSpaceModule.cs" />
+    <Compile Include="DiskSpace\DiskSpaceResource.cs" />
+    <Compile Include="DownloadClient\DownloadClientModule.cs" />
+    <Compile Include="DownloadClient\DownloadClientResource.cs" />
+    <Compile Include="ErrorManagement\ApiException.cs" />
+    <Compile Include="ErrorManagement\ErrorHandler.cs" />
+    <Compile Include="ErrorManagement\ErrorModel.cs" />
+    <Compile Include="ErrorManagement\NzbDroneErrorPipeline.cs" />
+    <Compile Include="Exceptions\InvalidApiKeyException.cs" />
+    <Compile Include="Extensions\NancyJsonSerializer.cs" />
+    <Compile Include="Extensions\Pipelines\CacheHeaderPipeline.cs" />
+    <Compile Include="Extensions\Pipelines\GZipPipeline.cs" />
+    <Compile Include="Extensions\Pipelines\IfModifiedPipeline.cs" />
+    <Compile Include="Extensions\Pipelines\IRegisterNancyPipeline.cs" />
+    <Compile Include="Extensions\Pipelines\NzbDroneVersionPipeline.cs" />
+    <Compile Include="Extensions\ReqResExtensions.cs" />
+    <Compile Include="Extensions\RequestExtensions.cs" />
+    <Compile Include="Frontend\CacheableSpecification.cs" />
+    <Compile Include="Frontend\Mappers\BackupFileMapper.cs" />
+    <Compile Include="Frontend\Mappers\CacheBreakerProvider.cs" />
+    <Compile Include="Frontend\Mappers\FaviconMapper.cs" />
+    <Compile Include="Frontend\Mappers\IMapHttpRequestsToDisk.cs" />
+    <Compile Include="Frontend\Mappers\IndexHtmlMapper.cs" />
+    <Compile Include="Frontend\Mappers\LogFileMapper.cs" />
+    <Compile Include="Frontend\Mappers\MediaCoverMapper.cs" />
+    <Compile Include="Frontend\Mappers\StaticResourceMapper.cs" />
+    <Compile Include="Frontend\Mappers\StaticResourceMapperBase.cs" />
+    <Compile Include="Frontend\Mappers\UpdateLogFileMapper.cs" />
+    <Compile Include="Frontend\StaticResourceModule.cs" />
+    <Compile Include="Health\HealthModule.cs" />
+    <Compile Include="Health\HealthResource.cs" />
+    <Compile Include="History\HistoryModule.cs" />
+    <Compile Include="History\HistoryResource.cs" />
+    <Compile Include="Indexers\IndexerModule.cs" />
+    <Compile Include="Indexers\IndexerResource.cs" />
+    <Compile Include="Indexers\ReleaseModule.cs" />
+    <Compile Include="Indexers\ReleaseResource.cs" />
+    <Compile Include="Logs\LogFileModule.cs" />
+    <Compile Include="Logs\LogFileModuleBase.cs" />
+    <Compile Include="Logs\LogFileResource.cs" />
+    <Compile Include="Logs\LogModule.cs" />
+    <Compile Include="Logs\LogResource.cs" />
+    <Compile Include="Logs\UpdateLogFileModule.cs" />
+    <Compile Include="MediaCovers\MediaCoverModule.cs" />
+    <Compile Include="Metadata\MetadataModule.cs" />
+    <Compile Include="Metadata\MetadataResource.cs" />
+    <Compile Include="NancyBootstrapper.cs" />
+    <Compile Include="Notifications\NotificationModule.cs" />
+    <Compile Include="Notifications\NotificationResource.cs" />
+    <Compile Include="NzbDroneApiModule.cs" />
+    <Compile Include="NzbDroneFeedModule.cs" />
+    <Compile Include="NzbDroneRestModule.cs" />
+    <Compile Include="NzbDroneRestModuleWithSignalR.cs" />
+    <Compile Include="PagingResource.cs" />
+    <Compile Include="Profiles\Languages\LanguageModule.cs" />
+    <Compile Include="Profiles\Languages\LanguageResource.cs" />
+    <Compile Include="Profiles\LegacyProfileModule.cs" />
+    <Compile Include="Profiles\ProfileModule.cs" />
+    <Compile Include="Profiles\ProfileResource.cs" />
+    <Compile Include="Profiles\ProfileSchemaModule.cs" />
+    <Compile Include="Profiles\ProfileValidation.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="ProviderModuleBase.cs" />
+    <Compile Include="ProviderResource.cs" />
+    <Compile Include="Qualities\QualityDefinitionModule.cs" />
+    <Compile Include="Qualities\QualityDefinitionResource.cs" />
+    <Compile Include="Queue\QueueModule.cs" />
+    <Compile Include="Queue\QueueResource.cs" />
+    <Compile Include="ResourceChangeMessage.cs" />
+    <Compile Include="Restrictions\RestrictionModule.cs" />
+    <Compile Include="Restrictions\RestrictionResource.cs" />
+    <Compile Include="REST\NotFoundException.cs" />
+    <Compile Include="REST\BadRequestException.cs" />
+    <Compile Include="REST\MethodNotAllowedException.cs" />
+    <Compile Include="REST\ResourceValidator.cs" />
+    <Compile Include="REST\RestModule.cs" />
+    <Compile Include="REST\RestResource.cs" />
+    <Compile Include="RootFolders\RootFolderModule.cs" />
+    <Compile Include="RootFolders\RootFolderResource.cs" />
+    <Compile Include="Movies\AlternativeTitleResource.cs" />
+    <Compile Include="MovieFiles\MovieFileResource.cs" />
+    <Compile Include="Movies\FetchMovieListModule.cs" />
+    <Compile Include="Movies\MovieLookupModule.cs" />
+    <Compile Include="Series\SeriesModule.cs" />
+    <Compile Include="Movies\MovieResource.cs" />
+    <Compile Include="Series\SeriesResource.cs" />
+    <Compile Include="System\Backup\BackupModule.cs" />
+    <Compile Include="System\Backup\BackupResource.cs" />
+    <Compile Include="System\Tasks\TaskModule.cs" />
+    <Compile Include="System\Tasks\TaskResource.cs" />
+    <Compile Include="System\SystemModule.cs" />
+    <Compile Include="Tags\TagModule.cs" />
+    <Compile Include="Tags\TagResource.cs" />
+    <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\LegacyMissingModule.cs" />
+    <Compile Include="Wanted\MovieCutoffModule.cs" />
+    <Compile Include="Wanted\MovieMissingModule.cs" />
+    <Compile Include="Movies\MovieDiscoverModule.cs" />
+    <Compile Include="NetImport\ImportExclusionsModule.cs" />
+    <Compile Include="NetImport\ImportExclusionsResource.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+    <None Include="packages.config">
+      <SubType>Designer</SubType>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Marr.Data\Marr.Data.csproj">
+      <Project>{F6FC6BE7-0847-4817-A1ED-223DC647C3D7}</Project>
+      <Name>Marr.Data</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\NzbDrone.Common\NzbDrone.Common.csproj">
+      <Project>{F2BE0FDF-6E47-4827-A420-DD4EF82407F8}</Project>
+      <Name>NzbDrone.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\NzbDrone.Core\NzbDrone.Core.csproj">
+      <Project>{FF5EE3B6-913B-47CE-9CEB-11C51B4E1205}</Project>
+      <Name>NzbDrone.Core</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\NzbDrone.SignalR\NzbDrone.SignalR.csproj">
+      <Project>{7C2CC69F-5CA0-4E5C-85CB-983F9F6C3B36}</Project>
+      <Name>NzbDrone.SignalR</Name>
+    </ProjectReference>
+  </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.
 			 Other similar extension points exist, see Microsoft.Common.targets.
 	<Target Name="BeforeBuild">
 	</Target>
 	<Target Name="AfterBuild">
 	</Target>
-	-->
+	-->
 </Project>

src/NzbDrone.Api/Series/SeriesModule.cs

@@ -5,7 +5,7 @@ using NzbDrone.SignalR;
 namespace NzbDrone.Api.Series
 {
     [Obsolete("SeriesModule is Obsolete, Remove with new UI")]
-    public class SeriesModule : NzbDroneRestModuleWithSignalR<SeriesResource, Core.Tv.Series>
+    public class SeriesModule : NzbDroneRestModuleWithSignalR<SeriesResource, Core.Movies.Movie>
 
     {
         public SeriesModule(IBroadcastSignalRMessage signalRBroadcaster

src/NzbDrone.Api/Wanted/MovieCutoffModule.cs

@@ -1,6 +1,6 @@
 using NzbDrone.Api.Movies;
 using NzbDrone.Core.DecisionEngine;
-using NzbDrone.Core.Tv;
+using NzbDrone.Core.Movies;
 using NzbDrone.Core.Datastore;
 using NzbDrone.SignalR;
 
@@ -22,7 +22,7 @@ namespace NzbDrone.Api.Wanted
 
         private PagingResource<MovieResource> GetCutoffUnmetMovies(PagingResource<MovieResource> pagingResource)
         {
-            var pagingSpec = pagingResource.MapToPagingSpec<MovieResource, Core.Tv.Movie>("title", SortDirection.Ascending);
+            var pagingSpec = pagingResource.MapToPagingSpec<MovieResource, Core.Movies.Movie>("title", SortDirection.Ascending);
 
             pagingSpec.FilterExpression = _movieService.ConstructFilterExpression(pagingResource.FilterKey, pagingResource.FilterValue);
 

src/NzbDrone.Api/Wanted/MovieMissingModule.cs

@@ -1,6 +1,6 @@
 using NzbDrone.Api.Movies;
 using NzbDrone.Core.DecisionEngine;
-using NzbDrone.Core.Tv;
+using NzbDrone.Core.Movies;
 using NzbDrone.Core.Datastore;
 using NzbDrone.SignalR;
 using NzbDrone.Core.Download;
@@ -27,7 +27,7 @@ namespace NzbDrone.Api.Wanted
 
         private PagingResource<MovieResource> GetMissingMovies(PagingResource<MovieResource> pagingResource)
         {
-            var pagingSpec = pagingResource.MapToPagingSpec<MovieResource, Core.Tv.Movie>("title", SortDirection.Descending);
+            var pagingSpec = pagingResource.MapToPagingSpec<MovieResource, Core.Movies.Movie>("title", SortDirection.Descending);
 
             pagingSpec.FilterExpression = _movieService.ConstructFilterExpression(pagingResource.FilterKey, pagingResource.FilterValue);
 

src/NzbDrone.Api/packages.config

@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="FluentValidation" version="6.2.1.0" targetFramework="net40" />
-  <package id="Ical.Net" version="2.2.25" targetFramework="net40" />
-  <package id="Nancy" version="1.4.3" targetFramework="net40" />
-  <package id="Nancy.Authentication.Basic" version="1.4.1" targetFramework="net40" />
-  <package id="Nancy.Authentication.Forms" version="1.4.1" targetFramework="net40" />
-  <package id="Newtonsoft.Json" version="6.0.6" targetFramework="net40" />
-  <package id="NLog" version="4.4.12" targetFramework="net40" />
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="FluentValidation" version="6.2.1.0" targetFramework="net40" />
+  <package id="Ical.Net" version="2.2.25" targetFramework="net40" />
+  <package id="Nancy" version="1.4.3" targetFramework="net40" />
+  <package id="Nancy.Authentication.Basic" version="1.4.1" targetFramework="net40" />
+  <package id="Nancy.Authentication.Forms" version="1.4.1" targetFramework="net40" />
+  <package id="Newtonsoft.Json" version="6.0.6" targetFramework="net40" />
+  <package id="NLog" version="4.5.0-rc06" targetFramework="net40" />
 </packages>

src/NzbDrone.App.Test/ContainerFixture.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using NUnit.Framework;
 using NzbDrone.Common;
 using NzbDrone.Common.EnvironmentInfo;
@@ -77,8 +77,8 @@ namespace NzbDrone.App.Test
         [Test]
         public void should_return_same_instance_of_singletons_by_different_same_interface()
         {
-            var first = _container.ResolveAll<IHandle<EpisodeGrabbedEvent>>().OfType<DownloadMonitoringService>().Single();
-            var second = _container.ResolveAll<IHandle<EpisodeGrabbedEvent>>().OfType<DownloadMonitoringService>().Single();
+            var first = _container.ResolveAll<IHandle<MovieGrabbedEvent>>().OfType<DownloadMonitoringService>().Single();
+            var second = _container.ResolveAll<IHandle<MovieGrabbedEvent>>().OfType<DownloadMonitoringService>().Single();
 
             first.Should().BeSameAs(second);
         }
@@ -86,10 +86,10 @@ namespace NzbDrone.App.Test
         [Test]
         public void should_return_same_instance_of_singletons_by_different_interfaces()
         {
-            var first = _container.ResolveAll<IHandle<EpisodeGrabbedEvent>>().OfType<DownloadMonitoringService>().Single();
+            var first = _container.ResolveAll<IHandle<MovieGrabbedEvent>>().OfType<DownloadMonitoringService>().Single();
             var second = (DownloadMonitoringService)_container.Resolve<IExecute<CheckForFinishedDownloadCommand>>();
 
             first.Should().BeSameAs(second);
         }
     }
-}
+}

src/NzbDrone.App.Test/NzbDrone.Host.Test.csproj

@@ -1,125 +1,131 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{C0EA1A40-91AD-4EEB-BD16-2DDDEBD20AE5}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>NzbDrone.App.Test</RootNamespace>
-    <AssemblyName>NzbDrone.App.Test</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x86\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <WarningLevel>4</WarningLevel>
-    <Optimize>false</Optimize>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <OutputPath>bin\x86\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="FizzWare.NBuilder, Version=4.0.0.115, Culture=neutral, PublicKeyToken=5651b03e12e42c12, processorArchitecture=MSIL">
-      <HintPath>..\packages\NBuilder.4.0.0\lib\net40\FizzWare.NBuilder.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="FluentAssertions, Version=4.18.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
-      <HintPath>..\packages\FluentAssertions.4.18.0\lib\net40\FluentAssertions.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="FluentAssertions.Core, Version=4.18.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
-      <HintPath>..\packages\FluentAssertions.4.18.0\lib\net40\FluentAssertions.Core.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c">
-      <HintPath>..\packages\NLog.4.4.12\lib\net40\NLog.dll</HintPath>
-    </Reference>
-    <Reference Include="nunit.framework, Version=3.5.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnit.3.5.0\lib\net40\nunit.framework.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.ServiceProcess" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="Moq">
-      <HintPath>..\packages\Moq.4.0.10827\lib\NET40\Moq.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="ContainerFixture.cs" />
-    <Compile Include="NzbDroneProcessServiceFixture.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="RouterTest.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\NzbDrone.Test.Common\App.config">
-      <Link>App.config</Link>
-    </None>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\NzbDrone.Common\NzbDrone.Common.csproj">
-      <Project>{F2BE0FDF-6E47-4827-A420-DD4EF82407F8}</Project>
-      <Name>NzbDrone.Common</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\NzbDrone.Core\NzbDrone.Core.csproj">
-      <Project>{FF5EE3B6-913B-47CE-9CEB-11C51B4E1205}</Project>
-      <Name>NzbDrone.Core</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\NzbDrone.Host\NzbDrone.Host.csproj">
-      <Project>{95C11A9E-56ED-456A-8447-2C89C1139266}</Project>
-      <Name>NzbDrone.Host</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\NzbDrone.Test.Common\NzbDrone.Test.Common.csproj">
-      <Project>{CADDFCE0-7509-4430-8364-2074E1EEFCA2}</Project>
-      <Name>NzbDrone.Test.Common</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="..\Libraries\Sqlite\sqlite3.dll">
-      <Link>sqlite3.dll</Link>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{C0EA1A40-91AD-4EEB-BD16-2DDDEBD20AE5}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>NzbDrone.App.Test</RootNamespace>
+    <AssemblyName>NzbDrone.App.Test</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+    <RestorePackages>true</RestorePackages>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x86\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <WarningLevel>4</WarningLevel>
+    <Optimize>false</Optimize>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <OutputPath>bin\x86\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="FizzWare.NBuilder, Version=4.0.0.115, Culture=neutral, PublicKeyToken=5651b03e12e42c12, processorArchitecture=MSIL">
+      <HintPath>..\packages\NBuilder.4.0.0\lib\net40\FizzWare.NBuilder.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="FluentAssertions, Version=4.18.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
+      <HintPath>..\packages\FluentAssertions.4.18.0\lib\net40\FluentAssertions.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="FluentAssertions.Core, Version=4.18.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
+      <HintPath>..\packages\FluentAssertions.4.18.0\lib\net40\FluentAssertions.Core.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+      <HintPath>..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll</HintPath>
+    </Reference>
+    <Reference Include="nunit.framework, Version=3.5.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.3.5.0\lib\net40\nunit.framework.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel" />
+    <Reference Include="System.ServiceProcess" />
+    <Reference Include="System.Transactions" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="Moq">
+      <HintPath>..\packages\Moq.4.0.10827\lib\NET40\Moq.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="ContainerFixture.cs" />
+    <Compile Include="NzbDroneProcessServiceFixture.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="RouterTest.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\NzbDrone.Test.Common\App.config">
+      <Link>App.config</Link>
+    </None>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\NzbDrone.Common\NzbDrone.Common.csproj">
+      <Project>{F2BE0FDF-6E47-4827-A420-DD4EF82407F8}</Project>
+      <Name>NzbDrone.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\NzbDrone.Core\NzbDrone.Core.csproj">
+      <Project>{FF5EE3B6-913B-47CE-9CEB-11C51B4E1205}</Project>
+      <Name>NzbDrone.Core</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\NzbDrone.Host\NzbDrone.Host.csproj">
+      <Project>{95C11A9E-56ED-456A-8447-2C89C1139266}</Project>
+      <Name>NzbDrone.Host</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\NzbDrone.Test.Common\NzbDrone.Test.Common.csproj">
+      <Project>{CADDFCE0-7509-4430-8364-2074E1EEFCA2}</Project>
+      <Name>NzbDrone.Test.Common</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="..\Libraries\Sqlite\sqlite3.dll">
+      <Link>sqlite3.dll</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
     <PostBuildEvent Condition="('$(OS)' == 'Windows_NT')">
       xcopy /s /y "$(SolutionDir)\..\_output\NzbDrone.Mono.*"   "$(TargetDir)"
       xcopy /s /y "$(SolutionDir)\..\_output\NzbDrone.Windows.*"   "$(TargetDir)"
-    </PostBuildEvent>
+    </PostBuildEvent>
     <PostBuildEvent Condition="('$(OS)' != 'Windows_NT')">
       cp -rv $(SolutionDir)\..\_output\NzbDrone.Mono.* $(TargetDir)
       cp -rv $(SolutionDir)\..\_output\NzbDrone.Windows.* $(TargetDir)
-    </PostBuildEvent>
-  </PropertyGroup>
+    </PostBuildEvent>
+  </PropertyGroup>
   <!-- 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.
   <Target Name="BeforeBuild">
   </Target>
   <Target Name="AfterBuild">
   </Target>
-  -->
+  -->
 </Project>

src/NzbDrone.App.Test/packages.config

@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="FluentAssertions" version="4.18.0" targetFramework="net40" />
-  <package id="Moq" version="4.0.10827" />
-  <package id="NBuilder" version="4.0.0" targetFramework="net40" />
-  <package id="NLog" version="4.4.12" targetFramework="net40" />
-  <package id="NUnit" version="3.5.0" targetFramework="net40" />
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="FluentAssertions" version="4.18.0" targetFramework="net40" />
+  <package id="Moq" version="4.0.10827" />
+  <package id="NBuilder" version="4.0.0" targetFramework="net40" />
+  <package id="NLog" version="4.5.0-rc06" targetFramework="net40" />
+  <package id="NUnit" version="3.5.0" targetFramework="net40" />
 </packages>

src/NzbDrone.Automation.Test/NzbDrone.Automation.Test.csproj

@@ -1,105 +1,109 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProjectGuid>{CC26800D-F67E-464B-88DE-8EB1A0C227A3}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>NzbDrone.Automation.Test</RootNamespace>
-    <AssemblyName>NzbDrone.Automation.Test</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
-    <ProductVersion>12.0.0</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x86\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <WarningLevel>4</WarningLevel>
-    <Optimize>false</Optimize>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <OutputPath>bin\x86\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="FluentAssertions, Version=4.18.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
-      <HintPath>..\packages\FluentAssertions.4.18.0\lib\net40\FluentAssertions.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="FluentAssertions.Core, Version=4.18.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
-      <HintPath>..\packages\FluentAssertions.4.18.0\lib\net40\FluentAssertions.Core.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c">
-      <HintPath>..\packages\NLog.4.4.12\lib\net40\NLog.dll</HintPath>
-    </Reference>
-    <Reference Include="nunit.framework, Version=3.5.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnit.3.5.0\lib\net40\nunit.framework.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="WebDriver, Version=3.0.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Selenium.WebDriver.3.0.1\lib\net40\WebDriver.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="WebDriver.Support, Version=3.0.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Selenium.Support.3.0.1\lib\net40\WebDriver.Support.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AutomationTest.cs" />
-    <Compile Include="AutomationTestAttribute.cs" />
-    <Compile Include="MainPagesTest.cs" />
-    <Compile Include="PageModel\PageBase.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\NzbDrone.Common\NzbDrone.Common.csproj">
-      <Project>{F2BE0FDF-6E47-4827-A420-DD4EF82407F8}</Project>
-      <Name>NzbDrone.Common</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\NzbDrone.Test.Common\NzbDrone.Test.Common.csproj">
-      <Project>{CADDFCE0-7509-4430-8364-2074E1EEFCA2}</Project>
-      <Name>NzbDrone.Test.Common</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="app.config" />
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <ProjectGuid>{CC26800D-F67E-464B-88DE-8EB1A0C227A3}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>NzbDrone.Automation.Test</RootNamespace>
+    <AssemblyName>NzbDrone.Automation.Test</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+    <RestorePackages>true</RestorePackages>
+    <ProductVersion>12.0.0</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x86\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <WarningLevel>4</WarningLevel>
+    <Optimize>false</Optimize>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <OutputPath>bin\x86\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="FluentAssertions, Version=4.18.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
+      <HintPath>..\packages\FluentAssertions.4.18.0\lib\net40\FluentAssertions.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="FluentAssertions.Core, Version=4.18.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
+      <HintPath>..\packages\FluentAssertions.4.18.0\lib\net40\FluentAssertions.Core.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+      <HintPath>..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll</HintPath>
+    </Reference>
+    <Reference Include="nunit.framework, Version=3.5.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.3.5.0\lib\net40\nunit.framework.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel" />
+    <Reference Include="System.Transactions" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="WebDriver, Version=3.0.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Selenium.WebDriver.3.0.1\lib\net40\WebDriver.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="WebDriver.Support, Version=3.0.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Selenium.Support.3.0.1\lib\net40\WebDriver.Support.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="AutomationTest.cs" />
+    <Compile Include="AutomationTestAttribute.cs" />
+    <Compile Include="MainPagesTest.cs" />
+    <Compile Include="PageModel\PageBase.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\NzbDrone.Common\NzbDrone.Common.csproj">
+      <Project>{F2BE0FDF-6E47-4827-A420-DD4EF82407F8}</Project>
+      <Name>NzbDrone.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\NzbDrone.Test.Common\NzbDrone.Test.Common.csproj">
+      <Project>{CADDFCE0-7509-4430-8364-2074E1EEFCA2}</Project>
+      <Name>NzbDrone.Test.Common</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- 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.
   <Target Name="BeforeBuild">
   </Target>
   <Target Name="AfterBuild">
   </Target>
-  -->
+  -->
 </Project>

src/NzbDrone.Automation.Test/packages.config

@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="FluentAssertions" version="4.18.0" targetFramework="net40" />
-  <package id="NLog" version="4.4.12" targetFramework="net40" />
-  <package id="NUnit" version="3.5.0" targetFramework="net40" />
-  <package id="Selenium.Support" version="3.0.1" targetFramework="net40" />
-  <package id="Selenium.WebDriver" version="3.0.1" targetFramework="net40" />
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="FluentAssertions" version="4.18.0" targetFramework="net40" />
+  <package id="NLog" version="4.5.0-rc06" targetFramework="net40" />
+  <package id="NUnit" version="3.5.0" targetFramework="net40" />
+  <package id="Selenium.Support" version="3.0.1" targetFramework="net40" />
+  <package id="Selenium.WebDriver" version="3.0.1" targetFramework="net40" />
 </packages>

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

@@ -54,7 +54,7 @@ namespace NzbDrone.Common.Test.Http
 
             response.Content.Should().NotBeNullOrWhiteSpace();
         }
-        
+
         [Test]
         public void should_execute_https_get()
         {
@@ -132,7 +132,49 @@ namespace NzbDrone.Common.Test.Http
             var request = new HttpRequest(string.Format("http://{0}/redirect/1", _httpBinHost));
             request.AllowAutoRedirect = true;
 
-            Subject.Get(request);
+            var response = Subject.Get(request);
+
+            response.StatusCode.Should().Be(HttpStatusCode.OK);
+
+            ExceptionVerification.ExpectedErrors(0);
+        }
+
+        [Test]
+        public void should_not_follow_redirects()
+        {
+            var request = new HttpRequest($"http://{_httpBinHost}/redirect/1");
+            request.AllowAutoRedirect = false;
+
+            var response = Subject.Get(request);
+
+            response.StatusCode.Should().Be(HttpStatusCode.Found);
+
+            ExceptionVerification.ExpectedErrors(1);
+        }
+
+        [Test]
+        public void should_follow_redirects_to_https()
+        {
+            var request = new HttpRequestBuilder($"http://{_httpBinHost}/redirect-to")
+                .AddQueryParam("url", $"https://sonarr.tv/")
+                .Build();
+            request.AllowAutoRedirect = true;
+
+            var response = Subject.Get(request);
+
+            response.StatusCode.Should().Be(HttpStatusCode.OK);
+            response.Content.Should().Contain("Sonarr");
+
+            ExceptionVerification.ExpectedErrors(0);
+        }
+
+        [Test]
+        public void should_throw_on_too_many_redirects()
+        {
+            var request = new HttpRequest($"http://{_httpBinHost}/redirect/4");
+            request.AllowAutoRedirect = true;
+
+            Assert.Throws<WebException>(() => Subject.Get(request));
 
             ExceptionVerification.ExpectedErrors(0);
         }
@@ -231,19 +273,74 @@ namespace NzbDrone.Common.Test.Http
             response.Resource.Headers.Should().NotContainKey("Cookie");
         }
 
+        [Test]
+        public void should_not_store_request_cookie()
+        {
+            var requestGet = new HttpRequest($"http://{_httpBinHost}/get");
+            requestGet.Cookies.Add("my", "cookie");
+            requestGet.AllowAutoRedirect = false;
+            requestGet.StoreRequestCookie = false;
+            requestGet.StoreResponseCookie = false;
+            var responseGet = Subject.Get<HttpBinResource>(requestGet);
+
+            var requestCookies = new HttpRequest($"http://{_httpBinHost}/cookies");
+            requestCookies.AllowAutoRedirect = false;
+            var responseCookies = Subject.Get<HttpCookieResource>(requestCookies);
+
+            responseCookies.Resource.Cookies.Should().BeEmpty();
+
+            ExceptionVerification.IgnoreErrors();
+        }
+
+        [Test]
+        public void should_store_request_cookie()
+        {
+            var requestGet = new HttpRequest($"http://{_httpBinHost}/get");
+            requestGet.Cookies.Add("my", "cookie");
+            requestGet.AllowAutoRedirect = false;
+            requestGet.StoreRequestCookie.Should().BeTrue();
+            requestGet.StoreResponseCookie = false;
+            var responseGet = Subject.Get<HttpBinResource>(requestGet);
+
+            var requestCookies = new HttpRequest($"http://{_httpBinHost}/cookies");
+            requestCookies.AllowAutoRedirect = false;
+            var responseCookies = Subject.Get<HttpCookieResource>(requestCookies);
+
+            responseCookies.Resource.Cookies.Should().HaveCount(1).And.Contain("my", "cookie");
+
+            ExceptionVerification.IgnoreErrors();
+        }
+
+        [Test]
+        public void should_delete_request_cookie()
+        {
+            var requestDelete = new HttpRequest($"http://{_httpBinHost}/cookies/delete?my");
+            requestDelete.Cookies.Add("my", "cookie");
+            requestDelete.AllowAutoRedirect = true;
+            requestDelete.StoreRequestCookie = false;
+            requestDelete.StoreResponseCookie = false;
+
+            // Delete and redirect since that's the only way to check the internal temporary cookie container
+            var responseCookies = Subject.Get<HttpCookieResource>(requestDelete);
+
+            responseCookies.Resource.Cookies.Should().BeEmpty();
+        }
+
         [Test]
         public void should_not_store_response_cookie()
         {
             var requestSet = new HttpRequest(string.Format("http://{0}/cookies/set?my=cookie", _httpBinHost));
             requestSet.AllowAutoRedirect = false;
+            requestSet.StoreRequestCookie = false;
+            requestSet.StoreResponseCookie.Should().BeFalse();
 
             var responseSet = Subject.Get(requestSet);
 
-            var request = new HttpRequest(string.Format("http://{0}/get", _httpBinHost));
+            var requestCookies = new HttpRequest($"http://{_httpBinHost}/cookies");
 
-            var response = Subject.Get<HttpBinResource>(request);
+            var responseCookies = Subject.Get<HttpCookieResource>(requestCookies);
 
-            response.Resource.Headers.Should().NotContainKey("Cookie");
+            responseCookies.Resource.Cookies.Should().BeEmpty();
 
             ExceptionVerification.IgnoreErrors();
         }
@@ -253,19 +350,31 @@ namespace NzbDrone.Common.Test.Http
         {
             var requestSet = new HttpRequest(string.Format("http://{0}/cookies/set?my=cookie", _httpBinHost));
             requestSet.AllowAutoRedirect = false;
+            requestSet.StoreRequestCookie = false;
             requestSet.StoreResponseCookie = true;
 
             var responseSet = Subject.Get(requestSet);
 
-            var request = new HttpRequest(string.Format("http://{0}/get", _httpBinHost));
+            var requestCookies = new HttpRequest($"http://{_httpBinHost}/cookies");
 
-            var response = Subject.Get<HttpBinResource>(request);
+            var responseCookies = Subject.Get<HttpCookieResource>(requestCookies);
 
-            response.Resource.Headers.Should().ContainKey("Cookie");
+            responseCookies.Resource.Cookies.Should().HaveCount(1).And.Contain("my", "cookie");
 
-            var cookie = response.Resource.Headers["Cookie"].ToString();
+            ExceptionVerification.IgnoreErrors();
+        }
 
-            cookie.Should().Contain("my=cookie");
+        [Test]
+        public void should_temp_store_response_cookie()
+        {
+            var requestSet = new HttpRequest($"http://{_httpBinHost}/cookies/set?my=cookie");
+            requestSet.AllowAutoRedirect = true;
+            requestSet.StoreRequestCookie = false;
+            requestSet.StoreResponseCookie.Should().BeFalse();
+            var responseSet = Subject.Get<HttpCookieResource>(requestSet);
+
+            // Set and redirect since that's the only way to check the internal temporary cookie container
+            responseSet.Resource.Cookies.Should().HaveCount(1).And.Contain("my", "cookie");
 
             ExceptionVerification.IgnoreErrors();
         }
@@ -273,26 +382,148 @@ namespace NzbDrone.Common.Test.Http
         [Test]
         public void should_overwrite_response_cookie()
         {
-            var requestSet = new HttpRequest(string.Format("http://{0}/cookies/set?my=cookie", _httpBinHost));
+            var requestSet = new HttpRequest($"http://{_httpBinHost}/cookies/set?my=cookie");
+            requestSet.Cookies.Add("my", "oldcookie");
             requestSet.AllowAutoRedirect = false;
+            requestSet.StoreRequestCookie = false;
             requestSet.StoreResponseCookie = true;
-            requestSet.Cookies["my"] = "oldcookie";
 
             var responseSet = Subject.Get(requestSet);
 
-            var request = new HttpRequest(string.Format("http://{0}/get", _httpBinHost));
+            var requestCookies = new HttpRequest($"http://{_httpBinHost}/cookies");
 
-            var response = Subject.Get<HttpBinResource>(request);
+            var responseCookies = Subject.Get<HttpCookieResource>(requestCookies);
 
-            response.Resource.Headers.Should().ContainKey("Cookie");
-
-            var cookie = response.Resource.Headers["Cookie"].ToString();
-
-            cookie.Should().Contain("my=cookie");
+            responseCookies.Resource.Cookies.Should().HaveCount(1).And.Contain("my", "cookie");
 
             ExceptionVerification.IgnoreErrors();
         }
 
+        [Test]
+        public void should_overwrite_temp_response_cookie()
+        {
+            var requestSet = new HttpRequest($"http://{_httpBinHost}/cookies/set?my=cookie");
+            requestSet.Cookies.Add("my", "oldcookie");
+            requestSet.AllowAutoRedirect = true;
+            requestSet.StoreRequestCookie = true;
+            requestSet.StoreResponseCookie = false;
+
+            var responseSet = Subject.Get<HttpCookieResource>(requestSet);
+
+            responseSet.Resource.Cookies.Should().HaveCount(1).And.Contain("my", "cookie");
+
+            var requestCookies = new HttpRequest($"http://{_httpBinHost}/cookies");
+
+            var responseCookies = Subject.Get<HttpCookieResource>(requestCookies);
+
+            responseCookies.Resource.Cookies.Should().HaveCount(1).And.Contain("my", "oldcookie");
+
+            ExceptionVerification.IgnoreErrors();
+        }
+
+        [Test]
+        public void should_not_delete_response_cookie()
+        {
+            var requestCookies = new HttpRequest($"http://{_httpBinHost}/cookies");
+            requestCookies.Cookies.Add("my", "cookie");
+            requestCookies.AllowAutoRedirect = false;
+            requestCookies.StoreRequestCookie = true;
+            requestCookies.StoreResponseCookie = false;
+            var responseCookies = Subject.Get<HttpCookieResource>(requestCookies);
+
+            responseCookies.Resource.Cookies.Should().HaveCount(1).And.Contain("my", "cookie");
+
+            var requestDelete = new HttpRequest($"http://{_httpBinHost}/cookies/delete?my");
+            requestDelete.AllowAutoRedirect = false;
+            requestDelete.StoreRequestCookie = false;
+            requestDelete.StoreResponseCookie = false;
+
+            var responseDelete = Subject.Get(requestDelete);
+
+            requestCookies = new HttpRequest($"http://{_httpBinHost}/cookies");
+            requestCookies.StoreRequestCookie = false;
+            requestCookies.StoreResponseCookie = false;
+
+            responseCookies = Subject.Get<HttpCookieResource>(requestCookies);
+
+            responseCookies.Resource.Cookies.Should().HaveCount(1).And.Contain("my", "cookie");
+
+            ExceptionVerification.IgnoreErrors();
+        }
+
+        [Test]
+        public void should_delete_response_cookie()
+        {
+            var requestCookies = new HttpRequest($"http://{_httpBinHost}/cookies");
+            requestCookies.Cookies.Add("my", "cookie");
+            requestCookies.AllowAutoRedirect = false;
+            requestCookies.StoreRequestCookie = true;
+            requestCookies.StoreResponseCookie = false;
+            var responseCookies = Subject.Get<HttpCookieResource>(requestCookies);
+
+            responseCookies.Resource.Cookies.Should().HaveCount(1).And.Contain("my", "cookie");
+
+            var requestDelete = new HttpRequest($"http://{_httpBinHost}/cookies/delete?my");
+            requestDelete.AllowAutoRedirect = false;
+            requestDelete.StoreRequestCookie = false;
+            requestDelete.StoreResponseCookie = true;
+
+            var responseDelete = Subject.Get(requestDelete);
+
+            requestCookies = new HttpRequest($"http://{_httpBinHost}/cookies");
+            requestCookies.StoreRequestCookie = false;
+            requestCookies.StoreResponseCookie = false;
+
+            responseCookies = Subject.Get<HttpCookieResource>(requestCookies);
+
+            responseCookies.Resource.Cookies.Should().BeEmpty();
+
+            ExceptionVerification.IgnoreErrors();
+        }
+
+        [Test]
+        public void should_delete_temp_response_cookie()
+        {
+            var requestCookies = new HttpRequest($"http://{_httpBinHost}/cookies");
+            requestCookies.Cookies.Add("my", "cookie");
+            requestCookies.AllowAutoRedirect = false;
+            requestCookies.StoreRequestCookie = true;
+            requestCookies.StoreResponseCookie = false;
+            var responseCookies = Subject.Get<HttpCookieResource>(requestCookies);
+
+            responseCookies.Resource.Cookies.Should().HaveCount(1).And.Contain("my", "cookie");
+
+            var requestDelete = new HttpRequest($"http://{_httpBinHost}/cookies/delete?my");
+            requestDelete.AllowAutoRedirect = true;
+            requestDelete.StoreRequestCookie = false;
+            requestDelete.StoreResponseCookie = false;
+            var responseDelete = Subject.Get<HttpCookieResource>(requestDelete);
+
+            responseDelete.Resource.Cookies.Should().BeEmpty();
+
+            requestCookies = new HttpRequest($"http://{_httpBinHost}/cookies");
+            requestCookies.StoreRequestCookie = false;
+            requestCookies.StoreResponseCookie = false;
+
+            responseCookies.Resource.Cookies.Should().HaveCount(1).And.Contain("my", "cookie");
+
+            ExceptionVerification.IgnoreErrors();
+        }
+
+        [Test]
+        public void should_not_send_old_cookie()
+        {
+            GivenOldCookie();
+            
+            var requestCookies = new HttpRequest($"http://{_httpBinHost}/cookies");
+            requestCookies.IgnorePersistentCookies = true;
+            requestCookies.StoreRequestCookie = false;
+            requestCookies.StoreResponseCookie = false;
+            var responseCookies = Subject.Get<HttpCookieResource>(requestCookies);
+
+            responseCookies.Resource.Cookies.Should().BeEmpty();
+        }
+
         [Test]
         public void should_throw_on_http429_too_many_requests()
         {
@@ -400,4 +631,9 @@ namespace NzbDrone.Common.Test.Http
         public string Url { get; set; }
         public string Data { get; set; }
     }
-}
+
+    public class HttpCookieResource
+    {
+        public Dictionary<string, string> Cookies { get; set; }
+    }
+}

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

@@ -1,160 +1,164 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{BEC74619-DDBB-4FBA-B517-D3E20AFC9997}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>NzbDrone.Common.Test</RootNamespace>
-    <AssemblyName>NzbDrone.Common.Test</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x86\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <WarningLevel>4</WarningLevel>
-    <Optimize>false</Optimize>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <OutputPath>bin\x86\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="FluentAssertions, Version=4.18.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
-      <HintPath>..\packages\FluentAssertions.4.18.0\lib\net40\FluentAssertions.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="FluentAssertions.Core, Version=4.18.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
-      <HintPath>..\packages\FluentAssertions.4.18.0\lib\net40\FluentAssertions.Core.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c">
-      <HintPath>..\packages\NLog.4.4.12\lib\net40\NLog.dll</HintPath>
-    </Reference>
-    <Reference Include="nunit.framework, Version=3.5.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnit.3.5.0\lib\net40\nunit.framework.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.ServiceProcess" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="Moq">
-      <HintPath>..\packages\Moq.4.0.10827\lib\NET40\Moq.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="CacheTests\CachedDictionaryFixture.cs" />
-    <Compile Include="CacheTests\CachedFixture.cs" />
-    <Compile Include="CacheTests\CachedManagerFixture.cs" />
-    <Compile Include="ConfigFileProviderTest.cs" />
-    <Compile Include="DiskTests\DirectoryLookupServiceFixture.cs" />
-    <Compile Include="DiskTests\DiskProviderFixtureBase.cs" />
-    <Compile Include="DiskTests\FreeSpaceFixtureBase.cs" />
-    <Compile Include="DiskTests\IsParentFixtureBase.cs" />
-    <Compile Include="DiskTests\DiskTransferServiceFixture.cs" />
-    <Compile Include="EnsureTest\PathExtensionFixture.cs" />
-    <Compile Include="EnvironmentProviderTest.cs" />
-    <Compile Include="EnvironmentTests\EnvironmentProviderTest.cs" />
-    <Compile Include="EnvironmentTests\StartupArgumentsFixture.cs" />
-    <Compile Include="ExtensionTests\FromOctalStringFixture.cs" />
-    <Compile Include="ExtensionTests\IEnumerableExtensionTests\ExceptByFixture.cs" />
-    <Compile Include="ExtensionTests\IEnumerableExtensionTests\IntersectByFixture.cs" />
-    <Compile Include="ExtensionTests\Int64ExtensionFixture.cs" />
-    <Compile Include="Http\HttpClientFixture.cs" />
-    <Compile Include="Http\HttpHeaderFixture.cs" />
-    <Compile Include="Http\HttpRequestBuilderFixture.cs" />
-    <Compile Include="Http\HttpRequestFixture.cs" />
-    <Compile Include="Http\HttpUriFixture.cs" />
-    <Compile Include="InstrumentationTests\CleanseLogMessageFixture.cs" />
-    <Compile Include="LevenshteinDistanceFixture.cs" />
-    <Compile Include="OsPathFixture.cs" />
-    <Compile Include="PathExtensionFixture.cs" />
-    <Compile Include="ProcessProviderTests.cs" />
-    <Compile Include="ReflectionExtensions.cs" />
-    <Compile Include="ReflectionTests\ReflectionExtensionFixture.cs" />
-    <Compile Include="ServiceFactoryFixture.cs" />
-    <Compile Include="ServiceProviderTests.cs" />
-    <Compile Include="TPLTests\DebouncerFixture.cs" />
-    <Compile Include="TPLTests\RateLimitServiceFixture.cs" />
-    <Compile Include="WebClientTests.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\NzbDrone.Test.Common\App.config">
-      <Link>App.config</Link>
-    </None>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\NzbDrone.Common\NzbDrone.Common.csproj">
-      <Project>{F2BE0FDF-6E47-4827-A420-DD4EF82407F8}</Project>
-      <Name>NzbDrone.Common</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\NzbDrone.Core\NzbDrone.Core.csproj">
-      <Project>{FF5EE3B6-913B-47CE-9CEB-11C51B4E1205}</Project>
-      <Name>NzbDrone.Core</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\NzbDrone.Host\NzbDrone.Host.csproj">
-      <Project>{95C11A9E-56ED-456A-8447-2C89C1139266}</Project>
-      <Name>NzbDrone.Host</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\NzbDrone.Mono\NzbDrone.Mono.csproj">
-      <Project>{15ad7579-a314-4626-b556-663f51d97cd1}</Project>
-      <Name>NzbDrone.Mono</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\NzbDrone.Windows\NzbDrone.Windows.csproj">
-      <Project>{911284d3-f130-459e-836c-2430b6fbf21d}</Project>
-      <Name>NzbDrone.Windows</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\NzbDrone\NzbDrone.csproj">
-      <Project>{D12F7F2F-8A3C-415F-88FA-6DD061A84869}</Project>
-      <Name>NzbDrone</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\NzbDrone.Test.Common\NzbDrone.Test.Common.csproj">
-      <Project>{CADDFCE0-7509-4430-8364-2074E1EEFCA2}</Project>
-      <Name>NzbDrone.Test.Common</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\NzbDrone.Test.Dummy\NzbDrone.Test.Dummy.csproj">
-      <Project>{FAFB5948-A222-4CF6-AD14-026BE7564802}</Project>
-      <Name>NzbDrone.Test.Dummy</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PostBuildEvent Condition="'$(Configuration)|$(OS)' == 'Debug|Windows_NT'">xcopy /s /y "$(SolutionDir)\ExternalModules\CurlSharp\libs\i386\*" "$(TargetDir)"</PostBuildEvent>
-  </PropertyGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{BEC74619-DDBB-4FBA-B517-D3E20AFC9997}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>NzbDrone.Common.Test</RootNamespace>
+    <AssemblyName>NzbDrone.Common.Test</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+    <RestorePackages>true</RestorePackages>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x86\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <WarningLevel>4</WarningLevel>
+    <Optimize>false</Optimize>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <OutputPath>bin\x86\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="FluentAssertions, Version=4.18.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
+      <HintPath>..\packages\FluentAssertions.4.18.0\lib\net40\FluentAssertions.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="FluentAssertions.Core, Version=4.18.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
+      <HintPath>..\packages\FluentAssertions.4.18.0\lib\net40\FluentAssertions.Core.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+      <HintPath>..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll</HintPath>
+    </Reference>
+    <Reference Include="nunit.framework, Version=3.5.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.3.5.0\lib\net40\nunit.framework.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel" />
+    <Reference Include="System.ServiceProcess" />
+    <Reference Include="System.Transactions" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="Moq">
+      <HintPath>..\packages\Moq.4.0.10827\lib\NET40\Moq.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="CacheTests\CachedDictionaryFixture.cs" />
+    <Compile Include="CacheTests\CachedFixture.cs" />
+    <Compile Include="CacheTests\CachedManagerFixture.cs" />
+    <Compile Include="ConfigFileProviderTest.cs" />
+    <Compile Include="DiskTests\DirectoryLookupServiceFixture.cs" />
+    <Compile Include="DiskTests\DiskProviderFixtureBase.cs" />
+    <Compile Include="DiskTests\FreeSpaceFixtureBase.cs" />
+    <Compile Include="DiskTests\IsParentFixtureBase.cs" />
+    <Compile Include="DiskTests\DiskTransferServiceFixture.cs" />
+    <Compile Include="EnsureTest\PathExtensionFixture.cs" />
+    <Compile Include="EnvironmentProviderTest.cs" />
+    <Compile Include="EnvironmentTests\EnvironmentProviderTest.cs" />
+    <Compile Include="EnvironmentTests\StartupArgumentsFixture.cs" />
+    <Compile Include="ExtensionTests\FromOctalStringFixture.cs" />
+    <Compile Include="ExtensionTests\IEnumerableExtensionTests\ExceptByFixture.cs" />
+    <Compile Include="ExtensionTests\IEnumerableExtensionTests\IntersectByFixture.cs" />
+    <Compile Include="ExtensionTests\Int64ExtensionFixture.cs" />
+    <Compile Include="Http\HttpClientFixture.cs" />
+    <Compile Include="Http\HttpHeaderFixture.cs" />
+    <Compile Include="Http\HttpRequestBuilderFixture.cs" />
+    <Compile Include="Http\HttpRequestFixture.cs" />
+    <Compile Include="Http\HttpUriFixture.cs" />
+    <Compile Include="InstrumentationTests\CleanseLogMessageFixture.cs" />
+    <Compile Include="LevenshteinDistanceFixture.cs" />
+    <Compile Include="OsPathFixture.cs" />
+    <Compile Include="PathExtensionFixture.cs" />
+    <Compile Include="ProcessProviderTests.cs" />
+    <Compile Include="ReflectionExtensions.cs" />
+    <Compile Include="ReflectionTests\ReflectionExtensionFixture.cs" />
+    <Compile Include="ServiceFactoryFixture.cs" />
+    <Compile Include="ServiceProviderTests.cs" />
+    <Compile Include="TPLTests\DebouncerFixture.cs" />
+    <Compile Include="TPLTests\RateLimitServiceFixture.cs" />
+    <Compile Include="WebClientTests.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\NzbDrone.Test.Common\App.config">
+      <Link>App.config</Link>
+    </None>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\NzbDrone.Common\NzbDrone.Common.csproj">
+      <Project>{F2BE0FDF-6E47-4827-A420-DD4EF82407F8}</Project>
+      <Name>NzbDrone.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\NzbDrone.Core\NzbDrone.Core.csproj">
+      <Project>{FF5EE3B6-913B-47CE-9CEB-11C51B4E1205}</Project>
+      <Name>NzbDrone.Core</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\NzbDrone.Host\NzbDrone.Host.csproj">
+      <Project>{95C11A9E-56ED-456A-8447-2C89C1139266}</Project>
+      <Name>NzbDrone.Host</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\NzbDrone.Mono\NzbDrone.Mono.csproj">
+      <Project>{15ad7579-a314-4626-b556-663f51d97cd1}</Project>
+      <Name>NzbDrone.Mono</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\NzbDrone.Windows\NzbDrone.Windows.csproj">
+      <Project>{911284d3-f130-459e-836c-2430b6fbf21d}</Project>
+      <Name>NzbDrone.Windows</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\NzbDrone\NzbDrone.csproj">
+      <Project>{D12F7F2F-8A3C-415F-88FA-6DD061A84869}</Project>
+      <Name>NzbDrone</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\NzbDrone.Test.Common\NzbDrone.Test.Common.csproj">
+      <Project>{CADDFCE0-7509-4430-8364-2074E1EEFCA2}</Project>
+      <Name>NzbDrone.Test.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\NzbDrone.Test.Dummy\NzbDrone.Test.Dummy.csproj">
+      <Project>{FAFB5948-A222-4CF6-AD14-026BE7564802}</Project>
+      <Name>NzbDrone.Test.Dummy</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PostBuildEvent Condition="'$(Configuration)|$(OS)' == 'Debug|Windows_NT'">xcopy /s /y "$(SolutionDir)\ExternalModules\CurlSharp\libs\i386\*" "$(TargetDir)"</PostBuildEvent>
+  </PropertyGroup>
   <!-- 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.
   <Target Name="BeforeBuild">
   </Target>
   <Target Name="AfterBuild">
   </Target>
-  -->
+  -->
 </Project>

src/NzbDrone.Common.Test/packages.config

@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="FluentAssertions" version="4.18.0" targetFramework="net40" />
-  <package id="Moq" version="4.0.10827" />
-  <package id="NLog" version="4.4.12" targetFramework="net40" />
-  <package id="NUnit" version="3.5.0" targetFramework="net40" />
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="FluentAssertions" version="4.18.0" targetFramework="net40" />
+  <package id="Moq" version="4.0.10827" />
+  <package id="NLog" version="4.5.0-rc06" targetFramework="net40" />
+  <package id="NUnit" version="3.5.0" targetFramework="net40" />
 </packages>

src/NzbDrone.Common/Disk/DiskProviderBase.cs

@@ -294,12 +294,22 @@ namespace NzbDrone.Common.Disk
         {
             Ensure.That(path, () => path).IsValidPath();
 
+            if (dateTime.Before(DateTimeExtensions.Epoch))
+            {
+                dateTime = DateTimeExtensions.Epoch;
+            }
+
             Directory.SetLastWriteTimeUtc(path, dateTime);
         }
 
         public void FileSetLastWriteTime(string path, DateTime dateTime)
         {
             Ensure.That(path, () => path).IsValidPath();
+            
+            if (dateTime.Before(DateTimeExtensions.Epoch))
+            {
+                dateTime = DateTimeExtensions.Epoch;
+            }
 
             File.SetLastWriteTime(path, dateTime);
         }

src/NzbDrone.Common/Extensions/DateTimeExtensions.cs

@@ -38,5 +38,7 @@ namespace NzbDrone.Common.Extensions
         {
             return dateTime >= afterDateTime && dateTime <= beforeDateTime;
         }
+        
+        public static DateTime Epoch = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);
     }
 }

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

@@ -104,8 +104,8 @@ namespace NzbDrone.Common.Http.Dispatchers
                         default:
                             throw new NotSupportedException(string.Format("HttpCurl method {0} not supported", request.Method));
                     }
+                    curlEasy.FollowLocation = false;
                     curlEasy.UserAgent = request.UseSimplifiedUserAgent ? UserAgentBuilder.UserAgentSimplified : UserAgentBuilder.UserAgent; ;
-                    curlEasy.FollowLocation = request.AllowAutoRedirect;
 
                     if (request.RequestTimeout != TimeSpan.Zero)
                     {

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

@@ -30,7 +30,7 @@ namespace NzbDrone.Common.Http.Dispatchers
             webRequest.Method = request.Method.ToString();
             webRequest.UserAgent = request.UseSimplifiedUserAgent ? UserAgentBuilder.UserAgentSimplified : UserAgentBuilder.UserAgent;
             webRequest.KeepAlive = request.ConnectionKeepAlive;
-            webRequest.AllowAutoRedirect = request.AllowAutoRedirect;
+            webRequest.AllowAutoRedirect = false;
             webRequest.CookieContainer = cookies;
 
             if (request.RequestTimeout != TimeSpan.Zero)

src/NzbDrone.Common/Http/HttpClient.cs

@@ -7,6 +7,7 @@ using System.Net;
 using NLog;
 using NzbDrone.Common.Cache;
 using NzbDrone.Common.EnvironmentInfo;
+using NzbDrone.Common.Extensions;
 using NzbDrone.Common.Http.Dispatchers;
 using NzbDrone.Common.TPL;
 
@@ -44,46 +45,35 @@ namespace NzbDrone.Common.Http
 
         public HttpResponse Execute(HttpRequest request)
         {
-            foreach (var interceptor in _requestInterceptors)
+            var cookieContainer = InitializeRequestCookies(request);
+
+            var response = ExecuteRequest(request, cookieContainer);
+
+            if (request.AllowAutoRedirect && response.HasHttpRedirect)
             {
-                request = interceptor.PreRequest(request);
+                var autoRedirectChain = new List<string>();
+                autoRedirectChain.Add(request.Url.ToString());
+
+                do
+                {
+                    request.Url += new HttpUri(response.Headers.GetSingleValue("Location"));
+                    autoRedirectChain.Add(request.Url.ToString());
+
+                    _logger.Trace("Redirected to {0}", request.Url);
+
+                    if (autoRedirectChain.Count > 3)
+                    {
+                        throw new WebException($"Too many automatic redirections were attempted for {string.Join(" -> ", autoRedirectChain)}", WebExceptionStatus.ProtocolError);
+                    }
+
+                    response = ExecuteRequest(request, cookieContainer);
+                }
+                while (response.HasHttpRedirect);
             }
 
-            if (request.RateLimit != TimeSpan.Zero)
+            if (response.HasHttpRedirect && !RuntimeInfoBase.IsProduction)
             {
-                _rateLimitService.WaitAndPulse(request.Url.Host, request.RateLimit);
-            }
-
-            _logger.Trace(request);
-
-            var stopWatch = Stopwatch.StartNew();
-
-            var cookies = PrepareRequestCookies(request);
-
-            var response = _httpDispatcher.GetResponse(request, cookies);
-
-            HandleResponseCookies(request, cookies);
-
-            stopWatch.Stop();
-
-            _logger.Trace("{0} ({1} ms)", response, stopWatch.ElapsedMilliseconds);
-
-            foreach (var interceptor in _requestInterceptors)
-            {
-                response = interceptor.PostResponse(response);
-            }
-
-            if (request.LogResponseContent)
-            {
-                _logger.Trace("Response content ({0} bytes): {1}", response.ResponseData.Length, response.Content);
-            }
-
-            if (!RuntimeInfoBase.IsProduction &&
-                (response.StatusCode == HttpStatusCode.Moved ||
-                 response.StatusCode == HttpStatusCode.MovedPermanently ||
-                 response.StatusCode == HttpStatusCode.Found))
-            {
-                _logger.Error("Server requested a redirect to [" + response.Headers["Location"] + "]. Update the request URL to avoid this redirect.");
+                _logger.Error("Server requested a redirect to [{0}] while in developer mode. Update the request URL to avoid this redirect.", response.Headers["Location"]);
             }
 
             if (!request.SuppressHttpError && response.HasHttpError)
@@ -103,49 +93,123 @@ namespace NzbDrone.Common.Http
             return response;
         }
 
-        private CookieContainer PrepareRequestCookies(HttpRequest request)
+        private HttpResponse ExecuteRequest(HttpRequest request, CookieContainer cookieContainer)
+        {
+            foreach (var interceptor in _requestInterceptors)
+            {
+                request = interceptor.PreRequest(request);
+            }
+
+            if (request.RateLimit != TimeSpan.Zero)
+            {
+                _rateLimitService.WaitAndPulse(request.Url.Host, request.RateLimit);
+            }
+
+            _logger.Trace(request);
+
+            var stopWatch = Stopwatch.StartNew();
+
+            PrepareRequestCookies(request, cookieContainer);
+
+            var response = _httpDispatcher.GetResponse(request, cookieContainer);
+
+            HandleResponseCookies(response, cookieContainer);
+
+            stopWatch.Stop();
+
+            _logger.Trace("{0} ({1} ms)", response, stopWatch.ElapsedMilliseconds);
+
+            foreach (var interceptor in _requestInterceptors)
+            {
+                response = interceptor.PostResponse(response);
+            }
+
+            if (request.LogResponseContent)
+            {
+                _logger.Trace("Response content ({0} bytes): {1}", response.ResponseData.Length, response.Content);
+            }
+
+            return response;
+        }
+
+        private CookieContainer InitializeRequestCookies(HttpRequest request)
         {
             lock (_cookieContainerCache)
             {
-                var persistentCookieContainer = _cookieContainerCache.Get("container", () => new CookieContainer());
+                var sourceContainer = new CookieContainer();
+
+                var presistentContainer = _cookieContainerCache.Get("container", () => new CookieContainer());
+
+                if (!request.IgnorePersistentCookies)
+                {
+                    var persistentCookies = presistentContainer.GetCookies((Uri)request.Url);
+                    sourceContainer.Add(persistentCookies);   
+                }
 
                 if (request.Cookies.Count != 0)
                 {
                     foreach (var pair in request.Cookies)
                     {
-                        persistentCookieContainer.Add(new Cookie(pair.Key, pair.Value, "/", request.Url.Host)
+                        var cookie = new Cookie(pair.Key, pair.Value, "/")
                         {
                             // Use Now rather than UtcNow to work around Mono cookie expiry bug.
                             // See https://gist.github.com/ta264/7822b1424f72e5b4c961
                             Expires = DateTime.Now.AddHours(1)
-                        });
+                        };
+
+                        sourceContainer.Add((Uri)request.Url, cookie);
+
+                        if (request.StoreRequestCookie)
+                        {
+                            presistentContainer.Add((Uri)request.Url, cookie);
+                        }
                     }
                 }
 
-                var requestCookies = persistentCookieContainer.GetCookies((Uri)request.Url);
-
-                var cookieContainer = new CookieContainer();
-
-                cookieContainer.Add(requestCookies);
-
-                return cookieContainer;
+                return sourceContainer;
             }
         }
 
-        private void HandleResponseCookies(HttpRequest request, CookieContainer cookieContainer)
+        private void PrepareRequestCookies(HttpRequest request, CookieContainer cookieContainer)
         {
-            if (!request.StoreResponseCookie)
+            // Don't collect persistnet cookies for intermediate/redirected urls.
+            /*lock (_cookieContainerCache)
+            {
+                var presistentContainer = _cookieContainerCache.Get("container", () => new CookieContainer());
+                var persistentCookies = presistentContainer.GetCookies((Uri)request.Url);
+                var existingCookies = cookieContainer.GetCookies((Uri)request.Url);
+
+                cookieContainer.Add(persistentCookies);
+                cookieContainer.Add(existingCookies);
+            }*/
+        }
+
+        private void HandleResponseCookies(HttpResponse response, CookieContainer cookieContainer)
+        {
+            var cookieHeaders = response.GetCookieHeaders();
+            if (cookieHeaders.Empty())
             {
                 return;
             }
 
-            lock (_cookieContainerCache)
+            if (response.Request.StoreResponseCookie)
             {
-                var persistentCookieContainer = _cookieContainerCache.Get("container", () => new CookieContainer());
+                lock (_cookieContainerCache)
+                {
+                    var persistentCookieContainer = _cookieContainerCache.Get("container", () => new CookieContainer());
 
-                var cookies = cookieContainer.GetCookies((Uri)request.Url);
-
-                persistentCookieContainer.Add(cookies);
+                    foreach (var cookieHeader in cookieHeaders)
+                    {
+                        try
+                        {
+                            persistentCookieContainer.SetCookies((Uri)response.Request.Url, cookieHeader);
+                        }
+                        catch (Exception ex)
+                        {
+                            _logger.Debug(ex, "Invalid cookie in {0}", response.Request.Url);
+                        }
+                    }
+                }
             }
         }
 
@@ -210,4 +274,4 @@ namespace NzbDrone.Common.Http
             return new HttpResponse<T>(response);
         }
     }
-}
+}

src/NzbDrone.Common/Http/HttpRequest.cs

@@ -13,6 +13,8 @@ namespace NzbDrone.Common.Http
             Url = new HttpUri(url);
             Headers = new HttpHeader();
             AllowAutoRedirect = true;
+            StoreRequestCookie = true;
+            IgnorePersistentCookies = false;
             Cookies = new Dictionary<string, string>();
             
             if (!RuntimeInfoBase.IsProduction)
@@ -37,6 +39,8 @@ namespace NzbDrone.Common.Http
         public bool ConnectionKeepAlive { get; set; }
         public bool LogResponseContent { get; set; }
         public Dictionary<string, string> Cookies { get; private set; }
+        public bool IgnorePersistentCookies { get; set; }
+        public bool StoreRequestCookie { get; set; }
         public bool StoreResponseCookie { get; set; }
         public TimeSpan RequestTimeout { get; set; }
         public TimeSpan RateLimit { get; set; }

src/NzbDrone.Common/Http/HttpResponse.cs

@@ -35,7 +35,7 @@ namespace NzbDrone.Common.Http
 
         private string _content;
 
-        public string Content 
+        public string Content
         {
             get
             {
@@ -51,20 +51,26 @@ namespace NzbDrone.Common.Http
 
         public bool HasHttpError => (int)StatusCode >= 400;
 
+        public bool HasHttpRedirect => StatusCode == HttpStatusCode.Moved ||
+                                       StatusCode == HttpStatusCode.MovedPermanently ||
+                                       StatusCode == HttpStatusCode.Found;
+
+        public string[] GetCookieHeaders()
+        {
+            return Headers.GetValues("Set-Cookie") ?? new string[0];
+        }
+
         public Dictionary<string, string> GetCookies()
         {
             var result = new Dictionary<string, string>();
 
-            var setCookieHeaders = Headers.GetValues("Set-Cookie");
-            if (setCookieHeaders != null)
+            var setCookieHeaders = GetCookieHeaders();
+            foreach (var cookie in setCookieHeaders)
             {
-                foreach (var cookie in setCookieHeaders)
+                var match = RegexSetCookie.Match(cookie);
+                if (match.Success)
                 {
-                    var match = RegexSetCookie.Match(cookie);
-                    if (match.Success)
-                    {
-                        result[match.Groups[1].Value] = match.Groups[2].Value;
-                    }
+                    result[match.Groups[1].Value] = match.Groups[2].Value;
                 }
             }
 
@@ -95,4 +101,4 @@ namespace NzbDrone.Common.Http
 
         public T Resource { get; private set; }
     }
-}
+}

src/NzbDrone.Common/Http/HttpUri.cs

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

src/NzbDrone.Common/NzbDrone.Common.csproj

@@ -1,261 +1,265 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{F2BE0FDF-6E47-4827-A420-DD4EF82407F8}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>NzbDrone.Common</RootNamespace>
-    <AssemblyName>NzbDrone.Common</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
-    <TargetFrameworkProfile>
-    </TargetFrameworkProfile>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>..\..\_output\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <WarningLevel>4</WarningLevel>
-    <Optimize>false</Optimize>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <OutputPath>..\..\_output\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Newtonsoft.Json.6.0.6\lib\net40\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c">
-      <HintPath>..\packages\NLog.4.4.12\lib\net40\NLog.dll</HintPath>
-    </Reference>
-    <Reference Include="Org.Mentalis, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\DotNet4.SocksProxy.1.3.2.0\lib\net40\Org.Mentalis.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="SocksWebProxy, Version=1.3.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\DotNet4.SocksProxy.1.3.2.0\lib\net40\SocksWebProxy.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.Configuration.Install" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.ServiceProcess" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="ICSharpCode.SharpZipLib">
-      <HintPath>..\packages\ICSharpCode.SharpZipLib.Patched.0.86.5\lib\net20\ICSharpCode.SharpZipLib.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Xml.Linq" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="ArchiveService.cs" />
-    <Compile Include="Cache\Cached.cs" />
-    <Compile Include="Cache\CacheManager.cs" />
-    <Compile Include="Cache\CachedDictionary.cs" />
-    <Compile Include="Cache\ICached.cs" />
-    <Compile Include="Cache\ICachedDictionary.cs" />
-    <Compile Include="Cloud\SonarrCloudRequestBuilder.cs" />
-    <Compile Include="Composition\Container.cs" />
-    <Compile Include="Composition\ContainerBuilderBase.cs" />
-    <Compile Include="Composition\IContainer.cs" />
-    <Compile Include="ConsoleService.cs" />
-    <Compile Include="ConvertBase32.cs" />
-    <Compile Include="Crypto\HashProvider.cs" />
-    <Compile Include="Disk\FileSystemLookupService.cs" />
-    <Compile Include="Disk\DriveInfoMount.cs" />
-    <Compile Include="Disk\IMount.cs" />
-    <Compile Include="Disk\RelativeFileSystemModel.cs" />
-    <Compile Include="Disk\FileSystemModel.cs" />
-    <Compile Include="Disk\FileSystemResult.cs" />
-    <Compile Include="Extensions\DictionaryExtensions.cs" />
-    <Compile Include="Disk\GdiPlusInterop.cs" />
-    <Compile Include="Disk\OsPath.cs" />
-    <Compile Include="Disk\DiskProviderBase.cs" />
-    <Compile Include="Disk\IDiskProvider.cs" />
-    <Compile Include="Disk\DiskTransferService.cs" />
-    <Compile Include="Disk\TransferMode.cs" />
-    <Compile Include="EnsureThat\Ensure.cs" />
-    <Compile Include="EnsureThat\EnsureBoolExtensions.cs" />
-    <Compile Include="EnsureThat\EnsureCollectionExtensions.cs" />
-    <Compile Include="EnsureThat\EnsureDateTimeExtensions.cs" />
-    <Compile Include="EnsureThat\EnsureDecimalExtensions.cs" />
-    <Compile Include="EnsureThat\EnsureDoubleExtensions.cs" />
-    <Compile Include="EnsureThat\EnsureGuidExtensions.cs" />
-    <Compile Include="EnsureThat\EnsureIntExtensions.cs" />
-    <Compile Include="EnsureThat\EnsureLongExtensions.cs" />
-    <Compile Include="EnsureThat\EnsureNullableValueTypeExtensions.cs" />
-    <Compile Include="EnsureThat\EnsureObjectExtensions.cs" />
-    <Compile Include="EnsureThat\EnsureShortExtensions.cs" />
-    <Compile Include="EnsureThat\EnsureStringExtensions.cs" />
-    <Compile Include="EnsureThat\EnsureTypeExtensions.cs" />
-    <Compile Include="EnsureThat\ExceptionFactory.cs" />
-    <Compile Include="EnsureThat\ExpressionExtensions.cs" />
-    <Compile Include="EnsureThat\Param.cs" />
-    <Compile Include="EnsureThat\Resources\ExceptionMessages.Designer.cs" />
-    <Compile Include="EnsureThat\TypeParam.cs" />
-    <Compile Include="EnvironmentInfo\AppFolderFactory.cs" />
-    <Compile Include="EnvironmentInfo\AppFolderInfo.cs" />
-    <Compile Include="EnvironmentInfo\BuildInfo.cs" />
-    <Compile Include="EnvironmentInfo\OsInfo.cs" />
-    <Compile Include="EnvironmentInfo\IRuntimeInfo.cs" />
-    <Compile Include="EnvironmentInfo\RuntimeInfoBase.cs" />
-    <Compile Include="EnvironmentInfo\StartupContext.cs" />
-    <Compile Include="Exceptions\NotParentException.cs" />
-    <Compile Include="Exceptions\NzbDroneException.cs" />
-    <Compile Include="Exceptron\Configuration\ExceptronConfiguration.cs" />
-    <Compile Include="Exceptron\ExceptionData.cs" />
-    <Compile Include="Exceptron\ExceptionExtentions.cs" />
-    <Compile Include="Exceptron\ExceptionSeverity.cs" />
-    <Compile Include="Exceptron\ExceptronApiException.cs" />
-    <Compile Include="Exceptron\ExceptronClient.cs" />
-    <Compile Include="Exceptron\fastJSON\Getters.cs" />
-    <Compile Include="Exceptron\fastJSON\JSON.cs" />
-    <Compile Include="Exceptron\fastJSON\JsonParser.cs" />
-    <Compile Include="Exceptron\fastJSON\JsonSerializer.cs" />
-    <Compile Include="Exceptron\fastJSON\SafeDictionary.cs" />
-    <Compile Include="Exceptron\IExceptronClient.cs" />
-    <Compile Include="Exceptron\IRestClient.cs" />
-    <Compile Include="Exceptron\Message\ExceptionReport.cs" />
-    <Compile Include="Exceptron\Message\ExceptionResponse.cs" />
-    <Compile Include="Exceptron\Message\Frame.cs" />
-    <Compile Include="Exceptron\RestClient.cs" />
-    <Compile Include="Expansive\CircularReferenceException.cs" />
-    <Compile Include="Expansive\Expansive.cs" />
-    <Compile Include="Expansive\PatternStyle.cs" />
-    <Compile Include="Expansive\Tree.cs" />
-    <Compile Include="Expansive\TreeNode.cs" />
-    <Compile Include="Expansive\TreeNodeList.cs" />
-    <Compile Include="Extensions\Base64Extensions.cs" />
-    <Compile Include="Extensions\DateTimeExtensions.cs" />
-    <Compile Include="Crypto\HashConverter.cs" />
-    <Compile Include="Extensions\Int64Extensions.cs" />
-    <Compile Include="Extensions\ObjectExtensions.cs" />
-    <Compile Include="Extensions\StreamExtensions.cs" />
-    <Compile Include="Extensions\UrlExtensions.cs" />
-    <Compile Include="Extensions\XmlExtensions.cs" />
-    <Compile Include="HashUtil.cs" />
-    <Compile Include="Http\Dispatchers\CurlHttpDispatcher.cs" />
-    <Compile Include="Http\Dispatchers\FallbackHttpDispatcher.cs" />
-    <Compile Include="Http\Dispatchers\IHttpDispatcher.cs" />
-    <Compile Include="Http\Dispatchers\ManagedHttpDispatcher.cs" />
-    <Compile Include="Http\Proxy\ManagedWebProxyFactory.cs" />
-    <Compile Include="Http\GZipWebClient.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="Http\HttpAccept.cs" />
-    <Compile Include="Http\HttpClient.cs" />
-    <Compile Include="Http\HttpException.cs" />
-    <Compile Include="Http\HttpFormData.cs" />
-    <Compile Include="Http\HttpHeader.cs" />
-    <Compile Include="Http\HttpMethod.cs" />
-    <Compile Include="Http\HttpProvider.cs" />
-    <Compile Include="Http\HttpRequest.cs" />
-    <Compile Include="Http\Proxy\HttpProxySettings.cs" />
-    <Compile Include="Http\HttpResponse.cs" />
-    <Compile Include="Http\HttpUri.cs" />
-    <Compile Include="Http\Proxy\IHttpProxySettingsProvider.cs" />
-    <Compile Include="Http\IHttpRequestInterceptor.cs" />
-    <Compile Include="Http\JsonRpcRequestBuilder.cs" />
-    <Compile Include="Http\JsonRpcResponse.cs" />
-    <Compile Include="Http\NzbDroneWebClient.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="Http\HttpRequestBuilder.cs" />
-    <Compile Include="Http\HttpRequestBuilderFactory.cs" />
-    <Compile Include="Http\Proxy\ProxyType.cs" />
-    <Compile Include="Http\TooManyRequestsException.cs" />
-    <Compile Include="Extensions\IEnumerableExtensions.cs" />
-    <Compile Include="Http\UserAgentBuilder.cs" />
-    <Compile Include="Instrumentation\CleanseLogMessage.cs" />
-    <Compile Include="Instrumentation\ExceptronTarget.cs" />
-    <Compile Include="Instrumentation\Extensions\LoggerProgressExtensions.cs" />
-    <Compile Include="Instrumentation\GlobalExceptionHandlers.cs" />
-    <Compile Include="Instrumentation\LogEventExtensions.cs" />
-    <Compile Include="Instrumentation\NzbDroneFileTarget.cs" />
-    <Compile Include="Instrumentation\NzbDroneLogger.cs" />
-    <Compile Include="Instrumentation\VersionLayoutRenderer.cs" />
-    <Compile Include="Extensions\LevenstheinExtensions.cs" />
-    <Compile Include="Messaging\IEvent.cs" />
-    <Compile Include="Messaging\IMessage.cs" />
-    <Compile Include="Model\ProcessInfo.cs" />
-    <Compile Include="PathEqualityComparer.cs" />
-    <Compile Include="Extensions\PathExtensions.cs" />
-    <Compile Include="Processes\PidFileProvider.cs" />
-    <Compile Include="Processes\ProcessOutput.cs" />
-    <Compile Include="Processes\ProcessOutputLine.cs" />
-    <Compile Include="Processes\ProcessProvider.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Properties\SharedAssemblyInfo.cs" />
-    <Compile Include="Reflection\ReflectionExtensions.cs" />
-    <Compile Include="Extensions\ResourceExtensions.cs" />
-    <Compile Include="Security\SecurityProtocolPolicy.cs" />
-    <Compile Include="Security\X509CertificateValidationPolicy.cs" />
-    <Compile Include="Serializer\HttpUriConverter.cs" />
-    <Compile Include="Serializer\IntConverter.cs" />
-    <Compile Include="Serializer\Json.cs" />
-    <Compile Include="ServiceFactory.cs" />
-    <Compile Include="ServiceProvider.cs" />
-    <Compile Include="Extensions\StringExtensions.cs" />
-    <Compile Include="TinyIoC.cs" />
-    <Compile Include="TPL\Debouncer.cs" />
-    <Compile Include="TPL\LimitedConcurrencyLevelTaskScheduler.cs" />
-    <Compile Include="TPL\RateLimitService.cs" />
-    <Compile Include="TPL\TaskExtensions.cs" />
-    <Compile Include="Extensions\TryParseExtensions.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="app.config" />
-    <None Include="CurlSharp.dll.config">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="packages.config">
-      <SubType>Designer</SubType>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="EnsureThat\Resources\ExceptionMessages.resx" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Exceptron\fastJSON\license.txt" />
-    <Content Include="Expansive\license.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\ExternalModules\CurlSharp\CurlSharp\CurlSharp.csproj">
-      <Project>{74420a79-cc16-442c-8b1e-7c1b913844f0}</Project>
-      <Name>CurlSharp</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\LogentriesNLog\LogentriesNLog.csproj">
-      <Project>{9DC31DE3-79FF-47A8-96B4-6BA18F6BB1CB}</Project>
-      <Name>LogentriesNLog</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- 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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{F2BE0FDF-6E47-4827-A420-DD4EF82407F8}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>NzbDrone.Common</RootNamespace>
+    <AssemblyName>NzbDrone.Common</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+    <RestorePackages>true</RestorePackages>
+    <TargetFrameworkProfile>
+    </TargetFrameworkProfile>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>..\..\_output\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <WarningLevel>4</WarningLevel>
+    <Optimize>false</Optimize>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <OutputPath>..\..\_output\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Newtonsoft.Json.6.0.6\lib\net40\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+      <HintPath>..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll</HintPath>
+    </Reference>
+    <Reference Include="Org.Mentalis, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\DotNet4.SocksProxy.1.3.2.0\lib\net40\Org.Mentalis.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="SocksWebProxy, Version=1.3.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\DotNet4.SocksProxy.1.3.2.0\lib\net40\SocksWebProxy.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Configuration.Install" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel" />
+    <Reference Include="System.ServiceProcess" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="ICSharpCode.SharpZipLib">
+      <HintPath>..\packages\ICSharpCode.SharpZipLib.Patched.0.86.5\lib\net20\ICSharpCode.SharpZipLib.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Transactions" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Xml.Linq" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="ArchiveService.cs" />
+    <Compile Include="Cache\Cached.cs" />
+    <Compile Include="Cache\CacheManager.cs" />
+    <Compile Include="Cache\CachedDictionary.cs" />
+    <Compile Include="Cache\ICached.cs" />
+    <Compile Include="Cache\ICachedDictionary.cs" />
+    <Compile Include="Cloud\SonarrCloudRequestBuilder.cs" />
+    <Compile Include="Composition\Container.cs" />
+    <Compile Include="Composition\ContainerBuilderBase.cs" />
+    <Compile Include="Composition\IContainer.cs" />
+    <Compile Include="ConsoleService.cs" />
+    <Compile Include="ConvertBase32.cs" />
+    <Compile Include="Crypto\HashProvider.cs" />
+    <Compile Include="Disk\FileSystemLookupService.cs" />
+    <Compile Include="Disk\DriveInfoMount.cs" />
+    <Compile Include="Disk\IMount.cs" />
+    <Compile Include="Disk\RelativeFileSystemModel.cs" />
+    <Compile Include="Disk\FileSystemModel.cs" />
+    <Compile Include="Disk\FileSystemResult.cs" />
+    <Compile Include="Extensions\DictionaryExtensions.cs" />
+    <Compile Include="Disk\GdiPlusInterop.cs" />
+    <Compile Include="Disk\OsPath.cs" />
+    <Compile Include="Disk\DiskProviderBase.cs" />
+    <Compile Include="Disk\IDiskProvider.cs" />
+    <Compile Include="Disk\DiskTransferService.cs" />
+    <Compile Include="Disk\TransferMode.cs" />
+    <Compile Include="EnsureThat\Ensure.cs" />
+    <Compile Include="EnsureThat\EnsureBoolExtensions.cs" />
+    <Compile Include="EnsureThat\EnsureCollectionExtensions.cs" />
+    <Compile Include="EnsureThat\EnsureDateTimeExtensions.cs" />
+    <Compile Include="EnsureThat\EnsureDecimalExtensions.cs" />
+    <Compile Include="EnsureThat\EnsureDoubleExtensions.cs" />
+    <Compile Include="EnsureThat\EnsureGuidExtensions.cs" />
+    <Compile Include="EnsureThat\EnsureIntExtensions.cs" />
+    <Compile Include="EnsureThat\EnsureLongExtensions.cs" />
+    <Compile Include="EnsureThat\EnsureNullableValueTypeExtensions.cs" />
+    <Compile Include="EnsureThat\EnsureObjectExtensions.cs" />
+    <Compile Include="EnsureThat\EnsureShortExtensions.cs" />
+    <Compile Include="EnsureThat\EnsureStringExtensions.cs" />
+    <Compile Include="EnsureThat\EnsureTypeExtensions.cs" />
+    <Compile Include="EnsureThat\ExceptionFactory.cs" />
+    <Compile Include="EnsureThat\ExpressionExtensions.cs" />
+    <Compile Include="EnsureThat\Param.cs" />
+    <Compile Include="EnsureThat\Resources\ExceptionMessages.Designer.cs" />
+    <Compile Include="EnsureThat\TypeParam.cs" />
+    <Compile Include="EnvironmentInfo\AppFolderFactory.cs" />
+    <Compile Include="EnvironmentInfo\AppFolderInfo.cs" />
+    <Compile Include="EnvironmentInfo\BuildInfo.cs" />
+    <Compile Include="EnvironmentInfo\OsInfo.cs" />
+    <Compile Include="EnvironmentInfo\IRuntimeInfo.cs" />
+    <Compile Include="EnvironmentInfo\RuntimeInfoBase.cs" />
+    <Compile Include="EnvironmentInfo\StartupContext.cs" />
+    <Compile Include="Exceptions\NotParentException.cs" />
+    <Compile Include="Exceptions\NzbDroneException.cs" />
+    <Compile Include="Exceptron\Configuration\ExceptronConfiguration.cs" />
+    <Compile Include="Exceptron\ExceptionData.cs" />
+    <Compile Include="Exceptron\ExceptionExtentions.cs" />
+    <Compile Include="Exceptron\ExceptionSeverity.cs" />
+    <Compile Include="Exceptron\ExceptronApiException.cs" />
+    <Compile Include="Exceptron\ExceptronClient.cs" />
+    <Compile Include="Exceptron\fastJSON\Getters.cs" />
+    <Compile Include="Exceptron\fastJSON\JSON.cs" />
+    <Compile Include="Exceptron\fastJSON\JsonParser.cs" />
+    <Compile Include="Exceptron\fastJSON\JsonSerializer.cs" />
+    <Compile Include="Exceptron\fastJSON\SafeDictionary.cs" />
+    <Compile Include="Exceptron\IExceptronClient.cs" />
+    <Compile Include="Exceptron\IRestClient.cs" />
+    <Compile Include="Exceptron\Message\ExceptionReport.cs" />
+    <Compile Include="Exceptron\Message\ExceptionResponse.cs" />
+    <Compile Include="Exceptron\Message\Frame.cs" />
+    <Compile Include="Exceptron\RestClient.cs" />
+    <Compile Include="Expansive\CircularReferenceException.cs" />
+    <Compile Include="Expansive\Expansive.cs" />
+    <Compile Include="Expansive\PatternStyle.cs" />
+    <Compile Include="Expansive\Tree.cs" />
+    <Compile Include="Expansive\TreeNode.cs" />
+    <Compile Include="Expansive\TreeNodeList.cs" />
+    <Compile Include="Extensions\Base64Extensions.cs" />
+    <Compile Include="Extensions\DateTimeExtensions.cs" />
+    <Compile Include="Crypto\HashConverter.cs" />
+    <Compile Include="Extensions\Int64Extensions.cs" />
+    <Compile Include="Extensions\ObjectExtensions.cs" />
+    <Compile Include="Extensions\StreamExtensions.cs" />
+    <Compile Include="Extensions\UrlExtensions.cs" />
+    <Compile Include="Extensions\XmlExtensions.cs" />
+    <Compile Include="HashUtil.cs" />
+    <Compile Include="Http\Dispatchers\CurlHttpDispatcher.cs" />
+    <Compile Include="Http\Dispatchers\FallbackHttpDispatcher.cs" />
+    <Compile Include="Http\Dispatchers\IHttpDispatcher.cs" />
+    <Compile Include="Http\Dispatchers\ManagedHttpDispatcher.cs" />
+    <Compile Include="Http\Proxy\ManagedWebProxyFactory.cs" />
+    <Compile Include="Http\GZipWebClient.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Http\HttpAccept.cs" />
+    <Compile Include="Http\HttpClient.cs" />
+    <Compile Include="Http\HttpException.cs" />
+    <Compile Include="Http\HttpFormData.cs" />
+    <Compile Include="Http\HttpHeader.cs" />
+    <Compile Include="Http\HttpMethod.cs" />
+    <Compile Include="Http\HttpProvider.cs" />
+    <Compile Include="Http\HttpRequest.cs" />
+    <Compile Include="Http\Proxy\HttpProxySettings.cs" />
+    <Compile Include="Http\HttpResponse.cs" />
+    <Compile Include="Http\HttpUri.cs" />
+    <Compile Include="Http\Proxy\IHttpProxySettingsProvider.cs" />
+    <Compile Include="Http\IHttpRequestInterceptor.cs" />
+    <Compile Include="Http\JsonRpcRequestBuilder.cs" />
+    <Compile Include="Http\JsonRpcResponse.cs" />
+    <Compile Include="Http\NzbDroneWebClient.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Http\HttpRequestBuilder.cs" />
+    <Compile Include="Http\HttpRequestBuilderFactory.cs" />
+    <Compile Include="Http\Proxy\ProxyType.cs" />
+    <Compile Include="Http\TooManyRequestsException.cs" />
+    <Compile Include="Extensions\IEnumerableExtensions.cs" />
+    <Compile Include="Http\UserAgentBuilder.cs" />
+    <Compile Include="Instrumentation\CleanseLogMessage.cs" />
+    <Compile Include="Instrumentation\ExceptronTarget.cs" />
+    <Compile Include="Instrumentation\Extensions\LoggerProgressExtensions.cs" />
+    <Compile Include="Instrumentation\GlobalExceptionHandlers.cs" />
+    <Compile Include="Instrumentation\LogEventExtensions.cs" />
+    <Compile Include="Instrumentation\NzbDroneFileTarget.cs" />
+    <Compile Include="Instrumentation\NzbDroneLogger.cs" />
+    <Compile Include="Instrumentation\VersionLayoutRenderer.cs" />
+    <Compile Include="Extensions\LevenstheinExtensions.cs" />
+    <Compile Include="Messaging\IEvent.cs" />
+    <Compile Include="Messaging\IMessage.cs" />
+    <Compile Include="Model\ProcessInfo.cs" />
+    <Compile Include="PathEqualityComparer.cs" />
+    <Compile Include="Extensions\PathExtensions.cs" />
+    <Compile Include="Processes\PidFileProvider.cs" />
+    <Compile Include="Processes\ProcessOutput.cs" />
+    <Compile Include="Processes\ProcessOutputLine.cs" />
+    <Compile Include="Processes\ProcessProvider.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Properties\SharedAssemblyInfo.cs" />
+    <Compile Include="Reflection\ReflectionExtensions.cs" />
+    <Compile Include="Extensions\ResourceExtensions.cs" />
+    <Compile Include="Security\SecurityProtocolPolicy.cs" />
+    <Compile Include="Security\X509CertificateValidationPolicy.cs" />
+    <Compile Include="Serializer\HttpUriConverter.cs" />
+    <Compile Include="Serializer\IntConverter.cs" />
+    <Compile Include="Serializer\Json.cs" />
+    <Compile Include="Serializer\UnderscoreStringEnumConverter.cs" />
+    <Compile Include="ServiceFactory.cs" />
+    <Compile Include="ServiceProvider.cs" />
+    <Compile Include="Extensions\StringExtensions.cs" />
+    <Compile Include="TinyIoC.cs" />
+    <Compile Include="TPL\Debouncer.cs" />
+    <Compile Include="TPL\LimitedConcurrencyLevelTaskScheduler.cs" />
+    <Compile Include="TPL\RateLimitService.cs" />
+    <Compile Include="TPL\TaskExtensions.cs" />
+    <Compile Include="Extensions\TryParseExtensions.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+    <None Include="CurlSharp.dll.config">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="packages.config">
+      <SubType>Designer</SubType>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="EnsureThat\Resources\ExceptionMessages.resx" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Exceptron\fastJSON\license.txt" />
+    <Content Include="Expansive\license.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\ExternalModules\CurlSharp\CurlSharp\CurlSharp.csproj">
+      <Project>{74420a79-cc16-442c-8b1e-7c1b913844f0}</Project>
+      <Name>CurlSharp</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\LogentriesNLog\LogentriesNLog.csproj">
+      <Project>{9DC31DE3-79FF-47A8-96B4-6BA18F6BB1CB}</Project>
+      <Name>LogentriesNLog</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- 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.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
 </Project>

src/NzbDrone.Common/Serializer/UnderscoreStringEnumConverter.cs

@@ -0,0 +1,58 @@
+using System;
+using System.Text;
+using Newtonsoft.Json;
+
+namespace NzbDrone.Common.Serializer
+{
+    public class UnderscoreStringEnumConverter : JsonConverter
+    {
+        public object UnknownValue { get; set; }
+
+        public UnderscoreStringEnumConverter(object unknownValue)
+        {
+            UnknownValue = unknownValue;
+        }
+
+        public override bool CanConvert(Type objectType)
+        {
+            return objectType.IsEnum;
+        }
+
+        public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
+        {
+            var enumString = reader.Value.ToString().Replace("_", string.Empty);
+
+            try
+            {
+                return Enum.Parse(objectType, enumString, true);
+            }
+            catch
+            {
+                if (UnknownValue == null)
+                {
+                    throw;
+                }
+
+                return UnknownValue;
+            }
+        }
+
+        public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
+        {
+            var enumText = value.ToString();
+            var builder = new StringBuilder(enumText.Length + 4);
+            builder.Append(char.ToLower(enumText[0]));
+            for (int i = 1; i < enumText.Length; i++)
+            {
+                if (char.IsUpper(enumText[i]))
+                {
+                    builder.Append('_');
+                }
+                builder.Append(char.ToLower(enumText[i]));
+            }
+            enumText = builder.ToString();
+
+            writer.WriteValue(enumText);
+        }
+    }
+}

src/NzbDrone.Common/packages.config

@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="DotNet4.SocksProxy" version="1.3.2.0" targetFramework="net40" />
-  <package id="ICSharpCode.SharpZipLib.Patched" version="0.86.5" targetFramework="net40" />
-  <package id="Newtonsoft.Json" version="6.0.6" targetFramework="net40" />
-  <package id="NLog" version="4.4.12" targetFramework="net40" />
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="DotNet4.SocksProxy" version="1.3.2.0" targetFramework="net40" />
+  <package id="ICSharpCode.SharpZipLib.Patched" version="0.86.5" targetFramework="net40" />
+  <package id="Newtonsoft.Json" version="6.0.6" targetFramework="net40" />
+  <package id="NLog" version="4.5.0-rc06" targetFramework="net40" />
 </packages>

src/NzbDrone.Console/ConsoleApp.cs

@@ -23,7 +23,15 @@ namespace NzbDrone.Console
             try
             {
                 var startupArgs = new StartupContext(args);
-                NzbDroneLogger.Register(startupArgs, false, true);
+                try
+                {
+                    NzbDroneLogger.Register(startupArgs, false, true);
+                }
+                catch (Exception ex)
+                {
+                    System.Console.WriteLine("NLog Exception: " + ex.ToString());
+                    throw;
+                }
                 Bootstrap.Start(startupArgs, new ConsoleAlerts());
             }
             catch (SocketException e)

src/NzbDrone.Console/NzbDrone.Console.csproj

@@ -1,156 +1,163 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{3DCA7B58-B8B3-49AC-9D9E-56F4A0460976}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>NzbDrone.Console</RootNamespace>
-    <AssemblyName>Radarr.Console</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile>
-    </TargetFrameworkProfile>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\_output\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <UseVSHostingProcess>true</UseVSHostingProcess>
-    <CodeAnalysisRuleSet>BasicCorrectnessRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\..\_output\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup>
-    <ApplicationIcon>Radarr.ico</ApplicationIcon>
-  </PropertyGroup>
-  <PropertyGroup>
-    <StartupObject>NzbDrone.Console.ConsoleApp</StartupObject>
-  </PropertyGroup>
-  <PropertyGroup>
-    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.Owin, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Microsoft.Owin.2.1.0\lib\net40\Microsoft.Owin.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Owin.Hosting, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Microsoft.Owin.Hosting.2.1.0\lib\net40\Microsoft.Owin.Hosting.dll</HintPath>
-    </Reference>
-    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Newtonsoft.Json.6.0.6\lib\net40\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c">
-      <HintPath>..\packages\NLog.4.4.12\lib\net40\NLog.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="Owin">
-      <HintPath>..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\NzbDrone.Common\Properties\SharedAssemblyInfo.cs">
-      <Link>Properties\SharedAssemblyInfo.cs</Link>
-    </Compile>
-    <Compile Include="ConsoleAlerts.cs" />
-    <Compile Include="ConsoleApp.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include=".NETFramework,Version=v4.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft .NET Framework 4 %28x86 and x64%29</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Microsoft.AspNet.SignalR.Core\Microsoft.AspNet.SignalR.Core.csproj">
-      <Project>{1B9A82C4-BCA1-4834-A33E-226F17BE070B}</Project>
-      <Name>Microsoft.AspNet.SignalR.Core</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Microsoft.AspNet.SignalR.Owin\Microsoft.AspNet.SignalR.Owin.csproj">
-      <Project>{2B8C6DAD-4D85-41B1-83FD-248D9F347522}</Project>
-      <Name>Microsoft.AspNet.SignalR.Owin</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\NzbDrone.Common\NzbDrone.Common.csproj">
-      <Project>{F2BE0FDF-6E47-4827-A420-DD4EF82407F8}</Project>
-      <Name>NzbDrone.Common</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\NzbDrone.Host\NzbDrone.Host.csproj">
-      <Project>{95C11A9E-56ED-456A-8447-2C89C1139266}</Project>
-      <Name>NzbDrone.Host</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\NzbDrone.Host\app.config">
-      <Link>app.config</Link>
-    </None>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Radarr.ico" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-  </PropertyGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{3DCA7B58-B8B3-49AC-9D9E-56F4A0460976}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>NzbDrone.Console</RootNamespace>
+    <AssemblyName>Radarr.Console</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile>
+    </TargetFrameworkProfile>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+    <RestorePackages>true</RestorePackages>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <PlatformTarget>x86</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\_output\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <UseVSHostingProcess>true</UseVSHostingProcess>
+    <CodeAnalysisRuleSet>BasicCorrectnessRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <PlatformTarget>x86</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\..\_output\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>Radarr.ico</ApplicationIcon>
+  </PropertyGroup>
+  <PropertyGroup>
+    <StartupObject>NzbDrone.Console.ConsoleApp</StartupObject>
+  </PropertyGroup>
+  <PropertyGroup>
+    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="Microsoft.Owin, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Microsoft.Owin.2.1.0\lib\net40\Microsoft.Owin.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Owin.Hosting, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Microsoft.Owin.Hosting.2.1.0\lib\net40\Microsoft.Owin.Hosting.dll</HintPath>
+    </Reference>
+    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Newtonsoft.Json.6.0.6\lib\net40\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+      <HintPath>..\packages\NLog.4.5.0-rc06\lib\net40-client\NLog.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Core" />
+    <Reference Include="Owin">
+      <HintPath>..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Data" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel" />
+    <Reference Include="System.Transactions" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\NzbDrone.Common\Properties\SharedAssemblyInfo.cs">
+      <Link>Properties\SharedAssemblyInfo.cs</Link>
+    </Compile>
+    <Compile Include="ConsoleAlerts.cs" />
+    <Compile Include="ConsoleApp.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include=".NETFramework,Version=v4.0">
+      <Visible>False</Visible>
+      <ProductName>Microsoft .NET Framework 4 %28x86 and x64%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+      <Visible>False</Visible>
+      <ProductName>Windows Installer 3.1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Microsoft.AspNet.SignalR.Core\Microsoft.AspNet.SignalR.Core.csproj">
+      <Project>{1B9A82C4-BCA1-4834-A33E-226F17BE070B}</Project>
+      <Name>Microsoft.AspNet.SignalR.Core</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Microsoft.AspNet.SignalR.Owin\Microsoft.AspNet.SignalR.Owin.csproj">
+      <Project>{2B8C6DAD-4D85-41B1-83FD-248D9F347522}</Project>
+      <Name>Microsoft.AspNet.SignalR.Owin</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\NzbDrone.Common\NzbDrone.Common.csproj">
+      <Project>{F2BE0FDF-6E47-4827-A420-DD4EF82407F8}</Project>
+      <Name>NzbDrone.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\NzbDrone.Host\NzbDrone.Host.csproj">
+      <Project>{95C11A9E-56ED-456A-8447-2C89C1139266}</Project>
+      <Name>NzbDrone.Host</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\NzbDrone.Host\app.config">
+      <Link>app.config</Link>
+    </None>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Radarr.ico" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+  </PropertyGroup>
   <!-- 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.
   <Target Name="BeforeBuild">
   </Target>
   <Target Name="AfterBuild">
   </Target>
-  -->
+  -->
 </Project>

src/NzbDrone.Console/packages.config

@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Microsoft.Owin" version="2.1.0" targetFramework="net40" />
-  <package id="Microsoft.Owin.Hosting" version="2.1.0" targetFramework="net40" />
-  <package id="Newtonsoft.Json" version="6.0.6" targetFramework="net40" />
-  <package id="NLog" version="4.4.12" targetFramework="net40" />
-  <package id="Owin" version="1.0" targetFramework="net40" />
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Microsoft.Owin" version="2.1.0" targetFramework="net40" />
+  <package id="Microsoft.Owin.Hosting" version="2.1.0" targetFramework="net40" />
+  <package id="Newtonsoft.Json" version="6.0.6" targetFramework="net40" />
+  <package id="NLog" version="4.5.0-rc06" targetFramework="net40" />
+  <package id="Owin" version="1.0" targetFramework="net40" />
 </packages>

src/NzbDrone.Core.Test/Blacklisting/BlacklistRepositoryFixture.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using FluentAssertions;
@@ -19,9 +19,7 @@ namespace NzbDrone.Core.Test.Blacklisting
         {
             _blacklist = new Blacklist
                      {
-                         SeriesId = 12345,
                          MovieId = 1234,
-                         EpisodeIds = new List<int> { 1 },
                          Quality = new QualityModel(Quality.Bluray720p),
                          SourceTitle = "series.title.s01e01",
                          Date = DateTime.UtcNow
@@ -40,7 +38,7 @@ namespace NzbDrone.Core.Test.Blacklisting
         {
             Subject.Insert(_blacklist);
 
-            Subject.All().First().EpisodeIds.Should().Contain(_blacklist.EpisodeIds);
+            Subject.All().First().MovieId.Should().Be(_blacklist.MovieId);
         }
 
         [Test]

src/NzbDrone.Core.Test/Blacklisting/BlacklistServiceFixture.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using Moq;
 using NUnit.Framework;
@@ -19,9 +19,7 @@ namespace NzbDrone.Core.Test.Blacklisting
         {
             _event = new DownloadFailedEvent
                      {
-                         SeriesId = 0,
                          MovieId = 69,
-                         EpisodeIds = null,
                          Quality = new QualityModel(Quality.Bluray720p),
                          SourceTitle = "series.title.s01e01",
                          DownloadClient = "SabnzbdClient",

src/NzbDrone.Core.Test/BulkImport/AddMultiMoviesFixture.cs

@@ -3,9 +3,9 @@ using FluentAssertions;
 using NUnit.Framework;
 using Moq;
 using NzbDrone.Core.Organizer;
-using NzbDrone.Core.Tv;
+using NzbDrone.Core.Movies;
 using NzbDrone.Core.Test.Framework;
-using NzbDrone.Core.Tv.Events;
+using NzbDrone.Core.Movies.Events;
 using System.Collections.Generic;
 
 namespace NzbDrone.Core.Test.BulkImport

src/NzbDrone.Core.Test/DataAugmentation/DailySeries/DailySeriesDataProxyFixture.cs

@@ -1,28 +0,0 @@
-using FluentAssertions;
-using NUnit.Framework;
-using NzbDrone.Core.DataAugmentation.DailySeries;
-using NzbDrone.Core.Test.Framework;
-using NzbDrone.Test.Common.Categories;
-
-namespace NzbDrone.Core.Test.DataAugmentation.DailySeries
-{
-    [TestFixture]
-    [IntegrationTest]
-    public class DailySeriesDataProxyFixture : CoreTest<DailySeriesDataProxy>
-    {
-        [SetUp]
-        public void Setup()
-        {
-            UseRealHttp();
-        }
-
-        [Test]
-        [Ignore("Series")]
-        public void should_get_list_of_daily_series()
-        {
-            var list = Subject.GetDailySeriesIds();
-            list.Should().NotBeEmpty();
-            list.Should().OnlyHaveUniqueItems();
-        }
-    }
-}

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

@@ -1,35 +0,0 @@
-using FluentAssertions;
-using NUnit.Framework;
-using NzbDrone.Common.Extensions;
-using NzbDrone.Core.DataAugmentation.Scene;
-using NzbDrone.Core.Test.Framework;
-using NzbDrone.Test.Common.Categories;
-
-namespace NzbDrone.Core.Test.DataAugmentation.Scene
-{
-    [TestFixture]
-    [Ignore("Series")]
-    [IntegrationTest]
-    public class SceneMappingProxyFixture : CoreTest<SceneMappingProxy>
-    {
-        [SetUp]
-        public void Setup()
-        {
-            UseRealHttp();
-        }
-
-        [Test]
-
-        public void fetch_should_return_list_of_mappings()
-        {
-            var mappings = Subject.Fetch();
-
-            mappings.Should().NotBeEmpty();
-
-            mappings.Should().NotContain(c => c.SearchTerm.IsNullOrWhiteSpace());
-            mappings.Should().NotContain(c => c.Title.IsNullOrWhiteSpace());
-            mappings.Should().Contain(c => c.SeasonNumber > 0);
-        }
-
-    }
-}

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

@@ -1,337 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using FizzWare.NBuilder;
-using Moq;
-using NUnit.Framework;
-using NzbDrone.Core.DataAugmentation.Scene;
-using NzbDrone.Core.Test.Framework;
-using NzbDrone.Test.Common;
-using FluentAssertions;
-using NzbDrone.Common.Extensions;
-
-namespace NzbDrone.Core.Test.DataAugmentation.Scene
-{
-    [TestFixture]
-
-    public class SceneMappingServiceFixture : CoreTest<SceneMappingService>
-    {
-        private List<SceneMapping> _fakeMappings;
-
-        private Mock<ISceneMappingProvider> _provider1;
-        private Mock<ISceneMappingProvider> _provider2;
-            
-        [SetUp]
-        public void Setup()
-        {
-            _fakeMappings = Builder<SceneMapping>.CreateListOfSize(5).BuildListOfNew();
-
-            _fakeMappings[0].SearchTerm = "Words";
-            _fakeMappings[1].SearchTerm = "That";
-            _fakeMappings[2].SearchTerm = "Can";
-            _fakeMappings[3].SearchTerm = "Be";
-            _fakeMappings[4].SearchTerm = "Cleaned";
-
-            _fakeMappings[0].ParseTerm = "Words";
-            _fakeMappings[1].ParseTerm = "That";
-            _fakeMappings[2].ParseTerm = "Can";
-            _fakeMappings[3].ParseTerm = "Be";
-            _fakeMappings[4].ParseTerm = "Cleaned";
-
-            _provider1 = new Mock<ISceneMappingProvider>();
-            _provider1.Setup(s => s.GetSceneMappings()).Returns(_fakeMappings);
-
-            _provider2 = new Mock<ISceneMappingProvider>();
-            _provider2.Setup(s => s.GetSceneMappings()).Returns(_fakeMappings);
-        }
-
-        private void GivenProviders(IEnumerable<Mock<ISceneMappingProvider>> providers)
-        {
-            Mocker.SetConstant<IEnumerable<ISceneMappingProvider>>(providers.Select(s => s.Object));
-        }
-
-        [Test]
-        public void should_purge_existing_mapping_and_add_new_ones()
-        {
-            GivenProviders(new [] { _provider1 });
-
-            Mocker.GetMock<ISceneMappingRepository>().Setup(c => c.All()).Returns(_fakeMappings);
-
-            Subject.Execute(new UpdateSceneMappingCommand());
-
-            AssertMappingUpdated();
-        }
-
-        [Test]
-        public void should_not_delete_if_fetch_fails()
-        {
-            GivenProviders(new[] { _provider1 });
-
-            _provider1.Setup(c => c.GetSceneMappings()).Throws(new WebException());
-
-            Subject.Execute(new UpdateSceneMappingCommand());
-
-            AssertNoUpdate();
-
-            ExceptionVerification.ExpectedErrors(1);
-        }
-
-        [Test]
-        public void should_not_delete_if_fetch_returns_empty_list()
-        {
-            GivenProviders(new[] { _provider1 });
-
-            _provider1.Setup(c => c.GetSceneMappings()).Returns(new List<SceneMapping>());
-
-            Subject.Execute(new UpdateSceneMappingCommand());
-
-            AssertNoUpdate();
-
-            ExceptionVerification.ExpectedWarns(1);
-        }
-
-        [Test]
-        public void should_get_mappings_for_all_providers()
-        {
-            GivenProviders(new[] { _provider1, _provider2 });
-
-            Mocker.GetMock<ISceneMappingRepository>().Setup(c => c.All()).Returns(_fakeMappings);
-
-            Subject.Execute(new UpdateSceneMappingCommand());
-
-            _provider1.Verify(c => c.GetSceneMappings(), Times.Once());
-            _provider2.Verify(c => c.GetSceneMappings(), Times.Once());
-        }
-
-        [Test]
-        public void should_refresh_cache_if_cache_is_empty_when_looking_for_tvdb_id()
-        {
-            Subject.FindTvdbId("title");
-
-            Mocker.GetMock<ISceneMappingRepository>()
-                  .Verify(v => v.All(), Times.Once());
-        }
-
-        [Test]
-        public void should_not_refresh_cache_if_cache_is_not_empty_when_looking_for_tvdb_id()
-        {
-            GivenProviders(new[] { _provider1 });
-
-            Mocker.GetMock<ISceneMappingRepository>()
-                  .Setup(s => s.All())
-                  .Returns(Builder<SceneMapping>.CreateListOfSize(1).Build());
-
-
-            Subject.Execute(new UpdateSceneMappingCommand());
-
-            Mocker.GetMock<ISceneMappingRepository>()
-                  .Verify(v => v.All(), Times.Once());
-
-            Subject.FindTvdbId("title");
-
-            Mocker.GetMock<ISceneMappingRepository>()
-                  .Verify(v => v.All(), Times.Once());
-        }
-
-        [Test]
-        public void should_not_add_mapping_with_blank_title()
-        {
-            GivenProviders(new[] { _provider1 });
-
-            var fakeMappings = Builder<SceneMapping>.CreateListOfSize(2)
-                                                    .TheLast(1)
-                                                    .With(m => m.Title = null)
-                                                    .Build()
-                                                    .ToList();
-
-            _provider1.Setup(s => s.GetSceneMappings()).Returns(fakeMappings);
-
-            Mocker.GetMock<ISceneMappingRepository>().Setup(c => c.All()).Returns(_fakeMappings);
-
-            Subject.Execute(new UpdateSceneMappingCommand());
-
-            Mocker.GetMock<ISceneMappingRepository>().Verify(c => c.InsertMany(It.Is<IList<SceneMapping>>(m => !m.Any(s => s.Title.IsNullOrWhiteSpace()))), Times.Once());
-            ExceptionVerification.ExpectedWarns(1);
-        }
-
-        [Test]
-        public void should_not_add_mapping_with_blank_search_title()
-        {
-            GivenProviders(new[] { _provider1 });
-
-            var fakeMappings = Builder<SceneMapping>.CreateListOfSize(2)
-                                                    .TheLast(1)
-                                                    .With(m => m.SearchTerm = null)
-                                                    .Build()
-                                                    .ToList();
-
-            _provider1.Setup(s => s.GetSceneMappings()).Returns(fakeMappings);
-
-            Mocker.GetMock<ISceneMappingRepository>().Setup(c => c.All()).Returns(_fakeMappings);
-
-            Subject.Execute(new UpdateSceneMappingCommand());
-
-            Mocker.GetMock<ISceneMappingRepository>().Verify(c => c.InsertMany(It.Is<IList<SceneMapping>>(m => !m.Any(s => s. SearchTerm.IsNullOrWhiteSpace()))), Times.Once());
-            ExceptionVerification.ExpectedWarns(1);
-        }
-
-
-        [TestCase("Working!!", "Working!!", 1)]
-        [TestCase("Working`!!", "Working`!!", 2)]
-        [TestCase("Working!!!", "Working!!!", 3)]
-        [TestCase("Working!!!!", "Working!!!", 3)]
-        [TestCase("Working !!", "Working!!", 1)]
-        public void should_return_single_match(string parseTitle, string title, int expectedSeasonNumber)
-        {
-            var mappings = new List<SceneMapping>
-            {
-                new SceneMapping { Title = "Working!!", ParseTerm = "working", SearchTerm = "Working!!", TvdbId = 100, SceneSeasonNumber = 1 },
-                new SceneMapping { Title = "Working`!!", ParseTerm = "working", SearchTerm = "Working`!!", TvdbId = 100, SceneSeasonNumber = 2 },
-                new SceneMapping { Title = "Working!!!", ParseTerm = "working", SearchTerm = "Working!!!", TvdbId = 100, SceneSeasonNumber = 3 },
-            };
-
-            Mocker.GetMock<ISceneMappingRepository>().Setup(c => c.All()).Returns(mappings);
-
-            var tvdbId = Subject.FindTvdbId(parseTitle);
-            var seasonNumber = Subject.GetSceneSeasonNumber(parseTitle);
-
-            tvdbId.Should().Be(100);
-            seasonNumber.Should().Be(expectedSeasonNumber);
-        }
-
-        [Test]
-        public void should_return_alternate_title_for_global_season()
-        {
-            var mappings = new List<SceneMapping>
-            {
-                new SceneMapping { Title = "Fudanshi Koukou Seikatsu 1", ParseTerm = "fudanshikoukouseikatsu1", SearchTerm = "Fudanshi Koukou Seikatsu 1", TvdbId = 100, SeasonNumber = null, SceneSeasonNumber = null },
-                new SceneMapping { Title = "Fudanshi Koukou Seikatsu 2", ParseTerm = "fudanshikoukouseikatsu2", SearchTerm = "Fudanshi Koukou Seikatsu 2", TvdbId = 100, SeasonNumber = -1, SceneSeasonNumber = null },
-                new SceneMapping { Title = "Fudanshi Koukou Seikatsu 3", ParseTerm = "fudanshikoukouseikatsu3", SearchTerm = "Fudanshi Koukou Seikatsu 3", TvdbId = 100, SeasonNumber = null, SceneSeasonNumber = -1 },
-                new SceneMapping { Title = "Fudanshi Koukou Seikatsu 4", ParseTerm = "fudanshikoukouseikatsu4", SearchTerm = "Fudanshi Koukou Seikatsu 4", TvdbId = 100, SeasonNumber = -1, SceneSeasonNumber = -1 },
-            };
-
-            Mocker.GetMock<ISceneMappingRepository>().Setup(c => c.All()).Returns(mappings);
-
-            var names = Subject.GetSceneNames(100, new List<int> { 10 }, new List<int> { 10 });
-            names.Should().HaveCount(4);
-        }
-
-        [Test]
-        public void should_return_alternate_title_for_season()
-        {
-            var mappings = new List<SceneMapping>
-            {
-                new SceneMapping { Title = "Fudanshi Koukou Seikatsu", ParseTerm = "fudanshikoukouseikatsu", SearchTerm = "Fudanshi Koukou Seikatsu", TvdbId = 100, SeasonNumber = 1, SceneSeasonNumber = null }
-            };
-
-            Mocker.GetMock<ISceneMappingRepository>().Setup(c => c.All()).Returns(mappings);
-
-            var names = Subject.GetSceneNames(100, new List<int> { 1 }, new List<int> { 10 });
-            names.Should().HaveCount(1);
-        }
-
-        [Test]
-        public void should_not_return_alternate_title_for_season()
-        {
-            var mappings = new List<SceneMapping>
-            {
-                new SceneMapping { Title = "Fudanshi Koukou Seikatsu", ParseTerm = "fudanshikoukouseikatsu", SearchTerm = "Fudanshi Koukou Seikatsu", TvdbId = 100, SeasonNumber = 1, SceneSeasonNumber = null }
-            };
-
-            Mocker.GetMock<ISceneMappingRepository>().Setup(c => c.All()).Returns(mappings);
-
-            var names = Subject.GetSceneNames(100, new List<int> { 2 }, new List<int> { 10 });
-            names.Should().BeEmpty();
-        }
-
-        [Test]
-        public void should_return_alternate_title_for_sceneseason()
-        {
-            var mappings = new List<SceneMapping>
-            {
-                new SceneMapping { Title = "Fudanshi Koukou Seikatsu", ParseTerm = "fudanshikoukouseikatsu", SearchTerm = "Fudanshi Koukou Seikatsu", TvdbId = 100, SeasonNumber = null, SceneSeasonNumber = 1 }
-            };
-
-            Mocker.GetMock<ISceneMappingRepository>().Setup(c => c.All()).Returns(mappings);
-
-            var names = Subject.GetSceneNames(100, new List<int> { 10 }, new List<int> { 1 });
-            names.Should().HaveCount(1);
-        }
-
-        [Test]
-        public void should_not_return_alternate_title_for_sceneseason()
-        {
-            var mappings = new List<SceneMapping>
-            {
-                new SceneMapping { Title = "Fudanshi Koukou Seikatsu", ParseTerm = "fudanshikoukouseikatsu", SearchTerm = "Fudanshi Koukou Seikatsu", TvdbId = 100, SeasonNumber = null, SceneSeasonNumber = 1 }
-            };
-
-            Mocker.GetMock<ISceneMappingRepository>().Setup(c => c.All()).Returns(mappings);
-
-            var names = Subject.GetSceneNames(100, new List<int> { 10 }, new List<int> { 2 });
-            names.Should().BeEmpty();
-        }
-
-        [Test]
-        public void should_return_alternate_title_for_fairy_tail()
-        {
-            var mappings = new List<SceneMapping>
-            {
-                new SceneMapping { Title = "Fairy Tail S2", ParseTerm = "fairytails2", SearchTerm = "Fairy Tail S2", TvdbId = 100, SeasonNumber = null, SceneSeasonNumber = 2 }
-            };
-
-            Mocker.GetMock<ISceneMappingRepository>().Setup(c => c.All()).Returns(mappings);
-
-            Subject.GetSceneNames(100, new List<int> { 4 }, new List<int> { 20 }).Should().BeEmpty();
-            Subject.GetSceneNames(100, new List<int> { 5 }, new List<int> { 20 }).Should().BeEmpty();
-            Subject.GetSceneNames(100, new List<int> { 6 }, new List<int> { 20 }).Should().BeEmpty();
-            Subject.GetSceneNames(100, new List<int> { 7 }, new List<int> { 20 }).Should().BeEmpty();
-
-            Subject.GetSceneNames(100, new List<int> { 20 }, new List<int> { 1 }).Should().BeEmpty();
-            Subject.GetSceneNames(100, new List<int> { 20 }, new List<int> { 2 }).Should().NotBeEmpty();
-            Subject.GetSceneNames(100, new List<int> { 20 }, new List<int> { 3 }).Should().BeEmpty();
-            Subject.GetSceneNames(100, new List<int> { 20 }, new List<int> { 4 }).Should().BeEmpty();
-        }
-
-        [Test]
-        public void should_return_alternate_title_for_fudanshi()
-        {
-            var mappings = new List<SceneMapping>
-            {
-                new SceneMapping { Title = "Fudanshi Koukou Seikatsu", ParseTerm = "fudanshikoukouseikatsu", SearchTerm = "Fudanshi Koukou Seikatsu", TvdbId = 100, SeasonNumber = null, SceneSeasonNumber = 1 }
-            };
-
-            Mocker.GetMock<ISceneMappingRepository>().Setup(c => c.All()).Returns(mappings);
-
-            Subject.GetSceneNames(100, new List<int> { 1 }, new List<int> { 20 }).Should().BeEmpty();
-            Subject.GetSceneNames(100, new List<int> { 2 }, new List<int> { 20 }).Should().BeEmpty();
-            Subject.GetSceneNames(100, new List<int> { 3 }, new List<int> { 20 }).Should().BeEmpty();
-            Subject.GetSceneNames(100, new List<int> { 4 }, new List<int> { 20 }).Should().BeEmpty();
-
-            Subject.GetSceneNames(100, new List<int> { 1 }, new List<int> { 1 }).Should().NotBeEmpty();
-            Subject.GetSceneNames(100, new List<int> { 2 }, new List<int> { 2 }).Should().BeEmpty();
-            Subject.GetSceneNames(100, new List<int> { 3 }, new List<int> { 3 }).Should().BeEmpty();
-            Subject.GetSceneNames(100, new List<int> { 4 }, new List<int> { 4 }).Should().BeEmpty();
-        }
-
-        private void AssertNoUpdate()
-        {
-            _provider1.Verify(c => c.GetSceneMappings(), Times.Once());
-            Mocker.GetMock<ISceneMappingRepository>().Verify(c => c.Clear(It.IsAny<string>()), Times.Never());
-            Mocker.GetMock<ISceneMappingRepository>().Verify(c => c.InsertMany(_fakeMappings), Times.Never());
-        }
-
-        private void AssertMappingUpdated()
-        {
-            _provider1.Verify(c => c.GetSceneMappings(), Times.Once());
-            Mocker.GetMock<ISceneMappingRepository>().Verify(c => c.Clear(It.IsAny<string>()), Times.Once());
-            Mocker.GetMock<ISceneMappingRepository>().Verify(c => c.InsertMany(_fakeMappings), Times.Once());
-
-            foreach (var sceneMapping in _fakeMappings)
-            {
-                Subject.GetSceneNames(sceneMapping.TvdbId, _fakeMappings.Select(m => m.SeasonNumber.Value).Distinct().ToList(), new List<int>()).Should().Contain(sceneMapping.SearchTerm);
-                Subject.FindTvdbId(sceneMapping.ParseTerm).Should().Be(sceneMapping.TvdbId);
-            }
-        }
-    }
-}

src/NzbDrone.Core.Test/Datastore/DatabaseFixture.cs

@@ -4,7 +4,7 @@ using FluentAssertions;
 using NUnit.Framework;
 using NzbDrone.Core.Datastore;
 using NzbDrone.Core.Test.Framework;
-using NzbDrone.Core.Tv;
+using NzbDrone.Core.Movies;
 
 namespace NzbDrone.Core.Test.Datastore
 {
@@ -14,7 +14,7 @@ namespace NzbDrone.Core.Test.Datastore
         public void SingleOrDefault_should_return_null_on_empty_db()
         {
             Mocker.Resolve<IDatabase>()
-                .GetDataMapper().Query<Series>()
+                .GetDataMapper().Query<Movie>()
                 .SingleOrDefault(c => c.CleanTitle == "SomeTitle")
                 .Should()
                 .BeNull();
@@ -33,4 +33,4 @@ namespace NzbDrone.Core.Test.Datastore
             Mocker.Resolve<IDatabase>().Version.Should().BeGreaterThan(new Version("3.0.0"));
         }
     }
-}
+}

src/NzbDrone.Core.Test/Datastore/DatabaseRelationshipFixture.cs

@@ -1,11 +1,11 @@
-using System.Linq;
+using System.Linq;
 using FizzWare.NBuilder;
 using FluentAssertions;
 using NUnit.Framework;
 using NzbDrone.Core.MediaFiles;
 using NzbDrone.Core.Qualities;
 using NzbDrone.Core.Test.Framework;
-using NzbDrone.Core.Tv;
+using NzbDrone.Core.Movies;
 
 namespace NzbDrone.Core.Test.Datastore
 {
@@ -15,19 +15,19 @@ namespace NzbDrone.Core.Test.Datastore
         [Test]
         public void one_to_one()
         {
-            var episodeFile = Builder<EpisodeFile>.CreateNew()
+            var episodeFile = Builder<MovieFile>.CreateNew()
                            .With(c => c.Quality = new QualityModel())
                            .BuildNew();
 
             Db.Insert(episodeFile);
 
-            var episode = Builder<Episode>.CreateNew()
-                .With(c => c.EpisodeFileId = episodeFile.Id)
+            var episode = Builder<Movie>.CreateNew()
+                .With(c => c.MovieFileId = episodeFile.Id)
                 .BuildNew();
 
             Db.Insert(episode);
 
-            var loadedEpisodeFile = Db.Single<Episode>().EpisodeFile.Value;
+            var loadedEpisodeFile = Db.Single<Movie>().MovieFile;
 
             loadedEpisodeFile.Should().NotBeNull();
             loadedEpisodeFile.ShouldBeEquivalentTo(episodeFile,
@@ -35,20 +35,19 @@ namespace NzbDrone.Core.Test.Datastore
                     .IncludingAllRuntimeProperties()
                     .Excluding(c => c.DateAdded)
                     .Excluding(c => c.Path)
-                    .Excluding(c => c.Series)
-                    .Excluding(c => c.Episodes));
+                    .Excluding(c => c.Movie));
         }
 
         [Test]
         public void one_to_one_should_not_query_db_if_foreign_key_is_zero()
         {
-            var episode = Builder<Episode>.CreateNew()
-                .With(c => c.EpisodeFileId = 0)
+            var episode = Builder<Movie>.CreateNew()
+                .With(c => c.MovieFileId = 0)
                 .BuildNew();
 
             Db.Insert(episode);
 
-            Db.Single<Episode>().EpisodeFile.Value.Should().BeNull();
+            Db.Single<Movie>().MovieFile.Should().BeNull();
         }
 
 

src/NzbDrone.Core.Test/Datastore/MappingExtentionFixture.cs

@@ -1,11 +1,11 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using FluentAssertions;
 using Marr.Data;
 using NUnit.Framework;
 using NzbDrone.Core.Datastore;
 using NzbDrone.Core.Datastore.Converters;
 using NzbDrone.Core.Datastore.Extensions;
-using NzbDrone.Core.Tv;
+using NzbDrone.Core.Movies;
 
 namespace NzbDrone.Core.Test.Datastore
 {
@@ -30,7 +30,7 @@ namespace NzbDrone.Core.Test.Datastore
 
         public class TypeWithNoMappableProperties
         {
-            public Series Series { get; set; }
+            public Movie Movie { get; set; }
 
             public int ReadOnly { get; private set; }
             public int WriteOnly { private get; set; }
@@ -62,4 +62,4 @@ namespace NzbDrone.Core.Test.Datastore
             properties.Should().NotContain(c => MappingExtensions.IsMappableProperty(c));
         }
     }
-}
+}

src/NzbDrone.Core.Test/Datastore/MarrDataLazyLoadingFixture.cs

@@ -1,9 +1,9 @@
-using FizzWare.NBuilder;
+using FizzWare.NBuilder;
 using NUnit.Framework;
 using NzbDrone.Core.Datastore;
 using NzbDrone.Core.Profiles;
 using NzbDrone.Core.Test.Framework;
-using NzbDrone.Core.Tv;
+using NzbDrone.Core.Movies;
 using NzbDrone.Core.Qualities;
 using NzbDrone.Core.MediaFiles;
 
@@ -26,82 +26,30 @@ namespace NzbDrone.Core.Test.Datastore
             
             profile = Db.Insert(profile);
 
-            var series = Builder<Series>.CreateListOfSize(1)
+            var series = Builder<Movie>.CreateListOfSize(1)
                 .All()
                 .With(v => v.ProfileId = profile.Id)
                 .BuildListOfNew();
 
             Db.InsertMany(series);
 
-            var episodeFiles = Builder<EpisodeFile>.CreateListOfSize(1)
+            var episodeFiles = Builder<MovieFile>.CreateListOfSize(1)
                 .All()
-                .With(v => v.SeriesId = series[0].Id)
+                .With(v => v.MovieId = series[0].Id)
                 .With(v => v.Quality = new QualityModel())
                 .BuildListOfNew();
 
             Db.InsertMany(episodeFiles);
 
-            var episodes = Builder<Episode>.CreateListOfSize(10)
+            var episodes = Builder<Movie>.CreateListOfSize(10)
                 .All()
                 .With(v => v.Monitored = true)
-                .With(v => v.EpisodeFileId = episodeFiles[0].Id)
-                .With(v => v.SeriesId = series[0].Id)
+                .With(v => v.MovieFileId = episodeFiles[0].Id)
                 .BuildListOfNew();
 
             Db.InsertMany(episodes);
         }
 
-        [Test]
-        public void should_lazy_load_profile_if_not_joined()
-        {
-            var db = Mocker.Resolve<IDatabase>();
-            var DataMapper = db.GetDataMapper();
-
-            var episodes = DataMapper.Query<Episode>()
-                .Join<Episode, Series>(Marr.Data.QGen.JoinType.Inner, v => v.Series, (l, r) => l.SeriesId == r.Id)
-                .ToList();
-
-            foreach (var episode in episodes)
-            {
-                Assert.IsNotNull(episode.Series);
-                Assert.IsFalse(episode.Series.Profile.IsLoaded);
-            }
-        }
-
-        [Test]
-        public void should_explicit_load_episodefile_if_joined()
-        {
-            var db = Mocker.Resolve<IDatabase>();
-            var DataMapper = db.GetDataMapper();
-
-            var episodes = DataMapper.Query<Episode>()
-                .Join<Episode, EpisodeFile>(Marr.Data.QGen.JoinType.Inner, v => v.EpisodeFile, (l, r) => l.EpisodeFileId == r.Id)
-                .ToList();
-
-            foreach (var episode in episodes)
-            {
-                Assert.IsNull(episode.Series);
-                Assert.IsTrue(episode.EpisodeFile.IsLoaded);
-            }
-        }
-
-        [Test]
-        public void should_explicit_load_profile_if_joined()
-        {
-            var db = Mocker.Resolve<IDatabase>();
-            var DataMapper = db.GetDataMapper();
-
-            var episodes = DataMapper.Query<Episode>()
-                .Join<Episode, Series>(Marr.Data.QGen.JoinType.Inner, v => v.Series, (l, r) => l.SeriesId == r.Id)
-                .Join<Series, Profile>(Marr.Data.QGen.JoinType.Inner, v => v.Profile, (l, r) => l.ProfileId == r.Id)
-                .ToList();
-
-            foreach (var episode in episodes)
-            {
-                Assert.IsNotNull(episode.Series);
-                Assert.IsTrue(episode.Series.Profile.IsLoaded);
-            }
-        }
 
     }
-}
+}

src/NzbDrone.Core.Test/Datastore/PagingSpecExtensionsTests/PagingOffsetFixture.cs

@@ -1,8 +1,8 @@
-using FluentAssertions;
+using FluentAssertions;
 using NUnit.Framework;
 using NzbDrone.Core.Datastore;
 using NzbDrone.Core.Datastore.Extensions;
-using NzbDrone.Core.Tv;
+using NzbDrone.Core.Movies;
 
 namespace NzbDrone.Core.Test.Datastore.PagingSpecExtensionsTests
 {
@@ -14,7 +14,7 @@ namespace NzbDrone.Core.Test.Datastore.PagingSpecExtensionsTests
         [TestCase(1, 100, 0)]
         public void should_calcuate_expected_offset(int page, int pageSize, int expected)
         {
-            var pagingSpec = new PagingSpec<Episode>
+            var pagingSpec = new PagingSpec<Movie>
                 {
                     Page = page,
                     PageSize = pageSize,

src/NzbDrone.Core.Test/Datastore/PagingSpecExtensionsTests/ToSortDirectionFixture.cs

@@ -1,8 +1,8 @@
-using FluentAssertions;
+using FluentAssertions;
 using NUnit.Framework;
 using NzbDrone.Core.Datastore;
 using NzbDrone.Core.Datastore.Extensions;
-using NzbDrone.Core.Tv;
+using NzbDrone.Core.Movies;
 
 namespace NzbDrone.Core.Test.Datastore.PagingSpecExtensionsTests
 {
@@ -11,7 +11,7 @@ namespace NzbDrone.Core.Test.Datastore.PagingSpecExtensionsTests
         [Test]
         public void should_convert_default_to_asc()
         {
-            var pagingSpec = new PagingSpec<Episode>
+            var pagingSpec = new PagingSpec<Movie>
             {
                 Page = 1,
                 PageSize = 10,
@@ -25,7 +25,7 @@ namespace NzbDrone.Core.Test.Datastore.PagingSpecExtensionsTests
         [Test]
         public void should_convert_ascending_to_asc()
         {
-            var pagingSpec = new PagingSpec<Episode>
+            var pagingSpec = new PagingSpec<Movie>
                 {
                     Page = 1,
                     PageSize = 10,
@@ -39,7 +39,7 @@ namespace NzbDrone.Core.Test.Datastore.PagingSpecExtensionsTests
         [Test]
         public void should_convert_descending_to_desc()
         {
-            var pagingSpec = new PagingSpec<Episode>
+            var pagingSpec = new PagingSpec<Movie>
             {
                 Page = 1,
                 PageSize = 10,

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

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using FizzWare.NBuilder;
 using FluentAssertions;
@@ -8,7 +8,7 @@ using NzbDrone.Core.DecisionEngine.Specifications;
 using NzbDrone.Core.Parser.Model;
 using NzbDrone.Core.Qualities;
 using NzbDrone.Core.Test.Framework;
-using NzbDrone.Core.Tv;
+using NzbDrone.Core.Movies;
 
 namespace NzbDrone.Core.Test.DecisionEngineTests
 {
@@ -16,54 +16,23 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
 
     public class AcceptableSizeSpecificationFixture : CoreTest<AcceptableSizeSpecification>
     {
-        private RemoteEpisode parseResultMultiSet;
-        private RemoteEpisode parseResultMulti;
-        private RemoteEpisode parseResultSingle;
-        private Series series;
-	private Movie movie;
-	private RemoteMovie remoteMovie;
+        private Movie movie;
+        private RemoteMovie remoteMovie;
         private QualityDefinition qualityType;
 
         [SetUp]
         public void Setup()
         {
-            series = Builder<Series>.CreateNew()
-                .Build();
 
-		movie = Builder<Movie>.CreateNew().Build();
+            movie = Builder<Movie>.CreateNew().Build();
 
-		remoteMovie = new RemoteMovie
-		{
-			Movie = movie,
-			Release = new ReleaseInfo(),
-			ParsedMovieInfo = new ParsedMovieInfo { Quality = new QualityModel(Quality.SDTV, new Revision(version: 2)) },
+            remoteMovie = new RemoteMovie
+            {
+                Movie = movie,
+                Release = new ReleaseInfo(),
+                ParsedMovieInfo = new ParsedMovieInfo { Quality = new QualityModel(Quality.SDTV, new Revision(version: 2)) },
 
-		};
-
-            parseResultMultiSet = new RemoteEpisode
-                                    {
-                                        Series = series,
-                                        Release = new ReleaseInfo(),
-                                        ParsedEpisodeInfo = new ParsedEpisodeInfo { Quality = new QualityModel(Quality.SDTV, new Revision(version: 2)) },
-                                        Episodes = new List<Episode> { new Episode(), new Episode(), new Episode(), new Episode(), new Episode(), new Episode() }
-                                    };
-
-            parseResultMulti = new RemoteEpisode
-                                    {
-                                        Series = series,
-                                        Release = new ReleaseInfo(),
-                                        ParsedEpisodeInfo = new ParsedEpisodeInfo { Quality = new QualityModel(Quality.SDTV, new Revision(version: 2)) },
-                                        Episodes = new List<Episode> { new Episode(), new Episode() }
-                                    };
-
-            parseResultSingle = new RemoteEpisode
-                                    {
-                                        Series = series,
-                                        Release = new ReleaseInfo(),
-                                        ParsedEpisodeInfo = new ParsedEpisodeInfo { Quality = new QualityModel(Quality.SDTV, new Revision(version: 2)) },
-                                        Episodes = new List<Episode> { new Episode() { Id = 2 } }
-
-                                    };
+            };
 
             Mocker.GetMock<IQualityDefinitionService>()
                 .Setup(v => v.Get(It.IsAny<Quality>()))
@@ -76,22 +45,8 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
                 .Build();
 
             Mocker.GetMock<IQualityDefinitionService>().Setup(s => s.Get(Quality.SDTV)).Returns(qualityType);
-
-            Mocker.GetMock<IEpisodeService>().Setup(
-                s => s.GetEpisodesBySeason(It.IsAny<int>(), It.IsAny<int>()))
-                .Returns(new List<Episode>() {
-                    new Episode(), new Episode(), new Episode(), new Episode(), new Episode(),
-                    new Episode(), new Episode(), new Episode(), new Episode() { Id = 2 }, new Episode() });
         }
 
-        private void GivenLastEpisode()
-        {
-            Mocker.GetMock<IEpisodeService>().Setup(
-                s => s.GetEpisodesBySeason(It.IsAny<int>(), It.IsAny<int>()))
-                .Returns(new List<Episode>() {
-                    new Episode(), new Episode(), new Episode(), new Episode(), new Episode(),
-                    new Episode(), new Episode(), new Episode(), new Episode(), new Episode() { Id = 2 } });
-        }
 
         [TestCase(30, 50, false)]
         [TestCase(30, 250, true)]
@@ -100,145 +55,58 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
         [TestCase(60, 500, true)]
         [TestCase(60, 1000, false)]
         public void single_episode(int runtime, int sizeInMegaBytes, bool expectedResult)
-        {           
-            series.Runtime = runtime;
-            parseResultSingle.Series = series;
-            parseResultSingle.Release.Size = sizeInMegaBytes.Megabytes();
-
-            Subject.IsSatisfiedBy(parseResultSingle, null).Accepted.Should().Be(expectedResult);
-        }
-
-        [TestCase(30, 500, true)]
-        [TestCase(30, 1000, false)]
-        [TestCase(60, 1000, true)]
-        [TestCase(60, 2000, false)]
-        public void single_episode_first_or_last(int runtime, int sizeInMegaBytes, bool expectedResult)
         {
-            GivenLastEpisode();
+            movie.Runtime = runtime;
+            remoteMovie.Movie = movie;
+            remoteMovie.Release.Size = sizeInMegaBytes.Megabytes();
 
-            series.Runtime = runtime;
-            parseResultSingle.Series = series;
-            parseResultSingle.Release.Size = sizeInMegaBytes.Megabytes();
-
-            Subject.IsSatisfiedBy(parseResultSingle, null).Accepted.Should().Be(expectedResult);
-        }
-
-        [TestCase(30, 50 * 2, false)]
-        [TestCase(30, 250 * 2, true)]
-        [TestCase(30, 500 * 2, false)]
-        [TestCase(60, 100 * 2, false)]
-        [TestCase(60, 500 * 2, true)]
-        [TestCase(60, 1000 * 2, false)]
-        public void multi_episode(int runtime, int sizeInMegaBytes, bool expectedResult)
-        {
-            series.Runtime = runtime;
-            parseResultMulti.Series = series;
-            parseResultMulti.Release.Size = sizeInMegaBytes.Megabytes();
-
-            Subject.IsSatisfiedBy(parseResultMulti, null).Accepted.Should().Be(expectedResult);
-        }
-
-        [TestCase(30, 50 * 6, false)]
-        [TestCase(30, 250 * 6, true)]
-        [TestCase(30, 500 * 6, false)]
-        [TestCase(60, 100 * 6, false)]
-        [TestCase(60, 500 * 6, true)]
-        [TestCase(60, 1000 * 6, false)]
-        public void multiset_episode(int runtime, int sizeInMegaBytes, bool expectedResult)
-        {
-            series.Runtime = runtime;
-            parseResultMultiSet.Series = series;
-            parseResultMultiSet.Release.Size = sizeInMegaBytes.Megabytes();
-
-            Subject.IsSatisfiedBy(parseResultMultiSet, null).Accepted.Should().Be(expectedResult);
+            Subject.IsSatisfiedBy(remoteMovie, null).Accepted.Should().Be(expectedResult);
         }
 
         [Test]
         public void should_return_true_if_size_is_zero()
         {
-            GivenLastEpisode();
-
-            series.Runtime = 30;
-            parseResultSingle.Series = series;
-            parseResultSingle.Release.Size = 0;
+            movie.Runtime = 120;
+            remoteMovie.Movie = movie;
+            remoteMovie.Release.Size = 0;
             qualityType.MinSize = 10;
             qualityType.MaxSize = 20;
 
-            Subject.IsSatisfiedBy(parseResultSingle, null).Accepted.Should().BeTrue();
+            Subject.IsSatisfiedBy(remoteMovie, null).Accepted.Should().BeTrue();
         }
 
         [Test]
         public void should_return_true_if_unlimited_30_minute()
         {
-            GivenLastEpisode();
-
-            series.Runtime = 30;
-            parseResultSingle.Series = series;
-            parseResultSingle.Release.Size = 18457280000;
+            movie.Runtime = 30;
+            remoteMovie.Movie = movie;
+            remoteMovie.Release.Size = 18457280000;
             qualityType.MaxSize = null;
 
-            Subject.IsSatisfiedBy(parseResultSingle, null).Accepted.Should().BeTrue();
+            Subject.IsSatisfiedBy(remoteMovie, null).Accepted.Should().BeTrue();
         }
-        
+
         [Test]
         public void should_return_true_if_unlimited_60_minute()
         {
-            GivenLastEpisode();
-
-            series.Runtime = 60;
-            parseResultSingle.Series = series;
-            parseResultSingle.Release.Size = 36857280000;
+            movie.Runtime = 60;
+            remoteMovie.Movie = movie;
+            remoteMovie.Release.Size = 36857280000;
             qualityType.MaxSize = null;
 
-            Subject.IsSatisfiedBy(parseResultSingle, null).Accepted.Should().BeTrue();
+            Subject.IsSatisfiedBy(remoteMovie, null).Accepted.Should().BeTrue();
         }
 
         [Test]
-        public void should_treat_daily_series_as_single_episode()
+        public void should_use_110_minutes_if_runtime_is_0()
         {
-            GivenLastEpisode();
+            movie.Runtime = 0;
+            remoteMovie.Movie = movie;
+            remoteMovie.Release.Size = 1095.Megabytes();
 
-            series.Runtime = 60;
-            parseResultSingle.Series = series;
-            parseResultSingle.Series.SeriesType = SeriesTypes.Daily;
-            parseResultSingle.Release.Size = 300.Megabytes();
-
-            qualityType.MaxSize = 10;
-
-            Subject.IsSatisfiedBy(parseResultSingle, null).Accepted.Should().BeTrue();
+            Subject.IsSatisfiedBy(remoteMovie, null).Accepted.Should().Be(true);
+            remoteMovie.Release.Size = 1105.Megabytes();
+            Subject.IsSatisfiedBy(remoteMovie, null).Accepted.Should().Be(false);
         }
-
-        //[Test]
-        //public void should_return_true_if_RAWHD()
-        //{
-        //    parseResultSingle.ParsedEpisodeInfo.Quality = new QualityModel(Quality.RAWHD);
-            
-        //    series.Runtime = 45;
-        //    parseResultSingle.Series = series;
-        //    parseResultSingle.Series.SeriesType = SeriesTypes.Daily;
-        //    parseResultSingle.Release.Size = 8000.Megabytes();
-
-        //    Subject.IsSatisfiedBy(parseResultSingle, null).Accepted.Should().BeTrue();
-        //}
-
-        [Test]
-        public void should_return_true_for_special()
-        {
-            parseResultSingle.ParsedEpisodeInfo.Special = true;
-
-            Subject.IsSatisfiedBy(parseResultSingle, null).Accepted.Should().BeTrue();
-        }
-
-	[Test]
-	public void should_use_110_minutes_if_runtime_is_0()
-	{
-		movie.Runtime = 0;
-		remoteMovie.Movie = movie;
-		remoteMovie.Release.Size = 1095.Megabytes();
-
-		Subject.IsSatisfiedBy(remoteMovie, null).Accepted.Should().Be(true);
-		remoteMovie.Release.Size = 1105.Megabytes();
-		Subject.IsSatisfiedBy(remoteMovie, null).Accepted.Should().Be(false);
-	}
     }
 }

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

@@ -1,110 +0,0 @@
-using System.Linq;
-using FizzWare.NBuilder;
-using FluentAssertions;
-using Marr.Data;
-using NUnit.Framework;
-using NzbDrone.Core.DecisionEngine;
-using NzbDrone.Core.DecisionEngine.Specifications;
-using NzbDrone.Core.MediaFiles;
-using NzbDrone.Core.Parser.Model;
-using NzbDrone.Core.Qualities;
-using NzbDrone.Core.Tv;
-using NzbDrone.Core.Test.Framework;
-
-namespace NzbDrone.Core.Test.DecisionEngineTests
-{
-    [TestFixture]
-    public class AnimeVersionUpgradeSpecificationFixture : CoreTest<AnimeVersionUpgradeSpecification>
-    {
-        private AnimeVersionUpgradeSpecification _subject;
-        private RemoteEpisode _remoteEpisode;
-        private EpisodeFile _episodeFile;
-
-        [SetUp]
-        public void Setup()
-        {
-            Mocker.Resolve<QualityUpgradableSpecification>();
-            _subject = Mocker.Resolve<AnimeVersionUpgradeSpecification>();
-
-            _episodeFile = new EpisodeFile
-                           {
-                               Quality = new QualityModel(Quality.HDTV720p, new Revision()),
-                               ReleaseGroup = "DRONE2"
-                           };
-
-            _remoteEpisode = new RemoteEpisode();
-            _remoteEpisode.Series = new Series { SeriesType = SeriesTypes.Anime };
-            _remoteEpisode.ParsedEpisodeInfo = new ParsedEpisodeInfo
-                                               {
-                                                   Quality = new QualityModel(Quality.HDTV720p, new Revision(2)),
-                                                   ReleaseGroup = "DRONE"
-                                               };
-
-            _remoteEpisode.Episodes = Builder<Episode>.CreateListOfSize(1)
-                                                      .All()
-                                                      .With(e => e.EpisodeFile = new LazyLoaded<EpisodeFile>(_episodeFile))
-                                                      .Build()
-                                                      .ToList();
-        }
-
-        private void GivenStandardSeries()
-        {
-            _remoteEpisode.Series.SeriesType = SeriesTypes.Standard;
-        }
-
-        private void GivenNoVersionUpgrade()
-        {
-            _remoteEpisode.ParsedEpisodeInfo.Quality.Revision = new Revision();
-        }
-
-        [Test]
-        public void should_be_true_when_no_existing_file()
-        {
-            _remoteEpisode.Episodes.First().EpisodeFileId = 0;
-
-            _subject.IsSatisfiedBy(_remoteEpisode, null).Accepted.Should().BeTrue();
-        }
-
-        [Test]
-        public void should_be_true_if_series_is_not_anime()
-        {
-            GivenStandardSeries();
-            _subject.IsSatisfiedBy(_remoteEpisode, null).Accepted.Should().BeTrue();
-        }
-
-        [Test]
-        public void should_be_true_if_is_not_a_version_upgrade_for_existing_file()
-        {
-            GivenNoVersionUpgrade();
-            _subject.IsSatisfiedBy(_remoteEpisode, null).Accepted.Should().BeTrue();
-        }
-
-        [Test]
-        public void should_be_true_when_release_group_matches()
-        {
-            _episodeFile.ReleaseGroup = _remoteEpisode.ParsedEpisodeInfo.ReleaseGroup;
-
-            _subject.IsSatisfiedBy(_remoteEpisode, null).Accepted.Should().BeTrue();
-        }
-
-        [Test]
-        public void should_be_false_when_existing_file_doesnt_have_a_release_group()
-        {
-            _episodeFile.ReleaseGroup = string.Empty;
-            _subject.IsSatisfiedBy(_remoteEpisode, null).Accepted.Should().BeFalse();
-        }
-
-        [Test]
-        public void should_should_be_false_when_release_doesnt_have_a_release_group()
-        {
-            _remoteEpisode.ParsedEpisodeInfo.ReleaseGroup = string.Empty;
-            _subject.IsSatisfiedBy(_remoteEpisode, null).Accepted.Should().BeFalse();
-        }
-
-        [Test]
-        public void should_be_false_when_release_group_does_not_match()
-        {
-            _subject.IsSatisfiedBy(_remoteEpisode, null).Accepted.Should().BeFalse();
-        }
-    }
-}

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

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using FluentAssertions;
 using Moq;
@@ -8,7 +8,7 @@ using NzbDrone.Core.IndexerSearch.Definitions;
 using NzbDrone.Core.Parser;
 using NzbDrone.Core.Parser.Model;
 using NzbDrone.Core.Test.Framework;
-using NzbDrone.Core.Tv;
+using NzbDrone.Core.Movies;
 using NzbDrone.Test.Common;
 using FizzWare.NBuilder;
 
@@ -206,51 +206,6 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
             result.Should().HaveCount(1);
         }
 
-        [Test]
-        [Ignore( "Series")]
-        public void should_only_include_reports_for_requested_episodes()
-        {
-            var series = Builder<Series>.CreateNew().Build();
-
-            var episodes = Builder<Episode>.CreateListOfSize(2)
-                .All()
-                .With(v => v.SeriesId, series.Id)
-                .With(v => v.Series, series)
-                .With(v => v.SeasonNumber, 1)
-                .With(v => v.SceneSeasonNumber, 2)
-                .BuildList();
-
-            var criteria = new SeasonSearchCriteria { Episodes = episodes.Take(1).ToList(), SeasonNumber = 1 };
-
-            var reports = episodes.Select(v => 
-                new ReleaseInfo() 
-                { 
-                    Title = string.Format("{0}.S{1:00}E{2:00}.720p.WEB-DL-DRONE", series.Title, v.SceneSeasonNumber, v.SceneEpisodeNumber) 
-                }).ToList();
-
-            Mocker.GetMock<IParsingService>()
-                .Setup(v => v.Map(It.IsAny<ParsedEpisodeInfo>(), It.IsAny<int>(), It.IsAny<int>(), It.IsAny<SearchCriteriaBase>()))
-                .Returns<ParsedEpisodeInfo, int, int, SearchCriteriaBase>((p,tvdbid,tvrageid,c) =>
-                    new RemoteEpisode
-                    {
-                        DownloadAllowed = true,
-                        ParsedEpisodeInfo = p,
-                        Series = series,
-                        Episodes = episodes.Where(v => v.SceneEpisodeNumber == p.EpisodeNumbers.First()).ToList()
-                    });
-
-            Mocker.SetConstant<IEnumerable<IDecisionEngineSpecification>>(new List<IDecisionEngineSpecification>
-            {
-                Mocker.Resolve<NzbDrone.Core.DecisionEngine.Specifications.Search.EpisodeRequestedSpecification>()
-            });
-
-            var decisions = Subject.GetSearchDecision(reports, criteria);
-
-            var approvedDecisions = decisions.Where(v => v.Approved).ToList();
-
-            approvedDecisions.Count.Should().Be(1);
-        }
-
         [Test]
         public void should_not_allow_download_if_series_is_unknown()
         {
@@ -299,4 +254,4 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
             ExceptionVerification.ExpectedErrors(1);
         }
     }
-}
+}

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

@@ -1,76 +0,0 @@
-
-using System;
-using NUnit.Framework;
-using NzbDrone.Core.DecisionEngine.Specifications;
-using NzbDrone.Core.Parser.Model;
-using NzbDrone.Core.Test.Framework;
-using FizzWare.NBuilder;
-using System.Linq;
-using FluentAssertions;
-using NzbDrone.Core.Tv;
-using Moq;
-using System.Collections.Generic;
-
-namespace NzbDrone.Core.Test.DecisionEngineTests
-{
-    [TestFixture]
-    [Ignore("Series")]
-    public class FullSeasonSpecificationFixture : CoreTest<FullSeasonSpecification>
-    {
-        private RemoteEpisode _remoteEpisode;
-
-        [SetUp]
-        public void Setup()
-        {
-            var show = Builder<Series>.CreateNew().With(s => s.Id = 1234).Build();
-            _remoteEpisode = new RemoteEpisode
-            {
-                ParsedEpisodeInfo = new ParsedEpisodeInfo
-                {
-                    FullSeason = true
-                },
-                Episodes = Builder<Episode>.CreateListOfSize(3)
-                                           .All()
-                                           .With(e => e.AirDateUtc = DateTime.UtcNow.AddDays(-8))
-                                           .With(s => s.SeriesId = show.Id)
-                                           .BuildList(),
-                Series = show,
-                Release = new ReleaseInfo
-                {
-                    Title = "Series.Title.S01.720p.BluRay.X264-RlsGrp"
-                }
-            };
-
-            Mocker.GetMock<IEpisodeService>().Setup(s => s.EpisodesBetweenDates(It.IsAny<DateTime>(), It.IsAny<DateTime>(), false))
-                                             .Returns(new List<Episode>());
-        }
-
-        [Test]
-        public void should_return_true_if_is_not_a_full_season()
-        {
-            _remoteEpisode.ParsedEpisodeInfo.FullSeason = false;
-            _remoteEpisode.Episodes.Last().AirDateUtc = DateTime.UtcNow.AddDays(+2);
-            Mocker.Resolve<FullSeasonSpecification>().IsSatisfiedBy(_remoteEpisode, null).Accepted.Should().BeTrue();
-        }
-
-        [Test]
-        public void should_return_true_if_all_episodes_have_aired()
-        {
-            Mocker.Resolve<FullSeasonSpecification>().IsSatisfiedBy(_remoteEpisode, null).Accepted.Should().BeTrue();
-        }
-
-        [Test]
-        public void should_return_false_if_one_episode_has_not_aired()
-        {
-            _remoteEpisode.Episodes.Last().AirDateUtc = DateTime.UtcNow.AddDays(+2);
-            Mocker.Resolve<FullSeasonSpecification>().IsSatisfiedBy(_remoteEpisode, null).Accepted.Should().BeFalse();
-        }
-
-        [Test]
-        public void should_return_false_if_an_episode_does_not_have_an_air_date()
-        {
-            _remoteEpisode.Episodes.Last().AirDateUtc = null;
-            Mocker.Resolve<FullSeasonSpecification>().IsSatisfiedBy(_remoteEpisode, null).Accepted.Should().BeFalse();
-        }
-    }
-}

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

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using FizzWare.NBuilder;
 using FluentAssertions;
@@ -11,7 +11,7 @@ using NzbDrone.Core.IndexerSearch.Definitions;
 using NzbDrone.Core.Parser.Model;
 using NzbDrone.Core.Profiles;
 using NzbDrone.Core.Qualities;
-using NzbDrone.Core.Tv;
+using NzbDrone.Core.Movies;
 using NzbDrone.Core.DecisionEngine;
 
 using NzbDrone.Core.Test.Framework;
@@ -23,11 +23,11 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
     {
         private HistorySpecification _upgradeHistory;
 
-        private RemoteEpisode _parseResultMulti;
-        private RemoteEpisode _parseResultSingle;
+        private RemoteMovie _parseResultMulti;
+        private RemoteMovie _parseResultSingle;
         private QualityModel _upgradableQuality;
         private QualityModel _notupgradableQuality;
-        private Series _fakeSeries;
+        private Movie _fakeMovie;
         private const int FIRST_EPISODE_ID = 1;
         private const int SECOND_EPISODE_ID = 2;
 
@@ -37,29 +37,14 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
             Mocker.Resolve<QualityUpgradableSpecification>();
             _upgradeHistory = Mocker.Resolve<HistorySpecification>();
 
-            var singleEpisodeList = new List<Episode> { new Episode { Id = FIRST_EPISODE_ID, SeasonNumber = 12, EpisodeNumber = 3 } };
-            var doubleEpisodeList = new List<Episode> { 
-                                                            new Episode {Id = FIRST_EPISODE_ID, SeasonNumber = 12, EpisodeNumber = 3 }, 
-                                                            new Episode {Id = SECOND_EPISODE_ID, SeasonNumber = 12, EpisodeNumber = 4 }, 
-                                                            new Episode {Id = 3, SeasonNumber = 12, EpisodeNumber = 5 }
-                                                       };
-
-            _fakeSeries = Builder<Series>.CreateNew()
+            _fakeMovie = Builder<Movie>.CreateNew()
                          .With(c => c.Profile = new Profile { Cutoff = Quality.Bluray1080p, Items = Qualities.QualityFixture.GetDefaultQualities() })
                          .Build();
 
-            _parseResultMulti = new RemoteEpisode
+            _parseResultSingle = new RemoteMovie
             {
-                Series = _fakeSeries,
-                ParsedEpisodeInfo = new ParsedEpisodeInfo { Quality = new QualityModel(Quality.DVD, new Revision(version: 2)) },
-                Episodes = doubleEpisodeList
-            };
-
-            _parseResultSingle = new RemoteEpisode
-            {
-                Series = _fakeSeries,
-                ParsedEpisodeInfo = new ParsedEpisodeInfo { Quality = new QualityModel(Quality.DVD, new Revision(version: 2)) },
-                Episodes = singleEpisodeList
+                Movie = _fakeMovie,
+                ParsedMovieInfo = new ParsedMovieInfo { Quality = new QualityModel(Quality.DVD, new Revision(version: 2)) }
             };
 
             _upgradableQuality = new QualityModel(Quality.SDTV, new Revision(version: 1));
@@ -72,7 +57,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
 
         private void GivenMostRecentForEpisode(int episodeId, string downloadId, QualityModel quality, DateTime date, HistoryEventType eventType)
         {
-            Mocker.GetMock<IHistoryService>().Setup(s => s.MostRecentForEpisode(episodeId))
+            Mocker.GetMock<IHistoryService>().Setup(s => s.MostRecentForMovie(episodeId))
                   .Returns(new History.History { DownloadId = downloadId, Quality = quality, Date = date, EventType = eventType });
         }
 
@@ -86,13 +71,13 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
         [Test]
         public void should_return_true_if_it_is_a_search()
         {
-            _upgradeHistory.IsSatisfiedBy(_parseResultMulti, new SeasonSearchCriteria()).Accepted.Should().BeTrue();
+            _upgradeHistory.IsSatisfiedBy(_parseResultMulti, new MovieSearchCriteria()).Accepted.Should().BeTrue();
         }
 
         [Test]
         public void should_return_true_if_latest_history_item_is_null()
         {
-            Mocker.GetMock<IHistoryService>().Setup(s => s.MostRecentForEpisode(It.IsAny<int>())).Returns((History.History)null);
+            Mocker.GetMock<IHistoryService>().Setup(s => s.MostRecentForMovie(It.IsAny<int>())).Returns((History.History)null);
             _upgradeHistory.IsSatisfiedBy(_parseResultMulti, null).Accepted.Should().BeTrue();
         }
 
@@ -159,8 +144,8 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
         [Test]
         public void should_not_be_upgradable_if_episode_is_of_same_quality_as_existing()
         {
-            _fakeSeries.Profile = new Profile { Cutoff = Quality.Bluray1080p, Items = Qualities.QualityFixture.GetDefaultQualities() };
-            _parseResultSingle.ParsedEpisodeInfo.Quality = new QualityModel(Quality.WEBDL1080p, new Revision(version: 1));
+            _fakeMovie.Profile = new Profile { Cutoff = Quality.Bluray1080p, Items = Qualities.QualityFixture.GetDefaultQualities() };
+            _parseResultSingle.ParsedMovieInfo.Quality = new QualityModel(Quality.WEBDL1080p, new Revision(version: 1));
             _upgradableQuality = new QualityModel(Quality.WEBDL1080p, new Revision(version: 1));
 
             GivenMostRecentForEpisode(FIRST_EPISODE_ID, string.Empty, _upgradableQuality, DateTime.UtcNow, HistoryEventType.Grabbed);
@@ -171,8 +156,8 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
         [Test]
         public void should_not_be_upgradable_if_cutoff_already_met()
         {
-            _fakeSeries.Profile = new Profile { Cutoff = Quality.WEBDL1080p, Items = Qualities.QualityFixture.GetDefaultQualities() };
-            _parseResultSingle.ParsedEpisodeInfo.Quality = new QualityModel(Quality.WEBDL1080p, new Revision(version: 1));
+            _fakeMovie.Profile = new Profile { Cutoff = Quality.WEBDL1080p, Items = Qualities.QualityFixture.GetDefaultQualities() };
+            _parseResultSingle.ParsedMovieInfo.Quality = new QualityModel(Quality.WEBDL1080p, new Revision(version: 1));
             _upgradableQuality = new QualityModel(Quality.Bluray1080p, new Revision(version: 1));
 
             GivenMostRecentForEpisode(FIRST_EPISODE_ID, string.Empty, _upgradableQuality, DateTime.UtcNow, HistoryEventType.Grabbed);
@@ -199,8 +184,8 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
         public void should_return_false_if_cutoff_already_met_and_cdh_is_disabled()
         {
             GivenCdhDisabled();
-            _fakeSeries.Profile = new Profile { Cutoff = Quality.WEBDL1080p, Items = Qualities.QualityFixture.GetDefaultQualities() };
-            _parseResultSingle.ParsedEpisodeInfo.Quality = new QualityModel(Quality.Bluray1080p, new Revision(version: 1));
+            _fakeMovie.Profile = new Profile { Cutoff = Quality.WEBDL1080p, Items = Qualities.QualityFixture.GetDefaultQualities() };
+            _parseResultSingle.ParsedMovieInfo.Quality = new QualityModel(Quality.Bluray1080p, new Revision(version: 1));
             _upgradableQuality = new QualityModel(Quality.WEBDL1080p, new Revision(version: 1));
 
             GivenMostRecentForEpisode(FIRST_EPISODE_ID, "test", _upgradableQuality, DateTime.UtcNow.AddDays(-100), HistoryEventType.Grabbed);

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

@@ -1,4 +1,4 @@
-using FluentAssertions;
+using FluentAssertions;
 using Marr.Data;
 using NUnit.Framework;
 using NzbDrone.Core.DecisionEngine.Specifications;
@@ -6,7 +6,7 @@ using NzbDrone.Core.Parser;
 using NzbDrone.Core.Parser.Model;
 using NzbDrone.Core.Profiles;
 using NzbDrone.Core.Test.Framework;
-using NzbDrone.Core.Tv;
+using NzbDrone.Core.Movies;
 
 namespace NzbDrone.Core.Test.DecisionEngineTests
 {
@@ -14,18 +14,18 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
 
     public class LanguageSpecificationFixture : CoreTest
     {
-        private RemoteEpisode _remoteEpisode;
+        private RemoteMovie _remoteEpisode;
 
         [SetUp]
         public void Setup()
         {
-            _remoteEpisode = new RemoteEpisode
+            _remoteEpisode = new RemoteMovie
             {
-                ParsedEpisodeInfo = new ParsedEpisodeInfo
+                ParsedMovieInfo = new ParsedMovieInfo
                 {
                     Language = Language.English
                 },
-                Series = new Series
+                Movie = new Movie
                          {
                              Profile = new LazyLoaded<Profile>(new Profile
                                                                {
@@ -37,12 +37,12 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
 
         private void WithEnglishRelease()
         {
-            _remoteEpisode.ParsedEpisodeInfo.Language = Language.English;
+            _remoteEpisode.ParsedMovieInfo.Language = Language.English;
         }
 
         private void WithGermanRelease()
         {
-            _remoteEpisode.ParsedEpisodeInfo.Language = Language.German;            
+            _remoteEpisode.ParsedMovieInfo.Language = Language.German;            
         }
 
         [Test]
@@ -61,4 +61,4 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
             Mocker.Resolve<LanguageSpecification>().IsSatisfiedBy(_remoteEpisode, null).Accepted.Should().BeFalse();
         }
     }
-}
+}

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

@@ -0,0 +1,75 @@
+using FluentAssertions;
+using NUnit.Framework;
+using NzbDrone.Core.Configuration;
+using NzbDrone.Core.DecisionEngine.Specifications;
+using NzbDrone.Core.Parser.Model;
+using NzbDrone.Core.Test.Framework;
+
+namespace NzbDrone.Core.Test.DecisionEngineTests
+{
+    public class MaximumSizeSpecificationFixture : CoreTest<MaximumSizeSpecification>
+    {
+        private RemoteMovie _remoteMovie;
+
+        [SetUp]
+        public void Setup()
+        {
+            _remoteMovie = new RemoteMovie { Release = new ReleaseInfo() };
+        }
+
+        private void WithMaximumSize(int size)
+        {
+            Mocker.GetMock<IConfigService>().SetupGet(c => c.MaximumSize).Returns(size);
+        }
+
+        private void WithSize(int size)
+        {
+            _remoteMovie.Release.Size = size * 1024 * 1024;
+        }
+
+        [Test]
+        public void should_return_true_when_maximum_size_is_set_to_zero()
+        {
+            WithMaximumSize(0);
+            WithSize(1000);
+
+            Subject.IsSatisfiedBy(_remoteMovie, null).Accepted.Should().BeTrue();
+        }
+
+        [Test]
+        public void should_return_true_when_size_is_smaller_than_maximum_size()
+        {
+            WithMaximumSize(2000);
+            WithSize(1999);
+
+            Subject.IsSatisfiedBy(_remoteMovie, null).Accepted.Should().BeTrue();
+        }
+
+        [Test]
+        public void should_return_true_when_size_is_equals_to_maximum_size()
+        {
+            WithMaximumSize(2000);
+            WithSize(2000);
+
+            Subject.IsSatisfiedBy(_remoteMovie, null).Accepted.Should().BeTrue();
+        }
+
+        [Test]
+        public void should_return_false_when_size_is_bigger_than_maximum_size()
+        {
+            WithMaximumSize(2000);
+            WithSize(2001);
+
+            Subject.IsSatisfiedBy(_remoteMovie, null).Accepted.Should().BeFalse();
+        }
+
+        [Test]
+        public void should_return_true_when_size_is_zero()
+        {
+            WithMaximumSize(2000);
+            WithSize(0);
+
+            Subject.IsSatisfiedBy(_remoteMovie, null).Accepted.Should().BeTrue();
+        }
+    }
+}

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

@@ -1,4 +1,4 @@
-using System;
+using System;
 using FluentAssertions;
 using NUnit.Framework;
 using NzbDrone.Core.Configuration;
@@ -13,12 +13,12 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
 
     public class MinimumAgeSpecificationFixture : CoreTest<MinimumAgeSpecification>
     {
-        private RemoteEpisode _remoteEpisode;
+        private RemoteMovie _remoteEpisode;
 
         [SetUp]
         public void Setup()
         {
-            _remoteEpisode = new RemoteEpisode
+            _remoteEpisode = new RemoteMovie
             {
                 Release = new ReleaseInfo() { DownloadProtocol = DownloadProtocol.Usenet }
             };
@@ -61,4 +61,4 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
             Subject.IsSatisfiedBy(_remoteEpisode, null).Accepted.Should().BeFalse();
         }
     }
-}
+}

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

@@ -1,53 +1,51 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using FizzWare.NBuilder;
 using FluentAssertions;
 using NUnit.Framework;
 using NzbDrone.Core.DecisionEngine.Specifications.RssSync;
 using NzbDrone.Core.IndexerSearch.Definitions;
 using NzbDrone.Core.Parser.Model;
-using NzbDrone.Core.Tv;
+using NzbDrone.Core.Movies;
 using NzbDrone.Core.Test.Framework;
 
 namespace NzbDrone.Core.Test.DecisionEngineTests
 {
     [TestFixture]
 
-    public class MonitoredEpisodeSpecificationFixture : CoreTest<MonitoredEpisodeSpecification>
+    public class MonitoredMovieSpecificationFixture : CoreTest<MonitoredMovieSpecification>
     {
-        private MonitoredEpisodeSpecification _monitoredEpisodeSpecification;
+        private MonitoredMovieSpecification _monitoredEpisodeSpecification;
 
-        private RemoteEpisode _parseResultMulti;
-        private RemoteEpisode _parseResultSingle;
-        private Series _fakeSeries;
-        private Episode _firstEpisode;
-        private Episode _secondEpisode;
+        private RemoteMovie _parseResultMulti;
+        private RemoteMovie _parseResultSingle;
+        private Movie _fakeSeries;
+        private Movie _firstEpisode;
+        private Movie _secondEpisode;
 
         [SetUp]
         public void Setup()
         {
-            _monitoredEpisodeSpecification = Mocker.Resolve<MonitoredEpisodeSpecification>();
+            _monitoredEpisodeSpecification = Mocker.Resolve<MonitoredMovieSpecification>();
 
-            _fakeSeries = Builder<Series>.CreateNew()
+            _fakeSeries = Builder<Movie>.CreateNew()
                 .With(c => c.Monitored = true)
                 .Build();
 
-            _firstEpisode = new Episode { Monitored = true };
-            _secondEpisode = new Episode { Monitored = true };
+            _firstEpisode = new Movie() { Monitored = true };
+            _secondEpisode = new Movie() { Monitored = true };
 
 
-            var singleEpisodeList = new List<Episode> { _firstEpisode };
-            var doubleEpisodeList = new List<Episode> { _firstEpisode, _secondEpisode };
+            var singleEpisodeList = new List<Movie> { _firstEpisode };
+            var doubleEpisodeList = new List<Movie> { _firstEpisode, _secondEpisode };
 
-            _parseResultMulti = new RemoteEpisode
+            _parseResultMulti = new RemoteMovie
             {
-                Series = _fakeSeries,
-                Episodes = doubleEpisodeList
+                Movie = _fakeSeries
             };
 
-            _parseResultSingle = new RemoteEpisode
+            _parseResultSingle = new RemoteMovie
             {
-                Series = _fakeSeries,
-                Episodes = singleEpisodeList
+                Movie = _fakeSeries
             };
         }
 
@@ -108,34 +106,8 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
         public void should_return_true_for_single_episode_search()
         {
             _fakeSeries.Monitored = false;
-            _monitoredEpisodeSpecification.IsSatisfiedBy(_parseResultSingle, new SingleEpisodeSearchCriteria()).Accepted.Should().BeTrue();
+            _monitoredEpisodeSpecification.IsSatisfiedBy(_parseResultSingle, new MovieSearchCriteria()).Accepted.Should().BeTrue();
         }
 
-        [Test]
-        public void should_return_true_if_episode_is_monitored_for_season_search()
-        {
-            _monitoredEpisodeSpecification.IsSatisfiedBy(_parseResultSingle, new SeasonSearchCriteria()).Accepted.Should().BeTrue();
-        }
-
-        [Test]
-        public void should_return_false_if_episode_is_not_monitored_for_season_search()
-        {
-            WithFirstEpisodeUnmonitored();
-            _monitoredEpisodeSpecification.IsSatisfiedBy(_parseResultSingle, new SeasonSearchCriteria()).Accepted.Should().BeFalse();
-        }
-
-        [Test]
-        public void should_return_true_if_episode_is_not_monitored_and_monitoredEpisodesOnly_flag_is_false()
-        {
-            WithFirstEpisodeUnmonitored();
-            _monitoredEpisodeSpecification.IsSatisfiedBy(_parseResultSingle, new SingleEpisodeSearchCriteria { MonitoredEpisodesOnly = false }).Accepted.Should().BeTrue();
-        }
-
-        [Test]
-        public void should_return_false_if_episode_is_not_monitored_and_monitoredEpisodesOnly_flag_is_true()
-        {
-            WithFirstEpisodeUnmonitored();
-            _monitoredEpisodeSpecification.IsSatisfiedBy(_parseResultSingle, new SingleEpisodeSearchCriteria{ MonitoredEpisodesOnly = true}).Accepted.Should().BeFalse();
-        }
     }
-}
+}

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

@@ -4,7 +4,7 @@ using System.Linq;
 using Moq;
 using NzbDrone.Core.Indexers;
 using NzbDrone.Core.Profiles.Delay;
-using NzbDrone.Core.Tv;
+using NzbDrone.Core.Movies;
 using NzbDrone.Core.Profiles;
 using NzbDrone.Core.Qualities;
 using NzbDrone.Core.Parser.Model;

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

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using FluentAssertions;
 using Moq;
 using NUnit.Framework;
@@ -7,22 +7,22 @@ using NzbDrone.Core.Indexers;
 using NzbDrone.Core.Parser.Model;
 using NzbDrone.Core.Profiles.Delay;
 using NzbDrone.Core.Test.Framework;
-using NzbDrone.Core.Tv;
+using NzbDrone.Core.Movies;
 
 namespace NzbDrone.Core.Test.DecisionEngineTests
 {
     [TestFixture]
     public class ProtocolSpecificationFixture : CoreTest<ProtocolSpecification>
     {
-        private RemoteEpisode _remoteEpisode;
+        private RemoteMovie _remoteEpisode;
         private DelayProfile _delayProfile;
 
         [SetUp]
         public void Setup()
         {
-            _remoteEpisode = new RemoteEpisode();
+            _remoteEpisode = new RemoteMovie();
             _remoteEpisode.Release = new ReleaseInfo();
-            _remoteEpisode.Series = new Series();
+            _remoteEpisode.Movie = new Movie();
             
             _delayProfile = new DelayProfile();
 
@@ -72,4 +72,4 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
             Subject.IsSatisfiedBy(_remoteEpisode, null).Accepted.Should().Be(false);
         }
     }
-}
+}

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

@@ -1,4 +1,4 @@
-using FizzWare.NBuilder;
+using FizzWare.NBuilder;
 using FluentAssertions;
 using Marr.Data;
 using NUnit.Framework;
@@ -6,7 +6,7 @@ using NzbDrone.Core.DecisionEngine.Specifications;
 using NzbDrone.Core.Parser.Model;
 using NzbDrone.Core.Profiles;
 using NzbDrone.Core.Qualities;
-using NzbDrone.Core.Tv;
+using NzbDrone.Core.Movies;
 using NzbDrone.Core.Test.Framework;
 
 namespace NzbDrone.Core.Test.DecisionEngineTests
@@ -15,7 +15,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
 
     public class QualityAllowedByProfileSpecificationFixture : CoreTest<QualityAllowedByProfileSpecification>
     {
-        private RemoteEpisode remoteEpisode;
+        private RemoteMovie remoteMovie;
 
         public static object[] AllowedTestCases =
         {
@@ -34,33 +34,33 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
         [SetUp]
         public void Setup()
         {
-            var fakeSeries = Builder<Series>.CreateNew()
+            var fakeSeries = Builder<Movie>.CreateNew()
                          .With(c => c.Profile = (LazyLoaded<Profile>)new Profile { Cutoff = Quality.Bluray1080p })
                          .Build();
 
-            remoteEpisode = new RemoteEpisode
+            remoteMovie = new RemoteMovie
             {
-                Series = fakeSeries,
-                ParsedEpisodeInfo = new ParsedEpisodeInfo { Quality = new QualityModel(Quality.DVD, new Revision(version: 2)) },
+                Movie = fakeSeries,
+                ParsedMovieInfo = new ParsedMovieInfo { Quality = new QualityModel(Quality.DVD, new Revision(version: 2)) },
             };
         }
 
         [Test, TestCaseSource("AllowedTestCases")]
         public void should_allow_if_quality_is_defined_in_profile(Quality qualityType)
         {
-            remoteEpisode.ParsedEpisodeInfo.Quality.Quality = qualityType;
-            remoteEpisode.Series.Profile.Value.Items = Qualities.QualityFixture.GetDefaultQualities(Quality.DVD, Quality.HDTV720p, Quality.Bluray1080p);
+            remoteMovie.ParsedMovieInfo.Quality.Quality = qualityType;
+            remoteMovie.Movie.Profile.Value.Items = Qualities.QualityFixture.GetDefaultQualities(Quality.DVD, Quality.HDTV720p, Quality.Bluray1080p);
 
-            Subject.IsSatisfiedBy(remoteEpisode, null).Accepted.Should().BeTrue();
+            Subject.IsSatisfiedBy(remoteMovie, null).Accepted.Should().BeTrue();
         }
 
         [Test, TestCaseSource("DeniedTestCases")]
         public void should_not_allow_if_quality_is_not_defined_in_profile(Quality qualityType)
         {
-            remoteEpisode.ParsedEpisodeInfo.Quality.Quality = qualityType;
-            remoteEpisode.Series.Profile.Value.Items = Qualities.QualityFixture.GetDefaultQualities(Quality.DVD, Quality.HDTV720p, Quality.Bluray1080p);
+            remoteMovie.ParsedMovieInfo.Quality.Quality = qualityType;
+            remoteMovie.Movie.Profile.Value.Items = Qualities.QualityFixture.GetDefaultQualities(Quality.DVD, Quality.HDTV720p, Quality.Bluray1080p);
 
-            Subject.IsSatisfiedBy(remoteEpisode, null).Accepted.Should().BeFalse();
+            Subject.IsSatisfiedBy(remoteMovie, null).Accepted.Should().BeFalse();
         }
     }
-}
+}