WIP: Statistics API endpoint.

fixes #1111

.gitignore

@@ -97,7 +97,7 @@ App_Data/*.ldf
 _NCrunch_*
 _TeamCity*
 
-# NzbDrone
+# Sonarr
 config.xml
 nzbdrone.log*txt
 UpdateLogs/
@@ -105,7 +105,7 @@ UpdateLogs/
 *.test-cache
 *.userprefs
 */test-results/*
-.idea/*
+src/UI/.idea/*
 *log.txt
 node_modules/
 _output*
@@ -113,13 +113,18 @@ _rawPackage/
 _dotTrace*
 _tests/
 *.Result.xml
-wix/*.msi
-wix/*.wixobj
-wix/*.wixpdb
 setup/Output/
 *.~is
 
+UI.Phantom/
+
 #VS outout folders
 bin
 obj
 output/*
+
+
+#OS X metadata files
+._*
+
+_start

.gitmodules

@@ -0,0 +1,4 @@
+[submodule "src/ExternalModules/CurlSharp"]
+	path = src/ExternalModules/CurlSharp
+	url = https://github.com/Sonarr/CurlSharp.git
+	branch = master

.idea/.name

@@ -0,0 +1 @@
+Sonarr

.idea/Sonarr.iml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.idea" />
+      <excludeFolder url="file://$MODULE_DIR$/Logo" />
+      <excludeFolder url="file://$MODULE_DIR$/_output" />
+      <excludeFolder url="file://$MODULE_DIR$/_output_mono" />
+      <excludeFolder url="file://$MODULE_DIR$/_output_osx" />
+      <excludeFolder url="file://$MODULE_DIR$/_output_osx_app" />
+      <excludeFolder url="file://$MODULE_DIR$/_start" />
+      <excludeFolder url="file://$MODULE_DIR$/_tests" />
+      <excludeFolder url="file://$MODULE_DIR$/debian" />
+      <excludeFolder url="file://$MODULE_DIR$/node_modules" />
+      <excludeFolder url="file://$MODULE_DIR$/osx" />
+      <excludeFolder url="file://$MODULE_DIR$/schemas" />
+      <excludeFolder url="file://$MODULE_DIR$/setup" />
+      <excludeFolder url="file://$MODULE_DIR$/src" />
+      <excludeFolder url="file://$MODULE_DIR$/tools" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Sonarr node_modules" level="project" />
+  </component>
+</module>

.idea/codeStyleSettings.xml

@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectCodeStyleSettingsManager">
+    <option name="PER_PROJECT_SETTINGS">
+      <value>
+        <option name="LINE_SEPARATOR" value="&#13;&#10;" />
+        <option name="RIGHT_MARGIN" value="190" />
+        <option name="HTML_ATTRIBUTE_WRAP" value="0" />
+        <option name="HTML_KEEP_LINE_BREAKS" value="false" />
+        <option name="HTML_KEEP_BLANK_LINES" value="1" />
+        <option name="HTML_ALIGN_ATTRIBUTES" value="false" />
+        <option name="HTML_INLINE_ELEMENTS" value="" />
+        <option name="HTML_DONT_ADD_BREAKS_IF_INLINE_CONTENT" value="" />
+        <CssCodeStyleSettings>
+          <option name="HEX_COLOR_LOWER_CASE" value="true" />
+          <option name="HEX_COLOR_LONG_FORMAT" value="true" />
+          <option name="VALUE_ALIGNMENT" value="1" />
+        </CssCodeStyleSettings>
+        <JSCodeStyleSettings>
+          <option name="SPACE_BEFORE_PROPERTY_COLON" value="true" />
+          <option name="ALIGN_OBJECT_PROPERTIES" value="2" />
+          <option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
+          <option name="OBJECT_LITERAL_WRAP" value="2" />
+          <option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
+        </JSCodeStyleSettings>
+        <XML>
+          <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
+        </XML>
+        <codeStyleSettings language="CSS">
+          <indentOptions>
+            <option name="SMART_TABS" value="true" />
+          </indentOptions>
+        </codeStyleSettings>
+        <codeStyleSettings language="JavaScript">
+          <option name="LINE_COMMENT_AT_FIRST_COLUMN" value="true" />
+          <option name="KEEP_LINE_BREAKS" value="false" />
+          <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
+          <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
+          <option name="CATCH_ON_NEW_LINE" value="true" />
+          <option name="FINALLY_ON_NEW_LINE" value="true" />
+          <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
+          <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
+          <option name="SPACE_BEFORE_METHOD_PARENTHESES" value="true" />
+          <option name="CALL_PARAMETERS_WRAP" value="1" />
+          <option name="BINARY_OPERATION_WRAP" value="1" />
+          <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
+          <option name="ARRAY_INITIALIZER_WRAP" value="2" />
+          <option name="ARRAY_INITIALIZER_LBRACE_ON_NEXT_LINE" value="true" />
+          <option name="ARRAY_INITIALIZER_RBRACE_ON_NEXT_LINE" value="true" />
+          <option name="IF_BRACE_FORCE" value="3" />
+          <option name="DOWHILE_BRACE_FORCE" value="3" />
+          <option name="WHILE_BRACE_FORCE" value="3" />
+          <option name="FOR_BRACE_FORCE" value="3" />
+        </codeStyleSettings>
+      </value>
+    </option>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+  </component>
+</project>

.idea/jsLibraryMappings.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="JavaScriptLibraryMappings">
+    <file url="file://$PROJECT_DIR$" libraries="{Sonarr node_modules}" />
+    <includedPredefinedLibrary name="ECMAScript 6" />
+  </component>
+</project>

.idea/libraries/Sonarr_node_modules.xml

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

.idea/misc.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
+    <OptionsSetting value="true" id="Add" />
+    <OptionsSetting value="true" id="Remove" />
+    <OptionsSetting value="true" id="Checkout" />
+    <OptionsSetting value="true" id="Update" />
+    <OptionsSetting value="true" id="Status" />
+    <OptionsSetting value="true" id="Edit" />
+    <ConfirmationsSetting value="0" id="Add" />
+    <ConfirmationsSetting value="0" id="Remove" />
+  </component>
+  <component name="ProjectRootManager" version="2" />
+</project>

.idea/modules.xml

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

.idea/vcs.xml

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

CLA.md

@@ -1,6 +1,6 @@
-# NzbDrone Individual Contributor License Agreement #
+# Sonarr Individual Contributor License Agreement #
 
-Thank you for your interest in contributing to NzbDrone ("We" or "Us").
+Thank you for your interest in contributing to Sonarr ("We" or "Us").
 This contributor agreement ("Agreement") documents the rights granted by contributors to Us. To make this document effective, please complete the form below. This is a legally binding document, so please read it carefully before agreeing to it. The Agreement may cover more than one software project managed by Us.
 
 ## 1. Definitions ##

CONTRIBUTING.md

@@ -1,6 +1,6 @@
 # How to Contribute #
 
-We're always looking for people to help make NzbDrone even better, there are a number of ways to contribute. To get started, <a href="http://www.clahub.com/agreements/NzbDrone/NzbDrone">sign the Contributor License Agreement</a>.
+We're always looking for people to help make Sonarr even better, there are a number of ways to contribute. To get started, <a href="http://www.clahub.com/agreements/NzbDrone/NzbDrone">sign the Contributor License Agreement</a>.
 
 ## Documentation ##
 Setup guides, FAQ, the more information we have on the wiki the better.
@@ -15,15 +15,15 @@ Setup guides, FAQ, the more information we have on the wiki the better.
 
 ### Getting started ###
 
-1.  Fork NzbDrone 
-2.  Clone (develop branch)
+1.  Fork Sonarr
+2.  Clone (develop branch) *you may need pull in submodules separately if you client doesn't clone them automatically (CurlSharp)*
 3.  Run `npm install`
 4.  Run `gulp watch` - Used to compile the UI components and copy them (leave this window open)
 5.  Compile in Visual Studio
 
 ### Contributing Code ###
-- If you're adding a new, already requested feature, please comment on [Trello](https://trello.sonarr.tv "Trello") so work is not duplicated (If you want to add something not already on there, please talk to us first)
-- Rebase from NzbDrone's develop branch, don't merge
+- If you're adding a new, already requested feature, please comment on [Github Issues](https://github.com/Sonarr/Sonarr/issues "Github Issues") so work is not duplicated (If you want to add something not already on there, please talk to us first)
+- Rebase from Sonarr's develop branch, don't merge
 - Make meaningful commits, or squash them
 - Feel free to make a pull request before work is complete, this will let us see where its at and make comments/suggest improvements
 - Reach out to us on the forums or on IRC if you have any questions

Log4ViewConfig.l4v

@@ -1,720 +0,0 @@
-<Config xmlns:a="http://schemas.microsoft.com/2003/10/Serialization/Arrays" xmlns:b="http://schemas.datacontract.org/2004/07/System.Drawing" xmlns:d="http://schemas.datacontract.org/2004/07/Prosa.Log4View.Db" xmlns:f="http://schemas.datacontract.org/2004/07/Prosa.Log4View.Receiver.File" xmlns:l="http://schemas.datacontract.org/2004/07/Prosa.Log4View.Level" xmlns:m="http://schemas.datacontract.org/2004/07/Prosa.Log4View.Receiver.Msg" xmlns:n="http://schemas.datacontract.org/2004/07/Prosa.Log4View.Receiver.Net" xmlns:t="http://schemas.datacontract.org/2004/07/Prosa.Log4View.LoggerTree" xmlns:u="http://schemas.datacontract.org/2004/07/Prosa.Log4View.Utils" xmlns:i="http://www.w3.org/2001/XMLSchema-instance" z:Id="1" xmlns:z="http://schemas.microsoft.com/2003/10/Serialization/" xmlns="http://schemas.datacontract.org/2004/07/Prosa.Log4View.Configuration">
-  <Id>
-    <u:Value>1</u:Value>
-  </Id>
-  <Data z:Id="2">
-    <Id>
-      <u:Value>2</u:Value>
-    </Id>
-    <Version>17</Version>
-    <_receivers z:Id="3" z:Size="1">
-      <ReceiverConfig z:Id="4" i:type="n:NetReceiverConfig">
-        <Id>
-          <u:Value>16</u:Value>
-        </Id>
-        <BackColor>
-          <b:knownColor>0</b:knownColor>
-          <b:name i:nil="true" />
-          <b:state>2</b:state>
-          <b:value>4293654015</b:value>
-        </BackColor>
-        <BufferSize>500000</BufferSize>
-        <Encoding z:Id="5">Windows-1252</Encoding>
-        <LevelFilter z:Id="6" i:type="LogLevelSurrogated">
-          <LevelName z:Id="7">ALL</LevelName>
-        </LevelFilter>
-        <LoggingFrameworkId z:Id="8">Log4net</LoggingFrameworkId>
-        <Name z:Id="9">NzbDrone</Name>
-        <ParserType>XML</ParserType>
-        <ReadAdjacentMessages>0</ReadAdjacentMessages>
-        <ReadFrom>0001-01-01T00:00:00</ReadFrom>
-        <ReadUntil>0001-01-01T00:00:00</ReadUntil>
-        <SourceId>0</SourceId>
-        <TimeOffset>0</TimeOffset>
-        <TimeZone z:Id="10">Pacific Standard Time</TimeZone>
-        <UseFilter>false</UseFilter>
-        <Window>18</Window>
-        <n:HostName z:Id="11">localhost</n:HostName>
-        <n:Port>20480</n:Port>
-        <n:Protocol>Udp</n:Protocol>
-      </ReceiverConfig>
-    </_receivers>
-    <_sources z:Id="12" z:Size="0" />
-  </Data>
-  <Presentation z:Id="13">
-    <Id>
-      <u:Value>3</u:Value>
-    </Id>
-    <DefaultLogLevel z:Ref="6" i:nil="true" />
-    <ShowCodeDetails>false</ShowCodeDetails>
-    <ShowMessageDetails>true</ShowMessageDetails>
-    <ShowMultiField>true</ShowMultiField>
-    <ShowOutputOnDebug>true</ShowOutputOnDebug>
-    <ShowProcessDetails>false</ShowProcessDetails>
-    <ToolTipLogLevel z:Id="14" i:type="LogLevelSurrogated">
-      <LevelName z:Id="15">OFF</LevelName>
-    </ToolTipLogLevel>
-    <Version>17</Version>
-    <_charts z:Id="16" z:Size="0" />
-    <_columns z:Id="17" z:Size="29">
-      <ColumnConfig z:Id="18">
-        <Id>
-          <u:Value>78</u:Value>
-        </Id>
-        <ClipMode>ClipRight</ClipMode>
-        <FieldName z:Id="19">Id</FieldName>
-        <Name z:Ref="19" i:nil="true" />
-        <Position>-1</Position>
-        <Width>45</Width>
-        <WindowId>18</WindowId>
-      </ColumnConfig>
-      <ColumnConfig z:Id="20">
-        <Id>
-          <u:Value>79</u:Value>
-        </Id>
-        <ClipMode>ClipRight</ClipMode>
-        <FieldName z:Id="21">OriginalTime</FieldName>
-        <Name z:Ref="21" i:nil="true" />
-        <Position>-1</Position>
-        <Width>120</Width>
-        <WindowId>18</WindowId>
-      </ColumnConfig>
-      <ColumnConfig z:Id="22">
-        <Id>
-          <u:Value>80</u:Value>
-        </Id>
-        <ClipMode>ClipRight</ClipMode>
-        <FieldName z:Id="23">Time</FieldName>
-        <Name z:Ref="23" i:nil="true" />
-        <Position>1</Position>
-        <Width>80</Width>
-        <WindowId>18</WindowId>
-      </ColumnConfig>
-      <ColumnConfig z:Id="24">
-        <Id>
-          <u:Value>81</u:Value>
-        </Id>
-        <ClipMode>ClipRight</ClipMode>
-        <FieldName z:Id="25">LocalTime</FieldName>
-        <Name z:Ref="25" i:nil="true" />
-        <Position>-1</Position>
-        <Width>120</Width>
-        <WindowId>18</WindowId>
-      </ColumnConfig>
-      <ColumnConfig z:Id="26">
-        <Id>
-          <u:Value>82</u:Value>
-        </Id>
-        <ClipMode>ClipRight</ClipMode>
-        <FieldName z:Id="27">UtcTime</FieldName>
-        <Name z:Ref="27" i:nil="true" />
-        <Position>-1</Position>
-        <Width>120</Width>
-        <WindowId>18</WindowId>
-      </ColumnConfig>
-      <ColumnConfig z:Id="28">
-        <Id>
-          <u:Value>83</u:Value>
-        </Id>
-        <ClipMode>ClipRight</ClipMode>
-        <FieldName z:Id="29">Date</FieldName>
-        <Name z:Ref="29" i:nil="true" />
-        <Position>-1</Position>
-        <Width>70</Width>
-        <WindowId>18</WindowId>
-      </ColumnConfig>
-      <ColumnConfig z:Id="30">
-        <Id>
-          <u:Value>84</u:Value>
-        </Id>
-        <ClipMode>ClipRight</ClipMode>
-        <FieldName z:Id="31">Key</FieldName>
-        <Name z:Ref="31" i:nil="true" />
-        <Position>-1</Position>
-        <Width>120</Width>
-        <WindowId>18</WindowId>
-      </ColumnConfig>
-      <ColumnConfig z:Id="32">
-        <Id>
-          <u:Value>85</u:Value>
-        </Id>
-        <ClipMode>ClipRight</ClipMode>
-        <FieldName z:Id="33">Level</FieldName>
-        <Name z:Ref="33" i:nil="true" />
-        <Position>-1</Position>
-        <Width>85</Width>
-        <WindowId>18</WindowId>
-      </ColumnConfig>
-      <ColumnConfig z:Id="34">
-        <Id>
-          <u:Value>86</u:Value>
-        </Id>
-        <ClipMode>ClipMiddle</ClipMode>
-        <FieldName z:Id="35">Logger</FieldName>
-        <Name z:Ref="35" i:nil="true" />
-        <Position>2</Position>
-        <Width>120</Width>
-        <WindowId>18</WindowId>
-      </ColumnConfig>
-      <ColumnConfig z:Id="36">
-        <Id>
-          <u:Value>87</u:Value>
-        </Id>
-        <ClipMode>ClipRight</ClipMode>
-        <FieldName z:Id="37">Source</FieldName>
-        <Name z:Ref="37" i:nil="true" />
-        <Position>-1</Position>
-        <Width>90</Width>
-        <WindowId>18</WindowId>
-      </ColumnConfig>
-      <ColumnConfig z:Id="38">
-        <Id>
-          <u:Value>88</u:Value>
-        </Id>
-        <ClipMode>ClipRight</ClipMode>
-        <FieldName z:Id="39">Message</FieldName>
-        <Name z:Ref="39" i:nil="true" />
-        <Position>3</Position>
-        <Width>874</Width>
-        <WindowId>18</WindowId>
-      </ColumnConfig>
-      <ColumnConfig z:Id="40">
-        <Id>
-          <u:Value>89</u:Value>
-        </Id>
-        <ClipMode>ClipRight</ClipMode>
-        <FieldName z:Id="41">Thread</FieldName>
-        <Name z:Ref="41" i:nil="true" />
-        <Position>-1</Position>
-        <Width>95</Width>
-        <WindowId>18</WindowId>
-      </ColumnConfig>
-      <ColumnConfig z:Id="42">
-        <Id>
-          <u:Value>90</u:Value>
-        </Id>
-        <ClipMode>ClipRight</ClipMode>
-        <FieldName z:Id="43">Host</FieldName>
-        <Name z:Ref="43" i:nil="true" />
-        <Position>-1</Position>
-        <Width>90</Width>
-        <WindowId>18</WindowId>
-      </ColumnConfig>
-      <ColumnConfig z:Id="44">
-        <Id>
-          <u:Value>91</u:Value>
-        </Id>
-        <ClipMode>ClipRight</ClipMode>
-        <FieldName z:Id="45">Exception</FieldName>
-        <Name z:Ref="45" i:nil="true" />
-        <Position>-1</Position>
-        <Width>120</Width>
-        <WindowId>18</WindowId>
-      </ColumnConfig>
-      <ColumnConfig z:Id="46">
-        <Id>
-          <u:Value>92</u:Value>
-        </Id>
-        <ClipMode>ClipRight</ClipMode>
-        <FieldName z:Id="47">Domain</FieldName>
-        <Name z:Ref="47" i:nil="true" />
-        <Position>-1</Position>
-        <Width>90</Width>
-        <WindowId>18</WindowId>
-      </ColumnConfig>
-      <ColumnConfig z:Id="48">
-        <Id>
-          <u:Value>93</u:Value>
-        </Id>
-        <ClipMode>ClipRight</ClipMode>
-        <FieldName z:Id="49">Identity</FieldName>
-        <Name z:Ref="49" i:nil="true" />
-        <Position>-1</Position>
-        <Width>120</Width>
-        <WindowId>18</WindowId>
-      </ColumnConfig>
-      <ColumnConfig z:Id="50">
-        <Id>
-          <u:Value>94</u:Value>
-        </Id>
-        <ClipMode>ClipRight</ClipMode>
-        <FieldName z:Id="51">User</FieldName>
-        <Name z:Ref="51" i:nil="true" />
-        <Position>-1</Position>
-        <Width>90</Width>
-        <WindowId>18</WindowId>
-      </ColumnConfig>
-      <ColumnConfig z:Id="52">
-        <Id>
-          <u:Value>95</u:Value>
-        </Id>
-        <ClipMode>ClipRight</ClipMode>
-        <FieldName z:Id="53">Class</FieldName>
-        <Name z:Ref="53" i:nil="true" />
-        <Position>-1</Position>
-        <Width>90</Width>
-        <WindowId>18</WindowId>
-      </ColumnConfig>
-      <ColumnConfig z:Id="54">
-        <Id>
-          <u:Value>96</u:Value>
-        </Id>
-        <ClipMode>ClipRight</ClipMode>
-        <FieldName z:Id="55">Method</FieldName>
-        <Name z:Ref="55" i:nil="true" />
-        <Position>-1</Position>
-        <Width>120</Width>
-        <WindowId>18</WindowId>
-      </ColumnConfig>
-      <ColumnConfig z:Id="56">
-        <Id>
-          <u:Value>97</u:Value>
-        </Id>
-        <ClipMode>ClipRight</ClipMode>
-        <FieldName z:Id="57">File</FieldName>
-        <Name z:Ref="57" i:nil="true" />
-        <Position>-1</Position>
-        <Width>120</Width>
-        <WindowId>18</WindowId>
-      </ColumnConfig>
-      <ColumnConfig z:Id="58">
-        <Id>
-          <u:Value>98</u:Value>
-        </Id>
-        <ClipMode>ClipRight</ClipMode>
-        <FieldName z:Id="59">Line</FieldName>
-        <Name z:Ref="59" i:nil="true" />
-        <Position>-1</Position>
-        <Width>45</Width>
-        <WindowId>18</WindowId>
-      </ColumnConfig>
-      <ColumnConfig z:Id="60">
-        <Id>
-          <u:Value>99</u:Value>
-        </Id>
-        <ClipMode>ClipRight</ClipMode>
-        <FieldName z:Id="61">NDC</FieldName>
-        <Name z:Ref="61" i:nil="true" />
-        <Position>-1</Position>
-        <Width>120</Width>
-        <WindowId>18</WindowId>
-      </ColumnConfig>
-      <ColumnConfig z:Id="62">
-        <Id>
-          <u:Value>100</u:Value>
-        </Id>
-        <ClipMode>ClipRight</ClipMode>
-        <FieldName z:Id="63">MDC</FieldName>
-        <Name z:Ref="63" i:nil="true" />
-        <Position>-1</Position>
-        <Width>120</Width>
-        <WindowId>18</WindowId>
-      </ColumnConfig>
-      <ColumnConfig z:Id="64">
-        <Id>
-          <u:Value>101</u:Value>
-        </Id>
-        <ClipMode>ClipRight</ClipMode>
-        <FieldName z:Id="65">Comment</FieldName>
-        <Name z:Ref="65" i:nil="true" />
-        <Position>-1</Position>
-        <Width>120</Width>
-        <WindowId>18</WindowId>
-      </ColumnConfig>
-      <ColumnConfig z:Id="66">
-        <Id>
-          <u:Value>102</u:Value>
-        </Id>
-        <ClipMode>ClipRight</ClipMode>
-        <FieldName z:Id="67">StackTrace</FieldName>
-        <Name z:Ref="67" i:nil="true" />
-        <Position>-1</Position>
-        <Width>120</Width>
-        <WindowId>18</WindowId>
-      </ColumnConfig>
-      <ColumnConfig z:Id="68">
-        <Id>
-          <u:Value>103</u:Value>
-        </Id>
-        <ClipMode>ClipRight</ClipMode>
-        <FieldName z:Id="69">ProcessId</FieldName>
-        <Name z:Ref="69" i:nil="true" />
-        <Position>-1</Position>
-        <Width>120</Width>
-        <WindowId>18</WindowId>
-      </ColumnConfig>
-      <ColumnConfig z:Id="70">
-        <Id>
-          <u:Value>104</u:Value>
-        </Id>
-        <ClipMode>ClipRight</ClipMode>
-        <FieldName z:Id="71">ThreadId</FieldName>
-        <Name z:Ref="71" i:nil="true" />
-        <Position>-1</Position>
-        <Width>120</Width>
-        <WindowId>18</WindowId>
-      </ColumnConfig>
-      <ColumnConfig z:Id="72">
-        <Id>
-          <u:Value>105</u:Value>
-        </Id>
-        <ClipMode>ClipRight</ClipMode>
-        <FieldName z:Id="73">CallStack</FieldName>
-        <Name z:Ref="73" i:nil="true" />
-        <Position>-1</Position>
-        <Width>120</Width>
-        <WindowId>18</WindowId>
-      </ColumnConfig>
-      <ColumnConfig z:Id="74">
-        <Id>
-          <u:Value>106</u:Value>
-        </Id>
-        <ClipMode>ClipRight</ClipMode>
-        <FieldName z:Id="75">assembly</FieldName>
-        <Name z:Ref="75" i:nil="true" />
-        <Position>-1</Position>
-        <Width>120</Width>
-        <WindowId>18</WindowId>
-      </ColumnConfig>
-    </_columns>
-    <_filters z:Id="76" z:Size="0" />
-    <_formats z:Id="77" z:Size="1">
-      <FormatConfig z:Id="78">
-        <Id>
-          <u:Value>0</u:Value>
-        </Id>
-        <ConditionFieldName z:Ref="39" i:nil="true" />
-        <ConditionRelation z:Id="79"></ConditionRelation>
-        <ConditionText z:Ref="79" i:nil="true" />
-        <Formats z:Id="80" z:Size="12">
-          <a:KeyValueOfLogLevelLoggerFormatConfigxIppDzWS>
-            <a:Key z:Id="81" i:type="LogLevelSurrogated">
-              <LevelName z:Id="82">VERBOSE</LevelName>
-            </a:Key>
-            <a:Value z:Id="83">
-              <Id>
-                <u:Value>4</u:Value>
-              </Id>
-              <Backcolor>
-                <b:knownColor>0</b:knownColor>
-                <b:name i:nil="true" />
-                <b:state>0</b:state>
-                <b:value>0</b:value>
-              </Backcolor>
-              <FontName z:Id="84">Tahoma</FontName>
-              <Forecolor>
-                <b:knownColor>0</b:knownColor>
-                <b:name i:nil="true" />
-                <b:state>2</b:state>
-                <b:value>4290032820</b:value>
-              </Forecolor>
-              <Loglevel z:Ref="81" i:nil="true" />
-              <Size>8.25</Size>
-              <Style>Regular</Style>
-            </a:Value>
-          </a:KeyValueOfLogLevelLoggerFormatConfigxIppDzWS>
-          <a:KeyValueOfLogLevelLoggerFormatConfigxIppDzWS>
-            <a:Key z:Id="85" i:type="LogLevelSurrogated">
-              <LevelName z:Id="86">TRACE</LevelName>
-            </a:Key>
-            <a:Value z:Id="87">
-              <Id>
-                <u:Value>5</u:Value>
-              </Id>
-              <Backcolor>
-                <b:knownColor>0</b:knownColor>
-                <b:name i:nil="true" />
-                <b:state>0</b:state>
-                <b:value>0</b:value>
-              </Backcolor>
-              <FontName z:Id="88">Tahoma</FontName>
-              <Forecolor>
-                <b:knownColor>0</b:knownColor>
-                <b:name i:nil="true" />
-                <b:state>2</b:state>
-                <b:value>4288716960</b:value>
-              </Forecolor>
-              <Loglevel z:Ref="85" i:nil="true" />
-              <Size>8.25</Size>
-              <Style>Regular</Style>
-            </a:Value>
-          </a:KeyValueOfLogLevelLoggerFormatConfigxIppDzWS>
-          <a:KeyValueOfLogLevelLoggerFormatConfigxIppDzWS>
-            <a:Key z:Id="89" i:type="LogLevelSurrogated">
-              <LevelName z:Id="90">DEBUG</LevelName>
-            </a:Key>
-            <a:Value z:Id="91">
-              <Id>
-                <u:Value>6</u:Value>
-              </Id>
-              <Backcolor>
-                <b:knownColor>0</b:knownColor>
-                <b:name i:nil="true" />
-                <b:state>0</b:state>
-                <b:value>0</b:value>
-              </Backcolor>
-              <FontName z:Id="92">Tahoma</FontName>
-              <Forecolor>
-                <b:knownColor>0</b:knownColor>
-                <b:name i:nil="true" />
-                <b:state>2</b:state>
-                <b:value>4286743170</b:value>
-              </Forecolor>
-              <Loglevel z:Ref="89" i:nil="true" />
-              <Size>8.25</Size>
-              <Style>Regular</Style>
-            </a:Value>
-          </a:KeyValueOfLogLevelLoggerFormatConfigxIppDzWS>
-          <a:KeyValueOfLogLevelLoggerFormatConfigxIppDzWS>
-            <a:Key z:Id="93" i:type="LogLevelSurrogated">
-              <LevelName z:Id="94">INFO</LevelName>
-            </a:Key>
-            <a:Value z:Id="95">
-              <Id>
-                <u:Value>7</u:Value>
-              </Id>
-              <Backcolor>
-                <b:knownColor>0</b:knownColor>
-                <b:name i:nil="true" />
-                <b:state>0</b:state>
-                <b:value>0</b:value>
-              </Backcolor>
-              <FontName z:Id="96">Tahoma</FontName>
-              <Forecolor>
-                <b:knownColor>0</b:knownColor>
-                <b:name i:nil="true" />
-                <b:state>2</b:state>
-                <b:value>4278190080</b:value>
-              </Forecolor>
-              <Loglevel z:Ref="93" i:nil="true" />
-              <Size>8.25</Size>
-              <Style>Regular</Style>
-            </a:Value>
-          </a:KeyValueOfLogLevelLoggerFormatConfigxIppDzWS>
-          <a:KeyValueOfLogLevelLoggerFormatConfigxIppDzWS>
-            <a:Key z:Id="97" i:type="LogLevelSurrogated">
-              <LevelName z:Id="98">NOTICE</LevelName>
-            </a:Key>
-            <a:Value z:Id="99">
-              <Id>
-                <u:Value>8</u:Value>
-              </Id>
-              <Backcolor>
-                <b:knownColor>0</b:knownColor>
-                <b:name i:nil="true" />
-                <b:state>0</b:state>
-                <b:value>0</b:value>
-              </Backcolor>
-              <FontName z:Id="100">Tahoma</FontName>
-              <Forecolor>
-                <b:knownColor>0</b:knownColor>
-                <b:name i:nil="true" />
-                <b:state>2</b:state>
-                <b:value>4281957177</b:value>
-              </Forecolor>
-              <Loglevel z:Ref="97" i:nil="true" />
-              <Size>8.25</Size>
-              <Style>Regular</Style>
-            </a:Value>
-          </a:KeyValueOfLogLevelLoggerFormatConfigxIppDzWS>
-          <a:KeyValueOfLogLevelLoggerFormatConfigxIppDzWS>
-            <a:Key z:Id="101" i:type="LogLevelSurrogated">
-              <LevelName z:Id="102">WARN</LevelName>
-            </a:Key>
-            <a:Value z:Id="103">
-              <Id>
-                <u:Value>9</u:Value>
-              </Id>
-              <Backcolor>
-                <b:knownColor>0</b:knownColor>
-                <b:name i:nil="true" />
-                <b:state>0</b:state>
-                <b:value>0</b:value>
-              </Backcolor>
-              <FontName z:Id="104">Tahoma</FontName>
-              <Forecolor>
-                <b:knownColor>0</b:knownColor>
-                <b:name i:nil="true" />
-                <b:state>2</b:state>
-                <b:value>4294934528</b:value>
-              </Forecolor>
-              <Loglevel z:Ref="101" i:nil="true" />
-              <Size>8.25</Size>
-              <Style>Regular</Style>
-            </a:Value>
-          </a:KeyValueOfLogLevelLoggerFormatConfigxIppDzWS>
-          <a:KeyValueOfLogLevelLoggerFormatConfigxIppDzWS>
-            <a:Key z:Id="105" i:type="LogLevelSurrogated">
-              <LevelName z:Id="106">ERROR</LevelName>
-            </a:Key>
-            <a:Value z:Id="107">
-              <Id>
-                <u:Value>10</u:Value>
-              </Id>
-              <Backcolor>
-                <b:knownColor>0</b:knownColor>
-                <b:name i:nil="true" />
-                <b:state>0</b:state>
-                <b:value>0</b:value>
-              </Backcolor>
-              <FontName z:Id="108">Tahoma</FontName>
-              <Forecolor>
-                <b:knownColor>0</b:knownColor>
-                <b:name i:nil="true" />
-                <b:state>2</b:state>
-                <b:value>4294901760</b:value>
-              </Forecolor>
-              <Loglevel z:Ref="105" i:nil="true" />
-              <Size>8.25</Size>
-              <Style>Regular</Style>
-            </a:Value>
-          </a:KeyValueOfLogLevelLoggerFormatConfigxIppDzWS>
-          <a:KeyValueOfLogLevelLoggerFormatConfigxIppDzWS>
-            <a:Key z:Id="109" i:type="LogLevelSurrogated">
-              <LevelName z:Id="110">SEVERE</LevelName>
-            </a:Key>
-            <a:Value z:Id="111">
-              <Id>
-                <u:Value>11</u:Value>
-              </Id>
-              <Backcolor>
-                <b:knownColor>0</b:knownColor>
-                <b:name i:nil="true" />
-                <b:state>0</b:state>
-                <b:value>0</b:value>
-              </Backcolor>
-              <FontName z:Id="112">Tahoma</FontName>
-              <Forecolor>
-                <b:knownColor>0</b:knownColor>
-                <b:name i:nil="true" />
-                <b:state>2</b:state>
-                <b:value>4293067295</b:value>
-              </Forecolor>
-              <Loglevel z:Ref="109" i:nil="true" />
-              <Size>8.25</Size>
-              <Style>Regular</Style>
-            </a:Value>
-          </a:KeyValueOfLogLevelLoggerFormatConfigxIppDzWS>
-          <a:KeyValueOfLogLevelLoggerFormatConfigxIppDzWS>
-            <a:Key z:Id="113" i:type="LogLevelSurrogated">
-              <LevelName z:Id="114">CRITICAL</LevelName>
-            </a:Key>
-            <a:Value z:Id="115">
-              <Id>
-                <u:Value>12</u:Value>
-              </Id>
-              <Backcolor>
-                <b:knownColor>0</b:knownColor>
-                <b:name i:nil="true" />
-                <b:state>0</b:state>
-                <b:value>0</b:value>
-              </Backcolor>
-              <FontName z:Id="116">Tahoma</FontName>
-              <Forecolor>
-                <b:knownColor>0</b:knownColor>
-                <b:name i:nil="true" />
-                <b:state>2</b:state>
-                <b:value>4289400377</b:value>
-              </Forecolor>
-              <Loglevel z:Ref="113" i:nil="true" />
-              <Size>8.25</Size>
-              <Style>Regular</Style>
-            </a:Value>
-          </a:KeyValueOfLogLevelLoggerFormatConfigxIppDzWS>
-          <a:KeyValueOfLogLevelLoggerFormatConfigxIppDzWS>
-            <a:Key z:Id="117" i:type="LogLevelSurrogated">
-              <LevelName z:Id="118">ALERT</LevelName>
-            </a:Key>
-            <a:Value z:Id="119">
-              <Id>
-                <u:Value>13</u:Value>
-              </Id>
-              <Backcolor>
-                <b:knownColor>0</b:knownColor>
-                <b:name i:nil="true" />
-                <b:state>0</b:state>
-                <b:value>0</b:value>
-              </Backcolor>
-              <FontName z:Id="120">Tahoma</FontName>
-              <Forecolor>
-                <b:knownColor>0</b:knownColor>
-                <b:name i:nil="true" />
-                <b:state>2</b:state>
-                <b:value>4294902015</b:value>
-              </Forecolor>
-              <Loglevel z:Ref="117" i:nil="true" />
-              <Size>8.25</Size>
-              <Style>Regular</Style>
-            </a:Value>
-          </a:KeyValueOfLogLevelLoggerFormatConfigxIppDzWS>
-          <a:KeyValueOfLogLevelLoggerFormatConfigxIppDzWS>
-            <a:Key z:Id="121" i:type="LogLevelSurrogated">
-              <LevelName z:Id="122">FATAL</LevelName>
-            </a:Key>
-            <a:Value z:Id="123">
-              <Id>
-                <u:Value>14</u:Value>
-              </Id>
-              <Backcolor>
-                <b:knownColor>0</b:knownColor>
-                <b:name i:nil="true" />
-                <b:state>0</b:state>
-                <b:value>0</b:value>
-              </Backcolor>
-              <FontName z:Id="124">Tahoma</FontName>
-              <Forecolor>
-                <b:knownColor>0</b:knownColor>
-                <b:name i:nil="true" />
-                <b:state>2</b:state>
-                <b:value>4287309977</b:value>
-              </Forecolor>
-              <Loglevel z:Ref="121" i:nil="true" />
-              <Size>8.25</Size>
-              <Style>Regular</Style>
-            </a:Value>
-          </a:KeyValueOfLogLevelLoggerFormatConfigxIppDzWS>
-          <a:KeyValueOfLogLevelLoggerFormatConfigxIppDzWS>
-            <a:Key z:Id="125" i:type="LogLevelSurrogated">
-              <LevelName z:Id="126">EMERGENCY</LevelName>
-            </a:Key>
-            <a:Value z:Id="127">
-              <Id>
-                <u:Value>15</u:Value>
-              </Id>
-              <Backcolor>
-                <b:knownColor>0</b:knownColor>
-                <b:name i:nil="true" />
-                <b:state>0</b:state>
-                <b:value>0</b:value>
-              </Backcolor>
-              <FontName z:Id="128">Tahoma</FontName>
-              <Forecolor>
-                <b:knownColor>0</b:knownColor>
-                <b:name i:nil="true" />
-                <b:state>2</b:state>
-                <b:value>4285932413</b:value>
-              </Forecolor>
-              <Loglevel z:Ref="125" i:nil="true" />
-              <Size>8.25</Size>
-              <Style>Regular</Style>
-            </a:Value>
-          </a:KeyValueOfLogLevelLoggerFormatConfigxIppDzWS>
-        </Formats>
-        <IgnoreCase>false</IgnoreCase>
-        <Name z:Id="129">Default Format Settings</Name>
-      </FormatConfig>
-    </_formats>
-    <_logLevels z:Id="130" z:Size="0" />
-    <_loggers z:Id="131" z:Size="1">
-      <LoggerConfig z:Id="132">
-        <Id>
-          <u:Value>77</u:Value>
-        </Id>
-        <LogLevel z:Ref="6" i:nil="true" />
-        <LoggerPath z:Ref="79" i:nil="true" />
-        <ReceiverId>16</ReceiverId>
-      </LoggerConfig>
-    </_loggers>
-  </Presentation>
-  <Version>17</Version>
-</Config>

NzbDrone.sln.DotSettings

@@ -1,2 +0,0 @@
-<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:Boolean x:Key="/Default/Environment/ExternalSources/Decompiler/DecompileMethodBodies/@EntryValue">True</s:Boolean></wpf:ResourceDictionary>

build.ps1

@@ -1,257 +1 @@
-$msBuild = 'C:\Windows\Microsoft.NET\Framework64\v4.0.30319\msbuild.exe'
-$outputFolder = '.\_output'
-$outputFolderMono = '.\_output_mono'
-$outputFolderOsx = '.\_output_osx'
-$outputFolderOsxApp = '.\_output_osx_app'
-$testPackageFolder = '.\_tests\'
-$testSearchPattern = '*.Test\bin\x86\Release'
-$sourceFolder = '.\src'
-$updateFolder = $outputFolder + '\NzbDrone.Update'
-$updateFolderMono = $outputFolderMono + '\NzbDrone.Update'
-
-Function Build()
-{
-    Write-Host "##teamcity[progressStart 'Build']"
-
-    $clean = $msbuild + " src\nzbdrone.sln /t:Clean /m"
-    $build = $msbuild + " src\nzbdrone.sln /p:Configuration=Release /p:Platform=x86 /t:Build /m"
-
-    if(Test-Path $outputFolder)
-    {
-        Remove-Item -Recurse -Force $outputFolder -ErrorAction Continue
-    }
-
-    Invoke-Expression $clean
-    CheckExitCode
-
-    Invoke-Expression $build
-    CheckExitCode
-
-    CleanFolder $outputFolder
-
-    AddJsonNet
-
-    Write-Host "Removing Mono.Posix.dll"
-    Remove-Item "$outputFolder\Mono.Posix.dll"
-
-    Write-Host "##teamcity[progressFinish 'Build']"
-}
-
-Function CleanFolder($path, $keepConfigFiles)
-{
-    Write-Host Removing XMLDoc files
-    get-childitem $path -File -Filter *.xml -Recurse | foreach ($_) {
-
-        $filename = $_.FullName
-        $exeFilename = $filename -replace "xml", "exe"
-        $dllFilename = $filename -replace "xml", "dll"
-
-        if (Test-Path $exeFilename) {
-            remove-item $_.fullname
-        }
-
-        if (Test-Path $dllFilename) {
-            remove-item $_.fullname
-        }
-    }
-
-    get-childitem $path -File -Filter *.transform -Recurse | foreach ($_) {remove-item $_.fullname}
-
-    if($keepConfigFiles -ne $true)
-    {
-        get-childitem $path -File -Filter *.dll.config -Recurse | foreach ($_) {remove-item $_.fullname}
-    }
-
-    Write-Host Removing FluentValidation.Resources  files
-    get-childitem $path -File -Filter FluentValidation.resources.dll -recurse | foreach ($_) {remove-item $_.fullname}
-
-    get-childitem $path -File -Filter app.config -Recurse | foreach ($_) {remove-item $_.fullname}
-
-    Write-Host Removing .less files
-    get-childitem $path -File -Filter *.less -Recurse | foreach ($_) {remove-item $_.fullname}
-
-    Write-Host Removing vshost files
-    get-childitem $path -File -Filter *.vshost.exe -Recurse | foreach ($_) {remove-item $_.fullname}
-
-    if(Test-Path $$path\NuGet)
-    {
-        Write-Host Removing NuGet
-        Remove-Item -Recurse -Force "$path\NuGet"
-    }
-
-    Write-Host Removing Empty folders
-    while (Get-ChildItem $path -recurse | where {!@(Get-ChildItem -force $_.fullname)} | Test-Path)
-    {
-        Get-ChildItem $path -Directory -recurse | where {!@(Get-ChildItem -force $_.fullname)} | Remove-Item
-    }
-}
-
-Function PackageMono()
-{
-    Write-Host "##teamcity[progressStart 'Creating Mono Package']"
-
-    if(Test-Path $outputFolderMono)
-    {
-        Remove-Item -Recurse -Force $outputFolderMono -ErrorAction Continue
-    }
-
-    Copy-Item $outputFolder $outputFolderMono -recurse
-
-    Write-Host Creating MDBs
-    get-childitem $outputFolderMono -File -Include @("*.exe", "*.dll") -Exclude @("MediaInfo.dll", "sqlite3.dll") -Recurse | foreach ($_) {
-        Write-Host "Creating .mdb for $_"
-        & "tools\pdb2mdb\pdb2mdb.exe" $_.fullname
-    }
-
-    Write-Host Removing PDBs
-    get-childitem $outputFolderMono -File -Filter *.pdb -Recurse | foreach ($_) {remove-item $_.fullname}
-
-    Write-Host Removing Service helpers
-    get-childitem $outputFolderMono -File -Filter ServiceUninstall.* -Recurse | foreach ($_) {remove-item $_.fullname}
-    get-childitem $outputFolderMono -File -Filter ServiceInstall.* -Recurse | foreach ($_) {remove-item $_.fullname}
-
-    Write-Host Removing native windows binaries Sqlite, MediaInfo
-    get-childitem $outputFolderMono -File -Filter sqlite3.* -Recurse | foreach ($_) {remove-item $_.fullname}
-    get-childitem $outputFolderMono -File -Filter MediaInfo.* -Recurse | foreach ($_) {remove-item $_.fullname}
-
-    Write-Host "Adding MediaInfoDotNet.dll.config (for dllmap)"
-    Copy-Item "$sourceFolder\MediaInfoDotNet.dll.config" $outputFolderMono
-
-    Write-Host Renaming NzbDrone.Console.exe to NzbDrone.exe
-    Get-ChildItem $outputFolderMono -File -Filter "NzbDrone.exe*" -Recurse | foreach ($_) {remove-item $_.fullname}
-
-    Write-Host Removing NzbDrone.Windows
-    get-childitem $outputFolderMono -File -Filter NzbDrone.Windows.* -Recurse | foreach ($_) {remove-item $_.fullname}
-
-    Get-ChildItem $outputFolderMono -File -Filter "NzbDrone.Console.exe*" -Recurse | foreach ($_) {
-        $newName = $_.fullname -Replace ".Console",""
-
-        Rename-Item $_.fullname $newName
-    }
-
-    Write-Host Adding NzbDrone.Mono to UpdatePackage
-    Copy-Item $outputFolderMono\* $updateFolderMono -Filter NzbDrone.Mono.*
-
-    Write-Host "##teamcity[progressFinish 'Creating Mono Package']"
-}
-
-Function PackageOsx()
-{
-    Write-Host "##teamcity[progressStart 'Creating OS X Package']"
-
-    if(Test-Path $outputFolderOsx)
-    {
-        Remove-Item -Recurse -Force $outputFolderOsx -ErrorAction Continue
-    }
-
-    Copy-Item $outputFolderMono $outputFolderOsx -recurse
-
-    Write-Host "Adding sqlite dylibs"
-    Copy-Item "$sourceFolder\Libraries\sqlite\*.dylib" "$outputFolderOsx"
-
-    Write-Host "Adding MediaInfo dylib"
-    Copy-Item "$sourceFolder\Libraries\MediaInfo\*.dylib" "$outputFolderOsx"
-
-    Write-Host "Adding Startup script"
-    Copy-Item  .\osx\Sonarr "$outputFolderOsx"
-
-    Write-Host "##teamcity[progressFinish 'Creating OS X Package']"
-}
-
-
-Function PackageOsxApp()
-{
-    Write-Host "##teamcity[progressStart 'Creating OS X App Package']"
-
-    if(Test-Path $outputFolderOsxApp)
-    {
-        Remove-Item -Recurse -Force $outputFolderOsxApp -ErrorAction Continue
-    }
-
-    Copy-Item .\osx\Sonarr.app $outputFolderOsxApp\Sonarr.app -recurse
-    Copy-Item $outputFolderOsx $outputFolderOsxApp\Sonarr.app\Contents\MacOS -recurse
-
-    Write-Host "##teamcity[progressFinish 'Creating OS X App Package']"
-}
-
-Function AddJsonNet()
-{
-    get-childitem $outputFolder -File -Filter Newtonsoft.Json.* -Recurse | foreach ($_) {remove-item $_.fullname}
-    Copy-Item .\src\packages\Newtonsoft.Json.*.*\lib\net35\*.dll -Destination $outputFolder
-    Copy-Item .\src\packages\Newtonsoft.Json.*.*\lib\net35\*.dll -Destination $outputFolder\NzbDrone.Update
-}
-
-Function PackageTests()
-{
-
-    Write-Host Packaging Tests
-    Write-Host "##teamcity[progressStart 'Creating Test Package']"
-
-    if(Test-Path $testPackageFolder)
-    {
-        Remove-Item -Recurse -Force $testPackageFolder -ErrorAction Continue
-    }
-
-    Get-ChildItem -Recurse -Directory | Where-Object {$_.FullName -like $testSearchPattern} |  foreach($_){
-        Copy-Item -Recurse ($_.FullName + "\*")  $testPackageFolder -ErrorAction Ignore
-    }
-
-    .\src\.nuget\NuGet.exe install NUnit.Runners -Version 2.6.1 -Output $testPackageFolder
-
-    Copy-Item $outputFolder\*.dll -Destination $testPackageFolder -Force
-    Copy-Item $outputFolder\*.pdb -Destination $testPackageFolder -Force
-    Copy-Item .\*.sh              -Destination $testPackageFolder -Force
-
-    Write-Host Creating MDBs for tests
-    get-childitem $testPackageFolder -File -Include @("*.exe", "*.dll") -Exclude @("MediaInfo.dll", "sqlite3.dll") -Recurse | foreach ($_) {
-        Write-Host "Creating .mdb for $_"
-        & "tools\pdb2mdb\pdb2mdb.exe" $_.fullname
-    }
-
-    get-childitem $testPackageFolder -File -Filter *log.config | foreach ($_) {remove-item $_.fullname}
-
-    CleanFolder $testPackageFolder $true
-
-    Write-Host "Adding MediaInfoDotNet.dll.config (for dllmap)"
-    Copy-Item "$sourceFolder\MediaInfoDotNet.dll.config" -Destination $testPackageFolder -Force
-
-    Write-Host "##teamcity[progressFinish 'Creating Test Package']"
-}
-
-Function RunGulp()
-{
-   Write-Host "##teamcity[progressStart 'Running Gulp']"
-   Invoke-Expression  'npm install'
-   CheckExitCode
-
-   Invoke-Expression 'gulp build' -ErrorAction Continue -Verbose
-   CheckExitCode
-
-   Write-Host "##teamcity[progressFinish 'Running Gulp']"
-}
-
-Function CheckExitCode()
-{
-        if ($lastexitcode -ne 0)
-        {
-            Write-Host $errorMessage
-            exit 1
-        }
-}
-
-Function CleanupWindowsPackage()
-{
-    Write-Host Removing NzbDrone.Mono
-    get-childitem $outputFolder -File -Filter NzbDrone.Mono.* -Recurse | foreach ($_) {remove-item $_.fullname}
-
-    Write-Host Adding NzbDrone.Windows to UpdatePackage
-    Copy-Item $outputFolder\* $updateFolder -Filter NzbDrone.Windows.*
-}
-
-Build
-RunGulp
-PackageMono
-PackageOsx
-PackageOsxApp
-PackageTests
-CleanupWindowsPackage
+Write-Warning "DEPRECATED -- Please use build.sh instead."

build.sh

@@ -0,0 +1,265 @@
+#! /bin/bash
+msBuild='/c/Windows/Microsoft.NET/Framework64/v4.0.30319/'
+outputFolder='./_output'
+outputFolderMono='./_output_mono'
+outputFolderOsx='./_output_osx'
+outputFolderOsxApp='./_output_osx_app'
+testPackageFolder='./_tests/'
+testSearchPattern='*.Test/bin/x86/Release'
+sourceFolder='./src'
+slnFile=$sourceFolder/NzbDrone.sln
+updateFolder=$outputFolder/NzbDrone.Update
+updateFolderMono=$outputFolderMono/NzbDrone.Update
+
+nuget='tools/nuget/nuget.exe';
+CheckExitCode()
+{
+    "$@"
+    local status=$?
+    if [ $status -ne 0 ]; then
+        echo "error with $1" >&2
+        exit 1
+    fi
+    return $status
+}
+
+CleanFolder()
+{
+    local path=$1
+    local keepConfigFiles=$2
+
+
+    find $path -name "*.transform" -exec rm "{}" \;
+
+    if [ $keepConfigFiles != true ] ; then
+        find $path -name "*.dll.config" -exec rm "{}" \;
+    fi
+
+    echo "Removing FluentValidation.Resources files"
+    find $path -name "FluentValidation.resources.dll" -exec rm "{}" \;
+    find $path -name "App.config" -exec rm "{}" \;
+
+    echo "Removing .less files"
+    find $path -name "*.less" -exec rm "{}" \;
+
+    echo "Removing vshost files"
+    find $path -name "*.vshost.exe" -exec rm "{}" \;
+
+    echo "Removing dylib files"
+    find $path -name "*.dylib" -exec rm "{}" \;
+
+    echo "Removing Empty folders"
+    find $path -depth -empty -type d -exec rm -r "{}" \;
+}
+
+
+
+AddJsonNet()
+{
+    rm $outputFolder/Newtonsoft.Json.*
+    cp $sourceFolder/packages/Newtonsoft.Json.*/lib/net35/*.dll $outputFolder
+    cp $sourceFolder/packages/Newtonsoft.Json.*/lib/net35/*.dll $outputFolder/NzbDrone.Update
+}
+
+BuildWithMSBuild()
+{
+    export PATH=$msBuild:$PATH
+    CheckExitCode MSBuild.exe $slnFile //t:Clean //m
+    $nuget restore $slnFile
+    CheckExitCode MSBuild.exe $slnFile //p:Configuration=Release //p:Platform=x86 //t:Build //m //p:AllowedReferenceRelatedFileExtensions=.pdb
+}
+
+BuildWithXbuild()
+{
+    export MONO_IOMAP=case
+    CheckExitCode xbuild /t:Clean $slnFile
+    mono $nuget restore $slnFile
+    CheckExitCode xbuild /p:Configuration=Release /p:Platform=x86 /t:Build /p:AllowedReferenceRelatedFileExtensions=.pdb $slnFile
+}
+
+Build()
+{
+    echo "##teamcity[progressStart 'Build']"
+
+    rm -rf $outputFolder
+
+    if [ $runtime = "dotnet" ] ; then
+        BuildWithMSBuild
+    else
+        BuildWithXbuild
+    fi
+
+    CleanFolder $outputFolder false
+
+    AddJsonNet
+
+    echo "Removing Mono.Posix.dll"
+    rm $outputFolder/Mono.Posix.dll
+
+    echo "##teamcity[progressFinish 'Build']"
+}
+
+RunGulp()
+{
+    echo "##teamcity[progressStart 'npm install']"
+    CheckExitCode npm install
+    echo "##teamcity[progressFinish 'npm install']"
+
+    echo "##teamcity[progressStart 'Running Gulp']"
+    CheckExitCode gulp build
+    echo "##teamcity[progressFinish 'Running Gulp']"
+}
+
+CreateMdbs()
+{
+    local path=$1
+    if [ $runtime = "dotnet" ] ; then
+        local pdbFiles=( $(find $path -name "*.pdb") )
+        for filename in "${pdbFiles[@]}"
+        do
+          if [ -e ${filename%.pdb}.dll ]  ; then
+            tools/pdb2mdb/pdb2mdb.exe ${filename%.pdb}.dll
+          fi
+          if [ -e ${filename%.pdb}.exe ]  ; then
+            tools/pdb2mdb/pdb2mdb.exe ${filename%.pdb}.exe
+          fi
+        done
+    fi
+}
+
+PackageMono()
+{
+    echo "##teamcity[progressStart 'Creating Mono Package']"
+    rm -rf $outputFolderMono
+    cp -r $outputFolder $outputFolderMono
+
+    echo "Creating MDBs"
+    CreateMdbs $outputFolderMono
+
+    echo "Removing PDBs"
+    find $outputFolderMono -name "*.pdb" -exec rm "{}" \;
+
+    echo "Removing Service helpers"
+    rm -f $outputFolderMono/ServiceUninstall.*
+    rm -f $outputFolderMono/ServiceInstall.*
+
+    echo "Removing native windows binaries Sqlite, MediaInfo"
+    rm -f $outputFolderMono/sqlite3.*
+    rm -f $outputFolderMono/MediaInfo.*
+
+    echo "Adding NzbDrone.Core.dll.config (for dllmap)"
+    cp $sourceFolder/NzbDrone.Core/NzbDrone.Core.dll.config $outputFolderMono
+
+    echo "Adding CurlSharp.dll.config (for dllmap)"
+    cp $sourceFolder/NzbDrone.Common/CurlSharp.dll.config $outputFolderMono
+
+    echo "Renaming NzbDrone.Console.exe to NzbDrone.exe"
+    rm $outputFolderMono/NzbDrone.exe*
+    for file in $outputFolderMono/NzbDrone.Console.exe*; do
+        mv "$file" "${file//.Console/}"
+    done
+
+    echo "Removing NzbDrone.Windows"
+    rm $outputFolderMono/NzbDrone.Windows.*
+
+    echo "Adding NzbDrone.Mono to UpdatePackage"
+    cp $outputFolderMono/NzbDrone.Mono.* $updateFolderMono
+
+    echo "##teamcity[progressFinish 'Creating Mono Package']"
+}
+
+PackageOsx()
+{
+    echo "##teamcity[progressStart 'Creating OS X Package']"
+    rm -rf $outputFolderOsx
+    cp -r $outputFolderMono $outputFolderOsx
+
+    echo "Adding sqlite dylibs"
+    cp $sourceFolder/Libraries/Sqlite/*.dylib $outputFolderOsx
+
+    echo "Adding MediaInfo dylib"
+    cp $sourceFolder/Libraries/MediaInfo/*.dylib $outputFolderOsx
+
+    echo "Adding Startup script"
+    cp  ./osx/Sonarr $outputFolderOsx
+
+    echo "##teamcity[progressFinish 'Creating OS X Package']"
+}
+
+PackageOsxApp()
+{
+    echo "##teamcity[progressStart 'Creating OS X App Package']"
+    rm -rf $outputFolderOsxApp
+    mkdir $outputFolderOsxApp
+
+    cp -r ./osx/Sonarr.app $outputFolderOsxApp
+    cp -r $outputFolderOsx $outputFolderOsxApp/Sonarr.app/Contents/MacOS
+
+    echo "##teamcity[progressFinish 'Creating OS X App Package']"
+}
+
+PackageTests()
+{
+    echo "Packaging Tests"
+    echo "##teamcity[progressStart 'Creating Test Package']"
+    rm -rf $testPackageFolder
+    mkdir $testPackageFolder
+
+    find $sourceFolder -path $testSearchPattern -exec cp -r -u -T "{}" $testPackageFolder \;
+
+    if [ $runtime = "dotnet" ] ; then
+        $nuget install NUnit.Runners -Version 2.6.1 -Output $testPackageFolder
+    else
+        mono $nuget install NUnit.Runners -Version 2.6.1 -Output $testPackageFolder
+    fi
+
+    cp $outputFolder/*.dll $testPackageFolder
+    cp ./*.sh $testPackageFolder
+
+    echo "Creating MDBs for tests"
+    CreateMdbs $testPackageFolder
+
+    rm -f $testPackageFolder/*.log.config
+
+    CleanFolder $testPackageFolder true
+
+    echo "Adding NzbDrone.Core.dll.config (for dllmap)"
+    cp $sourceFolder/NzbDrone.Core/NzbDrone.Core.dll.config $testPackageFolder
+
+    echo "Adding CurlSharp.dll.config (for dllmap)"
+    cp $sourceFolder/NzbDrone.Common/CurlSharp.dll.config $testPackageFolder
+
+    echo "Copying CurlSharp libraries"
+    cp $sourceFolder/ExternalModules/CurlSharp/libs/i386/* $testPackageFolder
+
+    echo "##teamcity[progressFinish 'Creating Test Package']"
+}
+
+CleanupWindowsPackage()
+{
+    echo "Removing NzbDrone.Mono"
+    rm -f $outputFolder/NzbDrone.Mono.*
+
+    echo "Adding NzbDrone.Windows to UpdatePackage"
+    cp $outputFolder/NzbDrone.Windows.* $updateFolder
+}
+
+# Use mono or .net depending on OS
+case "$(uname -s)" in
+    CYGWIN*|MINGW32*|MINGW64*|MSYS*)
+        # on windows, use dotnet
+        runtime="dotnet"
+        ;;
+    *)
+        # otherwise use mono
+        runtime="mono"
+        ;;
+esac
+
+Build
+RunGulp
+PackageMono
+PackageOsx
+PackageOsxApp
+PackageTests
+CleanupWindowsPackage

commonjsCleanup.linq

@@ -1,50 +0,0 @@
-<Query Kind="Program" />
-
-void Main()
-{
-	var files = Directory.GetFiles("c:\\git\\sonarr\\src\\UI","*.js", SearchOption.AllDirectories);
-	
-	var moduleRegex = new Regex(@"module.exports\s*=\s*\(function\s*\(\)\s*{\n\s*return\s*(\w|\W)*\)\.call\(this\);$");
-	var functionHead = new Regex(@"\s*\(function\s*\(\)\s*{\n\s*return\s*");
-	var functionTail = new Regex(@"\}\).call\(this\);$");
-    var multiVar = new Regex(@"^(?<d>var\s*\w*\s*=\s*require\(.*\)),");
-	var seperateDeclearatuin = new Regex(@"^((\w|\$|_)*\s=\srequire\(.*\))(,|;)", RegexOptions.Multiline);
-	
-	foreach (var filePath in files)
-	{
-	 	var text = File.ReadAllText(filePath);
-		
-		var newContent = text.Replace("// Generated by uRequire v0.7.0-beta.14  template: 'nodejs'","");
-		
-		newContent = newContent.Replace("var __isAMD = !!(typeof define === 'function' && define.amd),","");
-	    newContent = newContent.Replace("__isNode = (typeof exports === 'object'),","");
-		newContent = newContent.Replace("__isWeb = !__isNode;","");
-		newContent = newContent.Replace("\"use strict\";","'use strict';");
-		
-		newContent = newContent.Trim();
-		
-
-		
-		if(moduleRegex.IsMatch(newContent))
-		{
-			filePath.Dump();
-			
-			newContent = functionHead.Replace(newContent," ");
-			newContent = functionTail.Replace(newContent,"");
-		}
-		
-		if(multiVar.IsMatch(newContent))
-		{
-			newContent = multiVar.Replace(newContent,"$1;"); //first one
-		
-		}
-		
-		newContent = seperateDeclearatuin.Replace(newContent,"var $1;"); //ones after
-		newContent.Replace("var $ = require('jquery'), var","var $ = require('jquery');");
-		
-		File.WriteAllText(filePath,newContent.Trim());
-		
-	}
-}
-
-// Define other methods and classes here

debian/copyright

@@ -3,7 +3,7 @@ Upstream-Name: nzbdrone
 Source: https://github.com/Sonarr/Sonarr
 
 Files: *
-Copyright: 2010-2014 Sonarr <hello@sonarr.tv>
+Copyright: 2010-2016 Sonarr <hello@sonarr.tv>
 
 License: GPL-3.0+
 

gulp/build.js

@@ -6,7 +6,13 @@ require('./less');
 require('./handlebars');
 require('./copy');
 
-gulp.task('build', function () {
-    return  runSequence('clean',
-        ['webpack', 'less', 'handlebars', 'copyHtml', 'copyContent', 'copyJs']);
+gulp.task('build', function() {
+    return runSequence('clean', [
+            'webpack',
+            'less',
+            'handlebars',
+            'copyHtml',
+            'copyContent',
+            'copyJs'
+        ]);
 });

gulp/clean.js

@@ -3,6 +3,6 @@ var del = require('del');
 
 var paths = require('./paths');
 
-gulp.task('clean', function (cb) {
-	del([paths.dest.root], cb);
+gulp.task('clean', function(cb) {
+    del([paths.dest.root], cb);
 });

gulp/copy.js

@@ -1,27 +1,31 @@
 var gulp = require('gulp');
 var print = require('gulp-print');
 var cache = require('gulp-cached');
+var livereload = require('gulp-livereload');
 
 var paths = require('./paths.js');
 
 gulp.task('copyJs', function () {
-    return gulp.src(
-      [
-        paths.src.root + "polyfills.js",
-        paths.src.root + "JsLibraries\\handlebars.runtime.js",
-      ])
-        .pipe(cache('copyJs'))
-        .pipe(print())
-        .pipe(gulp.dest(paths.dest.root));
+  return gulp.src(
+    [
+      paths.src.root + 'polyfills.js',
+      paths.src.root + 'JsLibraries/handlebars.runtime.js'
+    ])
+    .pipe(cache('copyJs'))
+    .pipe(print())
+    .pipe(gulp.dest(paths.dest.root))
+    .pipe(livereload());
 });
 
 gulp.task('copyHtml', function () {
-    return gulp.src(paths.src.html)
-        .pipe(cache('copyHtml'))
-        .pipe(gulp.dest(paths.dest.root));
+  return gulp.src(paths.src.html)
+    .pipe(cache('copyHtml'))
+    .pipe(gulp.dest(paths.dest.root))
+    .pipe(livereload());
 });
 
 gulp.task('copyContent', function () {
-    return gulp.src([paths.src.content + '**/*.*', '!**/*.less'])
-        .pipe(gulp.dest(paths.dest.content));
+  return gulp.src([paths.src.content + '**/*.*', '!**/*.less'])
+    .pipe(gulp.dest(paths.dest.content))
+    .pipe(livereload());
 });

gulp/errorHandler.js

@@ -1,7 +1,7 @@
 module.exports = {
-    onError:function (error) {
+    onError : function(error) {
         //If you want details of the error in the console
         console.log(error.toString());
         this.emit('end');
     }
-} 
+};

gulp/gulpFile.js

@@ -8,5 +8,4 @@ require('./less.js');
 require('./stripBom.js');
 require('./imageMin.js');
 require('./webpack.js');
-
-
+require('./start.js');

gulp/handlebars.js

@@ -3,21 +3,25 @@ var handlebars = require('gulp-handlebars');
 var declare = require('gulp-declare');
 var concat = require('gulp-concat');
 var wrap = require("gulp-wrap");
+var livereload = require('gulp-livereload');
 var path = require('path');
 var streamqueue = require('streamqueue');
 var stripbom = require('gulp-stripbom');
 
 var paths = require('./paths.js');
 
-gulp.task('handlebars', function () {
+gulp.task('handlebars', function() {
 
-    var coreStream = gulp.src([paths.src.templates, '!*/**/*Partial.*'])
-        .pipe(stripbom({ showLog: false }))
+    var coreStream = gulp.src([
+        paths.src.templates,
+        '!*/**/*Partial.*'
+    ])
+        .pipe(stripbom({ showLog : false }))
         .pipe(handlebars())
         .pipe(declare({
-            namespace: 'T',
-            noRedeclare: true,
-            processName: function (filePath) {
+            namespace   : 'T',
+            noRedeclare : true,
+            processName : function(filePath) {
 
                 filePath = path.relative(paths.src.root, filePath);
 
@@ -29,12 +33,12 @@ gulp.task('handlebars', function () {
         }));
 
     var partialStream = gulp.src([paths.src.partials])
-        .pipe(stripbom({ showLog: false }))
+        .pipe(stripbom({ showLog : false }))
         .pipe(handlebars())
         .pipe(wrap('Handlebars.template(<%= contents %>)'))
         .pipe(wrap('Handlebars.registerPartial(<%= processPartialName(file.relative) %>, <%= contents %>)', {}, {
-            imports: {
-                processPartialName: function (fileName) {
+            imports : {
+                processPartialName : function(fileName) {
                     return JSON.stringify(
                         path.basename(fileName, '.js')
                     );
@@ -42,11 +46,10 @@ gulp.task('handlebars', function () {
             }
         }));
 
-
-    return streamqueue({ objectMode: true },
+    return streamqueue({ objectMode : true },
         partialStream,
         coreStream
     ).pipe(concat('templates.js'))
-
-        .pipe(gulp.dest(paths.dest.root));
+        .pipe(gulp.dest(paths.dest.root))
+        .pipe(livereload());
 });

gulp/imageMin.js

@@ -2,14 +2,13 @@ var gulp = require('gulp');
 var print = require('gulp-print');
 var paths = require('./paths.js');
 
-
-gulp.task('imageMin', function () {
+gulp.task('imageMin', function() {
     var imagemin = require('gulp-imagemin');
     return gulp.src(paths.src.images)
         .pipe(imagemin({
-            progressive: false,
-            optimizationLevel :4,
-            svgoPlugins: [{removeViewBox: false}]
+            progressive       : false,
+            optimizationLevel : 4,
+            svgoPlugins       : [{ removeViewBox : false }]
         }))
         .pipe(print())
         .pipe(gulp.dest(paths.src.content + 'Images/'));

gulp/jshint.js

@@ -4,9 +4,11 @@ var stylish = require('jshint-stylish');
 var cache = require('gulp-cached');
 var paths = require('./paths.js');
 
-
-gulp.task('jshint', function () {
-    return gulp.src([paths.src.scripts, paths.src.exclude.libs])
+gulp.task('jshint', function() {
+    return gulp.src([
+        paths.src.scripts,
+        paths.src.exclude.libs
+    ])
         .pipe(cache('jshint'))
         .pipe(jshint())
         .pipe(jshint.reporter(stylish));

gulp/less.js

@@ -1,33 +1,46 @@
 var gulp = require('gulp');
-var less = require('gulp-less');
-var print = require('gulp-print');
 
+var less = require('gulp-less');
+var postcss = require('gulp-postcss');
+var sourcemaps = require('gulp-sourcemaps');
+var autoprefixer = require('autoprefixer-core');
+var livereload = require('gulp-livereload');
+
+var print = require('gulp-print');
 var paths = require('./paths');
 var errorHandler = require('./errorHandler');
 
-gulp.task('less', function () {
-    return  gulp.src([
-            paths.src.content + 'bootstrap.less',
-            paths.src.content + 'theme.less',
-            paths.src.content + 'overrides.less',
-            paths.src.root + 'Series/series.less',
-            paths.src.root + 'Activity/activity.less',
-            paths.src.root + 'AddSeries/addSeries.less',
-            paths.src.root + 'Calendar/calendar.less',
-            paths.src.root + 'Cells/cells.less',
-            paths.src.root + 'Settings/settings.less',
-            paths.src.root + 'System/Logs/logs.less',
-            paths.src.root + 'System/Update/update.less',
-            paths.src.root + 'System/Info/info.less',
-    ])
+gulp.task('less', function() {
+
+    var src = [
+        paths.src.content + 'bootstrap.less',
+        paths.src.content + 'theme.less',
+        paths.src.content + 'overrides.less',
+        paths.src.root + 'Series/series.less',
+        paths.src.root + 'Activity/activity.less',
+        paths.src.root + 'AddSeries/addSeries.less',
+        paths.src.root + 'Calendar/calendar.less',
+        paths.src.root + 'Cells/cells.less',
+        paths.src.root + 'ManualImport/manualimport.less',
+        paths.src.root + 'Settings/settings.less',
+        paths.src.root + 'System/Logs/logs.less',
+        paths.src.root + 'System/Update/update.less',
+        paths.src.root + 'System/Info/info.less'
+    ];
+
+    return gulp.src(src)
         .pipe(print())
+        .pipe(sourcemaps.init())
         .pipe(less({
-            dumpLineNumbers: 'false',
-            compress: true,
-            yuicompress: true,
-            ieCompat: true,
-            strictImports: true
+            dumpLineNumbers : 'false',
+            compress        : true,
+            yuicompress     : true,
+            ieCompat        : true,
+            strictImports   : true
         }))
+        .pipe(postcss([ autoprefixer({ browsers: ['last 2 versions'] }) ]))
         .on('error', errorHandler.onError)
-        .pipe(gulp.dest(paths.dest.content));
+        .pipe(sourcemaps.write(paths.dest.content))
+        .pipe(gulp.dest(paths.dest.content))
+        .pipe(livereload());
 });

gulp/paths.js

@@ -1,19 +1,21 @@
-module.exports = {
-    src: {
-        root: './src/UI/',
-        templates: './src/UI/**/*.hbs',
-        html: './src/UI/*.html',
-        partials: './src/UI/**/*Partial.hbs',
-        scripts: './src/UI/**/*.js',
-        less: ['./src/UI/**/*.less'],
-        content: './src/UI/Content/',
-        images: './src/UI/Content/Images/**/*',
-        exclude :{
-            libs:'!./src/UI/JsLibraries/**'
+var paths = {
+    src  : {
+        root      : './src/UI/',
+        templates : './src/UI/**/*.hbs',
+        html      : './src/UI/*.html',
+        partials  : './src/UI/**/*Partial.hbs',
+        scripts   : './src/UI/**/*.js',
+        less      : ['./src/UI/**/*.less'],
+        content   : './src/UI/Content/',
+        images    : './src/UI/Content/Images/**/*',
+        exclude   : {
+            libs : '!./src/UI/JsLibraries/**'
         }
     },
-    dest: {
-        root: './_output/UI/',
-        content: './_output/UI/Content/'
+    dest : {
+        root    : './_output/UI/',
+        content : './_output/UI/Content/'
     }
 };
+
+module.exports = paths;

gulp/start.js

@@ -0,0 +1,112 @@
+// will download and run sonarr (server) in a non-windows enviroment
+// you can use this if you don't care about the server code and just want to work
+// with the web code.
+
+var http = require('http');
+var gulp = require('gulp');
+var fs = require('fs');
+var targz = require('tar.gz');
+var del = require('del');
+var print = require('gulp-print');
+var spawn = require('child_process').spawn;
+
+function download(url, dest, cb) {
+  console.log('Downloading ' + url + ' to ' + dest);
+  var file = fs.createWriteStream(dest);
+  var request = http.get(url, function (response) {
+    response.pipe(file);
+    file.on('finish', function () {
+      console.log('Download completed');
+      file.close(cb);
+    });
+  });
+}
+
+function getLatest(cb) {
+  var branch = 'develop';
+  process.argv.forEach(function (val) {
+    var branchMatch = /branch=([\S]*)/.exec(val);
+    if (branchMatch && branchMatch.length > 1) {
+      branch = branchMatch[1];
+    }
+  });
+
+  var url = 'http://services.sonarr.tv/v1/update/' + branch + '?os=osx';
+
+  console.log('Checking for latest version:', url);
+
+  http.get(url, function (res) {
+    var data = '';
+
+    res.on('data', function (chunk) {
+      data += chunk;
+    });
+
+    res.on('end', function () {
+      var updatePackage = JSON.parse(data).updatePackage;
+      console.log('Latest version available: ' + updatePackage.version + ' Release Date: ' + updatePackage.releaseDate);
+      cb(updatePackage);
+    });
+  }).on('error', function (e) {
+    console.log('problem with request: ' + e.message);
+  });
+}
+
+function extract(source, dest, cb) {
+  console.log('extracting download page to ' + dest);
+  new targz().extract(source, dest, function (err) {
+    if (err) {
+      console.log(err);
+    }
+    console.log('Update package extracted.');
+    cb();
+  });
+}
+
+gulp.task('getSonarr', function () {
+
+  //gulp.src('/Users/kayone/git/Sonarr/_start/2.0.0.3288/NzbDrone/*.*')
+  //  .pipe(print())
+  //  .pipe(gulp.dest('./_output
+
+  //return;
+  try {
+    fs.mkdirSync('./_start/');
+  } catch (e) {
+    if (e.code != 'EEXIST') {
+      throw e;
+    }
+  }
+
+  getLatest(function (package) {
+    var packagePath = "./_start/" + package.filename;
+    var dirName = "./_start/" + package.version;
+    download(package.url, packagePath, function () {
+      extract(packagePath, dirName, function () {
+        // clean old binaries
+        console.log('Cleaning old binaries');
+        del.sync(['./_output/*', '!./_output/UI/']);
+        console.log('copying binaries to target');
+        gulp.src(dirName + '/NzbDrone/*.*')
+          .pipe(gulp.dest('./_output/'));
+      });
+    });
+  });
+});
+
+gulp.task('startSonarr', function () {
+
+  var ls = spawn('mono', ['--debug', './_output/NzbDrone.exe']);
+
+  ls.stdout.on('data', function (data) {
+    process.stdout.write('' + data);
+  });
+
+  ls.stderr.on('data', function (data) {
+    process.stdout.write('' + data);
+  });
+
+  ls.on('close', function (code) {
+    console.log('child process exited with code ' + code);
+  });
+});

gulp/stripBom.js

@@ -7,6 +7,10 @@ var stripBom = function (dest) {
         .pipe(stripbom({ showLog: false }))
         .pipe(gulp.dest(dest));
 
+    gulp.src(paths.src.less)
+        .pipe(stripbom({ showLog: false }))
+        .pipe(gulp.dest(dest));
+
     gulp.src(paths.src.templates)
         .pipe(stripbom({ showLog: false }))
         .pipe(gulp.dest(dest));

gulp/watch.js

@@ -1,6 +1,5 @@
 var gulp = require('gulp');
-//var livereload = require('gulp-livereload');
-
+var livereload = require('gulp-livereload');
 
 var paths = require('./paths.js');
 
@@ -10,24 +9,12 @@ require('./less.js');
 require('./copy.js');
 require('./webpack.js');
 
-
-gulp.task('watch', ['jshint', 'handlebars', 'less','copyHtml', 'copyContent','copyJs'], function () {
-    gulp.start('webpackWatch');
-    gulp.watch([paths.src.scripts, paths.src.exclude.libs], ['jshint','copyJs']);
-    gulp.watch(paths.src.templates, ['handlebars']);
-    gulp.watch([paths.src.less, paths.src.exclude.libs], ['less']);
-    gulp.watch([paths.src.html], ['copyHtml']);
-    gulp.watch([paths.src.content + '**/*.*', '!**/*.less'], ['copyContent']);
-});
-
-gulp.task('liveReload', ['jshint', 'handlebars', 'less', 'webPack'], function () {
-    var server = livereload();
-    gulp.watch([
-        'app/**/*.js',
-        'app/**/*.css',
-        'app/index.html',
-        'app/login.html'
-    ]).on('change', function (file) {
-        server.changed(file.path);
-    });
-});
+gulp.task('watch', ['jshint', 'handlebars', 'less', 'copyHtml', 'copyContent', 'copyJs'], function () {
+  livereload.listen();
+  gulp.start('webpackWatch');
+  gulp.watch([paths.src.scripts, paths.src.exclude.libs], ['jshint', 'copyJs']);
+  gulp.watch(paths.src.templates, ['handlebars']);
+  gulp.watch([paths.src.less, paths.src.exclude.libs], ['less']);
+  gulp.watch([paths.src.html], ['copyHtml']);
+  gulp.watch([paths.src.content + '**/*.*', '!**/*.less'], ['copyContent']);
+});

gulp/webpack.js

@@ -1,20 +1,13 @@
 var gulp = require('gulp');
-
-var gulpWebpack = require('gulp-webpack');
-var webpack = require('webpack');
+var webpackStream = require('webpack-stream');
+var livereload = require('gulp-livereload');
 var webpackConfig = require('../webpack.config');
 
-webpackConfig.devtool = "#source-map";
-
 gulp.task('webpack', function() {
-  return gulp.src('main.js')
-    .pipe(gulpWebpack(webpackConfig, webpack))
-    .pipe(gulp.dest(''));
+    return gulp.src('main.js').pipe(webpackStream(webpackConfig)).pipe(gulp.dest(''));
 });
 
 gulp.task('webpackWatch', function() {
-  webpackConfig.watch = true;
-  return gulp.src('main.js')
-    .pipe(gulpWebpack(webpackConfig, webpack))
-    .pipe(gulp.dest(''));
+    webpackConfig.watch = true;
+    return gulp.src('main.js').pipe(webpackStream(webpackConfig)).pipe(gulp.dest('')).pipe(livereload());
 });

gulpFile.js

@@ -1 +1 @@
-require('./gulp/gulpfile.js');
+require('./gulp/gulpFile.js');

integration_mono.sh

@@ -5,3 +5,4 @@ NUNIT="$TESTDIR/NUnit.Runners.2.6.1/tools/nunit-console-x86.exe"
 mono --debug --runtime=v4.0 $NUNIT $EXCLUDE -xml:NzbDrone.Api.Result.xml $TESTDIR/NzbDrone.Api.Test.dll
 mono --debug --runtime=v4.0 $NUNIT $EXCLUDE -xml:NzbDrone.Core.Result.xml $TESTDIR/NzbDrone.Core.Test.dll
 mono --debug --runtime=v4.0 $NUNIT $EXCLUDE -xml:NzbDrone.Integration.Result.xml $TESTDIR/NzbDrone.Integration.Test.dll
+mono --debug --runtime=v4.0 $NUNIT $EXCLUDE -xml:NzbDrone.Common.Result.xml $TESTDIR/NzbDrone.Common.Test.dll

osx/Sonarr

@@ -4,7 +4,7 @@
 DIR=$(cd "$(dirname "$0")"; pwd)
  
 #change these values to match your app
-EXE_PATH="$DIR/nzbdrone.exe"
+EXE_PATH="$DIR/NzbDrone.exe"
 APPNAME="Sonarr"
  
 #set up environment

package.json

@@ -15,25 +15,31 @@
   "gitHead": "9ff7aa1bf7fe38c4c5bdb92f56c8ad556916ed67",
   "readmeFilename": "readme.md",
   "dependencies": {
-    "del": "1.1.1",
-    "gulp": "3.8.10",
-    "gulp-cached": "1.0.2",
-    "gulp-concat": "2.4.3",
+    "autoprefixer-core": "5.2.1",
+    "del": "1.2.0",
+    "gulp": "3.9.0",
+    "gulp-cached": "1.1.0",
+    "gulp-concat": "2.6.0",
     "gulp-declare": "0.3.0",
     "gulp-handlebars": "3.0.1",
-    "gulp-jshint": "1.9.2",
-    "gulp-less": "2.0.1",
+    "gulp-jshint": "1.11.2",
+    "gulp-less": "3.0.3",
+    "gulp-livereload": "3.8.0",
+    "gulp-postcss": "6.0.0",
     "gulp-print": "1.1.0",
-    "gulp-replace": "0.5.2",
+    "gulp-replace": "0.5.3",
+    "gulp-run": "1.6.8",
+    "gulp-sourcemaps": "1.5.2",
     "gulp-stripbom": "1.0.4",
-    "gulp-run": "1.6.6",
-    "gulp-webpack": "1.2.0",
-    "gulp-wrap": "0.10.1",
-    "handlebars": "2.0.0",
-    "jshint-loader": "0.8.1",
-    "jshint-stylish": "1.0.0",
-    "run-sequence": "1.0.2",
-    "streamqueue": "0.1.1",
-    "webpack": "1.5.3"
+    "gulp-webpack": "1.5.0",
+    "gulp-wrap": "0.11.0",
+    "handlebars": "3.0.3",
+    "jshint-loader": "0.8.3",
+    "jshint-stylish": "2.0.1",
+    "run-sequence": "1.1.1",
+    "streamqueue": "1.1.0",
+    "tar.gz": "0.1.1",
+    "webpack": "1.12.0",
+    "webpack-stream": "2.1.0"
   }
 }

readme.md

@@ -5,7 +5,7 @@ Sonarr is a PVR for Usenet and BitTorrent users. It can monitor multiple RSS fee
 
 ## Major Features Include: ##
 
-* Support for major platforms: Windows, Linux, OSX, Raspberry Pi, etc. 
+* Support for major platforms: Windows, Linux, OSX, Raspberry Pi, etc.
 * Automatically detects new episodes
 * Can scan your existing library and download any missing episodes
 * Can watch for better quality of the episodes you already have and do an automatic upgrade. *eg. from DVD to Blu-Ray*
@@ -21,7 +21,7 @@ Sonarr is a PVR for Usenet and BitTorrent users. It can monitor multiple RSS fee
 ## Configuring Development Environment: ##
 
 ### Requirements ###
-- Visual Studio 2013 ([Express Edition](http://www.microsoft.com/visualstudio/eng/products/visual-studio-express-for-web "Express Edition") might work but not tested.)
+- Visual Studio 2015 [Free Community Edition](https://www.visualstudio.com/en-us/products/visual-studio-community-vs.aspx)
 - [Git](http://git-scm.com/downloads)
 - [NodeJS](http://nodejs.org/download/)
 - [Gulp](http://gulpjs.com)
@@ -30,11 +30,12 @@ Sonarr is a PVR for Usenet and BitTorrent users. It can monitor multiple RSS fee
 
 - Make sure all the required software mentioned above are installed.
 - Clone the repository into your development machine. [*info*](https://help.github.com/articles/working-with-repositories)
+- Grab the submodules `git submodule init && git submodule update`
 - install the required Node Packages `npm install`
 - install gulp `npm install gulp -g`
 - start gulp to monitor your dev environment for any changes that need post processing using `gulp watch` command.
 
-*Please note gulp must be running at all times while you are working with NzbDrone client source files.*
+*Please note gulp must be running at all times while you are working with Sonarr client source files.*
 
 
 ### Development ###
@@ -44,7 +45,7 @@ Sonarr is a PVR for Usenet and BitTorrent users. It can monitor multiple RSS fee
 
 ### License ###
 * [GNU GPL v3](http://www.gnu.org/licenses/gpl.html)
-Copyright 2010-2014
+Copyright 2010-2016
 
 
 ### Sponsors ###

rename.ps1

@@ -1,17 +0,0 @@
-Param( 
-    [Parameter(Mandatory=$true, Position=0, HelpMessage="A branch name is #requires required")] 
-    [string]$branch, 
-    [Parameter(Mandatory=$true, Position=1, HelpMessage="A version is required")] 
-    [string]$version
-)
-
-if ($branch -eq "<default>")
-{
-    $branch = "teamcity";
-}
-
-Write-Host $branch;
-Write-Host $version;
-Write-Host "NzbDrone.$branch.$version.zip";
-
-Rename-Item "nzbdrone.zip" "NzbDrone.$branch.$version.zip"

src/.nuget/NuGet.Config

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <solution>
-    <add key="disableSourceControlIntegration" value="true" />
-  </solution>
-</configuration>

src/.nuget/NuGet.targets

@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-    <PropertyGroup>
-        <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(MSBuildProjectDirectory)\..\</SolutionDir>
-        
-        <!-- Enable the restore command to run before builds -->
-        <RestorePackages Condition="  '$(RestorePackages)' == '' ">false</RestorePackages>
-
-        <!-- Property that enables building a package from a project -->
-        <BuildPackage Condition=" '$(BuildPackage)' == '' ">false</BuildPackage>
-
-        <!-- Determines if package restore consent is required to restore packages -->
-        <RequireRestoreConsent Condition=" '$(RequireRestoreConsent)' != 'false' ">true</RequireRestoreConsent>
-        
-        <!-- Download NuGet.exe if it does not already exist -->
-        <DownloadNuGetExe Condition=" '$(DownloadNuGetExe)' == '' ">false</DownloadNuGetExe>
-    </PropertyGroup>
-    
-    <ItemGroup Condition=" '$(PackageSources)' == '' ">
-        <!-- Package sources used to restore packages. By default, registered sources under %APPDATA%\NuGet\NuGet.Config will be used -->
-        <!-- The official NuGet package source (https://www.nuget.org/api/v2/) will be excluded if package sources are specified and it does not appear in the list -->
-        <!--
-            <PackageSource Include="https://www.nuget.org/api/v2/" />
-            <PackageSource Include="https://my-nuget-source/nuget/" />
-        -->
-    </ItemGroup>
-
-    <PropertyGroup Condition=" '$(OS)' == 'Windows_NT'">
-        <!-- Windows specific commands -->
-        <NuGetToolsPath>$([System.IO.Path]::Combine($(SolutionDir), ".nuget"))</NuGetToolsPath>
-        <PackagesConfig>$([System.IO.Path]::Combine($(ProjectDir), "packages.config"))</PackagesConfig>
-    </PropertyGroup>
-    
-    <PropertyGroup Condition=" '$(OS)' != 'Windows_NT'">
-        <!-- We need to launch nuget.exe with the mono command if we're not on windows -->
-        <NuGetToolsPath>$(SolutionDir).nuget</NuGetToolsPath>
-        <PackagesConfig>packages.config</PackagesConfig>
-    </PropertyGroup>
-    
-    <PropertyGroup>
-        <!-- NuGet command -->
-        <NuGetExePath Condition=" '$(NuGetExePath)' == '' ">$(NuGetToolsPath)\NuGet.exe</NuGetExePath>
-        <PackageSources Condition=" $(PackageSources) == '' ">@(PackageSource)</PackageSources>
-        
-        <NuGetCommand Condition=" '$(OS)' == 'Windows_NT'">"$(NuGetExePath)"</NuGetCommand>
-        <NuGetCommand Condition=" '$(OS)' != 'Windows_NT' ">mono --runtime=v4.0.30319 $(NuGetExePath)</NuGetCommand>
-
-        <PackageOutputDir Condition="$(PackageOutputDir) == ''">$(TargetDir.Trim('\\'))</PackageOutputDir>
-        
-        <RequireConsentSwitch Condition=" $(RequireRestoreConsent) == 'true' ">-RequireConsent</RequireConsentSwitch>
-        <NonInteractiveSwitch Condition=" '$(VisualStudioVersion)' != '' AND '$(OS)' == 'Windows_NT' ">-NonInteractive</NonInteractiveSwitch>
-        
-        <PaddedSolutionDir Condition=" '$(OS)' == 'Windows_NT'">"$(SolutionDir) "</PaddedSolutionDir>
-        <PaddedSolutionDir Condition=" '$(OS)' != 'Windows_NT' ">"$(SolutionDir)"</PaddedSolutionDir>
-
-        <!-- Commands -->
-        <RestoreCommand>$(NuGetCommand) install "$(PackagesConfig)" -source "$(PackageSources)"  $(NonInteractiveSwitch) $(RequireConsentSwitch) -solutionDir $(PaddedSolutionDir)</RestoreCommand>
-        <BuildCommand>$(NuGetCommand) pack "$(ProjectPath)" -Properties "Configuration=$(Configuration);Platform=$(Platform)" $(NonInteractiveSwitch) -OutputDirectory "$(PackageOutputDir)" -symbols</BuildCommand>
-
-        <!-- We need to ensure packages are restored prior to assembly resolve -->
-        <BuildDependsOn Condition="$(RestorePackages) == 'true'">
-            RestorePackages;
-            $(BuildDependsOn);
-        </BuildDependsOn>
-
-        <!-- Make the build depend on restore packages -->
-        <BuildDependsOn Condition="$(BuildPackage) == 'true'">
-            $(BuildDependsOn);
-            BuildPackage;
-        </BuildDependsOn>
-    </PropertyGroup>
-
-    <Target Name="CheckPrerequisites">
-        <!-- Raise an error if we're unable to locate nuget.exe  -->
-        <Error Condition="'$(DownloadNuGetExe)' != 'true' AND !Exists('$(NuGetExePath)')" Text="Unable to locate '$(NuGetExePath)'" />
-        <!--
-        Take advantage of MsBuild's build dependency tracking to make sure that we only ever download nuget.exe once.
-        This effectively acts as a lock that makes sure that the download operation will only happen once and all
-        parallel builds will have to wait for it to complete.
-        -->
-        <MsBuild Targets="_DownloadNuGet" Projects="$(MSBuildThisFileFullPath)" Properties="Configuration=NOT_IMPORTANT;DownloadNuGetExe=$(DownloadNuGetExe)" />
-    </Target>
-
-    <Target Name="_DownloadNuGet">
-        <DownloadNuGet OutputFilename="$(NuGetExePath)" Condition=" '$(DownloadNuGetExe)' == 'true' AND !Exists('$(NuGetExePath)')" />
-    </Target>
-
-    <Target Name="RestorePackages" DependsOnTargets="CheckPrerequisites">
-        <Exec Command="$(RestoreCommand)"
-              Condition="'$(OS)' != 'Windows_NT' And Exists('$(PackagesConfig)')" />
-              
-        <Exec Command="$(RestoreCommand)"
-              LogStandardErrorAsError="true"
-              Condition="'$(OS)' == 'Windows_NT' And Exists('$(PackagesConfig)')" />
-    </Target>
-
-    <Target Name="BuildPackage" DependsOnTargets="CheckPrerequisites">
-        <Exec Command="$(BuildCommand)" 
-              Condition=" '$(OS)' != 'Windows_NT' " />
-              
-        <Exec Command="$(BuildCommand)"
-              LogStandardErrorAsError="true"
-              Condition=" '$(OS)' == 'Windows_NT' " />
-    </Target>
-    
-    <UsingTask TaskName="DownloadNuGet" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
-        <ParameterGroup>
-            <OutputFilename ParameterType="System.String" Required="true" />
-        </ParameterGroup>
-        <Task>
-            <Reference Include="System.Core" />
-            <Using Namespace="System" />
-            <Using Namespace="System.IO" />
-            <Using Namespace="System.Net" />
-            <Using Namespace="Microsoft.Build.Framework" />
-            <Using Namespace="Microsoft.Build.Utilities" />
-            <Code Type="Fragment" Language="cs">
-                <![CDATA[
-                try {
-                    OutputFilename = Path.GetFullPath(OutputFilename);
-
-                    Log.LogMessage("Downloading latest version of NuGet.exe...");
-                    WebClient webClient = new WebClient();
-                    webClient.DownloadFile("https://www.nuget.org/nuget.exe", OutputFilename);
-
-                    return true;
-                }
-                catch (Exception ex) {
-                    Log.LogErrorFromException(ex);
-                    return false;
-                }
-            ]]>
-            </Code>
-        </Task>
-    </UsingTask>
-</Project>

src/Libraries/Manifest Tool/mt.exe.config

@@ -1,9 +0,0 @@
-<?xml version ="1.0"?> 
-<!-- This allows mt.exe to run on machines with the CLR v4 installed but not 1.1 or 2.0 -->
-<configuration> 
-    <startup useLegacyV2RuntimeActivationPolicy="true"> 
-        <supportedRuntime version="v4.0"/> 
-        <supportedRuntime version="v2.0.50727"/>
-        <supportedRuntime version="v1.1.4322"/>
-    </startup> 
-</configuration>

src/LogentriesCore/LogentriesCore.csproj

@@ -73,13 +73,6 @@
     <PostBuildEvent>
     </PostBuildEvent>
   </PropertyGroup>
-  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
-  </Target>
   <!-- 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">

src/LogentriesNLog/LogentriesNLog.csproj

@@ -85,13 +85,6 @@
     <PostBuildEvent>
     </PostBuildEvent>
   </PropertyGroup>
-  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
-  </Target>
   <!-- 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">

src/LogentriesNLog/packages.config

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

src/Marr.Data/Marr.Data.csproj

@@ -144,7 +144,6 @@
     <PreBuildEvent>
     </PreBuildEvent>
   </PropertyGroup>
-  <Import Project="$(SolutionDir)\.nuget\nuget.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">

src/MediaInfoDotNet.dll.config

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-    <dllmap os="osx" dll="MediaInfo.dll" target="libmediainfo.0.dylib"/>
-    <dllmap os="linux" dll="MediaInfo.dll" target="libmediainfo.so.0" />
-    <dllmap os="freebsd" dll="MediaInfo.dll" target="libmediainfo.so.0" />
-    <dllmap os="solaris" dll="MediaInfo.dll" target="libmediainfo.so.0.0.0" />
-</configuration>

src/Microsoft.AspNet.SignalR.Core/Infrastructure/PerformanceCounterWrapper.cs

@@ -56,7 +56,7 @@ namespace Microsoft.AspNet.SignalR.Infrastructure
             }
             catch(NotImplementedException)
             {
-            	// This happens on mono
+                // This happens on mono
             }
         }
 

src/Microsoft.AspNet.SignalR.Core/Microsoft.AspNet.SignalR.Core.csproj

@@ -276,10 +276,9 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="AfterBuild">
   </Target>
-  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.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>
   -->
 </Project>

src/Microsoft.AspNet.SignalR.Owin/Microsoft.AspNet.SignalR.Owin.csproj

@@ -102,7 +102,6 @@
   </ItemGroup>
   <Import Project="..\Common\Microsoft.AspNet.SignalR.targets" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.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">
@@ -110,4 +109,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>

src/NzbDrone.Api.Test/MappingTests/ResourceMappingFixture.cs

@@ -116,14 +116,12 @@ namespace NzbDrone.Api.Test.MappingTests
             profileResource.InjectTo<Profile>();
 
         }
-
-
-
+        
         [Test]
         public void should_map_tracked_command()
         {
-            var profileResource = new ApplicationUpdateCommand();
-            profileResource.InjectTo<CommandResource>();
+            var commandResource = new CommandModel { Body = new ApplicationUpdateCommand() };
+            commandResource.InjectTo<CommandResource>();
         }
     }
 

src/NzbDrone.Api.Test/NzbDrone.Api.Test.csproj

@@ -38,13 +38,13 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="FluentAssertions, Version=3.2.1.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\FluentAssertions.3.2.1\lib\net40\FluentAssertions.dll</HintPath>
+    <Reference Include="FluentAssertions, Version=4.2.1.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
+      <HintPath>..\packages\FluentAssertions.4.2.1\lib\net40\FluentAssertions.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="FluentAssertions.Core, Version=3.2.1.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\FluentAssertions.3.2.1\lib\net40\FluentAssertions.Core.dll</HintPath>
+    <Reference Include="FluentAssertions.Core, Version=4.2.1.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
+      <HintPath>..\packages\FluentAssertions.4.2.1\lib\net40\FluentAssertions.Core.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="nunit.framework, Version=2.6.3.13283, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -64,7 +64,7 @@
       <HintPath>..\packages\Moq.4.0.10827\lib\NET40\Moq.dll</HintPath>
     </Reference>
     <Reference Include="Omu.ValueInjecter">
-      <HintPath>..\packages\valueinjecter.2.3.3\lib\net35\Omu.ValueInjecter.dll</HintPath>
+      <HintPath>..\packages\ValueInjecter.2.3.3\lib\net35\Omu.ValueInjecter.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -104,7 +104,6 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\nuget.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">
@@ -112,4 +111,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>

src/NzbDrone.Api.Test/packages.config

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="FluentAssertions" version="3.2.1" targetFramework="net40" />
+  <package id="FluentAssertions" version="4.2.1" targetFramework="net40" />
   <package id="Moq" version="4.0.10827" />
   <package id="NBuilder" version="3.0.1.1" targetFramework="net40" />
   <package id="NUnit" version="2.6.3" targetFramework="net40" />
-  <package id="valueinjecter" version="2.3.3" targetFramework="net40" />
+  <package id="ValueInjecter" version="2.3.3" targetFramework="net40" />
 </packages>

src/NzbDrone.Api/Authentication/AuthenticationModule.cs

@@ -3,6 +3,7 @@ using Nancy;
 using Nancy.Authentication.Forms;
 using Nancy.Extensions;
 using Nancy.ModelBinding;
+using NzbDrone.Common.EnsureThat;
 using NzbDrone.Core.Authentication;
 using NzbDrone.Core.Configuration;
 
@@ -23,6 +24,11 @@ namespace NzbDrone.Api.Authentication
 
         private Response Login(LoginResource resource)
         {
+            Ensure.That(resource.Username, () => resource.Username).IsNotNullOrWhiteSpace();
+
+            // TODO: A null or empty password should not be allowed, uncomment in v3
+            //Ensure.That(resource.Password, () => resource.Password).IsNotNullOrWhiteSpace();
+
             var user = _userService.FindUser(resource.Username, resource.Password);
 
             if (user == null)

src/NzbDrone.Api/Authentication/AuthenticationService.cs

@@ -22,7 +22,7 @@ namespace NzbDrone.Api.Authentication
         private readonly IUserService _userService;
         private static readonly NzbDroneUser AnonymousUser = new NzbDroneUser { UserName = "Anonymous" };
         
-        private static String API_KEY;
+        private static string API_KEY;
         private static AuthenticationType AUTH_METHOD;
 
         public AuthenticationService(IConfigFileProvider configFileProvider, IUserService userService)

src/NzbDrone.Api/Authentication/EnableAuthInNancy.cs

@@ -39,8 +39,8 @@ namespace NzbDrone.Api.Authentication
                 pipelines.EnableBasicAuthentication(new BasicAuthenticationConfiguration(_authenticationService, "Sonarr"));                
             }
 
-            pipelines.BeforeRequest.AddItemToEndOfPipeline(RequiresAuthentication);
-            pipelines.AfterRequest.AddItemToEndOfPipeline(RemoveLoginHooksForApiCalls);
+            pipelines.BeforeRequest.AddItemToEndOfPipeline((Func<NancyContext, Response>) RequiresAuthentication);
+            pipelines.AfterRequest.AddItemToEndOfPipeline((Action<NancyContext>) RemoveLoginHooksForApiCalls);
         }
 
         private Response RequiresAuthentication(NancyContext context)
@@ -74,8 +74,8 @@ namespace NzbDrone.Api.Authentication
         {
             if (context.Request.IsApiRequest())
             {
-                if ((context.Response.StatusCode == HttpStatusCode.SeeOther && 
-                     context.Response.ContentType.Equals("text/html", StringComparison.InvariantCultureIgnoreCase)) ||
+                if ((context.Response.StatusCode == HttpStatusCode.SeeOther &&
+                     context.Response.Headers["Location"].StartsWith("/login", StringComparison.InvariantCultureIgnoreCase)) ||
                     context.Response.StatusCode == HttpStatusCode.Unauthorized)
                 {
                     context.Response = new { Error = "Unauthorized" }.AsResponse(HttpStatusCode.Unauthorized);

src/NzbDrone.Api/Blacklist/BlacklistResource.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using NzbDrone.Api.REST;
 using NzbDrone.Core.Qualities;
 using NzbDrone.Api.Series;
+using NzbDrone.Core.Indexers;
 
 namespace NzbDrone.Api.Blacklist
 {
@@ -13,6 +14,9 @@ namespace NzbDrone.Api.Blacklist
         public string SourceTitle { get; set; }
         public QualityModel Quality { get; set; }
         public DateTime Date { get; set; }
+        public DownloadProtocol Protocol { get; set; }
+        public string Indexer { get; set; }
+        public string Message { get; set; }
 
         public SeriesResource Series { get; set; }
     }

src/NzbDrone.Api/Calendar/CalendarFeedModule.cs

@@ -22,16 +22,33 @@ namespace NzbDrone.Api.Calendar
 
         private Response GetCalendarFeed()
         {
-            var start = DateTime.Today.AddDays(-7);
-            var end = DateTime.Today.AddDays(28);
+            var pastDays = 7;
+            var futureDays = 28;            
+            var start = DateTime.Today.AddDays(-pastDays);
+            var end = DateTime.Today.AddDays(futureDays);
 
+            // TODO: Remove start/end parameters in v3, they don't work well for iCal
             var queryStart = Request.Query.Start;
             var queryEnd = Request.Query.End;
+            var queryPastDays = Request.Query.PastDays;
+            var queryFutureDays = Request.Query.FutureDays;
 
             if (queryStart.HasValue) start = DateTime.Parse(queryStart.Value);
             if (queryEnd.HasValue) end = DateTime.Parse(queryEnd.Value);
 
-            var episodes = _episodeService.EpisodesBetweenDates(start, end);
+            if (queryPastDays.HasValue)
+            {
+                pastDays = int.Parse(queryPastDays.Value);
+                start = DateTime.Today.AddDays(-pastDays);
+            }
+
+            if (queryFutureDays.HasValue)
+            {
+                futureDays = int.Parse(queryFutureDays.Value);
+                end = DateTime.Today.AddDays(futureDays);
+            }
+
+            var episodes = _episodeService.EpisodesBetweenDates(start, end, false);
             var icalCalendar = new iCalendar();
 
             foreach (var episode in episodes.OrderBy(v => v.AirDateUtc.Value))

src/NzbDrone.Api/Calendar/CalendarModule.cs

@@ -23,14 +23,17 @@ namespace NzbDrone.Api.Calendar
         {
             var start = DateTime.Today;
             var end = DateTime.Today.AddDays(2);
+            var includeUnmonitored = false;
 
             var queryStart = Request.Query.Start;
             var queryEnd = Request.Query.End;
+            var queryIncludeUnmonitored = Request.Query.Unmonitored;
 
             if (queryStart.HasValue) start = DateTime.Parse(queryStart.Value);
             if (queryEnd.HasValue) end = DateTime.Parse(queryEnd.Value);
+            if (queryIncludeUnmonitored.HasValue) includeUnmonitored = Convert.ToBoolean(queryIncludeUnmonitored.Value);
 
-            var resources = ToListResource(() => _episodeService.EpisodesBetweenDates(start, end));
+            var resources = ToListResource(() => _episodeService.EpisodesBetweenDates(start, end, includeUnmonitored));
 
             return resources.OrderBy(e => e.AirDateUtc).ToList();
         }

src/NzbDrone.Api/ClientSchema/Field.cs

@@ -5,14 +5,14 @@ namespace NzbDrone.Api.ClientSchema
 {
     public class Field
     {
-        public Int32 Order { get; set; }
-        public String Name { get; set; }
-        public String Label { get; set; }
-        public String HelpText { get; set; }
-        public String HelpLink { get; set; }
-        public Object Value { get; set; }
-        public String Type { get; set; }
-        public Boolean Advanced { get; set; }
+        public int Order { get; set; }
+        public string Name { get; set; }
+        public string Label { get; set; }
+        public string HelpText { get; set; }
+        public string HelpLink { get; set; }
+        public object Value { get; set; }
+        public string Type { get; set; }
+        public bool Advanced { get; set; }
         public List<SelectOption> SelectOptions { get; set; }
     }
 }

src/NzbDrone.Api/ClientSchema/SchemaBuilder.cs

@@ -28,15 +28,15 @@ namespace NzbDrone.Api.ClientSchema
                 {
 
                     var field = new Field
-                        {
-                            Name = propertyInfo.Name,
-                            Label = fieldAttribute.Label,
-                            HelpText = fieldAttribute.HelpText,
-                            HelpLink = fieldAttribute.HelpLink,
-                            Order = fieldAttribute.Order,
-                            Advanced = fieldAttribute.Advanced,
-                            Type = fieldAttribute.Type.ToString().ToLowerInvariant()
-                        };
+                    {
+                        Name = propertyInfo.Name,
+                        Label = fieldAttribute.Label,
+                        HelpText = fieldAttribute.HelpText,
+                        HelpLink = fieldAttribute.HelpLink,
+                        Order = fieldAttribute.Order,
+                        Advanced = fieldAttribute.Advanced,
+                        Type = fieldAttribute.Type.ToString().ToLowerInvariant()
+                    };
 
                     var value = propertyInfo.GetValue(model, null);
                     if (value != null)
@@ -53,11 +53,9 @@ namespace NzbDrone.Api.ClientSchema
                 }
             }
 
-            return result;
-
+            return result.OrderBy(r => r.Order).ToList();
         }
 
-
         public static object ReadFormSchema(List<Field> fields, Type targetType, object defaults = null)
         {
             Ensure.That(targetType, () => targetType).IsNotNull();
@@ -79,19 +77,19 @@ namespace NzbDrone.Api.ClientSchema
                 {
                     var field = fields.Find(f => f.Name == propertyInfo.Name);
 
-                    if (propertyInfo.PropertyType == typeof(Int32))
+                    if (propertyInfo.PropertyType == typeof(int))
                     {
                         var value = Convert.ToInt32(field.Value);
                         propertyInfo.SetValue(target, value, null);
                     }
 
-                    else if (propertyInfo.PropertyType == typeof(Int64))
+                    else if (propertyInfo.PropertyType == typeof(long))
                     {
                         var value = Convert.ToInt64(field.Value);
                         propertyInfo.SetValue(target, value, null);
                     }
 
-                    else if (propertyInfo.PropertyType == typeof(Nullable<Int32>))
+                    else if (propertyInfo.PropertyType == typeof(int?))
                     {
                         var value = field.Value.ToString().ParseInt32();
                         propertyInfo.SetValue(target, value, null);
@@ -103,20 +101,37 @@ namespace NzbDrone.Api.ClientSchema
                         propertyInfo.SetValue(target, value, null);
                     }
 
-                    else if (propertyInfo.PropertyType == typeof (IEnumerable<Int32>))
+                    else if (propertyInfo.PropertyType == typeof(IEnumerable<int>))
                     {
-                        IEnumerable<Int32> value;
+                        IEnumerable<int> value;
 
-                        if (field.Value.GetType() == typeof (JArray))
+                        if (field.Value.GetType() == typeof(JArray))
                         {
-                            value = ((JArray) field.Value).Select(s => s.Value<Int32>());
+                            value = ((JArray)field.Value).Select(s => s.Value<int>());
                         }
 
                         else
                         {
-                            value = field.Value.ToString().Split(new []{','}, StringSplitOptions.RemoveEmptyEntries).Select(s => Convert.ToInt32(s));
+                            value = field.Value.ToString().Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries).Select(s => Convert.ToInt32(s));
                         }
-                        
+
+                        propertyInfo.SetValue(target, value, null);
+                    }
+
+                    else if (propertyInfo.PropertyType == typeof(IEnumerable<string>))
+                    {
+                        IEnumerable<string> value;
+
+                        if (field.Value.GetType() == typeof(JArray))
+                        {
+                            value = ((JArray)field.Value).Select(s => s.Value<string>());
+                        }
+
+                        else
+                        {
+                            value = field.Value.ToString().Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+                        }
+
                         propertyInfo.SetValue(target, value, null);
                     }
 
@@ -144,4 +159,4 @@ namespace NzbDrone.Api.ClientSchema
             return options.OrderBy(o => o.Value).ToList();
         }
     }
-}
+}

src/NzbDrone.Api/Commands/CommandModule.cs

@@ -4,10 +4,9 @@ using System.Linq;
 using NzbDrone.Api.Extensions;
 using NzbDrone.Api.Mapping;
 using NzbDrone.Api.Validation;
-using NzbDrone.Common.Composition;
+using NzbDrone.Common;
 using NzbDrone.Core.Datastore.Events;
 using NzbDrone.Core.Messaging.Commands;
-using NzbDrone.Core.Messaging.Commands.Tracking;
 using NzbDrone.Core.Messaging.Events;
 using NzbDrone.Core.ProgressMessaging;
 using NzbDrone.SignalR;
@@ -15,58 +14,55 @@ using NzbDrone.SignalR;
 
 namespace NzbDrone.Api.Commands
 {
-    public class CommandModule : NzbDroneRestModuleWithSignalR<CommandResource, Command>, IHandle<CommandUpdatedEvent>
+    public class CommandModule : NzbDroneRestModuleWithSignalR<CommandResource, CommandModel>, IHandle<CommandUpdatedEvent>
     {
-        private readonly ICommandExecutor _commandExecutor;
-        private readonly IContainer _container;
-        private readonly ITrackCommands _trackCommands;
+        private readonly IManageCommandQueue _commandQueueManager;
+        private readonly IServiceFactory _serviceFactory;
 
-        public CommandModule(ICommandExecutor commandExecutor,
+        public CommandModule(IManageCommandQueue commandQueueManager,
                              IBroadcastSignalRMessage signalRBroadcaster,
-                             IContainer container,
-                             ITrackCommands trackCommands)
+                             IServiceFactory serviceFactory)
             : base(signalRBroadcaster)
         {
-            _commandExecutor = commandExecutor;
-            _container = container;
-            _trackCommands = trackCommands;
+            _commandQueueManager = commandQueueManager;
+            _serviceFactory = serviceFactory;
 
             GetResourceById = GetCommand;
             CreateResource = StartCommand;
-            GetResourceAll = GetAllCommands;
+            GetResourceAll = GetStartedCommands;
 
             PostValidator.RuleFor(c => c.Name).NotBlank();
         }
 
         private CommandResource GetCommand(int id)
         {
-            return _trackCommands.GetById(id).InjectTo<CommandResource>();
+            return _commandQueueManager.Get(id).InjectTo<CommandResource>();
         }
 
         private int StartCommand(CommandResource commandResource)
         {
             var commandType =
-              _container.GetImplementations(typeof(Command))
-                        .Single(c => c.Name.Replace("Command", "")
-                        .Equals(commandResource.Name, StringComparison.InvariantCultureIgnoreCase));
+                _serviceFactory.GetImplementations(typeof (Command))
+                               .Single(c => c.Name.Replace("Command", "")
+                                             .Equals(commandResource.Name, StringComparison.InvariantCultureIgnoreCase));
 
             dynamic command = Request.Body.FromJson(commandType);
-            command.Manual = true;
+            command.Trigger = CommandTrigger.Manual;
 
-            var trackedCommand = (Command)_commandExecutor.PublishCommandAsync(command);
+            var trackedCommand = _commandQueueManager.Push(command, CommandPriority.Normal, CommandTrigger.Manual);
             return trackedCommand.Id;
         }
 
-        private List<CommandResource> GetAllCommands()
+        private List<CommandResource> GetStartedCommands()
         {
-            return ToListResource(_trackCommands.RunningCommands);
+            return ToListResource(_commandQueueManager.GetStarted());
         }
 
         public void Handle(CommandUpdatedEvent message)
         {
-            if (message.Command.SendUpdatesToClient)
+            if (message.Command.Body.SendUpdatesToClient)
             {
-                BroadcastResourceChange(ModelAction.Updated, message.Command.Id);
+                BroadcastResourceChange(ModelAction.Updated, message.Command.InjectTo<CommandResource>());
             }
         }
     }

src/NzbDrone.Api/Commands/CommandResource.cs

@@ -1,18 +1,95 @@
 using System;
+using Newtonsoft.Json;
 using NzbDrone.Api.REST;
-using NzbDrone.Core.Messaging.Commands.Tracking;
+using NzbDrone.Core.Messaging.Commands;
 
 namespace NzbDrone.Api.Commands
 {
     public class CommandResource : RestResource
     {
-        public String Name { get; set; }
-        public String Message { get; set; }
-        public DateTime StartedOn { get; set; }
-        public DateTime StateChangeTime { get; set; }
-        public Boolean SendUpdatesToClient { get; set; }
-        public CommandStatus State { get; set; }
+        public string Name { get; set; }
+        public string Message { get; set; }
+        public Command Body { get; set; }
+        public CommandPriority Priority { get; set; }
+        public CommandStatus Status { get; set; }
+        public DateTime Queued { get; set; }
+        public DateTime? Started { get; set; }
+        public DateTime? Ended { get; set; }
+        public TimeSpan? Duration { get; set; }
+        public string Exception { get; set; }
+        public CommandTrigger Trigger { get; set; }
+
+        [JsonIgnore]
+        public string CompletionMessage { get; set; }
+
+        //Legacy
+        public CommandStatus State
+        {
+            get
+            {
+                return Status;
+            }
+
+            set { }
+        }
+
+        public bool Manual
+        {
+            get
+            {
+                return Trigger == CommandTrigger.Manual;
+            }
+
+            set { }
+        }
+
+        public DateTime StartedOn
+        {
+            get
+            {
+                return Queued;
+            }
+
+            set { }
+        }
+
+        public DateTime? StateChangeTime
+        {
+            get
+            {
+
+                if (Started.HasValue) return Started.Value;
+
+                return Ended;
+            }
+
+            set { }
+        }
+
+        public bool SendUpdatesToClient
+        {
+            get
+            {
+                if (Body != null) return Body.SendUpdatesToClient;
+
+                return false;
+            }
+
+            set { }
+        }
+
+        public bool UpdateScheduledTask
+        {
+            get
+            {
+                if (Body != null) return Body.UpdateScheduledTask;
+
+                return false;
+            }
+
+            set { }
+        }
+
         public DateTime? LastExecutionTime { get; set; }
-        public Boolean Manual { get; set; }
     }
-}
+}

src/NzbDrone.Api/Config/DownloadClientConfigModule.cs

@@ -7,16 +7,19 @@ namespace NzbDrone.Api.Config
 {
     public class DownloadClientConfigModule : NzbDroneConfigModule<DownloadClientConfigResource>
     {
-        public DownloadClientConfigModule(IConfigService configService, RootFolderValidator rootFolderValidator, PathExistsValidator pathExistsValidator)
+        public DownloadClientConfigModule(IConfigService configService,
+                                          RootFolderValidator rootFolderValidator,
+                                          PathExistsValidator pathExistsValidator,
+                                          MappedNetworkDriveValidator mappedNetworkDriveValidator)
             : base(configService)
         {
             SharedValidator.RuleFor(c => c.DownloadedEpisodesFolder)
                            .Cascade(CascadeMode.StopOnFirstFailure)
                            .IsValidPath()
                            .SetValidator(rootFolderValidator)
+                           .SetValidator(mappedNetworkDriveValidator)
                            .SetValidator(pathExistsValidator)
-                           .When(c => !String.IsNullOrWhiteSpace(c.DownloadedEpisodesFolder));
-
+                           .When(c => !string.IsNullOrWhiteSpace(c.DownloadedEpisodesFolder));
         }
     }
 }

src/NzbDrone.Api/Config/DownloadClientConfigResource.cs

@@ -5,14 +5,14 @@ namespace NzbDrone.Api.Config
 {
     public class DownloadClientConfigResource : RestResource
     {
-        public String DownloadedEpisodesFolder { get; set; }
-        public String DownloadClientWorkingFolders { get; set; }
-        public Int32 DownloadedEpisodesScanInterval { get; set; }
+        public string DownloadedEpisodesFolder { get; set; }
+        public string DownloadClientWorkingFolders { get; set; }
+        public int DownloadedEpisodesScanInterval { get; set; }
 
-        public Boolean EnableCompletedDownloadHandling { get; set; }
-        public Boolean RemoveCompletedDownloads { get; set; }
+        public bool EnableCompletedDownloadHandling { get; set; }
+        public bool RemoveCompletedDownloads { get; set; }
 
-        public Boolean AutoRedownloadFailed { get; set; }
-        public Boolean RemoveFailedDownloads { get; set; }
+        public bool AutoRedownloadFailed { get; set; }
+        public bool RemoveFailedDownloads { get; set; }
     }
 }

src/NzbDrone.Api/Config/HostConfigModule.cs

@@ -27,21 +27,23 @@ namespace NzbDrone.Api.Config
             GetResourceById = GetHostConfig;
             UpdateResource = SaveHostConfig;
 
-            SharedValidator.RuleFor(c => c.Branch).NotEmpty().WithMessage("Branch name is required, 'master' is the default");        
+            SharedValidator.RuleFor(c => c.BindAddress)
+                           .ValidIp4Address()
+                           .NotListenAllIp4Address()
+                           .When(c => c.BindAddress != "*");
+
             SharedValidator.RuleFor(c => c.Port).ValidPort();
 
+            SharedValidator.RuleFor(c => c.UrlBase).ValidUrlBase();
+
             SharedValidator.RuleFor(c => c.Username).NotEmpty().When(c => c.AuthenticationMethod != AuthenticationType.None);
             SharedValidator.RuleFor(c => c.Password).NotEmpty().When(c => c.AuthenticationMethod != AuthenticationType.None);
 
             SharedValidator.RuleFor(c => c.SslPort).ValidPort().When(c => c.EnableSsl);
             SharedValidator.RuleFor(c => c.SslCertHash).NotEmpty().When(c => c.EnableSsl && OsInfo.IsWindows);
 
+            SharedValidator.RuleFor(c => c.Branch).NotEmpty().WithMessage("Branch name is required, 'master' is the default");
             SharedValidator.RuleFor(c => c.UpdateScriptPath).IsValidPath().When(c => c.UpdateMechanism == UpdateMechanism.Script);
-
-            SharedValidator.RuleFor(c => c.BindAddress)
-                           .ValidIp4Address()
-                           .NotListenAllIp4Address()
-                           .When(c => c.BindAddress != "*");
         }
 
         private HostConfigResource GetHostConfig()

src/NzbDrone.Api/Config/HostConfigResource.cs

@@ -7,23 +7,23 @@ namespace NzbDrone.Api.Config
 {
     public class HostConfigResource : RestResource
     {
-        public String BindAddress { get; set; }
-        public Int32 Port { get; set; }
-        public Int32 SslPort { get; set; }
-        public Boolean EnableSsl { get; set; }
-        public Boolean LaunchBrowser { get; set; }
+        public string BindAddress { get; set; }
+        public int Port { get; set; }
+        public int SslPort { get; set; }
+        public bool EnableSsl { get; set; }
+        public bool LaunchBrowser { get; set; }
         public AuthenticationType AuthenticationMethod { get; set; }
-        public Boolean AnalyticsEnabled { get; set; }
-        public String Username { get; set; }
-        public String Password { get; set; }
-        public String LogLevel { get; set; }
-        public String Branch { get; set; }
-        public String ApiKey { get; set; }
-        public Boolean Torrent { get; set; }
-        public String SslCertHash { get; set; }
-        public String UrlBase { get; set; }
-        public Boolean UpdateAutomatically { get; set; }
+        public bool AnalyticsEnabled { get; set; }
+        public string Username { get; set; }
+        public string Password { get; set; }
+        public string LogLevel { get; set; }
+        public string Branch { get; set; }
+        public string ApiKey { get; set; }
+        public bool Torrent { get; set; }
+        public string SslCertHash { get; set; }
+        public string UrlBase { get; set; }
+        public bool UpdateAutomatically { get; set; }
         public UpdateMechanism UpdateMechanism { get; set; }
-        public String UpdateScriptPath { get; set; }
+        public string UpdateScriptPath { get; set; }
     }
 }

src/NzbDrone.Api/Config/IndexerConfigModule.cs

@@ -1,4 +1,5 @@
 using FluentValidation;
+using NzbDrone.Api.Validation;
 using NzbDrone.Core.Configuration;
 
 namespace NzbDrone.Api.Config
@@ -16,8 +17,7 @@ namespace NzbDrone.Api.Config
                            .GreaterThanOrEqualTo(0);
 
             SharedValidator.RuleFor(c => c.RssSyncInterval)
-                .InclusiveBetween(10, 120)
-                .When(c => c.RssSyncInterval > 0);
+                           .IsValidRssSyncInterval();
         }
     }
 }

src/NzbDrone.Api/Config/IndexerConfigResource.cs

@@ -5,8 +5,8 @@ namespace NzbDrone.Api.Config
 {
     public class IndexerConfigResource : RestResource
     {
-        public Int32 MinimumAge { get; set; }
-        public Int32 Retention { get; set; }
-        public Int32 RssSyncInterval { get; set; }
+        public int MinimumAge { get; set; }
+        public int Retention { get; set; }
+        public int RssSyncInterval { get; set; }
     }
 }

src/NzbDrone.Api/Config/MediaManagementConfigModule.cs

@@ -12,7 +12,7 @@ namespace NzbDrone.Api.Config
         {
             SharedValidator.RuleFor(c => c.FileChmod).NotEmpty();
             SharedValidator.RuleFor(c => c.FolderChmod).NotEmpty();
-            SharedValidator.RuleFor(c => c.RecycleBin).IsValidPath().SetValidator(pathExistsValidator).When(c => !String.IsNullOrWhiteSpace(c.RecycleBin));
+            SharedValidator.RuleFor(c => c.RecycleBin).IsValidPath().SetValidator(pathExistsValidator).When(c => !string.IsNullOrWhiteSpace(c.RecycleBin));
         }
     }
 }

