diff --git a/.gitignore b/.gitignore index e94e097f6..8b383bbbe 100644 --- a/.gitignore +++ b/.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,9 +113,6 @@ _rawPackage/ _dotTrace* _tests/ *.Result.xml -wix/*.msi -wix/*.wixobj -wix/*.wixpdb setup/Output/ *.~is diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 000000000..02629676e --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +Sonarr \ No newline at end of file diff --git a/.idea/Sonarr.iml b/.idea/Sonarr.iml new file mode 100644 index 000000000..aeec84bf6 --- /dev/null +++ b/.idea/Sonarr.iml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml new file mode 100644 index 000000000..7598f4c8e --- /dev/null +++ b/.idea/codeStyleSettings.xml @@ -0,0 +1,59 @@ + + + + + + \ No newline at end of file diff --git a/.idea/jsLibraryMappings.xml b/.idea/jsLibraryMappings.xml new file mode 100644 index 000000000..3d0774f1f --- /dev/null +++ b/.idea/jsLibraryMappings.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Sonarr_node_modules.xml b/.idea/libraries/Sonarr_node_modules.xml new file mode 100644 index 000000000..4eeebc5cc --- /dev/null +++ b/.idea/libraries/Sonarr_node_modules.xml @@ -0,0 +1,14 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 000000000..19f74da8e --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 000000000..7cc2cf51b --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 000000000..94a25f7f4 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/CLA.md b/CLA.md index 3198fdb1e..40adac7f6 100644 --- a/CLA.md +++ b/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 ## diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index b8f8c02c3..5beab2e58 100644 --- a/CONTRIBUTING.md +++ b/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, sign the Contributor License Agreement. +We're always looking for people to help make Sonarr even better, there are a number of ways to contribute. To get started, sign the Contributor License Agreement. ## Documentation ## Setup guides, FAQ, the more information we have on the wiki the better. @@ -15,7 +15,7 @@ Setup guides, FAQ, the more information we have on the wiki the better. ### Getting started ### -1. Fork NzbDrone +1. Fork Sonarr 2. Clone (develop branch) 3. Run `npm install` 4. Run `gulp watch` - Used to compile the UI components and copy them (leave this window open) @@ -23,7 +23,7 @@ Setup guides, FAQ, the more information we have on the wiki the better. ### Contributing Code ### - 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 NzbDrone's develop branch, don't merge +- 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 diff --git a/Log4ViewConfig.l4v b/Log4ViewConfig.l4v deleted file mode 100644 index d6c1f2252..000000000 --- a/Log4ViewConfig.l4v +++ /dev/null @@ -1,720 +0,0 @@ - - - 1 - - - - 2 - - 17 - <_receivers z:Id="3" z:Size="1"> - - - 16 - - - 0 - - 2 - 4293654015 - - 500000 - Windows-1252 - - ALL - - Log4net - NzbDrone - XML - 0 - 0001-01-01T00:00:00 - 0001-01-01T00:00:00 - 0 - 0 - Pacific Standard Time - false - 18 - localhost - 20480 - Udp - - - <_sources z:Id="12" z:Size="0" /> - - - - 3 - - - false - true - true - true - false - - OFF - - 17 - <_charts z:Id="16" z:Size="0" /> - <_columns z:Id="17" z:Size="29"> - - - 78 - - ClipRight - Id - - -1 - 45 - 18 - - - - 79 - - ClipRight - OriginalTime - - -1 - 120 - 18 - - - - 80 - - ClipRight - Time - - 1 - 80 - 18 - - - - 81 - - ClipRight - LocalTime - - -1 - 120 - 18 - - - - 82 - - ClipRight - UtcTime - - -1 - 120 - 18 - - - - 83 - - ClipRight - Date - - -1 - 70 - 18 - - - - 84 - - ClipRight - Key - - -1 - 120 - 18 - - - - 85 - - ClipRight - Level - - -1 - 85 - 18 - - - - 86 - - ClipMiddle - Logger - - 2 - 120 - 18 - - - - 87 - - ClipRight - Source - - -1 - 90 - 18 - - - - 88 - - ClipRight - Message - - 3 - 874 - 18 - - - - 89 - - ClipRight - Thread - - -1 - 95 - 18 - - - - 90 - - ClipRight - Host - - -1 - 90 - 18 - - - - 91 - - ClipRight - Exception - - -1 - 120 - 18 - - - - 92 - - ClipRight - Domain - - -1 - 90 - 18 - - - - 93 - - ClipRight - Identity - - -1 - 120 - 18 - - - - 94 - - ClipRight - User - - -1 - 90 - 18 - - - - 95 - - ClipRight - Class - - -1 - 90 - 18 - - - - 96 - - ClipRight - Method - - -1 - 120 - 18 - - - - 97 - - ClipRight - File - - -1 - 120 - 18 - - - - 98 - - ClipRight - Line - - -1 - 45 - 18 - - - - 99 - - ClipRight - NDC - - -1 - 120 - 18 - - - - 100 - - ClipRight - MDC - - -1 - 120 - 18 - - - - 101 - - ClipRight - Comment - - -1 - 120 - 18 - - - - 102 - - ClipRight - StackTrace - - -1 - 120 - 18 - - - - 103 - - ClipRight - ProcessId - - -1 - 120 - 18 - - - - 104 - - ClipRight - ThreadId - - -1 - 120 - 18 - - - - 105 - - ClipRight - CallStack - - -1 - 120 - 18 - - - - 106 - - ClipRight - assembly - - -1 - 120 - 18 - - - <_filters z:Id="76" z:Size="0" /> - <_formats z:Id="77" z:Size="1"> - - - 0 - - - - - - - - VERBOSE - - - - 4 - - - 0 - - 0 - 0 - - Tahoma - - 0 - - 2 - 4290032820 - - - 8.25 - - - - - - TRACE - - - - 5 - - - 0 - - 0 - 0 - - Tahoma - - 0 - - 2 - 4288716960 - - - 8.25 - - - - - - DEBUG - - - - 6 - - - 0 - - 0 - 0 - - Tahoma - - 0 - - 2 - 4286743170 - - - 8.25 - - - - - - INFO - - - - 7 - - - 0 - - 0 - 0 - - Tahoma - - 0 - - 2 - 4278190080 - - - 8.25 - - - - - - NOTICE - - - - 8 - - - 0 - - 0 - 0 - - Tahoma - - 0 - - 2 - 4281957177 - - - 8.25 - - - - - - WARN - - - - 9 - - - 0 - - 0 - 0 - - Tahoma - - 0 - - 2 - 4294934528 - - - 8.25 - - - - - - ERROR - - - - 10 - - - 0 - - 0 - 0 - - Tahoma - - 0 - - 2 - 4294901760 - - - 8.25 - - - - - - SEVERE - - - - 11 - - - 0 - - 0 - 0 - - Tahoma - - 0 - - 2 - 4293067295 - - - 8.25 - - - - - - CRITICAL - - - - 12 - - - 0 - - 0 - 0 - - Tahoma - - 0 - - 2 - 4289400377 - - - 8.25 - - - - - - ALERT - - - - 13 - - - 0 - - 0 - 0 - - Tahoma - - 0 - - 2 - 4294902015 - - - 8.25 - - - - - - FATAL - - - - 14 - - - 0 - - 0 - 0 - - Tahoma - - 0 - - 2 - 4287309977 - - - 8.25 - - - - - - EMERGENCY - - - - 15 - - - 0 - - 0 - 0 - - Tahoma - - 0 - - 2 - 4285932413 - - - 8.25 - - - - - false - Default Format Settings - - - <_logLevels z:Id="130" z:Size="0" /> - <_loggers z:Id="131" z:Size="1"> - - - 77 - - - - 16 - - - - 17 - \ No newline at end of file diff --git a/NzbDrone.sln.DotSettings b/NzbDrone.sln.DotSettings deleted file mode 100644 index 4657be0e3..000000000 --- a/NzbDrone.sln.DotSettings +++ /dev/null @@ -1,2 +0,0 @@ - - True \ No newline at end of file diff --git a/commonjsCleanup.linq b/commonjsCleanup.linq deleted file mode 100644 index d9df781c6..000000000 --- a/commonjsCleanup.linq +++ /dev/null @@ -1,50 +0,0 @@ - - -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(@"^(?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 diff --git a/gulp/phantom.js b/gulp/phantom.js index 1aeb0385b..54c0620e5 100644 --- a/gulp/phantom.js +++ b/gulp/phantom.js @@ -3,10 +3,10 @@ // gulp --phantom var phantom = false; -process.argv.forEach(function (val, index, array) { - if (val === '--phantom') { - phantom = true; - } +process.argv.forEach(function(val, index, array) { + if (val === '--phantom') { + phantom = true; + } }); console.log('Phantom:', phantom); diff --git a/readme.md b/readme.md index 06ad22ccb..327c05e86 100644 --- a/readme.md +++ b/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* @@ -35,7 +35,7 @@ Sonarr is a PVR for Usenet and BitTorrent users. It can monitor multiple RSS fee - 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 ###