src/NzbDrone.Api/Config/MediaManagementConfigResource.cs

@@ -6,20 +6,20 @@ namespace NzbDrone.Api.Config
 {
     public class MediaManagementConfigResource : RestResource
     {
-        public Boolean AutoUnmonitorPreviouslyDownloadedEpisodes { get; set; }
-        public String RecycleBin { get; set; }
-        public Boolean AutoDownloadPropers { get; set; }
-        public Boolean CreateEmptySeriesFolders { get; set; }
+        public bool AutoUnmonitorPreviouslyDownloadedEpisodes { get; set; }
+        public string RecycleBin { get; set; }
+        public bool AutoDownloadPropers { get; set; }
+        public bool CreateEmptySeriesFolders { get; set; }
         public FileDateType FileDate { get; set; }
 
-        public Boolean SetPermissionsLinux { get; set; }
-        public String FileChmod { get; set; }
-        public String FolderChmod { get; set; }
-        public String ChownUser { get; set; }
-        public String ChownGroup { get; set; }
+        public bool SetPermissionsLinux { get; set; }
+        public string FileChmod { get; set; }
+        public string FolderChmod { get; set; }
+        public string ChownUser { get; set; }
+        public string ChownGroup { get; set; }
 
-        public Boolean SkipFreeSpaceCheckWhenImporting { get; set; }
-        public Boolean CopyUsingHardlinks { get; set; }
-        public Boolean EnableMediaInfo { get; set; }
+        public bool SkipFreeSpaceCheckWhenImporting { get; set; }
+        public bool CopyUsingHardlinks { get; set; }
+        public bool EnableMediaInfo { get; set; }
     }
 }

src/NzbDrone.Api/Config/NamingConfigModule.cs

@@ -57,7 +57,7 @@ namespace NzbDrone.Api.Config
             var nameSpec = _namingConfigService.GetConfig();
             var resource = nameSpec.InjectTo<NamingConfigResource>();
 
-            if (String.IsNullOrWhiteSpace(resource.StandardEpisodeFormat))
+            if (string.IsNullOrWhiteSpace(resource.StandardEpisodeFormat))
             {
                 return resource;
             }

src/NzbDrone.Api/Config/NamingConfigResource.cs

@@ -5,8 +5,9 @@ namespace NzbDrone.Api.Config
 {
     public class NamingConfigResource : RestResource
     {
-        public Boolean RenameEpisodes { get; set; }
-        public Int32 MultiEpisodeStyle { get; set; }
+        public bool RenameEpisodes { get; set; }
+        public bool ReplaceIllegalCharacters { get; set; }
+        public int MultiEpisodeStyle { get; set; }
         public string StandardEpisodeFormat { get; set; }
         public string DailyEpisodeFormat { get; set; }
         public string AnimeEpisodeFormat { get; set; }

src/NzbDrone.Api/Config/UiConfigResource.cs

@@ -6,13 +6,15 @@ namespace NzbDrone.Api.Config
     public class UiConfigResource : RestResource
     {
         //Calendar
-        public Int32 FirstDayOfWeek { get; set; }
-        public String CalendarWeekColumnHeader { get; set; }
+        public int FirstDayOfWeek { get; set; }
+        public string CalendarWeekColumnHeader { get; set; }
 
         //Dates
-        public String ShortDateFormat { get; set; }
-        public String LongDateFormat { get; set; }
-        public String TimeFormat { get; set; }
-        public Boolean ShowRelativeDates { get; set; }
+        public string ShortDateFormat { get; set; }
+        public string LongDateFormat { get; set; }
+        public string TimeFormat { get; set; }
+        public bool ShowRelativeDates { get; set; }
+
+        public bool EnableColorImpairedMode { get; set; }
     }
 }

src/NzbDrone.Api/DiskSpace/DiskSpaceResource.cs

@@ -7,7 +7,7 @@ namespace NzbDrone.Api.DiskSpace
     {
         public string Path { get; set; }
         public string Label { get; set; }
-        public Int64 FreeSpace { get; set; }
-        public Int64 TotalSpace { get; set; }
+        public long FreeSpace { get; set; }
+        public long TotalSpace { get; set; }
     }
 }

src/NzbDrone.Api/DownloadClient/DownloadClientResource.cs

@@ -5,7 +5,7 @@ namespace NzbDrone.Api.DownloadClient
 {
     public class DownloadClientResource : ProviderResource
     {
-        public Boolean Enable { get; set; }
+        public bool Enable { get; set; }
         public DownloadProtocol Protocol { get; set; }
     }
 }

src/NzbDrone.Api/EpisodeFiles/EpisodeFileModule.cs

@@ -52,16 +52,16 @@ namespace NzbDrone.Api.EpisodeFiles
 
         private List<EpisodeFileResource> GetEpisodeFiles()
         {
-            var seriesId = (int?)Request.Query.SeriesId;
-
-            if (seriesId == null)
+            if (!Request.Query.SeriesId.HasValue)
             {
                 throw new BadRequestException("seriesId is missing");
             }
 
-            var series = _seriesService.GetSeries(seriesId.Value);
+            var seriesId = (int)Request.Query.SeriesId;
 
-            return _mediaFileService.GetFilesBySeries(seriesId.Value)
+            var series = _seriesService.GetSeries(seriesId);
+
+            return _mediaFileService.GetFilesBySeries(seriesId)
                                     .Select(f => MapToResource(series, f)).ToList();
         }
 

src/NzbDrone.Api/EpisodeFiles/EpisodeFileResource.cs

@@ -6,15 +6,15 @@ namespace NzbDrone.Api.EpisodeFiles
 {
     public class EpisodeFileResource : RestResource
     {
-        public Int32 SeriesId { get; set; }
-        public Int32 SeasonNumber { get; set; }
-        public String RelativePath { get; set; }
-        public String Path { get; set; }
-        public Int64 Size { get; set; }
+        public int SeriesId { get; set; }
+        public int SeasonNumber { get; set; }
+        public string RelativePath { get; set; }
+        public string Path { get; set; }
+        public long Size { get; set; }
         public DateTime DateAdded { get; set; }
-        public String SceneName { get; set; }
+        public string SceneName { get; set; }
         public QualityModel Quality { get; set; }
 
-        public Boolean QualityCutoffNotMet { get; set; }
+        public bool QualityCutoffNotMet { get; set; }
     }
 }

src/NzbDrone.Api/Episodes/EpisodeModule.cs

@@ -20,14 +20,14 @@ namespace NzbDrone.Api.Episodes
 
         private List<EpisodeResource> GetEpisodes()
         {
-            var seriesId = (int?)Request.Query.SeriesId;
-
-            if (seriesId == null)
+            if (!Request.Query.SeriesId.HasValue)
             {
                 throw new BadRequestException("seriesId is missing");
             }
 
-            var resources = ToListResource(_episodeService.GetEpisodeBySeries(seriesId.Value));
+            var seriesId = (int)Request.Query.SeriesId;
+
+            var resources = ToListResource(_episodeService.GetEpisodeBySeries(seriesId));
 
             return resources;
         }
@@ -36,5 +36,10 @@ namespace NzbDrone.Api.Episodes
         {
             _episodeService.SetEpisodeMonitored(episodeResource.Id, episodeResource.Monitored);
         }
+
+        protected override List<EpisodeResource> LoadSeries(List<EpisodeResource> resources)
+        {
+            return resources;
+        }
     }
-}
+}

src/NzbDrone.Api/Episodes/EpisodeModuleWithSignalR.cs

@@ -40,7 +40,7 @@ namespace NzbDrone.Api.Episodes
                                            ISeriesService seriesService,
                                            IQualityUpgradableSpecification qualityUpgradableSpecification,
                                            IBroadcastSignalRMessage signalRBroadcaster,
-                                           String resource)
+                                           string resource)
             : base(signalRBroadcaster, resource)
         {
             _episodeService = episodeService;
@@ -79,7 +79,8 @@ namespace NzbDrone.Api.Episodes
         {
             var resources =  base.ToListResource(modelList);
 
-            return resources.LoadSubtype<EpisodeResource, SeriesResource, Core.Tv.Series>(e => e.SeriesId, _seriesService.GetSeries).ToList();
+            return LoadSeries(resources);
+
         }
 
         public void Handle(EpisodeGrabbedEvent message)
@@ -100,5 +101,10 @@ namespace NzbDrone.Api.Episodes
                 BroadcastResourceChange(ModelAction.Updated, episode.Id);
             }
         }
+
+        protected virtual List<EpisodeResource> LoadSeries(List<EpisodeResource> resources)
+        {
+            return resources.LoadSubtype<EpisodeResource, SeriesResource, Core.Tv.Series>(e => e.SeriesId, _seriesService.GetSeries).ToList();
+        }
     }
-}
+}

src/NzbDrone.Api/Episodes/EpisodeResource.cs

@@ -8,30 +8,30 @@ namespace NzbDrone.Api.Episodes
 {
     public class EpisodeResource : RestResource
     {
-        public Int32 SeriesId { get; set; }
-        public Int32 EpisodeFileId { get; set; }
-        public Int32 SeasonNumber { get; set; }
-        public Int32 EpisodeNumber { get; set; }
-        public String Title { get; set; }
-        public String AirDate { get; set; }
+        public int SeriesId { get; set; }
+        public int EpisodeFileId { get; set; }
+        public int SeasonNumber { get; set; }
+        public int EpisodeNumber { get; set; }
+        public string Title { get; set; }
+        public string AirDate { get; set; }
         public DateTime? AirDateUtc { get; set; }
-        public String Overview { get; set; }
+        public string Overview { get; set; }
         public EpisodeFileResource EpisodeFile { get; set; }
 
-        public Boolean HasFile { get; set; }
-        public Boolean Monitored { get; set; }
-        public Nullable<Int32> AbsoluteEpisodeNumber { get; set; }
-        public Nullable<Int32> SceneAbsoluteEpisodeNumber { get; set; }
-        public Nullable<Int32> SceneEpisodeNumber { get; set; }
-        public Nullable<Int32> SceneSeasonNumber { get; set; }
-        public Int32 TvDbEpisodeId { get; set; }
+        public bool HasFile { get; set; }
+        public bool Monitored { get; set; }
+        public int? AbsoluteEpisodeNumber { get; set; }
+        public int? SceneAbsoluteEpisodeNumber { get; set; }
+        public int? SceneEpisodeNumber { get; set; }
+        public int? SceneSeasonNumber { get; set; }
+        public bool UnverifiedSceneNumbering { get; set; }
         public DateTime? EndTime { get; set; }
         public DateTime? GrabDate { get; set; }
-        public String SeriesTitle { get; set; }
+        public string SeriesTitle { get; set; }
         public SeriesResource Series { get; set; }
 
         //Hiding this so people don't think its usable (only used to set the initial state)
         [JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)]
-        public Boolean Grabbed { get; set; }
+        public bool Grabbed { get; set; }
     }
 }

src/NzbDrone.Api/Episodes/RenameEpisodeModule.cs

@@ -18,18 +18,13 @@ namespace NzbDrone.Api.Episodes
 
         private List<RenameEpisodeResource> GetEpisodes()
         {
-            int seriesId;
-
-            if (Request.Query.SeriesId.HasValue)
-            {
-                seriesId = (int)Request.Query.SeriesId;
-            }
-
-            else
+            if (!Request.Query.SeriesId.HasValue)
             {
                 throw new BadRequestException("seriesId is missing");
             }
 
+            var seriesId = (int)Request.Query.SeriesId;
+
             if (Request.Query.SeasonNumber.HasValue)
             {
                 var seasonNumber = (int)Request.Query.SeasonNumber;

src/NzbDrone.Api/Episodes/RenameEpisodeResource.cs

@@ -6,11 +6,11 @@ namespace NzbDrone.Api.Episodes
 {
     public class RenameEpisodeResource : RestResource
     {
-        public Int32 SeriesId { get; set; }
-        public Int32 SeasonNumber { get; set; }
-        public List<Int32> EpisodeNumbers { get; set; }
-        public Int32 EpisodeFileId { get; set; }
-        public String ExistingPath { get; set; }
-        public String NewPath { get; set; }
+        public int SeriesId { get; set; }
+        public int SeasonNumber { get; set; }
+        public List<int> EpisodeNumbers { get; set; }
+        public int EpisodeFileId { get; set; }
+        public string ExistingPath { get; set; }
+        public string NewPath { get; set; }
     }
 }

src/NzbDrone.Api/ErrorManagement/NzbDroneErrorPipeline.cs

@@ -63,7 +63,7 @@ namespace NzbDrone.Api.ErrorManagement
                         }.AsResponse(HttpStatusCode.Conflict);
                 }
 
-                var sqlErrorMessage = String.Format("[{0} {1}]", context.Request.Method, context.Request.Path);
+                var sqlErrorMessage = string.Format("[{0} {1}]", context.Request.Method, context.Request.Path);
 
                 _logger.ErrorException(sqlErrorMessage, sqLiteException);
             }

src/NzbDrone.Api/Extensions/LazyExtensions.cs

@@ -13,7 +13,7 @@ namespace NzbDrone.Api.Extensions
     {
         private static readonly ICached<MethodInfo> SetterCache = new Cached<MethodInfo>();
 
-        public static IEnumerable<TParent> LoadSubtype<TParent, TChild, TSourceChild>(this IEnumerable<TParent> parents, Func<TParent, Int32> foreignKeySelector, Func<IEnumerable<Int32>, IEnumerable<TSourceChild>> sourceChildSelector)
+        public static IEnumerable<TParent> LoadSubtype<TParent, TChild, TSourceChild>(this IEnumerable<TParent> parents, Func<TParent, int> foreignKeySelector, Func<IEnumerable<int>, IEnumerable<TSourceChild>> sourceChildSelector)
             where TSourceChild : ModelBase, new()
             where TChild : RestResource, new()
             where TParent : RestResource

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

@@ -1,4 +1,5 @@
-using Nancy;
+using System;
+using Nancy;
 using Nancy.Bootstrapper;
 using NzbDrone.Api.Frontend;
 
@@ -15,7 +16,7 @@ namespace NzbDrone.Api.Extensions.Pipelines
 
         public void Register(IPipelines pipelines)
         {
-            pipelines.AfterRequest.AddItemToStartOfPipeline(Handle);
+            pipelines.AfterRequest.AddItemToStartOfPipeline((Action<NancyContext>) Handle);
         }
 
         private void Handle(NancyContext context)

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

@@ -9,7 +9,7 @@ namespace NzbDrone.Api.Extensions.Pipelines
     {
         public void Register(IPipelines pipelines)
         {
-            pipelines.AfterRequest.AddItemToEndOfPipeline(Handle);
+            pipelines.AfterRequest.AddItemToEndOfPipeline((Action<NancyContext>) Handle);
         }
 
         private void Handle(NancyContext context)
@@ -31,7 +31,7 @@ namespace NzbDrone.Api.Extensions.Pipelines
                 allowedMethods = response.Headers["Allow"];
             }
             
-            var requestedHeaders = String.Join(", ", request.Headers[AccessControlHeaders.RequestHeaders]);
+            var requestedHeaders = string.Join(", ", request.Headers[AccessControlHeaders.RequestHeaders]);
 
             response.Headers.Add(AccessControlHeaders.AllowOrigin, "*");
             response.Headers.Add(AccessControlHeaders.AllowMethods, allowedMethods);

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

@@ -1,3 +1,4 @@
+using System;
 using Nancy;
 using Nancy.Bootstrapper;
 using NzbDrone.Api.Frontend;
@@ -15,7 +16,7 @@ namespace NzbDrone.Api.Extensions.Pipelines
 
         public void Register(IPipelines pipelines)
         {
-            pipelines.BeforeRequest.AddItemToStartOfPipeline(Handle);
+            pipelines.BeforeRequest.AddItemToStartOfPipeline((Func<NancyContext, Response>) Handle);
         }
 
         private Response Handle(NancyContext context)

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

@@ -1,4 +1,5 @@
-using Nancy;
+using System;
+using Nancy;
 using Nancy.Bootstrapper;
 using NzbDrone.Common.EnvironmentInfo;
 
@@ -8,7 +9,7 @@ namespace NzbDrone.Api.Extensions.Pipelines
     {
         public void Register(IPipelines pipelines)
         {
-            pipelines.AfterRequest.AddItemToStartOfPipeline(Handle);
+            pipelines.AfterRequest.AddItemToStartOfPipeline((Action<NancyContext>) Handle);
         }
 
         private void Handle(NancyContext context)

src/NzbDrone.Api/FileSystem/FileSystemModule.cs

@@ -1,19 +1,31 @@
 using System;
+using System.IO;
+using System.Linq;
 using Nancy;
 using NzbDrone.Api.Extensions;
 using NzbDrone.Common.Disk;
+using NzbDrone.Common.Extensions;
+using NzbDrone.Core.MediaFiles;
 
 namespace NzbDrone.Api.FileSystem
 {
     public class FileSystemModule : NzbDroneApiModule
     {
         private readonly IFileSystemLookupService _fileSystemLookupService;
+        private readonly IDiskProvider _diskProvider;
+        private readonly IDiskScanService _diskScanService;
 
-        public FileSystemModule(IFileSystemLookupService fileSystemLookupService)
+        public FileSystemModule(IFileSystemLookupService fileSystemLookupService,
+                                IDiskProvider diskProvider,
+                                IDiskScanService diskScanService)
             : base("/filesystem")
         {
             _fileSystemLookupService = fileSystemLookupService;
+            _diskProvider = diskProvider;
+            _diskScanService = diskScanService;
             Get["/"] = x => GetContents();
+            Get["/type"] = x => GetEntityType();
+            Get["/mediafiles"] = x => GetMediaFiles();
         }
 
         private Response GetContents()
@@ -29,5 +41,36 @@ namespace NzbDrone.Api.FileSystem
 
             return _fileSystemLookupService.LookupContents((string)pathQuery.Value, includeFiles).AsResponse();
         }
+
+        private Response GetEntityType()
+        {
+            var pathQuery = Request.Query.path;
+            var path = (string)pathQuery.Value;
+
+            if (_diskProvider.FileExists(path))
+            {
+                return new { type = "file" }.AsResponse();
+            }
+
+            //Return folder even if it doesn't exist on disk to avoid leaking anything from the UI about the underlying system
+            return new { type = "folder" }.AsResponse();
+        }
+
+        private Response GetMediaFiles()
+        {
+            var pathQuery = Request.Query.path;
+            var path = (string)pathQuery.Value;
+
+            if (!_diskProvider.FolderExists(path))
+            {
+                return new string[0].AsResponse();
+            }
+
+            return _diskScanService.GetVideoFiles(path).Select(f => new {
+                Path = f,
+                RelativePath = path.GetRelativePath(f),
+                Name = Path.GetFileName(f)
+            }).AsResponse();
+        }
     }
 }

src/NzbDrone.Api/Frontend/CacheableSpecification.cs

@@ -14,7 +14,7 @@ namespace NzbDrone.Api.Frontend
     {
         public bool IsCacheable(NancyContext context)
         {
-            if (BuildInfo.IsDebug)
+            if (!RuntimeInfoBase.IsProduction)
             {
                 return false;
             }

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

@@ -3,17 +3,20 @@ using System.IO;
 using NLog;
 using NzbDrone.Common.Disk;
 using NzbDrone.Common.EnvironmentInfo;
+using NzbDrone.Core.Configuration;
 
 namespace NzbDrone.Api.Frontend.Mappers
 {
     public class FaviconMapper : StaticResourceMapperBase
     {
         private readonly IAppFolderInfo _appFolderInfo;
+        private readonly IConfigFileProvider _configFileProvider;
 
-        public FaviconMapper(IAppFolderInfo appFolderInfo, IDiskProvider diskProvider, Logger logger)
+        public FaviconMapper(IAppFolderInfo appFolderInfo, IDiskProvider diskProvider,IConfigFileProvider configFileProvider, Logger logger)
             : base(diskProvider, logger)
         {
             _appFolderInfo = appFolderInfo;
+            _configFileProvider = configFileProvider;
         }
 
         public override string Map(string resourceUrl)
@@ -27,7 +30,7 @@ namespace NzbDrone.Api.Frontend.Mappers
 
             var path = Path.Combine("Content", "Images", fileName);
 
-            return Path.Combine(_appFolderInfo.StartUpFolder, "UI", path);
+            return Path.Combine(_appFolderInfo.StartUpFolder, _configFileProvider.UiFolder, path);
         }
 
         public override bool CanHandle(string resourceUrl)

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

@@ -17,10 +17,10 @@ namespace NzbDrone.Api.Frontend.Mappers
         private readonly IAnalyticsService _analyticsService;
         private readonly Func<ICacheBreakerProvider> _cacheBreakProviderFactory;
         private readonly string _indexPath;
-        private static readonly Regex ReplaceRegex = new Regex("(?<=(?:href|src)=\").*?(css|js)(?=\")", RegexOptions.Compiled | RegexOptions.IgnoreCase);
+        private static readonly Regex ReplaceRegex = new Regex(@"(?:(?<attribute>href|src)=\"")(?<path>.*?(?<extension>css|js|png|ico|ics))(?:\"")(?:\s(?<nohash>data-no-hash))?", RegexOptions.Compiled | RegexOptions.IgnoreCase);
 
-        private static String API_KEY;
-        private static String URL_BASE;
+        private static string API_KEY;
+        private static string URL_BASE;
         private string _generatedContent
             ;
 
@@ -36,7 +36,7 @@ namespace NzbDrone.Api.Frontend.Mappers
             _configFileProvider = configFileProvider;
             _analyticsService = analyticsService;
             _cacheBreakProviderFactory = cacheBreakProviderFactory;
-            _indexPath = Path.Combine(appFolderInfo.StartUpFolder, "UI", "index.html");
+            _indexPath = Path.Combine(appFolderInfo.StartUpFolder, _configFileProvider.UiFolder, "index.html");
 
             API_KEY = configFileProvider.ApiKey;
             URL_BASE = configFileProvider.UrlBase;
@@ -85,8 +85,19 @@ namespace NzbDrone.Api.Frontend.Mappers
 
             text = ReplaceRegex.Replace(text, match =>
             {
-                var url = cacheBreakProvider.AddCacheBreakerToPath(match.Value);
-                return URL_BASE + url;
+                string url;
+
+                if (match.Groups["nohash"].Success)
+                {
+                    url = match.Groups["path"].Value;
+                }
+
+                else
+                {
+                    url = cacheBreakProvider.AddCacheBreakerToPath(match.Groups["path"].Value);
+                }
+
+                return string.Format("{0}=\"{1}{2}\"", match.Groups["attribute"].Value, URL_BASE, url);
             });
 
             text = text.Replace("API_ROOT", URL_BASE + "/api");

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

@@ -12,11 +12,12 @@ namespace NzbDrone.Api.Frontend.Mappers
     public class LoginHtmlMapper : StaticResourceMapperBase
     {
         private readonly IDiskProvider _diskProvider;
+        private readonly IConfigFileProvider _configFileProvider;
         private readonly Func<ICacheBreakerProvider> _cacheBreakProviderFactory;
         private readonly string _indexPath;
         private static readonly Regex ReplaceRegex = new Regex("(?<=(?:href|src|data-main)=\").*?(?=\")", RegexOptions.Compiled | RegexOptions.IgnoreCase);
 
-        private static String URL_BASE;
+        private static string URL_BASE;
         private string _generatedContent;
 
         public LoginHtmlMapper(IAppFolderInfo appFolderInfo,
@@ -27,8 +28,9 @@ namespace NzbDrone.Api.Frontend.Mappers
             : base(diskProvider, logger)
         {
             _diskProvider = diskProvider;
+            _configFileProvider = configFileProvider;
             _cacheBreakProviderFactory = cacheBreakProviderFactory;
-            _indexPath = Path.Combine(appFolderInfo.StartUpFolder, "UI", "login.html");
+            _indexPath = Path.Combine(appFolderInfo.StartUpFolder, _configFileProvider.UiFolder, "login.html");
 
             URL_BASE = configFileProvider.UrlBase;
         }

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

@@ -0,0 +1,34 @@
+using System;
+using System.IO;
+using NLog;
+using NzbDrone.Common.Disk;
+using NzbDrone.Common.EnvironmentInfo;
+using NzbDrone.Core.Configuration;
+
+namespace NzbDrone.Api.Frontend.Mappers
+{
+    public class RobotsTxtMapper : StaticResourceMapperBase
+    {
+        private readonly IAppFolderInfo _appFolderInfo;
+        private readonly IConfigFileProvider _configFileProvider;
+
+        public RobotsTxtMapper(IAppFolderInfo appFolderInfo, IDiskProvider diskProvider, IConfigFileProvider configFileProvider, Logger logger)
+            : base(diskProvider, logger)
+        {
+            _appFolderInfo = appFolderInfo;
+            _configFileProvider = configFileProvider;
+        }
+
+        public override string Map(string resourceUrl)
+        {
+            var path = Path.Combine("Content", "robots.txt");
+
+            return Path.Combine(_appFolderInfo.StartUpFolder, _configFileProvider.UiFolder, path);
+        }
+
+        public override bool CanHandle(string resourceUrl)
+        {
+            return resourceUrl.Equals("/robots.txt");
+        }
+    }
+}

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

@@ -2,17 +2,20 @@ using System.IO;
 using NLog;
 using NzbDrone.Common.Disk;
 using NzbDrone.Common.EnvironmentInfo;
+using NzbDrone.Core.Configuration;
 
 namespace NzbDrone.Api.Frontend.Mappers
 {
     public class StaticResourceMapper : StaticResourceMapperBase
     {
         private readonly IAppFolderInfo _appFolderInfo;
+        private readonly IConfigFileProvider _configFileProvider;
 
-        public StaticResourceMapper(IAppFolderInfo appFolderInfo, IDiskProvider diskProvider, Logger logger)
+        public StaticResourceMapper(IAppFolderInfo appFolderInfo, IDiskProvider diskProvider, IConfigFileProvider configFileProvider, Logger logger)
             : base(diskProvider, logger)
         {
             _appFolderInfo = appFolderInfo;
+            _configFileProvider = configFileProvider;
         }
 
         public override string Map(string resourceUrl)
@@ -20,7 +23,7 @@ namespace NzbDrone.Api.Frontend.Mappers
             var path = resourceUrl.Replace('/', Path.DirectorySeparatorChar);
             path = path.Trim(Path.DirectorySeparatorChar);
 
-            return Path.Combine(_appFolderInfo.StartUpFolder, "UI", path);
+            return Path.Combine(_appFolderInfo.StartUpFolder, _configFileProvider.UiFolder, path);
         }
 
         public override bool CanHandle(string resourceUrl)
@@ -30,7 +33,8 @@ namespace NzbDrone.Api.Frontend.Mappers
                    resourceUrl.EndsWith(".map") ||
                    resourceUrl.EndsWith(".css") ||
                    (resourceUrl.EndsWith(".ico") && !resourceUrl.Equals("/favicon.ico")) ||
-                   resourceUrl.EndsWith(".swf");
+                   resourceUrl.EndsWith(".swf") ||
+                   resourceUrl.EndsWith("oauth.html");
         }
     }
 }