Merge pull request #1 from mattman86/develop

Migrate matman/Lidarr to Lidarr organization

.github/ISSUE_TEMPLATE.md

@@ -2,4 +2,4 @@
 
 
 Provide a description of the feature request or bug, the more details the better.
-Please use https://forums.sonarr.tv/ for support or other questions. (When in doubt, use the forums)
+Please use http://lidarr.audio for support or other questions. (When in doubt, use the forums)

.gitignore

@@ -101,7 +101,7 @@ App_Data/*.ldf
 _NCrunch_*
 _TeamCity*
 
-# Sonarr
+# Lidarr
 config.xml
 nzbdrone.log*txt
 UpdateLogs/

.idea/.name

@@ -1 +1 @@
-Sonarr
+Lidarr

CLA.md

@@ -1,6 +1,6 @@
-# Sonarr Individual Contributor License Agreement #
+# Lidarr Individual Contributor License Agreement #
 
-Thank you for your interest in contributing to Sonarr ("We" or "Us").
+Thank you for your interest in contributing to Lidarr ("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 Sonarr even better, there are a number of ways to contribute.
+We're always looking for people to help make Lidarr even better, there are a number of ways to contribute.
 
 ## 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 Sonarr
+1.  Fork Lidarr
 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 `npm start` - Used to compile the UI components and copy them.
@@ -24,8 +24,8 @@ Setup guides, FAQ, the more information we have on the wiki the better.
 5.  Compile in Visual Studio
 
 ### 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 Sonarr's develop branch, don't merge
+- If you're adding a new, already requested feature, please comment on [Github Issues](https://github.com/lidarr/Lidarr/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 Lidarr'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

README.md

@@ -1,3 +1,5 @@
+[![Build status](https://ci.appveyor.com/api/projects/status/37d89txts2vt5j83?svg=true)](https://ci.appveyor.com/project/mattman86/lidarr)
+
 ## Lidarr
 
 Lidarr is a music collection manager for Usenet and BitTorrent users. It can monitor multiple RSS feeds for new tracks from your favorite artists and will grab, sort and rename them. It can also be configured to automatically upgrade the quality of files already downloaded when a better quality format becomes available.
@@ -24,7 +26,7 @@ Lidarr is a music collection manager for Usenet and BitTorrent users. It can mon
 
 ### Requirements
 
-* Visual Studio 2015 (https://www.visualstudio.com/vs/)
+* Visual Studio 2015 or higher (https://www.visualstudio.com/vs/).  The community version is free and works (https://www.visualstudio.com/downloads/).
 * [Git](https://git-scm.com/downloads)
 * [NodeJS](https://nodejs.org/en/download/)
 
@@ -35,6 +37,8 @@ Lidarr is a music collection manager for Usenet and BitTorrent users. It can mon
 * Grab the submodules `git submodule init && git submodule update`
 * Install the required Node Packages `npm install`
 * Start gulp to monitor your dev environment for any changes that need post processing using `npm start` command.
+* Run the project in Visual Studio
+* Open http://localhost:8686
 
 *Please note gulp must be running at all times while you are working with Lidarr client source files.*
 

appveyor.yml

@@ -0,0 +1,53 @@
+version: '0.2.0.{build}'
+
+assembly_info:
+  patch: true
+  file: 'src\NzbDrone.Common\Properties\SharedAssemblyInfo.cs'
+  assembly_version: '{version}'
+  assembly_file_version: '{version}'
+  assembly_informational_version: '{version}-rc1'
+
+environment:
+  DOTNET_CLI_TELEMETRY_OPTOUT: 1
+
+install:
+  - git submodule update --init --recursive
+
+build_script:
+  - ps: ./build-appveyor.ps1
+
+test: off
+#test:
+#  assemblies:
+#    - '_tests\*Test.dll'
+#  categories:
+#    except:
+#      - IntegrationTest
+#      - AutomationTest
+
+artifacts:
+  - path: '_artifacts\*.zip'
+  - path: '_artifacts\*.exe'
+  - path: '_artifacts\*.tar.gz'
+
+cache:
+  - '%USERPROFILE%\.nuget\packages'
+  - node_modules
+  
+pull_requests:
+  do_not_increment_build_number: true
+
+on_failure:
+  - ps: Get-ChildItem .\_artifacts\*.zip | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name }
+  - ps: Get-ChildItem .\_artifacts\*.exe | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name }
+  - ps: Get-ChildItem .\_artifacts\*.tar.gz | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name }
+
+only_commits:
+  files:
+    - src/
+    - osx/
+    - gulp/
+    - logo/
+    - setup/
+    - appveyor.yml
+    - build-appveyor.cake

build-appveyor.cake

@@ -0,0 +1,313 @@
+#addin "Cake.Npm"
+#addin "SharpZipLib"
+#addin "Cake.Compression"
+
+// Build variables
+var outputFolder = "./_output";
+var outputFolderMono = outputFolder + "_mono";
+var outputFolderOsx = outputFolder + "_osx";
+var outputFolderOsxApp = outputFolderOsx + "_app";
+var testPackageFolder = "./_tests";
+var testSearchPattern = "*.Test/bin/x86/Release";
+var sourceFolder = "./src";
+var solutionFile = sourceFolder + "/NzbDrone.sln";
+var updateFolder = outputFolder + "/NzbDrone.Update";
+var updateFolderMono = outputFolderMono + "/NzbDrone.Update";
+
+// Artifact variables
+var artifactsFolder = "./_artifacts";
+var artifactsFolderWindows = artifactsFolder + "/windows";
+var artifactsFolderLinux = artifactsFolder + "/linux";
+var artifactsFolderOsx = artifactsFolder + "/osx";
+var artifactsFolderOsxApp = artifactsFolder + "/osx-app";
+
+// Utility methods
+public void RemoveEmptyFolders(string startLocation) {
+    foreach (var directory in System.IO.Directory.GetDirectories(startLocation))
+    {
+        RemoveEmptyFolders(directory);
+
+        if (System.IO.Directory.GetFiles(directory).Length == 0 && 
+            System.IO.Directory.GetDirectories(directory).Length == 0)
+        {
+            DeleteDirectory(directory, false);
+        }
+    }
+}
+
+public void CleanFolder(string path, bool keepConfigFiles) {
+	DeleteFiles(path + "/**/*.transform");
+
+	if (!keepConfigFiles) {
+		DeleteFiles(path + "/**/*.dll.config");
+	}
+
+	DeleteFiles(path + "/**/FluentValidation.resources.dll");
+	DeleteFiles(path + "/**/App.config");
+
+	DeleteFiles(path + "/**/*.less");
+
+	DeleteFiles(path + "/**/*.vshost.exe");
+
+	DeleteFiles(path + "/**/*.dylib");
+
+	RemoveEmptyFolders(path);
+}
+
+public void CreateMdbs(string path) {
+	foreach (var file in System.IO.Directory.EnumerateFiles(path, "*.pdb", System.IO.SearchOption.AllDirectories)) {
+		var actualFile = file.Substring(0, file.Length - 4);
+		
+		if (FileExists(actualFile + ".exe")) {
+			StartProcess("./tools/pdb2mdb/pdb2mdb.exe", new ProcessSettings()
+				.WithArguments(args => args.Append(actualFile + ".exe")));
+		}
+		
+		if (FileExists(actualFile + ".dll")) {
+			StartProcess("./tools/pdb2mdb/pdb2mdb.exe", new ProcessSettings()
+				.WithArguments(args => args.Append(actualFile + ".dll")));
+		}
+	}
+}
+
+// Build Tasks
+Task("Compile").Does(() => {
+	// Build
+	if (DirectoryExists(outputFolder)) {
+		DeleteDirectory(outputFolder, true);
+	}
+
+	MSBuild(solutionFile, config => 
+		config.UseToolVersion(MSBuildToolVersion.VS2015)
+			.WithTarget("Clean")
+			.SetVerbosity(Verbosity.Minimal));
+
+	NuGetRestore(solutionFile);
+
+	MSBuild(solutionFile, config => 
+		config.UseToolVersion(MSBuildToolVersion.VS2015)
+			.SetPlatformTarget(PlatformTarget.x86)
+			.SetConfiguration("Release")
+			.WithProperty("AllowedReferenceRelatedFileExtensions", new string[] { ".pdb" })
+			.WithTarget("Build")
+			.SetVerbosity(Verbosity.Minimal));
+
+	CleanFolder(outputFolder, false);
+
+	// Add JsonNet
+	DeleteFiles(outputFolder + "/Newtonsoft.Json.*");
+	CopyFiles(sourceFolder + "/packages/Newtonsoft.Json.*/lib/net35/*.dll", outputFolder);
+	CopyFiles(sourceFolder + "/packages/Newtonsoft.Json.*/lib/net35/*.dll", updateFolder);
+
+	// Remove Mono stuff
+	DeleteFile(outputFolder + "/Mono.Posix.dll");
+});
+
+Task("Gulp").Does(() => {
+	NpmInstall(new NpmInstallSettings {
+		LogLevel = NpmLogLevel.Silent,
+		WorkingDirectory = "./",
+		Production = true
+	});
+	
+	NpmRunScript("build");
+});
+
+Task("PackageMono").Does(() => {
+	// Start mono package
+	if (DirectoryExists(outputFolderMono)) {
+		DeleteDirectory(outputFolderMono, true);
+	}
+
+	CopyDirectory(outputFolder, outputFolderMono);
+
+	// Create MDBs
+	CreateMdbs(outputFolderMono);
+
+	// Remove PDBs
+	DeleteFiles(outputFolderMono + "/**/*.pdb");
+
+	// Remove service helpers
+	DeleteFiles(outputFolderMono + "/ServiceUninstall.*");
+	DeleteFiles(outputFolderMono + "/ServiceInstall.*");
+	
+	// Remove native windows binaries
+	DeleteFiles(outputFolderMono + "/sqlite3.*");
+	DeleteFiles(outputFolderMono + "/MediaInfo.*");
+
+	// Adding NzbDrone.Core.dll.config (for dllmap)
+	CopyFile(sourceFolder + "/NzbDrone.Core/NzbDrone.Core.dll.config", outputFolderMono + "/NzbDrone.Core.dll.config");
+
+	// Adding CurlSharp.dll.config (for dllmap)
+	CopyFile(sourceFolder + "/NzbDrone.Common/CurlSharp.dll.config", outputFolderMono + "/CurlSharp.dll.config");
+
+	// Renaming Lidarr.Console.exe to Lidarr.exe
+	DeleteFiles(outputFolderMono + "/Lidarr.exe*");
+	MoveFile(outputFolderMono + "/Lidarr.Console.exe", outputFolderMono + "/Lidarr.exe");
+	MoveFile(outputFolderMono + "/Lidarr.Console.exe.config", outputFolderMono + "/Lidarr.exe.config");
+	MoveFile(outputFolderMono + "/Lidarr.Console.exe.mdb", outputFolderMono + "/Lidarr.exe.mdb");
+
+	// Remove NzbDrone.Windows.*
+	DeleteFiles(outputFolderMono + "/NzbDrone.Windows.*");
+
+	// Adding NzbDrone.Mono to updatePackage
+	CopyFiles(outputFolderMono + "/NzbDrone.Mono.*", updateFolderMono);
+});
+
+Task("PackageOsx").Does(() => {
+	// Start osx package
+	if (DirectoryExists(outputFolderOsx)) {
+		DeleteDirectory(outputFolderOsx, true);
+	}
+
+	CopyDirectory(outputFolderMono, outputFolderOsx);
+
+	// Adding sqlite dylibs
+	CopyFiles(sourceFolder + "/Libraries/Sqlite/*.dylib", outputFolderOsx);
+
+	// Adding MediaInfo dylib
+	CopyFiles(sourceFolder + "/Libraries/MediaInfo/*.dylib", outputFolderOsx);
+
+	// Adding Startup script
+	CopyFile("./osx/Lidarr", outputFolderOsx + "/Lidarr");
+});
+
+Task("PackageOsxApp").Does(() => {
+	// Start osx app package
+	if (DirectoryExists(outputFolderOsxApp)) {
+		DeleteDirectory(outputFolderOsxApp, true);
+	}
+
+	CreateDirectory(outputFolderOsxApp);
+
+	// Copy osx package files
+	CopyDirectory("./osx/Lidarr.app", outputFolderOsxApp + "/Lidarr.app");
+	CopyDirectory(outputFolderOsx, outputFolderOsxApp + "/Lidarr.app/Contents/MacOS");
+});
+
+Task("PackageTests").Does(() => {
+	// Start tests package
+	if (DirectoryExists(testPackageFolder)) {
+		DeleteDirectory(testPackageFolder, true);
+	}
+
+	CreateDirectory(testPackageFolder);
+
+	// Copy tests
+	CopyFiles(sourceFolder + "/" + testSearchPattern + "/*", testPackageFolder);
+	foreach (var directory in System.IO.Directory.GetDirectories(sourceFolder, "*.Test")) {
+		var releaseDirectory = directory + "/bin/x86/Release";
+		if (DirectoryExists(releaseDirectory)) {
+			foreach (var releaseSubDirectory in System.IO.Directory.GetDirectories(releaseDirectory)) {
+				Information(System.IO.Path.GetDirectoryName(releaseSubDirectory));
+				CopyDirectory(releaseSubDirectory, testPackageFolder + "/" + System.IO.Path.GetFileName(releaseSubDirectory));
+			}
+		}
+	}
+
+	// Install NUnit.ConsoleRunner
+	NuGetInstall("NUnit.ConsoleRunner", new NuGetInstallSettings {
+		Version = "3.2.0",
+		OutputDirectory = testPackageFolder
+	});
+
+	// Copy dlls
+	CopyFiles(outputFolder + "/*.dll", testPackageFolder);
+	
+	// Copy scripts
+	CopyFiles("./*.sh", testPackageFolder);
+
+	// Create MDBs for tests
+	CreateMdbs(testPackageFolder);
+
+	// Remove config
+	DeleteFiles(testPackageFolder + "/*.log.config");
+
+	// Clean
+	CleanFolder(testPackageFolder, true);
+
+	// Adding NzbDrone.Core.dll.config (for dllmap)
+	CopyFile(sourceFolder + "/NzbDrone.Core/NzbDrone.Core.dll.config", testPackageFolder + "/NzbDrone.Core.dll.config");
+
+	// Adding CurlSharp.dll.config (for dllmap)
+	CopyFile(sourceFolder + "/NzbDrone.Common/CurlSharp.dll.config", testPackageFolder + "/CurlSharp.dll.config");
+
+	// Adding CurlSharp libraries
+	CopyFiles(sourceFolder + "/ExternalModules/CurlSharp/libs/i386/*", testPackageFolder);
+});
+
+Task("CleanupWindowsPackage").Does(() => {
+	// Remove mono
+	DeleteFiles(outputFolder + "/NzbDrone.Mono.*");
+
+	// Adding NzbDrone.Windows to updatePackage
+	CopyFiles(outputFolder + "/NzbDrone.Windows.*", updateFolder);
+});
+
+Task("Build")
+	.IsDependentOn("Compile")
+	.IsDependentOn("Gulp")
+	.IsDependentOn("PackageMono")
+	.IsDependentOn("PackageOsx")
+	.IsDependentOn("PackageOsxApp")
+	.IsDependentOn("PackageTests")
+	.IsDependentOn("CleanupWindowsPackage");
+
+// Build Artifacts
+Task("CleanArtifacts").Does(() => {
+	if (DirectoryExists(artifactsFolder)) {
+		DeleteDirectory(artifactsFolder, true);
+	}
+
+	CreateDirectory(artifactsFolder);
+});
+
+Task("ArtifactsWindows").Does(() => {
+	CopyDirectory(outputFolder, artifactsFolderWindows + "/Lidarr");
+});
+
+Task("ArtifactsWindowsInstaller").Does(() => {
+	InnoSetup("./setup/nzbdrone.iss", new InnoSetupSettings {
+    		OutputDirectory = artifactsFolder,
+		ToolPath = "./setup/inno/ISCC.exe"
+    	});
+});
+
+Task("ArtifactsLinux").Does(() => {
+	CopyDirectory(outputFolderMono, artifactsFolderLinux + "/Lidarr");
+});
+
+Task("ArtifactsOsx").Does(() => {
+	CopyDirectory(outputFolderOsx, artifactsFolderOsx + "/Lidarr");
+});
+
+Task("ArtifactsOsxApp").Does(() => {
+	CopyDirectory(outputFolderOsxApp, artifactsFolderOsxApp);
+});
+
+Task("CompressArtifacts").Does(() => {
+	var prefix = "";
+
+	if (AppVeyor.IsRunningOnAppVeyor) {
+		prefix += AppVeyor.Environment.Repository.Branch.Replace("/", "-") + ".";
+		prefix += AppVeyor.Environment.Build.Version + ".";
+	}
+
+	Zip(artifactsFolderWindows, artifactsFolder + "/Lidarr." + prefix + "windows.zip");
+	GZipCompress(artifactsFolderLinux, artifactsFolder + "/Lidarr." + prefix + "linux.tar.gz");
+	GZipCompress(artifactsFolderOsx, artifactsFolder + "/Lidarr." + prefix + "osx.tar.gz");
+	Zip(artifactsFolderOsxApp, artifactsFolder + "/Lidarr." + prefix + "osx-app.zip");
+});
+
+Task("Artifacts")
+	.IsDependentOn("CleanArtifacts")
+	.IsDependentOn("ArtifactsWindows")
+	.IsDependentOn("ArtifactsWindowsInstaller")
+	.IsDependentOn("ArtifactsLinux")
+	.IsDependentOn("ArtifactsOsx")
+	.IsDependentOn("ArtifactsOsxApp")
+	.IsDependentOn("CompressArtifacts");
+
+// Run
+RunTarget("Build");
+RunTarget("Artifacts");

build-appveyor.ps1

@@ -0,0 +1,184 @@
+##########################################################################
+# This is the Cake bootstrapper script for PowerShell.
+# This file was downloaded from https://github.com/cake-build/resources
+# Feel free to change this file to fit your needs.
+##########################################################################
+
+<#
+.SYNOPSIS
+This is a Powershell script to bootstrap a Cake build.
+.DESCRIPTION
+This Powershell script will download NuGet if missing, restore NuGet tools (including Cake)
+and execute your Cake build script with the parameters you provide.
+.PARAMETER Script
+The build script to execute.
+.PARAMETER Target
+The build script target to run.
+.PARAMETER Configuration
+The build configuration to use.
+.PARAMETER Verbosity
+Specifies the amount of information to be displayed.
+.PARAMETER Experimental
+Tells Cake to use the latest Roslyn release.
+.PARAMETER WhatIf
+Performs a dry run of the build script.
+No tasks will be executed.
+.PARAMETER Mono
+Tells Cake to use the Mono scripting engine.
+.PARAMETER SkipToolPackageRestore
+Skips restoring of packages.
+.PARAMETER ScriptArgs
+Remaining arguments are added here.
+.LINK
+http://cakebuild.net
+#>
+
+[CmdletBinding()]
+Param(
+    [string]$Script = "build-appveyor.cake",
+    [string]$Target = "Default",
+    [ValidateSet("Release", "Debug")]
+    [string]$Configuration = "Release",
+    [ValidateSet("Quiet", "Minimal", "Normal", "Verbose", "Diagnostic")]
+    [string]$Verbosity = "Verbose",
+    [switch]$Experimental,
+    [Alias("DryRun","Noop")]
+    [switch]$WhatIf,
+    [switch]$Mono,
+    [switch]$SkipToolPackageRestore,
+    [Parameter(Position=0,Mandatory=$false,ValueFromRemainingArguments=$true)]
+    [string[]]$ScriptArgs
+)
+
+[Reflection.Assembly]::LoadWithPartialName("System.Security") | Out-Null
+function MD5HashFile([string] $filePath)
+{
+    if ([string]::IsNullOrEmpty($filePath) -or !(Test-Path $filePath -PathType Leaf))
+    {
+        return $null
+    }
+
+    [System.IO.Stream] $file = $null;
+    [System.Security.Cryptography.MD5] $md5 = $null;
+    try
+    {
+        $md5 = [System.Security.Cryptography.MD5]::Create()
+        $file = [System.IO.File]::OpenRead($filePath)
+        return [System.BitConverter]::ToString($md5.ComputeHash($file))
+    }
+    finally
+    {
+        if ($file -ne $null)
+        {
+            $file.Dispose()
+        }
+    }
+}
+
+Write-Host "Preparing to run build script..."
+
+if(!$PSScriptRoot){
+    $PSScriptRoot = Split-Path $MyInvocation.MyCommand.Path -Parent
+}
+
+$TOOLS_DIR = Join-Path $PSScriptRoot "tools-cake"
+$NUGET_EXE = Join-Path $TOOLS_DIR "nuget.exe"
+$CAKE_EXE = Join-Path $TOOLS_DIR "Cake/Cake.exe"
+$NUGET_URL = "https://dist.nuget.org/win-x86-commandline/latest/nuget.exe"
+$PACKAGES_CONFIG = Join-Path $TOOLS_DIR "packages.config"
+$PACKAGES_CONFIG_MD5 = Join-Path $TOOLS_DIR "packages.config.md5sum"
+
+# Should we use mono?
+$UseMono = "";
+if($Mono.IsPresent) {
+    Write-Verbose -Message "Using the Mono based scripting engine."
+    $UseMono = "-mono"
+}
+
+# Should we use the new Roslyn?
+$UseExperimental = "";
+if($Experimental.IsPresent -and !($Mono.IsPresent)) {
+    Write-Verbose -Message "Using experimental version of Roslyn."
+    $UseExperimental = "-experimental"
+}
+
+# Is this a dry run?
+$UseDryRun = "";
+if($WhatIf.IsPresent) {
+    $UseDryRun = "-dryrun"
+}
+
+# Make sure tools folder exists
+if ((Test-Path $PSScriptRoot) -and !(Test-Path $TOOLS_DIR)) {
+    Write-Verbose -Message "Creating tools directory..."
+    New-Item -Path $TOOLS_DIR -Type directory | out-null
+}
+
+# Make sure that packages.config exist.
+if (!(Test-Path $PACKAGES_CONFIG)) {
+    Write-Verbose -Message "Downloading packages.config..."
+    try { (New-Object System.Net.WebClient).DownloadFile("http://cakebuild.net/download/bootstrapper/packages", $PACKAGES_CONFIG) } catch {
+        Throw "Could not download packages.config."
+    }
+}
+
+# Try find NuGet.exe in path if not exists
+if (!(Test-Path $NUGET_EXE)) {
+    Write-Verbose -Message "Trying to find nuget.exe in PATH..."
+    $existingPaths = $Env:Path -Split ';' | Where-Object { (![string]::IsNullOrEmpty($_)) -and (Test-Path $_) }
+    $NUGET_EXE_IN_PATH = Get-ChildItem -Path $existingPaths -Filter "nuget.exe" | Select -First 1
+    if ($NUGET_EXE_IN_PATH -ne $null -and (Test-Path $NUGET_EXE_IN_PATH.FullName)) {
+        Write-Verbose -Message "Found in PATH at $($NUGET_EXE_IN_PATH.FullName)."
+        $NUGET_EXE = $NUGET_EXE_IN_PATH.FullName
+    }
+}
+
+# Try download NuGet.exe if not exists
+if (!(Test-Path $NUGET_EXE)) {
+    Write-Verbose -Message "Downloading NuGet.exe..."
+    try {
+        (New-Object System.Net.WebClient).DownloadFile($NUGET_URL, $NUGET_EXE)
+    } catch {
+        Throw "Could not download NuGet.exe."
+    }
+}
+
+# Save nuget.exe path to environment to be available to child processed
+$ENV:NUGET_EXE = $NUGET_EXE
+
+# Restore tools from NuGet?
+if(-Not $SkipToolPackageRestore.IsPresent) {
+    Push-Location
+    Set-Location $TOOLS_DIR
+
+    # Check for changes in packages.config and remove installed tools if true.
+    [string] $md5Hash = MD5HashFile($PACKAGES_CONFIG)
+    if((!(Test-Path $PACKAGES_CONFIG_MD5)) -Or
+      ($md5Hash -ne (Get-Content $PACKAGES_CONFIG_MD5 ))) {
+        Write-Verbose -Message "Missing or changed package.config hash..."
+        Remove-Item * -Recurse -Exclude packages.config,nuget.exe
+    }
+
+    Write-Verbose -Message "Restoring tools from NuGet..."
+    $NuGetOutput = Invoke-Expression "&`"$NUGET_EXE`" install -ExcludeVersion -OutputDirectory `"$TOOLS_DIR`""
+
+    if ($LASTEXITCODE -ne 0) {
+        Throw "An error occured while restoring NuGet tools."
+    }
+    else
+    {
+        $md5Hash | Out-File $PACKAGES_CONFIG_MD5 -Encoding "ASCII"
+    }
+    Write-Verbose -Message ($NuGetOutput | out-string)
+    Pop-Location
+}
+
+# Make sure that Cake has been installed.
+if (!(Test-Path $CAKE_EXE)) {
+    Throw "Could not find Cake.exe at $CAKE_EXE"
+}
+
+# Start Cake
+Write-Host "Running build script..."
+Invoke-Expression "& `"$CAKE_EXE`" `"$Script`" -target=`"$Target`" -configuration=`"$Configuration`" -verbosity=`"$Verbosity`" $UseMono $UseDryRun $UseExperimental $ScriptArgs"
+exit $LASTEXITCODE

build.sh

@@ -181,7 +181,7 @@ PackageOsx()
     cp $sourceFolder/Libraries/MediaInfo/*.dylib $outputFolderOsx
 
     echo "Adding Startup script"
-    cp  ./osx/Sonarr $outputFolderOsx
+    cp  ./osx/Lidarr $outputFolderOsx
 
     echo "##teamcity[progressFinish 'Creating OS X Package']"
 }
@@ -192,8 +192,8 @@ PackageOsxApp()
     rm -rf $outputFolderOsxApp
     mkdir $outputFolderOsxApp
 
-    cp -r ./osx/Sonarr.app $outputFolderOsxApp
-    cp -r $outputFolderOsx $outputFolderOsxApp/Sonarr.app/Contents/MacOS
+    cp -r ./osx/Lidarr.app $outputFolderOsxApp
+    cp -r $outputFolderOsx $outputFolderOsxApp/Lidarr.app/Contents/MacOS
 
     echo "##teamcity[progressFinish 'Creating OS X App Package']"
 }

debian/control

@@ -2,11 +2,11 @@ Section: web
 Priority: optional
 Maintainer: Sonarr <contact@nzbdrone.com>
 Source: nzbdrone
-Homepage: https://sonarr.tv
-Vcs-Git: git@github.com:Sonarr/Sonarr.git
-Vcs-Browser: https://github.com/Sonarr/Sonarr
+Homepage: https://lidarr.audio
+Vcs-Git: git@github.com:lidarr/Lidarr.git
+Vcs-Browser: https://github.com/lidarr/Lidarr
 
 Package: nzbdrone
 Architecture: all
 Depends: libmono-cil-dev (>= 3.2), sqlite3 (>= 3.7), mediainfo (>= 0.7.52)
-Description: Sonarr is an internet PVR
+Description: Lidarr is a music collection manager

debian/copyright

@@ -1,9 +1,9 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: nzbdrone
-Source: https://github.com/Sonarr/Sonarr
+Source: https://github.com/lidarr/Lidarr
 
 Files: *
-Copyright: 2010-2016 Sonarr <hello@sonarr.tv>
+Copyright: 2010-2016 Lidarr <hello@lidarr.audio>
 
 License: GPL-3.0+
 

gulp/less.js

@@ -17,8 +17,10 @@ gulp.task('less', function() {
         paths.src.content + 'theme.less',
         paths.src.content + 'overrides.less',
         paths.src.root + 'Series/series.less',
+        paths.src.root + 'Artist/artist.less',
         paths.src.root + 'Activity/activity.less',
         paths.src.root + 'AddSeries/addSeries.less',
+        paths.src.root + 'AddArtist/addArtist.less',
         paths.src.root + 'Calendar/calendar.less',
         paths.src.root + 'Cells/cells.less',
         paths.src.root + 'ManualImport/manualimport.less',

gulp/start.js

@@ -1,4 +1,4 @@
-// will download and run sonarr (server) in a non-windows enviroment
+// will download and run Lidarr (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.
 
@@ -31,7 +31,7 @@ function getLatest(cb) {
     }
   });
 
-  var url = 'http://services.sonarr.tv/v1/update/' + branch + '?os=osx';
+  var url = 'http://services.lidarr.audio/v1/update/' + branch + '?os=osx';
 
   console.log('Checking for latest version:', url);
 

package.json

@@ -1,7 +1,7 @@
 {
-  "name": "Sonarr",
-  "version": "2.0.0",
-  "description": "Sonarr",
+  "name": "Lidarr",
+  "version": "1.0.0",
+  "description": "Lidarr",
   "main": "main.js",
   "scripts": {
     "build": "gulp build",
@@ -9,7 +9,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git://github.com/Sonarr/Sonarr.git"
+    "url": "git://github.com/lidarr/Lidarr.git"
   },
   "author": "",
   "license": "GPL-3.0",

setup/nzbdrone.iss

@@ -1,10 +1,10 @@
 ; Script generated by the Inno Setup Script Wizard.
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
-#define AppName "Sonarr"
-#define AppPublisher "Team Sonarr"
-#define AppURL "https://sonarr.tv/"
-#define ForumsURL "https://forums.sonarr.tv/"
+#define AppName "Lidarr"
+#define AppPublisher "Team Lidarr"
+#define AppURL "https://lidarr.audio/"
+#define ForumsURL "https://forums.lidarr.audio/"
 #define AppExeName "NzbDrone.exe"
 #define BuildNumber "2.0"
 #define BuildNumber GetEnv('BUILD_NUMBER')
@@ -44,7 +44,7 @@ Name: "english"; MessagesFile: "compiler:Default.isl"
 Name: "windowsService"; Description: "Install as a Windows Service"
 
 [Files]
-Source: "..\_output\NzbDrone.exe"; DestDir: "{app}"; Flags: ignoreversion  
+Source: "..\_output\Lidarr.exe"; DestDir: "{app}"; Flags: ignoreversion  
 Source: "..\_output\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
@@ -53,8 +53,8 @@ Name: "{group}\{#AppName}"; Filename: "{app}\{#AppExeName}"; Parameters: "/icon"
 Name: "{commondesktop}\{#AppName}"; Filename: "{app}\{#AppExeName}"; Parameters: "/icon"
 
 [Run]
-Filename: "{app}\nzbdrone.console.exe"; Parameters: "/u"; Flags: waituntilterminated;
-Filename: "{app}\nzbdrone.console.exe"; Parameters: "/i"; Flags: waituntilterminated; Tasks: windowsService
+Filename: "{app}\lidarr.console.exe"; Parameters: "/u"; Flags: waituntilterminated;
+Filename: "{app}\lidarr.console.exe"; Parameters: "/i"; Flags: waituntilterminated; Tasks: windowsService
 
 [UninstallRun]
-Filename: "{app}\nzbdrone.console.exe"; Parameters: "/u"; Flags: waituntilterminated skipifdoesntexist
+Filename: "{app}\lidarr.console.exe"; Parameters: "/u"; Flags: waituntilterminated skipifdoesntexist

src/NzbDrone.Api/Music/AlbumResource.cs

@@ -8,7 +8,7 @@ namespace NzbDrone.Api.Music
 {
     public class AlbumResource
     {
-        public int AlbumId { get; set; }
+        public string AlbumId { get; set; }
         public string AlbumName { get; set; }
         public bool Monitored { get; set; }
         public int Year { get; set; }

src/NzbDrone.Api/Music/ArtistModule.cs

@@ -71,7 +71,7 @@ ProfileExistsValidator profileExistsValidator
 
             PostValidator.RuleFor(s => s.Path).IsValidPath().When(s => s.RootFolderPath.IsNullOrWhiteSpace());
             PostValidator.RuleFor(s => s.RootFolderPath).IsValidPath().When(s => s.Path.IsNullOrWhiteSpace());
-            PostValidator.RuleFor(s => s.ItunesId).GreaterThan(0).SetValidator(artistExistsValidator);
+            PostValidator.RuleFor(s => s.SpotifyId).NotEqual("").SetValidator(artistExistsValidator);
 
             PutValidator.RuleFor(s => s.Path).IsValidPath();
         }

src/NzbDrone.Api/Music/ArtistResource.cs

@@ -19,9 +19,7 @@ public ArtistResource()
 
         //View Only
         public string ArtistName { get; set; }
-        public int ItunesId { get; set; }
-        //public List<AlternateTitleResource> AlternateTitles { get; set; }
-        //public string SortTitle { get; set; }
+        public string SpotifyId { get; set; }
         public string Overview { get; set; }
 
         public int AlbumCount
@@ -30,7 +28,7 @@ public int AlbumCount
             {
                 if (Albums == null) return 0;
 
-                return Albums.Where(s => s.AlbumId > 0).Count(); // TODO: CHeck this condition
+                return Albums.Where(s => s.AlbumId != "").Count(); // TODO: CHeck this condition
             }
         }
 
@@ -107,7 +105,7 @@ public static ArtistResource ToResource(this Core.Music.Artist model)
                 //FirstAired = resource.FirstAired,
                 //LastInfoSync = resource.LastInfoSync,
                 //SeriesType = resource.SeriesType,
-                ItunesId = model.ItunesId,
+                SpotifyId = model.SpotifyId,
                 ArtistSlug = model.ArtistSlug,
 
                 RootFolderPath = model.RootFolderPath,
@@ -151,16 +149,8 @@ public static Core.Music.Artist ToModel(this ArtistResource resource)
 
                 ArtistFolder = resource.ArtistFolder,
                 Monitored = resource.Monitored,
-
-                //UseSceneNumbering = resource.UseSceneNumbering,
-                //Runtime = resource.Runtime,
-                //TvdbId = resource.TvdbId,
-                //TvRageId = resource.TvRageId,
-                //TvMazeId = resource.TvMazeId,
-                //FirstAired = resource.FirstAired,
                 //LastInfoSync = resource.LastInfoSync,
-                //SeriesType = resource.SeriesType,
-                ItunesId = resource.ItunesId,
+                SpotifyId = resource.SpotifyId,
                 ArtistSlug = resource.ArtistSlug,
                 
                 RootFolderPath = resource.RootFolderPath,

src/NzbDrone.Common/Cloud/SonarrCloudRequestBuilder.cs

@@ -17,7 +17,8 @@ public LidarrCloudRequestBuilder()
             Services = new HttpRequestBuilder("http://services.lidarr.tv/v1/")
                 .CreateFactory();
 
-            Search = new HttpRequestBuilder("https://itunes.apple.com/{route}/")
+            Search = new HttpRequestBuilder("https://api.spotify.com/{version}/{route}/") // TODO: maybe use {version} 
+                .SetSegment("version", "v1")
                 .CreateFactory();
 
             InternalSearch = new HttpRequestBuilder("https://itunes.apple.com/WebObjects/MZStore.woa/wa/{route}") //viewArtist or search

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

@@ -21,7 +21,7 @@ public void Setup()
                      {
                          SeriesId = 12345,
                          EpisodeIds = new List<int> { 1 },
-                         Quality = new QualityModel(Quality.Bluray720p),
+                         Quality = new QualityModel(Quality.FLAC),
                          SourceTitle = "series.title.s01e01",
                          Date = DateTime.UtcNow
                      };

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

@@ -21,7 +21,7 @@ public void Setup()
                      {
                          SeriesId = 12345,
                          EpisodeIds = new List<int> {1},
-                         Quality = new QualityModel(Quality.Bluray720p),
+                         Quality = new QualityModel(Quality.MP3320),
                          SourceTitle = "series.title.s01e01",
                          DownloadClient = "SabnzbdClient",
                          DownloadId = "Sabnzbd_nzo_2dfh73k"

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

@@ -55,7 +55,7 @@ public void one_to_one_should_not_query_db_if_foreign_key_is_zero()
         [Test]
         public void embedded_document_as_json()
         {
-            var quality = new QualityModel { Quality = Quality.Bluray720p, Revision = new Revision(version: 2 )};
+            var quality = new QualityModel { Quality = Quality.MP3320, Revision = new Revision(version: 2 )};
 
             var history = Builder<History.History>.CreateNew()
                             .With(c => c.Id = 0)
@@ -75,15 +75,15 @@ public void embedded_list_of_document_with_json()
                             .All().With(c => c.Id = 0)
                             .Build().ToList();
 
-            history[0].Quality = new QualityModel(Quality.HDTV1080p, new Revision(version: 2));
-            history[1].Quality = new QualityModel(Quality.Bluray720p, new Revision(version: 2));
+            history[0].Quality = new QualityModel(Quality.MP3512, new Revision(version: 2));
+            history[1].Quality = new QualityModel(Quality.MP3320, new Revision(version: 2));
 
 
             Db.InsertMany(history);
 
             var returnedHistory = Db.All<History.History>();
 
-            returnedHistory[0].Quality.Quality.Should().Be(Quality.HDTV1080p);
+            returnedHistory[0].Quality.Quality.Should().Be(Quality.MP3512);
         }
     }
 }

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

@@ -19,7 +19,7 @@ public void Setup()
             var profile = new Profile
                 {
                     Name = "Test",
-                    Cutoff = Quality.WEBDL720p,
+                    Cutoff = Quality.MP3320,
                     Items = Qualities.QualityFixture.GetDefaultQualities()
                 };
 

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

@@ -32,7 +32,7 @@ public void Setup()
                                     {
                                         Series = series,
                                         Release = new ReleaseInfo(),
-                                        ParsedEpisodeInfo = new ParsedEpisodeInfo { Quality = new QualityModel(Quality.SDTV, new Revision(version: 2)) },
+                                        ParsedEpisodeInfo = new ParsedEpisodeInfo { Quality = new QualityModel(Quality.MP3192, new Revision(version: 2)) },
                                         Episodes = new List<Episode> { new Episode(), new Episode(), new Episode(), new Episode(), new Episode(), new Episode() }
                                     };
 
@@ -40,7 +40,7 @@ public void Setup()
                                     {
                                         Series = series,
                                         Release = new ReleaseInfo(),
-                                        ParsedEpisodeInfo = new ParsedEpisodeInfo { Quality = new QualityModel(Quality.SDTV, new Revision(version: 2)) },
+                                        ParsedEpisodeInfo = new ParsedEpisodeInfo { Quality = new QualityModel(Quality.MP3192, new Revision(version: 2)) },
                                         Episodes = new List<Episode> { new Episode(), new Episode() }
                                     };
 
@@ -48,7 +48,7 @@ public void Setup()
                                     {
                                         Series = series,
                                         Release = new ReleaseInfo(),
-                                        ParsedEpisodeInfo = new ParsedEpisodeInfo { Quality = new QualityModel(Quality.SDTV, new Revision(version: 2)) },
+                                        ParsedEpisodeInfo = new ParsedEpisodeInfo { Quality = new QualityModel(Quality.MP3192, new Revision(version: 2)) },
                                         Episodes = new List<Episode> { new Episode() { Id = 2 } }
 
                                     };
@@ -60,10 +60,10 @@ public void Setup()
             qualityType = Builder<QualityDefinition>.CreateNew()
                 .With(q => q.MinSize = 2)
                 .With(q => q.MaxSize = 10)
-                .With(q => q.Quality = Quality.SDTV)
+                .With(q => q.Quality = Quality.MP3192)
                 .Build();
 
-            Mocker.GetMock<IQualityDefinitionService>().Setup(s => s.Get(Quality.SDTV)).Returns(qualityType);
+            Mocker.GetMock<IQualityDefinitionService>().Setup(s => s.Get(Quality.MP3192)).Returns(qualityType);
 
             Mocker.GetMock<IEpisodeService>().Setup(
                 s => s.GetEpisodesBySeason(It.IsAny<int>(), It.IsAny<int>()))
@@ -199,7 +199,7 @@ public void should_treat_daily_series_as_single_episode()
         [Test]
         public void should_return_true_if_RAWHD()
         {
-            parseResultSingle.ParsedEpisodeInfo.Quality = new QualityModel(Quality.RAWHD);
+            parseResultSingle.ParsedEpisodeInfo.Quality = new QualityModel(Quality.FLAC);
             
             series.Runtime = 45;
             parseResultSingle.Series = series;

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

@@ -28,7 +28,7 @@ public void Setup()
 
             _episodeFile = new EpisodeFile
                            {
-                               Quality = new QualityModel(Quality.HDTV720p, new Revision()),
+                               Quality = new QualityModel(Quality.MP3256, new Revision()),
                                ReleaseGroup = "DRONE2"
                            };
 
@@ -36,7 +36,7 @@ public void Setup()
             _remoteEpisode.Series = new Series { SeriesType = SeriesTypes.Anime };
             _remoteEpisode.ParsedEpisodeInfo = new ParsedEpisodeInfo
                                                {
-                                                   Quality = new QualityModel(Quality.HDTV720p, new Revision(2)),
+                                                   Quality = new QualityModel(Quality.MP3256, new Revision(2)),
                                                    ReleaseGroup = "DRONE"
                                                };
 

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

@@ -13,38 +13,38 @@ public class CutoffSpecificationFixture : CoreTest<QualityUpgradableSpecificatio
         [Test]
         public void should_return_true_if_current_episode_is_less_than_cutoff()
         {
-            Subject.CutoffNotMet(new Profile { Cutoff = Quality.Bluray1080p, Items = Qualities.QualityFixture.GetDefaultQualities() },
-                new QualityModel(Quality.DVD, new Revision(version: 2))).Should().BeTrue();
+            Subject.CutoffNotMet(new Profile { Cutoff = Quality.MP3512, Items = Qualities.QualityFixture.GetDefaultQualities() },
+                new QualityModel(Quality.MP3192, new Revision(version: 2))).Should().BeTrue();
         }
 
         [Test]
         public void should_return_false_if_current_episode_is_equal_to_cutoff()
         {
-            Subject.CutoffNotMet(new Profile { Cutoff = Quality.HDTV720p, Items = Qualities.QualityFixture.GetDefaultQualities() },
-                               new QualityModel(Quality.HDTV720p, new Revision(version: 2))).Should().BeFalse();
+            Subject.CutoffNotMet(new Profile { Cutoff = Quality.MP3256, Items = Qualities.QualityFixture.GetDefaultQualities() },
+                               new QualityModel(Quality.MP3256, new Revision(version: 2))).Should().BeFalse();
         }
 
         [Test]
         public void should_return_false_if_current_episode_is_greater_than_cutoff()
         {
-            Subject.CutoffNotMet(new Profile { Cutoff = Quality.HDTV720p, Items = Qualities.QualityFixture.GetDefaultQualities() },
-                                new QualityModel(Quality.Bluray1080p, new Revision(version: 2))).Should().BeFalse();
+            Subject.CutoffNotMet(new Profile { Cutoff = Quality.MP3256, Items = Qualities.QualityFixture.GetDefaultQualities() },
+                                new QualityModel(Quality.MP3512, new Revision(version: 2))).Should().BeFalse();
         }
 
         [Test]
         public void should_return_true_when_new_episode_is_proper_but_existing_is_not()
         {
-            Subject.CutoffNotMet(new Profile { Cutoff = Quality.HDTV720p, Items = Qualities.QualityFixture.GetDefaultQualities() },
-                                new QualityModel(Quality.HDTV720p, new Revision(version: 1)),
-                                new QualityModel(Quality.HDTV720p, new Revision(version: 2))).Should().BeTrue();
+            Subject.CutoffNotMet(new Profile { Cutoff = Quality.MP3256, Items = Qualities.QualityFixture.GetDefaultQualities() },
+                                new QualityModel(Quality.MP3256, new Revision(version: 1)),
+                                new QualityModel(Quality.MP3256, new Revision(version: 2))).Should().BeTrue();
         }
 
         [Test]
         public void should_return_false_if_cutoff_is_met_and_quality_is_higher()
         {
-            Subject.CutoffNotMet(new Profile { Cutoff = Quality.HDTV720p, Items = Qualities.QualityFixture.GetDefaultQualities() },
-                                new QualityModel(Quality.HDTV720p, new Revision(version: 2)),
-                                new QualityModel(Quality.Bluray1080p, new Revision(version: 2))).Should().BeFalse();
+            Subject.CutoffNotMet(new Profile { Cutoff = Quality.MP3256, Items = Qualities.QualityFixture.GetDefaultQualities() },
+                                new QualityModel(Quality.MP3256, new Revision(version: 2)),
+                                new QualityModel(Quality.MP3512, new Revision(version: 2))).Should().BeFalse();
         }
     }
 }

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

@@ -45,25 +45,25 @@ public void Setup()
                                                        };
 
             _fakeSeries = Builder<Series>.CreateNew()
-                         .With(c => c.Profile = new Profile { Cutoff = Quality.Bluray1080p, Items = Qualities.QualityFixture.GetDefaultQualities() })
+                         .With(c => c.Profile = new Profile { Cutoff = Quality.MP3512, Items = Qualities.QualityFixture.GetDefaultQualities() })
                          .Build();
 
             _parseResultMulti = new RemoteEpisode
             {
                 Series = _fakeSeries,
-                ParsedEpisodeInfo = new ParsedEpisodeInfo { Quality = new QualityModel(Quality.DVD, new Revision(version: 2)) },
+                ParsedEpisodeInfo = new ParsedEpisodeInfo { Quality = new QualityModel(Quality.MP3192, new Revision(version: 2)) },
                 Episodes = doubleEpisodeList
             };
 
             _parseResultSingle = new RemoteEpisode
             {
                 Series = _fakeSeries,
-                ParsedEpisodeInfo = new ParsedEpisodeInfo { Quality = new QualityModel(Quality.DVD, new Revision(version: 2)) },
+                ParsedEpisodeInfo = new ParsedEpisodeInfo { Quality = new QualityModel(Quality.MP3192, new Revision(version: 2)) },
                 Episodes = singleEpisodeList
             };
 
-            _upgradableQuality = new QualityModel(Quality.SDTV, new Revision(version: 1));
-            _notupgradableQuality = new QualityModel(Quality.HDTV1080p, new Revision(version: 2));
+            _upgradableQuality = new QualityModel(Quality.MP3192, new Revision(version: 1));
+            _notupgradableQuality = new QualityModel(Quality.MP3512, new Revision(version: 2));
 
             Mocker.GetMock<IConfigService>()
                   .SetupGet(s => s.EnableCompletedDownloadHandling)
@@ -159,9 +159,9 @@ public void should_be_not_upgradable_if_only_second_episodes_is_upgradable()
         [Test]
         public void should_not_be_upgradable_if_episode_is_of_same_quality_as_existing()
         {
-            _fakeSeries.Profile = new Profile { Cutoff = Quality.Bluray1080p, Items = Qualities.QualityFixture.GetDefaultQualities() };
-            _parseResultSingle.ParsedEpisodeInfo.Quality = new QualityModel(Quality.WEBDL1080p, new Revision(version: 1));
-            _upgradableQuality = new QualityModel(Quality.WEBDL1080p, new Revision(version: 1));
+            _fakeSeries.Profile = new Profile { Cutoff = Quality.MP3512, Items = Qualities.QualityFixture.GetDefaultQualities() };
+            _parseResultSingle.ParsedEpisodeInfo.Quality = new QualityModel(Quality.MP3512, new Revision(version: 1));
+            _upgradableQuality = new QualityModel(Quality.MP3512, new Revision(version: 1));
 
             GivenMostRecentForEpisode(FIRST_EPISODE_ID, string.Empty, _upgradableQuality, DateTime.UtcNow, HistoryEventType.Grabbed);
 
@@ -171,9 +171,9 @@ public void should_not_be_upgradable_if_episode_is_of_same_quality_as_existing()
         [Test]
         public void should_not_be_upgradable_if_cutoff_already_met()
         {
-            _fakeSeries.Profile = new Profile { Cutoff = Quality.WEBDL1080p, Items = Qualities.QualityFixture.GetDefaultQualities() };
-            _parseResultSingle.ParsedEpisodeInfo.Quality = new QualityModel(Quality.WEBDL1080p, new Revision(version: 1));
-            _upgradableQuality = new QualityModel(Quality.Bluray1080p, new Revision(version: 1));
+            _fakeSeries.Profile = new Profile { Cutoff = Quality.MP3512, Items = Qualities.QualityFixture.GetDefaultQualities() };
+            _parseResultSingle.ParsedEpisodeInfo.Quality = new QualityModel(Quality.MP3512, new Revision(version: 1));
+            _upgradableQuality = new QualityModel(Quality.MP3512, new Revision(version: 1));
 
             GivenMostRecentForEpisode(FIRST_EPISODE_ID, string.Empty, _upgradableQuality, DateTime.UtcNow, HistoryEventType.Grabbed);
 
@@ -199,9 +199,9 @@ public void should_return_false_if_latest_history_has_a_download_id_and_cdh_is_d
         public void should_return_false_if_cutoff_already_met_and_cdh_is_disabled()
         {
             GivenCdhDisabled();
-            _fakeSeries.Profile = new Profile { Cutoff = Quality.WEBDL1080p, Items = Qualities.QualityFixture.GetDefaultQualities() };
-            _parseResultSingle.ParsedEpisodeInfo.Quality = new QualityModel(Quality.Bluray1080p, new Revision(version: 1));
-            _upgradableQuality = new QualityModel(Quality.WEBDL1080p, new Revision(version: 1));
+            _fakeSeries.Profile = new Profile { Cutoff = Quality.MP3512, Items = Qualities.QualityFixture.GetDefaultQualities() };
+            _parseResultSingle.ParsedEpisodeInfo.Quality = new QualityModel(Quality.MP3512, new Revision(version: 1));
+            _upgradableQuality = new QualityModel(Quality.MP3512, new Revision(version: 1));
 
             GivenMostRecentForEpisode(FIRST_EPISODE_ID, "test", _upgradableQuality, DateTime.UtcNow.AddDays(-100), HistoryEventType.Grabbed);
 

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

@@ -68,8 +68,8 @@ private void GivenPreferredDownloadProtocol(DownloadProtocol downloadProtocol)
         [Test]
         public void should_put_propers_before_non_propers()
         {
-            var remoteEpisode1 = GivenRemoteEpisode(new List<Episode> { GivenEpisode(1) }, new QualityModel(Quality.HDTV720p, new Revision(version: 1)));
-            var remoteEpisode2 = GivenRemoteEpisode(new List<Episode> { GivenEpisode(1) }, new QualityModel(Quality.HDTV720p, new Revision(version: 2)));
+            var remoteEpisode1 = GivenRemoteEpisode(new List<Episode> { GivenEpisode(1) }, new QualityModel(Quality.MP3256, new Revision(version: 1)));
+            var remoteEpisode2 = GivenRemoteEpisode(new List<Episode> { GivenEpisode(1) }, new QualityModel(Quality.MP3256, new Revision(version: 2)));
 
             var decisions = new List<DownloadDecision>();
             decisions.Add(new DownloadDecision(remoteEpisode1));
@@ -82,22 +82,22 @@ public void should_put_propers_before_non_propers()
         [Test]
         public void should_put_higher_quality_before_lower()
         {
-            var remoteEpisode1 = GivenRemoteEpisode(new List<Episode> { GivenEpisode(1) }, new QualityModel(Quality.SDTV));
-            var remoteEpisode2 = GivenRemoteEpisode(new List<Episode> { GivenEpisode(1) }, new QualityModel(Quality.HDTV720p));
+            var remoteEpisode1 = GivenRemoteEpisode(new List<Episode> { GivenEpisode(1) }, new QualityModel(Quality.MP3192));
+            var remoteEpisode2 = GivenRemoteEpisode(new List<Episode> { GivenEpisode(1) }, new QualityModel(Quality.MP3256));
 
             var decisions = new List<DownloadDecision>();
             decisions.Add(new DownloadDecision(remoteEpisode1));
             decisions.Add(new DownloadDecision(remoteEpisode2));
 
             var qualifiedReports = Subject.PrioritizeDecisions(decisions);
-            qualifiedReports.First().RemoteEpisode.ParsedEpisodeInfo.Quality.Quality.Should().Be(Quality.HDTV720p);
+            qualifiedReports.First().RemoteEpisode.ParsedEpisodeInfo.Quality.Quality.Should().Be(Quality.MP3256);
         }
 
         [Test]
         public void should_order_by_lowest_number_of_episodes()
         {
-            var remoteEpisode1 = GivenRemoteEpisode(new List<Episode> { GivenEpisode(2) }, new QualityModel(Quality.HDTV720p));
-            var remoteEpisode2 = GivenRemoteEpisode(new List<Episode> { GivenEpisode(1) }, new QualityModel(Quality.HDTV720p));
+            var remoteEpisode1 = GivenRemoteEpisode(new List<Episode> { GivenEpisode(2) }, new QualityModel(Quality.MP3256));
+            var remoteEpisode2 = GivenRemoteEpisode(new List<Episode> { GivenEpisode(1) }, new QualityModel(Quality.MP3256));
 
             var decisions = new List<DownloadDecision>();
             decisions.Add(new DownloadDecision(remoteEpisode1));
@@ -110,8 +110,8 @@ public void should_order_by_lowest_number_of_episodes()
         [Test]
         public void should_order_by_lowest_number_of_episodes_with_multiple_episodes()
         {
-            var remoteEpisode1 = GivenRemoteEpisode(new List<Episode> { GivenEpisode(2), GivenEpisode(3) }, new QualityModel(Quality.HDTV720p));
-            var remoteEpisode2 = GivenRemoteEpisode(new List<Episode> { GivenEpisode(1), GivenEpisode(2) }, new QualityModel(Quality.HDTV720p));
+            var remoteEpisode1 = GivenRemoteEpisode(new List<Episode> { GivenEpisode(2), GivenEpisode(3) }, new QualityModel(Quality.MP3256));
+            var remoteEpisode2 = GivenRemoteEpisode(new List<Episode> { GivenEpisode(1), GivenEpisode(2) }, new QualityModel(Quality.MP3256));
 
             var decisions = new List<DownloadDecision>();
             decisions.Add(new DownloadDecision(remoteEpisode1));
@@ -124,10 +124,10 @@ public void should_order_by_lowest_number_of_episodes_with_multiple_episodes()
         [Test]
         public void should_order_by_age_then_largest_rounded_to_200mb()
         {
-            var remoteEpisodeSd = GivenRemoteEpisode(new List<Episode> { GivenEpisode(1) }, new QualityModel(Quality.SDTV), size: 100.Megabytes(), age: 1);
-            var remoteEpisodeHdSmallOld = GivenRemoteEpisode(new List<Episode> { GivenEpisode(1) }, new QualityModel(Quality.HDTV720p), size: 1200.Megabytes(), age: 1000);
-            var remoteEpisodeSmallYoung = GivenRemoteEpisode(new List<Episode> { GivenEpisode(1) }, new QualityModel(Quality.HDTV720p), size: 1250.Megabytes(), age: 10);
-            var remoteEpisodeHdLargeYoung = GivenRemoteEpisode(new List<Episode> { GivenEpisode(1) }, new QualityModel(Quality.HDTV720p), size: 3000.Megabytes(), age: 1);
+            var remoteEpisodeSd = GivenRemoteEpisode(new List<Episode> { GivenEpisode(1) }, new QualityModel(Quality.MP3192), size: 100.Megabytes(), age: 1);
+            var remoteEpisodeHdSmallOld = GivenRemoteEpisode(new List<Episode> { GivenEpisode(1) }, new QualityModel(Quality.MP3256), size: 1200.Megabytes(), age: 1000);
+            var remoteEpisodeSmallYoung = GivenRemoteEpisode(new List<Episode> { GivenEpisode(1) }, new QualityModel(Quality.MP3256), size: 1250.Megabytes(), age: 10);
+            var remoteEpisodeHdLargeYoung = GivenRemoteEpisode(new List<Episode> { GivenEpisode(1) }, new QualityModel(Quality.MP3256), size: 3000.Megabytes(), age: 1);
 
             var decisions = new List<DownloadDecision>();
             decisions.Add(new DownloadDecision(remoteEpisodeSd));
@@ -142,8 +142,8 @@ public void should_order_by_age_then_largest_rounded_to_200mb()
         [Test]
         public void should_order_by_youngest()
         {
-            var remoteEpisode1 = GivenRemoteEpisode(new List<Episode> { GivenEpisode(1) }, new QualityModel(Quality.HDTV720p), age: 10);
-            var remoteEpisode2 = GivenRemoteEpisode(new List<Episode> { GivenEpisode(1) }, new QualityModel(Quality.HDTV720p), age: 5);
+            var remoteEpisode1 = GivenRemoteEpisode(new List<Episode> { GivenEpisode(1) }, new QualityModel(Quality.MP3256), age: 10);
+            var remoteEpisode2 = GivenRemoteEpisode(new List<Episode> { GivenEpisode(1) }, new QualityModel(Quality.MP3256), age: 5);
 
 
             var decisions = new List<DownloadDecision>();
@@ -157,8 +157,8 @@ public void should_order_by_youngest()
         [Test]
         public void should_not_throw_if_no_episodes_are_found()
         {
-            var remoteEpisode1 = GivenRemoteEpisode(new List<Episode> { GivenEpisode(1) }, new QualityModel(Quality.HDTV720p), size: 500.Megabytes());
-            var remoteEpisode2 = GivenRemoteEpisode(new List<Episode> { GivenEpisode(1) }, new QualityModel(Quality.HDTV720p), size: 500.Megabytes());
+            var remoteEpisode1 = GivenRemoteEpisode(new List<Episode> { GivenEpisode(1) }, new QualityModel(Quality.MP3256), size: 500.Megabytes());
+            var remoteEpisode2 = GivenRemoteEpisode(new List<Episode> { GivenEpisode(1) }, new QualityModel(Quality.MP3256), size: 500.Megabytes());
 
             remoteEpisode1.Episodes = new List<Episode>();
 
@@ -174,8 +174,8 @@ public void should_put_usenet_above_torrent_when_usenet_is_preferred()
         {
             GivenPreferredDownloadProtocol(DownloadProtocol.Usenet);
 
-            var remoteEpisode1 = GivenRemoteEpisode(new List<Episode> { GivenEpisode(1) }, new QualityModel(Quality.HDTV720p), downloadProtocol: DownloadProtocol.Torrent);
-            var remoteEpisode2 = GivenRemoteEpisode(new List<Episode> { GivenEpisode(1) }, new QualityModel(Quality.HDTV720p), downloadProtocol: DownloadProtocol.Usenet);
+            var remoteEpisode1 = GivenRemoteEpisode(new List<Episode> { GivenEpisode(1) }, new QualityModel(Quality.MP3256), downloadProtocol: DownloadProtocol.Torrent);
+            var remoteEpisode2 = GivenRemoteEpisode(new List<Episode> { GivenEpisode(1) }, new QualityModel(Quality.MP3256), downloadProtocol: DownloadProtocol.Usenet);
 
             var decisions = new List<DownloadDecision>();
             decisions.Add(new DownloadDecision(remoteEpisode1));
@@ -190,8 +190,8 @@ public void should_put_torrent_above_usenet_when_torrent_is_preferred()
         {
             GivenPreferredDownloadProtocol(DownloadProtocol.Torrent);
 
-            var remoteEpisode1 = GivenRemoteEpisode(new List<Episode> { GivenEpisode(1) }, new QualityModel(Quality.HDTV720p), downloadProtocol: DownloadProtocol.Torrent);
-            var remoteEpisode2 = GivenRemoteEpisode(new List<Episode> { GivenEpisode(1) }, new QualityModel(Quality.HDTV720p), downloadProtocol: DownloadProtocol.Usenet);
+            var remoteEpisode1 = GivenRemoteEpisode(new List<Episode> { GivenEpisode(1) }, new QualityModel(Quality.MP3256), downloadProtocol: DownloadProtocol.Torrent);
+            var remoteEpisode2 = GivenRemoteEpisode(new List<Episode> { GivenEpisode(1) }, new QualityModel(Quality.MP3256), downloadProtocol: DownloadProtocol.Usenet);
 
             var decisions = new List<DownloadDecision>();
             decisions.Add(new DownloadDecision(remoteEpisode1));
@@ -204,8 +204,8 @@ public void should_put_torrent_above_usenet_when_torrent_is_preferred()
         [Test]
         public void should_prefer_season_pack_above_single_episode()
         {
-            var remoteEpisode1 = GivenRemoteEpisode(new List<Episode> { GivenEpisode(1), GivenEpisode(2) }, new QualityModel(Quality.HDTV720p));
-            var remoteEpisode2 = GivenRemoteEpisode(new List<Episode> { GivenEpisode(1) }, new QualityModel(Quality.HDTV720p));
+            var remoteEpisode1 = GivenRemoteEpisode(new List<Episode> { GivenEpisode(1), GivenEpisode(2) }, new QualityModel(Quality.MP3256));
+            var remoteEpisode2 = GivenRemoteEpisode(new List<Episode> { GivenEpisode(1) }, new QualityModel(Quality.MP3256));
 
             remoteEpisode1.ParsedEpisodeInfo.FullSeason = true;
 
@@ -220,8 +220,8 @@ public void should_prefer_season_pack_above_single_episode()
         [Test]
         public void should_prefer_multiepisode_over_single_episode_for_anime()
         {
-            var remoteEpisode1 = GivenRemoteEpisode(new List<Episode> { GivenEpisode(1), GivenEpisode(2) }, new QualityModel(Quality.HDTV720p));
-            var remoteEpisode2 = GivenRemoteEpisode(new List<Episode> { GivenEpisode(1) }, new QualityModel(Quality.HDTV720p));
+            var remoteEpisode1 = GivenRemoteEpisode(new List<Episode> { GivenEpisode(1), GivenEpisode(2) }, new QualityModel(Quality.MP3256));
+            var remoteEpisode2 = GivenRemoteEpisode(new List<Episode> { GivenEpisode(1) }, new QualityModel(Quality.MP3256));
 
             remoteEpisode1.Series.SeriesType = SeriesTypes.Anime;
             remoteEpisode2.Series.SeriesType = SeriesTypes.Anime;
@@ -237,8 +237,8 @@ public void should_prefer_multiepisode_over_single_episode_for_anime()
         [Test]
         public void should_prefer_single_episode_over_multi_episode_for_non_anime()
         {
-            var remoteEpisode1 = GivenRemoteEpisode(new List<Episode> { GivenEpisode(1), GivenEpisode(2) }, new QualityModel(Quality.HDTV720p));
-            var remoteEpisode2 = GivenRemoteEpisode(new List<Episode> { GivenEpisode(1) }, new QualityModel(Quality.HDTV720p));
+            var remoteEpisode1 = GivenRemoteEpisode(new List<Episode> { GivenEpisode(1), GivenEpisode(2) }, new QualityModel(Quality.MP3256));
+            var remoteEpisode2 = GivenRemoteEpisode(new List<Episode> { GivenEpisode(1) }, new QualityModel(Quality.MP3256));
 
             var decisions = new List<DownloadDecision>();
             decisions.Add(new DownloadDecision(remoteEpisode1));
@@ -251,8 +251,8 @@ public void should_prefer_single_episode_over_multi_episode_for_non_anime()
         [Test]
         public void should_prefer_releases_with_more_seeders()
         {
-            var remoteEpisode1 = GivenRemoteEpisode(new List<Episode> { GivenEpisode(1) }, new QualityModel(Quality.HDTV720p));
-            var remoteEpisode2 = GivenRemoteEpisode(new List<Episode> { GivenEpisode(1) }, new QualityModel(Quality.HDTV720p));
+            var remoteEpisode1 = GivenRemoteEpisode(new List<Episode> { GivenEpisode(1) }, new QualityModel(Quality.MP3256));
+            var remoteEpisode2 = GivenRemoteEpisode(new List<Episode> { GivenEpisode(1) }, new QualityModel(Quality.MP3256));
 
             var torrentInfo1 = new TorrentInfo();
             torrentInfo1.PublishDate = DateTime.Now;
@@ -277,8 +277,8 @@ public void should_prefer_releases_with_more_seeders()
         [Test]
         public void should_prefer_releases_with_more_peers_given_equal_number_of_seeds()
         {
-            var remoteEpisode1 = GivenRemoteEpisode(new List<Episode> { GivenEpisode(1) }, new QualityModel(Quality.HDTV720p));
-            var remoteEpisode2 = GivenRemoteEpisode(new List<Episode> { GivenEpisode(1) }, new QualityModel(Quality.HDTV720p));
+            var remoteEpisode1 = GivenRemoteEpisode(new List<Episode> { GivenEpisode(1) }, new QualityModel(Quality.MP3256));
+            var remoteEpisode2 = GivenRemoteEpisode(new List<Episode> { GivenEpisode(1) }, new QualityModel(Quality.MP3256));
 
             var torrentInfo1 = new TorrentInfo();
             torrentInfo1.PublishDate = DateTime.Now;
@@ -305,8 +305,8 @@ public void should_prefer_releases_with_more_peers_given_equal_number_of_seeds()
         [Test]
         public void should_prefer_releases_with_more_peers_no_seeds()
         {
-            var remoteEpisode1 = GivenRemoteEpisode(new List<Episode> { GivenEpisode(1) }, new QualityModel(Quality.HDTV720p));
-            var remoteEpisode2 = GivenRemoteEpisode(new List<Episode> { GivenEpisode(1) }, new QualityModel(Quality.HDTV720p));
+            var remoteEpisode1 = GivenRemoteEpisode(new List<Episode> { GivenEpisode(1) }, new QualityModel(Quality.MP3256));
+            var remoteEpisode2 = GivenRemoteEpisode(new List<Episode> { GivenEpisode(1) }, new QualityModel(Quality.MP3256));
 
             var torrentInfo1 = new TorrentInfo();
             torrentInfo1.PublishDate = DateTime.Now;
@@ -334,8 +334,8 @@ public void should_prefer_releases_with_more_peers_no_seeds()
         [Test]
         public void should_prefer_first_release_if_peers_and_size_are_too_similar()
         {
-            var remoteEpisode1 = GivenRemoteEpisode(new List<Episode> { GivenEpisode(1) }, new QualityModel(Quality.HDTV720p));
-            var remoteEpisode2 = GivenRemoteEpisode(new List<Episode> { GivenEpisode(1) }, new QualityModel(Quality.HDTV720p));
+            var remoteEpisode1 = GivenRemoteEpisode(new List<Episode> { GivenEpisode(1) }, new QualityModel(Quality.MP3256));
+            var remoteEpisode2 = GivenRemoteEpisode(new List<Episode> { GivenEpisode(1) }, new QualityModel(Quality.MP3256));
 
             var torrentInfo1 = new TorrentInfo();
             torrentInfo1.PublishDate = DateTime.Now;
@@ -363,8 +363,8 @@ public void should_prefer_first_release_if_peers_and_size_are_too_similar()
         [Test]
         public void should_prefer_first_release_if_age_and_size_are_too_similar()
         {
-            var remoteEpisode1 = GivenRemoteEpisode(new List<Episode> { GivenEpisode(1) }, new QualityModel(Quality.HDTV720p));
-            var remoteEpisode2 = GivenRemoteEpisode(new List<Episode> { GivenEpisode(1) }, new QualityModel(Quality.HDTV720p));
+            var remoteEpisode1 = GivenRemoteEpisode(new List<Episode> { GivenEpisode(1) }, new QualityModel(Quality.MP3256));
+            var remoteEpisode2 = GivenRemoteEpisode(new List<Episode> { GivenEpisode(1) }, new QualityModel(Quality.MP3256));
 
             remoteEpisode1.Release.PublishDate = DateTime.UtcNow.AddDays(-100);
             remoteEpisode1.Release.Size = 200.Megabytes();
@@ -383,8 +383,8 @@ public void should_prefer_first_release_if_age_and_size_are_too_similar()
         [Test]
         public void should_prefer_quality_over_the_number_of_peers()
         {
-            var remoteEpisode1 = GivenRemoteEpisode(new List<Episode> { GivenEpisode(1) }, new QualityModel(Quality.Bluray1080p));
-            var remoteEpisode2 = GivenRemoteEpisode(new List<Episode> { GivenEpisode(1) }, new QualityModel(Quality.SDTV));
+            var remoteEpisode1 = GivenRemoteEpisode(new List<Episode> { GivenEpisode(1) }, new QualityModel(Quality.MP3512));
+            var remoteEpisode2 = GivenRemoteEpisode(new List<Episode> { GivenEpisode(1) }, new QualityModel(Quality.MP3192));
 
             var torrentInfo1 = new TorrentInfo();
             torrentInfo1.PublishDate = DateTime.Now;

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

@@ -19,29 +19,29 @@ public class QualityAllowedByProfileSpecificationFixture : CoreTest<QualityAllow
 
         public static object[] AllowedTestCases =
         {
-            new object[] { Quality.DVD },
-            new object[] { Quality.HDTV720p },
-            new object[] { Quality.Bluray1080p }
+            new object[] { Quality.MP3192 },
+            new object[] { Quality.MP3256 },
+            new object[] { Quality.MP3512 }
         };
 
         public static object[] DeniedTestCases =
         {
-            new object[] { Quality.SDTV },
-            new object[] { Quality.WEBDL720p },
-            new object[] { Quality.Bluray720p }
+            new object[] { Quality.MP3192 },
+            new object[] { Quality.MP3320 },
+            new object[] { Quality.MP3320 }
         };
 
         [SetUp]
         public void Setup()
         {
             var fakeSeries = Builder<Series>.CreateNew()
-                         .With(c => c.Profile = (LazyLoaded<Profile>)new Profile { Cutoff = Quality.Bluray1080p })
+                         .With(c => c.Profile = (LazyLoaded<Profile>)new Profile { Cutoff = Quality.MP3512 })
                          .Build();
 
             remoteEpisode = new RemoteEpisode
             {
                 Series = fakeSeries,
-                ParsedEpisodeInfo = new ParsedEpisodeInfo { Quality = new QualityModel(Quality.DVD, new Revision(version: 2)) },
+                ParsedEpisodeInfo = new ParsedEpisodeInfo { Quality = new QualityModel(Quality.MP3192, new Revision(version: 2)) },
             };
         }
 
@@ -49,7 +49,7 @@ public void Setup()
         public void should_allow_if_quality_is_defined_in_profile(Quality qualityType)
         {
             remoteEpisode.ParsedEpisodeInfo.Quality.Quality = qualityType;
-            remoteEpisode.Series.Profile.Value.Items = Qualities.QualityFixture.GetDefaultQualities(Quality.DVD, Quality.HDTV720p, Quality.Bluray1080p);
+            remoteEpisode.Series.Profile.Value.Items = Qualities.QualityFixture.GetDefaultQualities(Quality.MP3192, Quality.MP3256, Quality.MP3512);
 
             Subject.IsSatisfiedBy(remoteEpisode, null).Accepted.Should().BeTrue();
         }
@@ -58,7 +58,7 @@ public void should_allow_if_quality_is_defined_in_profile(Quality qualityType)
         public void should_not_allow_if_quality_is_not_defined_in_profile(Quality qualityType)
         {
             remoteEpisode.ParsedEpisodeInfo.Quality.Quality = qualityType;
-            remoteEpisode.Series.Profile.Value.Items = Qualities.QualityFixture.GetDefaultQualities(Quality.DVD, Quality.HDTV720p, Quality.Bluray1080p);
+            remoteEpisode.Series.Profile.Value.Items = Qualities.QualityFixture.GetDefaultQualities(Quality.MP3192, Quality.MP3256, Quality.MP3512);
 
             Subject.IsSatisfiedBy(remoteEpisode, null).Accepted.Should().BeFalse();
         }

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

@@ -14,13 +14,13 @@ public class QualityUpgradeSpecificationFixture : CoreTest<QualityUpgradableSpec
     {
         public static object[] IsUpgradeTestCases =
         {
-            new object[] { Quality.SDTV, 1, Quality.SDTV, 2, Quality.SDTV, true },
-            new object[] { Quality.WEBDL720p, 1, Quality.WEBDL720p, 2, Quality.WEBDL720p, true },
-            new object[] { Quality.SDTV, 1, Quality.SDTV, 1, Quality.SDTV, false },
-            new object[] { Quality.WEBDL720p, 1, Quality.HDTV720p, 2, Quality.Bluray720p, false },
-            new object[] { Quality.WEBDL720p, 1, Quality.HDTV720p, 2, Quality.WEBDL720p, false },
-            new object[] { Quality.WEBDL720p, 1, Quality.WEBDL720p, 1, Quality.WEBDL720p, false },
-            new object[] { Quality.WEBDL1080p, 1, Quality.WEBDL1080p, 1, Quality.WEBDL1080p, false }
+            new object[] { Quality.MP3192, 1, Quality.MP3192, 2, Quality.MP3192, true },
+            new object[] { Quality.MP3320, 1, Quality.MP3320, 2, Quality.MP3320, true },
+            new object[] { Quality.MP3192, 1, Quality.MP3192, 1, Quality.MP3192, false },
+            new object[] { Quality.MP3320, 1, Quality.MP3256, 2, Quality.MP3320, false },
+            new object[] { Quality.MP3320, 1, Quality.MP3256, 2, Quality.MP3320, false },
+            new object[] { Quality.MP3320, 1, Quality.MP3320, 1, Quality.MP3320, false },
+            new object[] { Quality.MP3512, 1, Quality.MP3512, 1, Quality.MP3512, false }
         };
         
         [SetUp]
@@ -54,7 +54,7 @@ public void should_return_false_if_proper_and_autoDownloadPropers_is_false()
 
             var profile = new Profile { Items = Qualities.QualityFixture.GetDefaultQualities() };
 
-            Subject.IsUpgradable(profile, new QualityModel(Quality.DVD, new Revision(version: 2)), new QualityModel(Quality.DVD, new Revision(version: 1)))
+            Subject.IsUpgradable(profile, new QualityModel(Quality.MP3192, new Revision(version: 2)), new QualityModel(Quality.MP3192, new Revision(version: 1)))
                     .Should().BeFalse();
         }
     }

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

@@ -51,7 +51,7 @@ public void Setup()
             _remoteEpisode = Builder<RemoteEpisode>.CreateNew()
                                                    .With(r => r.Series = _series)
                                                    .With(r => r.Episodes = new List<Episode> { _episode })
-                                                   .With(r => r.ParsedEpisodeInfo = new ParsedEpisodeInfo { Quality = new QualityModel(Quality.DVD) })
+                                                   .With(r => r.ParsedEpisodeInfo = new ParsedEpisodeInfo { Quality = new QualityModel(Quality.MP3192) })
                                                    .Build();
         }
 
@@ -96,14 +96,14 @@ public void should_return_true_when_series_doesnt_match()
         [Test]
         public void should_return_true_when_quality_in_queue_is_lower()
         {
-            _series.Profile.Value.Cutoff = Quality.Bluray1080p;
+            _series.Profile.Value.Cutoff = Quality.MP3512;
 
             var remoteEpisode = Builder<RemoteEpisode>.CreateNew()
                                                       .With(r => r.Series = _series)
                                                       .With(r => r.Episodes = new List<Episode> { _episode })
                                                       .With(r => r.ParsedEpisodeInfo = new ParsedEpisodeInfo
                                                                                        {
-                                                                                           Quality = new QualityModel(Quality.SDTV)
+                                                                                           Quality = new QualityModel(Quality.MP3192)
                                                                                        })
                                                       .Build();
 
@@ -119,7 +119,7 @@ public void should_return_true_when_episode_doesnt_match()
                                                       .With(r => r.Episodes = new List<Episode> { _otherEpisode })
                                                       .With(r => r.ParsedEpisodeInfo = new ParsedEpisodeInfo
                                                                                        {
-                                                                                           Quality = new QualityModel(Quality.DVD)
+                                                                                           Quality = new QualityModel(Quality.MP3192)
                                                                                        })
                                                       .Build();
 
@@ -135,7 +135,7 @@ public void should_return_false_when_qualities_are_the_same()
                                                       .With(r => r.Episodes = new List<Episode> { _episode })
                                                       .With(r => r.ParsedEpisodeInfo = new ParsedEpisodeInfo
                                                                                        {
-                                                                                           Quality = new QualityModel(Quality.DVD)
+                                                                                           Quality = new QualityModel(Quality.MP3192)
                                                                                        })
                                                       .Build();
 
@@ -146,14 +146,14 @@ public void should_return_false_when_qualities_are_the_same()
         [Test]
         public void should_return_false_when_quality_in_queue_is_better()
         {
-            _series.Profile.Value.Cutoff = Quality.Bluray1080p;
+            _series.Profile.Value.Cutoff = Quality.MP3512;
 
             var remoteEpisode = Builder<RemoteEpisode>.CreateNew()
                                                       .With(r => r.Series = _series)
                                                       .With(r => r.Episodes = new List<Episode> { _episode })
                                                       .With(r => r.ParsedEpisodeInfo = new ParsedEpisodeInfo
                                                                                        {
-                                                                                           Quality = new QualityModel(Quality.HDTV720p)
+                                                                                           Quality = new QualityModel(Quality.MP3256)
                                                                                        })
                                                       .Build();
 
@@ -169,7 +169,7 @@ public void should_return_false_if_matching_multi_episode_is_in_queue()
                                                       .With(r => r.Episodes = new List<Episode> { _episode, _otherEpisode })
                                                       .With(r => r.ParsedEpisodeInfo = new ParsedEpisodeInfo
                                                       {
-                                                          Quality = new QualityModel(Quality.HDTV720p)
+                                                          Quality = new QualityModel(Quality.MP3256)
                                                       })
                                                       .Build();
 
@@ -185,7 +185,7 @@ public void should_return_false_if_multi_episode_has_one_episode_in_queue()
                                                       .With(r => r.Episodes = new List<Episode> { _episode })
                                                       .With(r => r.ParsedEpisodeInfo = new ParsedEpisodeInfo
                                                       {
-                                                          Quality = new QualityModel(Quality.HDTV720p)
+                                                          Quality = new QualityModel(Quality.MP3256)
                                                       })
                                                       .Build();
 
@@ -203,7 +203,7 @@ public void should_return_false_if_multi_part_episode_is_already_in_queue()
                                                       .With(r => r.Episodes = new List<Episode> { _episode, _otherEpisode })
                                                       .With(r => r.ParsedEpisodeInfo = new ParsedEpisodeInfo
                                                       {
-                                                          Quality = new QualityModel(Quality.HDTV720p)
+                                                          Quality = new QualityModel(Quality.MP3256)
                                                       })
                                                       .Build();
 
@@ -223,7 +223,7 @@ public void should_return_false_if_multi_part_episode_has_two_episodes_in_queue(
                                                                                         {
                                                                                             Quality =
                                                                                                 new QualityModel(
-                                                                                                Quality.HDTV720p)
+                                                                                                Quality.MP3256)
                                                                                         })
                                                        .TheFirst(1)
                                                        .With(r => r.Episodes = new List<Episode> { _episode })
@@ -246,7 +246,7 @@ public void should_return_false_if_quality_in_queue_meets_cutoff()
                                                       .With(r => r.Episodes = new List<Episode> { _episode })
                                                       .With(r => r.ParsedEpisodeInfo = new ParsedEpisodeInfo
                                                       {
-                                                          Quality = new QualityModel(Quality.HDTV720p)
+                                                          Quality = new QualityModel(Quality.MP3256)
                                                       })
                                                       .Build();
 

src/NzbDrone.Core.Test/DecisionEngineTests/RssSync/DelaySpecificationFixture.cs

@@ -47,11 +47,11 @@ public void Setup()
                                                    .Build();
 
             _profile.Items = new List<ProfileQualityItem>();
-            _profile.Items.Add(new ProfileQualityItem { Allowed = true, Quality = Quality.HDTV720p });
-            _profile.Items.Add(new ProfileQualityItem { Allowed = true, Quality = Quality.WEBDL720p });
-            _profile.Items.Add(new ProfileQualityItem { Allowed = true, Quality = Quality.Bluray720p });
+            _profile.Items.Add(new ProfileQualityItem { Allowed = true, Quality = Quality.MP3256 });
+            _profile.Items.Add(new ProfileQualityItem { Allowed = true, Quality = Quality.MP3320 });
+            _profile.Items.Add(new ProfileQualityItem { Allowed = true, Quality = Quality.MP3320 });
 
-            _profile.Cutoff = Quality.WEBDL720p;
+            _profile.Cutoff = Quality.MP3320;
 
             _remoteEpisode.ParsedEpisodeInfo = new ParsedEpisodeInfo();
             _remoteEpisode.Release = new ReleaseInfo();
@@ -95,7 +95,7 @@ public void should_be_true_when_user_invoked_search()
         [Test]
         public void should_be_false_when_system_invoked_search_and_release_is_younger_than_delay()
         {
-            _remoteEpisode.ParsedEpisodeInfo.Quality = new QualityModel(Quality.SDTV);
+            _remoteEpisode.ParsedEpisodeInfo.Quality = new QualityModel(Quality.MP3192);
             _remoteEpisode.Release.PublishDate = DateTime.UtcNow;
 
             _delayProfile.UsenetDelay = 720;
@@ -114,7 +114,7 @@ public void should_be_true_when_profile_does_not_have_a_delay()
         [Test]
         public void should_be_true_when_quality_is_last_allowed_in_profile()
         {
-            _remoteEpisode.ParsedEpisodeInfo.Quality = new QualityModel(Quality.Bluray720p);
+            _remoteEpisode.ParsedEpisodeInfo.Quality = new QualityModel(Quality.MP3320);
 
             Subject.IsSatisfiedBy(_remoteEpisode, null).Accepted.Should().BeTrue();
         }
@@ -122,7 +122,7 @@ public void should_be_true_when_quality_is_last_allowed_in_profile()
         [Test]
         public void should_be_true_when_release_is_older_than_delay()
         {
-            _remoteEpisode.ParsedEpisodeInfo.Quality = new QualityModel(Quality.HDTV720p);
+            _remoteEpisode.ParsedEpisodeInfo.Quality = new QualityModel(Quality.MP3256);
             _remoteEpisode.Release.PublishDate = DateTime.UtcNow.AddHours(-10);
 
             _delayProfile.UsenetDelay = 60;
@@ -133,7 +133,7 @@ public void should_be_true_when_release_is_older_than_delay()
         [Test]
         public void should_be_false_when_release_is_younger_than_delay()
         {
-            _remoteEpisode.ParsedEpisodeInfo.Quality = new QualityModel(Quality.SDTV);
+            _remoteEpisode.ParsedEpisodeInfo.Quality = new QualityModel(Quality.MP3192);
             _remoteEpisode.Release.PublishDate = DateTime.UtcNow;
 
             _delayProfile.UsenetDelay = 720;
@@ -144,10 +144,10 @@ public void should_be_false_when_release_is_younger_than_delay()
         [Test]
         public void should_be_true_when_release_is_a_proper_for_existing_episode()
         {
-            _remoteEpisode.ParsedEpisodeInfo.Quality = new QualityModel(Quality.HDTV720p, new Revision(version: 2));
+            _remoteEpisode.ParsedEpisodeInfo.Quality = new QualityModel(Quality.MP3256, new Revision(version: 2));
             _remoteEpisode.Release.PublishDate = DateTime.UtcNow;
 
-            GivenExistingFile(new QualityModel(Quality.HDTV720p));
+            GivenExistingFile(new QualityModel(Quality.MP3256));
             GivenUpgradeForExistingFile();
 
             Mocker.GetMock<IQualityUpgradableSpecification>()
@@ -162,10 +162,10 @@ public void should_be_true_when_release_is_a_proper_for_existing_episode()
         [Test]
         public void should_be_true_when_release_is_a_real_for_existing_episode()
         {
-            _remoteEpisode.ParsedEpisodeInfo.Quality = new QualityModel(Quality.HDTV720p, new Revision(real: 1));
+            _remoteEpisode.ParsedEpisodeInfo.Quality = new QualityModel(Quality.MP3256, new Revision(real: 1));
             _remoteEpisode.Release.PublishDate = DateTime.UtcNow;
 
-            GivenExistingFile(new QualityModel(Quality.HDTV720p));
+            GivenExistingFile(new QualityModel(Quality.MP3256));
             GivenUpgradeForExistingFile();
 
             Mocker.GetMock<IQualityUpgradableSpecification>()
@@ -180,10 +180,10 @@ public void should_be_true_when_release_is_a_real_for_existing_episode()
         [Test]
         public void should_be_false_when_release_is_proper_for_existing_episode_of_different_quality()
         {
-            _remoteEpisode.ParsedEpisodeInfo.Quality = new QualityModel(Quality.HDTV720p, new Revision(version: 2));
+            _remoteEpisode.ParsedEpisodeInfo.Quality = new QualityModel(Quality.MP3256, new Revision(version: 2));
             _remoteEpisode.Release.PublishDate = DateTime.UtcNow;
 
-            GivenExistingFile(new QualityModel(Quality.SDTV));
+            GivenExistingFile(new QualityModel(Quality.MP3192));
 
             _delayProfile.UsenetDelay = 720;
 

src/NzbDrone.Core.Test/DecisionEngineTests/RssSync/ProperSpecificationFixture.cs

@@ -31,34 +31,34 @@ public void Setup()
         {
             Mocker.Resolve<QualityUpgradableSpecification>();
 
-            _firstFile = new EpisodeFile { Quality = new QualityModel(Quality.Bluray1080p, new Revision(version: 1)), DateAdded = DateTime.Now };
-            _secondFile = new EpisodeFile { Quality = new QualityModel(Quality.Bluray1080p, new Revision(version: 1)), DateAdded = DateTime.Now };
+            _firstFile = new EpisodeFile { Quality = new QualityModel(Quality.MP3512, new Revision(version: 1)), DateAdded = DateTime.Now };
+            _secondFile = new EpisodeFile { Quality = new QualityModel(Quality.MP3512, new Revision(version: 1)), DateAdded = DateTime.Now };
 
             var singleEpisodeList = new List<Episode> { new Episode { EpisodeFile = _firstFile, EpisodeFileId = 1 }, new Episode { EpisodeFile = null } };
             var doubleEpisodeList = new List<Episode> { new Episode { EpisodeFile = _firstFile, EpisodeFileId = 1 }, new Episode { EpisodeFile = _secondFile, EpisodeFileId = 1 }, new Episode { EpisodeFile = null } };
 
             var fakeSeries = Builder<Series>.CreateNew()
-                         .With(c => c.Profile = new Profile { Cutoff = Quality.Bluray1080p })
+                         .With(c => c.Profile = new Profile { Cutoff = Quality.MP3512 })
                          .Build();
 
             _parseResultMulti = new RemoteEpisode
             {
                 Series = fakeSeries,
-                ParsedEpisodeInfo = new ParsedEpisodeInfo { Quality = new QualityModel(Quality.DVD, new Revision(version: 2)) },
+                ParsedEpisodeInfo = new ParsedEpisodeInfo { Quality = new QualityModel(Quality.MP3192, new Revision(version: 2)) },
                 Episodes = doubleEpisodeList
             };
 
             _parseResultSingle = new RemoteEpisode
             {
                 Series = fakeSeries,
-                ParsedEpisodeInfo = new ParsedEpisodeInfo { Quality = new QualityModel(Quality.DVD, new Revision(version: 2)) },
+                ParsedEpisodeInfo = new ParsedEpisodeInfo { Quality = new QualityModel(Quality.MP3192, new Revision(version: 2)) },
                 Episodes = singleEpisodeList
             };
         }
 
         private void WithFirstFileUpgradable()
         {
-            _firstFile.Quality = new QualityModel(Quality.SDTV);
+            _firstFile.Quality = new QualityModel(Quality.MP3192);
         }
 
         private void GivenAutoDownloadPropers()
@@ -71,7 +71,7 @@ private void GivenAutoDownloadPropers()
         [Test]
         public void should_return_false_when_episodeFile_was_added_more_than_7_days_ago()
         {
-            _firstFile.Quality.Quality = Quality.DVD;
+            _firstFile.Quality.Quality = Quality.MP3192;
 
             _firstFile.DateAdded = DateTime.Today.AddDays(-30);
             Subject.IsSatisfiedBy(_parseResultSingle, null).Accepted.Should().BeFalse();
@@ -80,8 +80,8 @@ public void should_return_false_when_episodeFile_was_added_more_than_7_days_ago(
         [Test]
         public void should_return_false_when_first_episodeFile_was_added_more_than_7_days_ago()
         {
-            _firstFile.Quality.Quality = Quality.DVD;
-            _secondFile.Quality.Quality = Quality.DVD;
+            _firstFile.Quality.Quality = Quality.MP3192;
+            _secondFile.Quality.Quality = Quality.MP3192;
 
             _firstFile.DateAdded = DateTime.Today.AddDays(-30);
             Subject.IsSatisfiedBy(_parseResultMulti, null).Accepted.Should().BeFalse();
@@ -90,8 +90,8 @@ public void should_return_false_when_first_episodeFile_was_added_more_than_7_day
         [Test]
         public void should_return_false_when_second_episodeFile_was_added_more_than_7_days_ago()
         {
-            _firstFile.Quality.Quality = Quality.DVD;
-            _secondFile.Quality.Quality = Quality.DVD;
+            _firstFile.Quality.Quality = Quality.MP3192;
+            _secondFile.Quality.Quality = Quality.MP3192;
 
             _secondFile.DateAdded = DateTime.Today.AddDays(-30);
             Subject.IsSatisfiedBy(_parseResultMulti, null).Accepted.Should().BeFalse();
@@ -118,7 +118,7 @@ public void should_return_true_when_episodeFile_was_added_more_than_7_days_ago_b
         [Test]
         public void should_return_false_when_proper_but_auto_download_propers_is_false()
         {
-            _firstFile.Quality.Quality = Quality.DVD;
+            _firstFile.Quality.Quality = Quality.MP3192;
 
             _firstFile.DateAdded = DateTime.Today;
             Subject.IsSatisfiedBy(_parseResultSingle, null).Accepted.Should().BeFalse();
@@ -129,7 +129,7 @@ public void should_return_true_when_episodeFile_was_added_today()
         {
             GivenAutoDownloadPropers();
 
-            _firstFile.Quality.Quality = Quality.DVD;
+            _firstFile.Quality.Quality = Quality.MP3192;
 
             _firstFile.DateAdded = DateTime.Today;
             Subject.IsSatisfiedBy(_parseResultSingle, null).Accepted.Should().BeTrue();

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

@@ -32,39 +32,39 @@ public void Setup()
             Mocker.Resolve<QualityUpgradableSpecification>();
             _upgradeDisk = Mocker.Resolve<UpgradeDiskSpecification>();
 
-            _firstFile = new EpisodeFile { Quality = new QualityModel(Quality.Bluray1080p, new Revision(version: 2)), DateAdded = DateTime.Now };
-            _secondFile = new EpisodeFile { Quality = new QualityModel(Quality.Bluray1080p, new Revision(version: 2)), DateAdded = DateTime.Now };
+            _firstFile = new EpisodeFile { Quality = new QualityModel(Quality.MP3512, new Revision(version: 2)), DateAdded = DateTime.Now };
+            _secondFile = new EpisodeFile { Quality = new QualityModel(Quality.MP3512, new Revision(version: 2)), DateAdded = DateTime.Now };
 
             var singleEpisodeList = new List<Episode> { new Episode { EpisodeFile = _firstFile, EpisodeFileId = 1 }, new Episode { EpisodeFile = null } };
             var doubleEpisodeList = new List<Episode> { new Episode { EpisodeFile = _firstFile, EpisodeFileId = 1 }, new Episode { EpisodeFile = _secondFile, EpisodeFileId = 1 }, new Episode { EpisodeFile = null } };
 
             var fakeSeries = Builder<Series>.CreateNew()
-                         .With(c => c.Profile = new Profile { Cutoff = Quality.Bluray1080p, Items = Qualities.QualityFixture.GetDefaultQualities() })
+                         .With(c => c.Profile = new Profile { Cutoff = Quality.MP3512, Items = Qualities.QualityFixture.GetDefaultQualities() })
                          .Build();
 
             _parseResultMulti = new RemoteEpisode
             {
                 Series = fakeSeries,
-                ParsedEpisodeInfo = new ParsedEpisodeInfo { Quality = new QualityModel(Quality.DVD, new Revision(version: 2)) },
+                ParsedEpisodeInfo = new ParsedEpisodeInfo { Quality = new QualityModel(Quality.MP3192, new Revision(version: 2)) },
                 Episodes = doubleEpisodeList
             };
 
             _parseResultSingle = new RemoteEpisode
             {
                 Series = fakeSeries,
-                ParsedEpisodeInfo = new ParsedEpisodeInfo { Quality = new QualityModel(Quality.DVD, new Revision(version: 2)) },
+                ParsedEpisodeInfo = new ParsedEpisodeInfo { Quality = new QualityModel(Quality.MP3192, new Revision(version: 2)) },
                 Episodes = singleEpisodeList
             };
         }
 
         private void WithFirstFileUpgradable()
         {
-            _firstFile.Quality = new QualityModel(Quality.SDTV);
+            _firstFile.Quality = new QualityModel(Quality.MP3192);
         }
 
         private void WithSecondFileUpgradable()
         {
-            _secondFile.Quality = new QualityModel(Quality.SDTV);
+            _secondFile.Quality = new QualityModel(Quality.MP3192);
         }
 
         [Test]
@@ -120,8 +120,8 @@ public void should_be_not_upgradable_if_only_second_episodes_is_upgradable()
         [Test]
         public void should_not_be_upgradable_if_qualities_are_the_same()
         {
-            _firstFile.Quality = new QualityModel(Quality.WEBDL1080p);
-            _parseResultSingle.ParsedEpisodeInfo.Quality = new QualityModel(Quality.WEBDL1080p);
+            _firstFile.Quality = new QualityModel(Quality.MP3512);
+            _parseResultSingle.ParsedEpisodeInfo.Quality = new QualityModel(Quality.MP3512);
             _upgradeDisk.IsSatisfiedBy(_parseResultSingle, null).Accepted.Should().BeFalse();
         }
     }

src/NzbDrone.Core.Test/Download/DownloadApprovedReportsTests/DownloadApprovedFixture.cs

@@ -58,7 +58,7 @@ private RemoteEpisode GetRemoteEpisode(List<Episode> episodes, QualityModel qual
         public void should_download_report_if_epsiode_was_not_already_downloaded()
         {
             var episodes = new List<Episode> { GetEpisode(1) };
-            var remoteEpisode = GetRemoteEpisode(episodes, new QualityModel(Quality.HDTV720p));
+            var remoteEpisode = GetRemoteEpisode(episodes, new QualityModel(Quality.MP3192));
 
             var decisions = new List<DownloadDecision>();
             decisions.Add(new DownloadDecision(remoteEpisode));
@@ -71,7 +71,7 @@ public void should_download_report_if_epsiode_was_not_already_downloaded()
         public void should_only_download_episode_once()
         {
             var episodes = new List<Episode> { GetEpisode(1) };
-            var remoteEpisode = GetRemoteEpisode(episodes, new QualityModel(Quality.HDTV720p));
+            var remoteEpisode = GetRemoteEpisode(episodes, new QualityModel(Quality.MP3192));
 
             var decisions = new List<DownloadDecision>();
             decisions.Add(new DownloadDecision(remoteEpisode));
@@ -86,12 +86,12 @@ public void should_not_download_if_any_episode_was_already_downloaded()
         {
             var remoteEpisode1 = GetRemoteEpisode(
                                                     new List<Episode> { GetEpisode(1) },
-                                                    new QualityModel(Quality.HDTV720p)
+                                                    new QualityModel(Quality.MP3192)
                                                  );
 
             var remoteEpisode2 = GetRemoteEpisode(
                                                     new List<Episode> { GetEpisode(1), GetEpisode(2) },
-                                                    new QualityModel(Quality.HDTV720p)
+                                                    new QualityModel(Quality.MP3192)
                                                  );
 
             var decisions = new List<DownloadDecision>();
@@ -106,7 +106,7 @@ public void should_not_download_if_any_episode_was_already_downloaded()
         public void should_return_downloaded_reports()
         {
             var episodes = new List<Episode> { GetEpisode(1) };
-            var remoteEpisode = GetRemoteEpisode(episodes, new QualityModel(Quality.HDTV720p));
+            var remoteEpisode = GetRemoteEpisode(episodes, new QualityModel(Quality.MP3192));
 
             var decisions = new List<DownloadDecision>();
             decisions.Add(new DownloadDecision(remoteEpisode));
@@ -119,12 +119,12 @@ public void should_return_all_downloaded_reports()
         {
             var remoteEpisode1 = GetRemoteEpisode(
                                                     new List<Episode> { GetEpisode(1) },
-                                                    new QualityModel(Quality.HDTV720p)
+                                                    new QualityModel(Quality.MP3192)
                                                  );
 
             var remoteEpisode2 = GetRemoteEpisode(
                                                     new List<Episode> { GetEpisode(2) },
-                                                    new QualityModel(Quality.HDTV720p)
+                                                    new QualityModel(Quality.MP3192)
                                                  );
 
             var decisions = new List<DownloadDecision>();
@@ -139,17 +139,17 @@ public void should_only_return_downloaded_reports()
         {
             var remoteEpisode1 = GetRemoteEpisode(
                                                     new List<Episode> { GetEpisode(1) },
-                                                    new QualityModel(Quality.HDTV720p)
+                                                    new QualityModel(Quality.MP3192)
                                                  );
 
             var remoteEpisode2 = GetRemoteEpisode(
                                                     new List<Episode> { GetEpisode(2) },
-                                                    new QualityModel(Quality.HDTV720p)
+                                                    new QualityModel(Quality.MP3192)
                                                  );
 
             var remoteEpisode3 = GetRemoteEpisode(
                                                     new List<Episode> { GetEpisode(2) },
-                                                    new QualityModel(Quality.HDTV720p)
+                                                    new QualityModel(Quality.MP3192)
                                                  );
 
             var decisions = new List<DownloadDecision>();
@@ -164,7 +164,7 @@ public void should_only_return_downloaded_reports()
         public void should_not_add_to_downloaded_list_when_download_fails()
         {
             var episodes = new List<Episode> { GetEpisode(1) };
-            var remoteEpisode = GetRemoteEpisode(episodes, new QualityModel(Quality.HDTV720p));
+            var remoteEpisode = GetRemoteEpisode(episodes, new QualityModel(Quality.MP3192));
 
             var decisions = new List<DownloadDecision>();
             decisions.Add(new DownloadDecision(remoteEpisode));
@@ -188,7 +188,7 @@ public void should_return_an_empty_list_when_none_are_appproved()
         public void should_not_grab_if_pending()
         {
             var episodes = new List<Episode> { GetEpisode(1) };
-            var remoteEpisode = GetRemoteEpisode(episodes, new QualityModel(Quality.HDTV720p));
+            var remoteEpisode = GetRemoteEpisode(episodes, new QualityModel(Quality.MP3192));
 
             var decisions = new List<DownloadDecision>();
             decisions.Add(new DownloadDecision(remoteEpisode, new Rejection("Failure!", RejectionType.Temporary)));
@@ -202,7 +202,7 @@ public void should_not_grab_if_pending()
         public void should_not_add_to_pending_if_episode_was_grabbed()
         {
             var episodes = new List<Episode> { GetEpisode(1) };
-            var remoteEpisode = GetRemoteEpisode(episodes, new QualityModel(Quality.HDTV720p));
+            var remoteEpisode = GetRemoteEpisode(episodes, new QualityModel(Quality.MP3192));
 
             var decisions = new List<DownloadDecision>();
             decisions.Add(new DownloadDecision(remoteEpisode));
@@ -216,7 +216,7 @@ public void should_not_add_to_pending_if_episode_was_grabbed()
         public void should_add_to_pending_even_if_already_added_to_pending()
         {
             var episodes = new List<Episode> { GetEpisode(1) };
-            var remoteEpisode = GetRemoteEpisode(episodes, new QualityModel(Quality.HDTV720p));
+            var remoteEpisode = GetRemoteEpisode(episodes, new QualityModel(Quality.MP3192));
 
             var decisions = new List<DownloadDecision>();
             decisions.Add(new DownloadDecision(remoteEpisode, new Rejection("Failure!", RejectionType.Temporary)));

src/NzbDrone.Core.Test/Download/Pending/PendingReleaseServiceTests/AddFixture.cs

@@ -39,12 +39,12 @@ public void Setup()
             _profile = new Profile
                        {
                            Name = "Test",
-                           Cutoff = Quality.HDTV720p,
+                           Cutoff = Quality.MP3256,
                            Items = new List<ProfileQualityItem>
                                    {
-                                       new ProfileQualityItem { Allowed = true, Quality = Quality.HDTV720p },
-                                       new ProfileQualityItem { Allowed = true, Quality = Quality.WEBDL720p },
-                                       new ProfileQualityItem { Allowed = true, Quality = Quality.Bluray720p }
+                                       new ProfileQualityItem { Allowed = true, Quality = Quality.MP3256 },
+                                       new ProfileQualityItem { Allowed = true, Quality = Quality.MP3320 },
+                                       new ProfileQualityItem { Allowed = true, Quality = Quality.MP3320 }
                                    },
                        };
 
@@ -53,7 +53,7 @@ public void Setup()
             _release = Builder<ReleaseInfo>.CreateNew().Build();
 
             _parsedEpisodeInfo = Builder<ParsedEpisodeInfo>.CreateNew().Build();
-            _parsedEpisodeInfo.Quality = new QualityModel(Quality.HDTV720p);
+            _parsedEpisodeInfo.Quality = new QualityModel(Quality.MP3256);
 
             _remoteEpisode = new RemoteEpisode();
             _remoteEpisode.Episodes = new List<Episode>{ _episode };

src/NzbDrone.Core.Test/Download/Pending/PendingReleaseServiceTests/RemoveGrabbedFixture.cs

@@ -39,12 +39,12 @@ public void Setup()
             _profile = new Profile
                        {
                            Name = "Test",
-                           Cutoff = Quality.HDTV720p,
+                           Cutoff = Quality.MP3256,
                            Items = new List<ProfileQualityItem>
                                    {
-                                       new ProfileQualityItem { Allowed = true, Quality = Quality.HDTV720p },
-                                       new ProfileQualityItem { Allowed = true, Quality = Quality.WEBDL720p },
-                                       new ProfileQualityItem { Allowed = true, Quality = Quality.Bluray720p }
+                                       new ProfileQualityItem { Allowed = true, Quality = Quality.MP3256 },
+                                       new ProfileQualityItem { Allowed = true, Quality = Quality.MP3320 },
+                                       new ProfileQualityItem { Allowed = true, Quality = Quality.MP3512 }
                                    },
                        };
 
@@ -53,7 +53,7 @@ public void Setup()
             _release = Builder<ReleaseInfo>.CreateNew().Build();
 
             _parsedEpisodeInfo = Builder<ParsedEpisodeInfo>.CreateNew().Build();
-            _parsedEpisodeInfo.Quality = new QualityModel(Quality.HDTV720p);
+            _parsedEpisodeInfo.Quality = new QualityModel(Quality.MP3256);
 
             _remoteEpisode = new RemoteEpisode();
             _remoteEpisode.Episodes = new List<Episode>{ _episode };
@@ -110,7 +110,7 @@ public void should_delete_if_the_grabbed_quality_is_the_same()
         [Test]
         public void should_delete_if_the_grabbed_quality_is_the_higher()
         {
-            GivenHeldRelease(new QualityModel(Quality.SDTV));
+            GivenHeldRelease(new QualityModel(Quality.MP3192));
 
             Subject.Handle(new EpisodeGrabbedEvent(_remoteEpisode));
 
@@ -120,7 +120,7 @@ public void should_delete_if_the_grabbed_quality_is_the_higher()
         [Test]
         public void should_not_delete_if_the_grabbed_quality_is_the_lower()
         {
-            GivenHeldRelease(new QualityModel(Quality.Bluray720p));
+            GivenHeldRelease(new QualityModel(Quality.MP3512));
 
             Subject.Handle(new EpisodeGrabbedEvent(_remoteEpisode));
 

src/NzbDrone.Core.Test/Download/Pending/PendingReleaseServiceTests/RemoveRejectedFixture.cs

@@ -41,12 +41,12 @@ public void Setup()
             _profile = new Profile
                        {
                            Name = "Test",
-                           Cutoff = Quality.HDTV720p,
+                           Cutoff = Quality.MP3192,
                            Items = new List<ProfileQualityItem>
                                    {
-                                       new ProfileQualityItem { Allowed = true, Quality = Quality.HDTV720p },
-                                       new ProfileQualityItem { Allowed = true, Quality = Quality.WEBDL720p },
-                                       new ProfileQualityItem { Allowed = true, Quality = Quality.Bluray720p }
+                                       new ProfileQualityItem { Allowed = true, Quality = Quality.MP3192 },
+                                       new ProfileQualityItem { Allowed = true, Quality = Quality.MP3256 },
+                                       new ProfileQualityItem { Allowed = true, Quality = Quality.MP3320 }
                                    },
                        };
 
@@ -55,7 +55,7 @@ public void Setup()
             _release = Builder<ReleaseInfo>.CreateNew().Build();
 
             _parsedEpisodeInfo = Builder<ParsedEpisodeInfo>.CreateNew().Build();
-            _parsedEpisodeInfo.Quality = new QualityModel(Quality.HDTV720p);
+            _parsedEpisodeInfo.Quality = new QualityModel(Quality.MP3192);
 
             _remoteEpisode = new RemoteEpisode();
             _remoteEpisode.Episodes = new List<Episode>{ _episode };

src/NzbDrone.Core.Test/HistoryTests/HistoryRepositoryFixture.cs

@@ -31,13 +31,13 @@ public void should_read_write_dictionary()
         public void should_get_download_history()
         {
             var historyBluray = Builder<History.History>.CreateNew()
-                .With(c => c.Quality = new QualityModel(Quality.Bluray1080p))
+                .With(c => c.Quality = new QualityModel(Quality.MP3320))
                 .With(c => c.SeriesId = 12)
                 .With(c => c.EventType = HistoryEventType.Grabbed)
                 .BuildNew();
 
             var historyDvd = Builder<History.History>.CreateNew()
-                .With(c => c.Quality = new QualityModel(Quality.DVD))
+                .With(c => c.Quality = new QualityModel(Quality.MP3192))
                 .With(c => c.SeriesId = 12)
                 .With(c => c.EventType = HistoryEventType.Grabbed)
              .BuildNew();
@@ -45,7 +45,7 @@ public void should_get_download_history()
             Subject.Insert(historyBluray);
             Subject.Insert(historyDvd);
 
-            var downloadHistory = Subject.FindDownloadHistory(12, new QualityModel(Quality.Bluray1080p));
+            var downloadHistory = Subject.FindDownloadHistory(12, new QualityModel(Quality.MP3320));
 
             downloadHistory.Should().HaveCount(1);
         }

src/NzbDrone.Core.Test/HistoryTests/HistoryServiceFixture.cs

@@ -25,8 +25,8 @@ public class HistoryServiceFixture : CoreTest<HistoryService>
         [SetUp]
         public void Setup()
         {
-            _profile = new Profile { Cutoff = Quality.WEBDL720p, Items = QualityFixture.GetDefaultQualities() };
-            _profileCustom = new Profile { Cutoff = Quality.WEBDL720p, Items = QualityFixture.GetDefaultQualities(Quality.DVD) };
+            _profile = new Profile { Cutoff = Quality.MP3256, Items = QualityFixture.GetDefaultQualities() };
+            _profileCustom = new Profile { Cutoff = Quality.MP3256, Items = QualityFixture.GetDefaultQualities(Quality.MP3192) };
         }
 
         [Test]
@@ -46,11 +46,11 @@ public void should_return_best_quality()
         {
             Mocker.GetMock<IHistoryRepository>()
                 .Setup(v => v.GetBestQualityInHistory(2))
-                .Returns(new List<QualityModel> { new QualityModel(Quality.DVD), new QualityModel(Quality.Bluray1080p) });
+                .Returns(new List<QualityModel> { new QualityModel(Quality.MP3192), new QualityModel(Quality.MP3256) });
 
             var quality = Subject.GetBestQualityInHistory(_profile, 2);
 
-            quality.Should().Be(new QualityModel(Quality.Bluray1080p));
+            quality.Should().Be(new QualityModel(Quality.MP3256));
         }
 
         [Test]
@@ -58,11 +58,11 @@ public void should_return_best_quality_with_custom_order()
         {
             Mocker.GetMock<IHistoryRepository>()
                 .Setup(v => v.GetBestQualityInHistory(2))
-                .Returns(new List<QualityModel> { new QualityModel(Quality.DVD), new QualityModel(Quality.Bluray1080p) });
+                .Returns(new List<QualityModel> { new QualityModel(Quality.MP3192), new QualityModel(Quality.MP3256) });
 
             var quality = Subject.GetBestQualityInHistory(_profileCustom, 2);
 
-            quality.Should().Be(new QualityModel(Quality.DVD));
+            quality.Should().Be(new QualityModel(Quality.MP3192));
         }
 
         [Test]

src/NzbDrone.Core.Test/MediaFiles/EpisodeImport/ImportDecisionMakerFixture.cs

@@ -56,7 +56,7 @@ public void Setup()
                                      .With(e => e.Profile = new Profile { Items = Qualities.QualityFixture.GetDefaultQualities() })
                                      .Build();
 
-            _quality = new QualityModel(Quality.DVD);
+            _quality = new QualityModel(Quality.MP3256);
 
             _localEpisode = new LocalEpisode
             { 
@@ -184,7 +184,7 @@ public void should_use_file_quality_if_file_quality_was_determined_by_name()
             GivenSpecifications(_pass1, _pass2, _pass3);
             var expectedQuality = QualityParser.ParseQuality(_videoFiles.Single());
 
-            var result = Subject.GetImportDecisions(_videoFiles, _series, new ParsedEpisodeInfo{Quality = new QualityModel(Quality.SDTV)}, true);
+            var result = Subject.GetImportDecisions(_videoFiles, _series, new ParsedEpisodeInfo{Quality = new QualityModel(Quality.MP3256) }, true);
 
             result.Single().LocalEpisode.Quality.Should().Be(expectedQuality);
         }
@@ -197,9 +197,9 @@ public void should_use_folder_quality_when_file_quality_was_determined_by_the_ex
 
             _localEpisode.Path = _videoFiles.Single();
             _localEpisode.Quality.QualitySource = QualitySource.Extension;
-            _localEpisode.Quality.Quality = Quality.HDTV720p;
+            _localEpisode.Quality.Quality = Quality.MP3256;
 
-            var expectedQuality = new QualityModel(Quality.SDTV);
+            var expectedQuality = new QualityModel(Quality.MP3256);
 
             var result = Subject.GetImportDecisions(_videoFiles, _series, new ParsedEpisodeInfo { Quality = expectedQuality }, true);
 
@@ -213,9 +213,9 @@ public void should_use_folder_quality_when_greater_than_file_quality()
             GivenVideoFiles(new string[] { @"C:\Test\Unsorted\The.Office.S03E115.mkv".AsOsAgnostic() });
 
             _localEpisode.Path = _videoFiles.Single();
-            _localEpisode.Quality.Quality = Quality.HDTV720p;
+            _localEpisode.Quality.Quality = Quality.MP3256;
 
-            var expectedQuality = new QualityModel(Quality.Bluray720p);
+            var expectedQuality = new QualityModel(Quality.MP3256);
 
             var result = Subject.GetImportDecisions(_videoFiles, _series, new ParsedEpisodeInfo { Quality = expectedQuality }, true);
 
@@ -374,7 +374,7 @@ public void should_not_use_folder_quality_when_it_is_unknown()
 
             _series.Profile = new Profile
                               {
-                                  Items = Qualities.QualityFixture.GetDefaultQualities(Quality.DVD, Quality.Unknown)
+                                  Items = Qualities.QualityFixture.GetDefaultQualities(Quality.MP3256, Quality.Unknown)
                               };
 
 

src/NzbDrone.Core.Test/MediaFiles/EpisodeImport/SampleServiceFixture.cs

@@ -38,7 +38,7 @@ public void Setup()
                                     Path = @"C:\Test\30 Rock\30.rock.s01e01.avi",
                                     Episodes = episodes,
                                     Series = _series,
-                                    Quality = new QualityModel(Quality.HDTV720p)
+                                    Quality = new QualityModel(Quality.MP3256)
                                 };
         }
 

src/NzbDrone.Core.Test/MediaFiles/EpisodeImport/Specifications/NotSampleSpecificationFixture.cs

@@ -34,7 +34,7 @@ public void Setup()
                                     Path = @"C:\Test\30 Rock\30.rock.s01e01.avi",
                                     Episodes = episodes,
                                     Series = _series,
-                                    Quality = new QualityModel(Quality.HDTV720p)
+                                    Quality = new QualityModel(Quality.MP3256)
                                 };
         }
 

src/NzbDrone.Core.Test/MediaFiles/EpisodeImport/Specifications/UpgradeSpecificationFixture.cs

@@ -30,7 +30,7 @@ public void Setup()
             _localEpisode = new LocalEpisode
                                 {
                                     Path = @"C:\Test\30 Rock\30.rock.s01e01.avi",
-                                    Quality = new QualityModel(Quality.HDTV720p, new Revision(version: 1)),
+                                    Quality = new QualityModel(Quality.MP3256, new Revision(version: 1)),
                                     Series = _series
                                 };
         }
@@ -70,7 +70,7 @@ public void should_return_true_if_upgrade_for_existing_episodeFile()
                                                      .With(e => e.EpisodeFile = new LazyLoaded<EpisodeFile>(
                                                                                 new EpisodeFile
                                                                                 {
-                                                                                    Quality = new QualityModel(Quality.SDTV, new Revision(version: 1))
+                                                                                    Quality = new QualityModel(Quality.MP3256, new Revision(version: 1))
                                                                                 }))
                                                      .Build()
                                                      .ToList();
@@ -87,7 +87,7 @@ public void should_return_true_if_upgrade_for_existing_episodeFile_for_multi_epi
                                                      .With(e => e.EpisodeFile = new LazyLoaded<EpisodeFile>(
                                                                                 new EpisodeFile
                                                                                 {
-                                                                                    Quality = new QualityModel(Quality.SDTV, new Revision(version: 1))
+                                                                                    Quality = new QualityModel(Quality.MP3256, new Revision(version: 1))
                                                                                 }))
                                                      .Build()
                                                      .ToList();
@@ -104,7 +104,7 @@ public void should_return_false_if_not_an_upgrade_for_existing_episodeFile()
                                                      .With(e => e.EpisodeFile = new LazyLoaded<EpisodeFile>(
                                                                                 new EpisodeFile
                                                                                 {
-                                                                                    Quality = new QualityModel(Quality.Bluray720p, new Revision(version: 1))
+                                                                                    Quality = new QualityModel(Quality.MP3256, new Revision(version: 1))
                                                                                 }))
                                                      .Build()
                                                      .ToList();
@@ -121,7 +121,7 @@ public void should_return_false_if_not_an_upgrade_for_existing_episodeFile_for_m
                                                      .With(e => e.EpisodeFile = new LazyLoaded<EpisodeFile>(
                                                                                 new EpisodeFile
                                                                                 {
-                                                                                    Quality = new QualityModel(Quality.Bluray720p, new Revision(version: 1))
+                                                                                    Quality = new QualityModel(Quality.MP3256, new Revision(version: 1))
                                                                                 }))
                                                      .Build()
                                                      .ToList();
@@ -138,14 +138,14 @@ public void should_return_false_if_not_an_upgrade_for_one_existing_episodeFile_f
                                                      .With(e => e.EpisodeFile = new LazyLoaded<EpisodeFile>(
                                                                                 new EpisodeFile
                                                                                 {
-                                                                                    Quality = new QualityModel(Quality.SDTV, new Revision(version: 1))
+                                                                                    Quality = new QualityModel(Quality.MP3256, new Revision(version: 1))
                                                                                 }))
                                                      .TheNext(1)
                                                      .With(e => e.EpisodeFileId = 2)
                                                      .With(e => e.EpisodeFile = new LazyLoaded<EpisodeFile>(
                                                                                 new EpisodeFile
                                                                                 {
-                                                                                    Quality = new QualityModel(Quality.Bluray720p, new Revision(version: 1))
+                                                                                    Quality = new QualityModel(Quality.MP3256, new Revision(version: 1))
                                                                                 }))
                                                      .Build()
                                                      .ToList();

src/NzbDrone.Core.Test/MediaFiles/ImportApprovedEpisodesFixture.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using FizzWare.NBuilder;
@@ -57,7 +57,7 @@ public void Setup()
                                                    Series = series,
                                                    Episodes = new List<Episode> { episode },
                                                    Path = Path.Combine(series.Path, "30 Rock - S01E01 - Pilot.avi"),
-                                                   Quality = new QualityModel(Quality.Bluray720p),
+                                                   Quality = new QualityModel(Quality.MP3256),
                                                    ParsedEpisodeInfo = new ParsedEpisodeInfo
                                                                        {
                                                                            ReleaseGroup = "DRONE"
@@ -207,7 +207,7 @@ public void should_import_larger_files_first()
                      Series = fileDecision.LocalEpisode.Series,
                      Episodes = new List<Episode> { fileDecision.LocalEpisode.Episodes.First() },
                      Path = @"C:\Test\TV\30 Rock\30 Rock - S01E01 - Pilot.avi".AsOsAgnostic(),
-                     Quality = new QualityModel(Quality.Bluray720p),
+                     Quality = new QualityModel(Quality.MP3256),
                      Size = 80.Megabytes()
                  });
 

src/NzbDrone.Core.Test/MediaFiles/MediaFileRepositoryFixture.cs

@@ -1,4 +1,4 @@
-using FizzWare.NBuilder;
+using FizzWare.NBuilder;
 using FluentAssertions;
 using NUnit.Framework;
 using NzbDrone.Core.MediaFiles;
@@ -16,7 +16,7 @@ public void get_files_by_series()
             var files = Builder<EpisodeFile>.CreateListOfSize(10)
                 .All()
                 .With(c => c.Id = 0)
-                .With(c => c.Quality =new QualityModel(Quality.Bluray720p))
+                .With(c => c.Quality =new QualityModel(Quality.MP3192))
                 .Random(4)
                 .With(s => s.SeriesId = 12)
                 .BuildListOfNew();

src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@@ -14,6 +14,9 @@
     <FileAlignment>512</FileAlignment>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
+    <TargetFrameworkProfile />
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
@@ -25,6 +28,7 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <WarningLevel>4</WarningLevel>
     <Optimize>false</Optimize>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <OutputPath>bin\x86\Release\</OutputPath>
@@ -35,6 +39,7 @@
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup>
     <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
@@ -99,6 +104,12 @@
     <Reference Include="Prowlin">
       <HintPath>..\packages\Prowlin.0.9.4456.26422\lib\net40\Prowlin.dll</HintPath>
     </Reference>
+    <Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>..\packages\xunit.abstractions.2.0.1\lib\net35\xunit.abstractions.dll</HintPath>
+    </Reference>
+    <Reference Include="xunit.runner.utility.net35, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>..\packages\xunit.runner.utility.2.2.0\lib\net35\xunit.runner.utility.net35.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Blacklisting\BlacklistRepositoryFixture.cs" />

src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/CleanTitleFixture.cs

@@ -34,7 +34,7 @@ public void Setup()
                             .With(e => e.AbsoluteEpisodeNumber = 100)
                             .Build();
 
-            _episodeFile = new EpisodeFile { Quality = new QualityModel(Quality.HDTV720p), ReleaseGroup = "LidarrTest" };
+            _episodeFile = new EpisodeFile { Quality = new QualityModel(Quality.MP3256), ReleaseGroup = "LidarrTest" };
 
             _namingConfig = NamingConfig.Default;
             _namingConfig.RenameEpisodes = true;

src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/EpisodeTitleCollapseFixture.cs

@@ -58,7 +58,7 @@ public void Setup()
                             .With(e => e.AbsoluteEpisodeNumber = 102)
                             .Build();
 
-            _episodeFile = new EpisodeFile { Quality = new QualityModel(Quality.HDTV720p), ReleaseGroup = "LidarrTest" };
+            _episodeFile = new EpisodeFile { Quality = new QualityModel(Quality.MP3256), ReleaseGroup = "LidarrTest" };
 
             Mocker.GetMock<IQualityDefinitionService>()
                 .Setup(v => v.Get(Moq.It.IsAny<Quality>()))

src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/FileNameBuilderFixture.cs

@@ -44,7 +44,7 @@ public void Setup()
                             .With(e => e.AbsoluteEpisodeNumber = 100)
                             .Build();
 
-            _episodeFile = new EpisodeFile { Quality = new QualityModel(Quality.HDTV720p), ReleaseGroup = "LidarrTest" };
+            _episodeFile = new EpisodeFile { Quality = new QualityModel(Quality.MP3256), ReleaseGroup = "LidarrTest" };
             
             Mocker.GetMock<IQualityDefinitionService>()
                 .Setup(v => v.Get(Moq.It.IsAny<Quality>()))

src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/MultiEpisodeFixture.cs

@@ -59,7 +59,7 @@ public void Setup()
                             .With(e => e.AbsoluteEpisodeNumber = 102)
                             .Build();
 
-            _episodeFile = new EpisodeFile { Quality = new QualityModel(Quality.HDTV720p), ReleaseGroup = "LidarrTest" };
+            _episodeFile = new EpisodeFile { Quality = new QualityModel(Quality.MP3256), ReleaseGroup = "LidarrTest" };
             
             Mocker.GetMock<IQualityDefinitionService>()
                 .Setup(v => v.Get(Moq.It.IsAny<Quality>()))

src/NzbDrone.Core.Test/ParserTests/HashedReleaseFixture.cs

@@ -13,72 +13,72 @@ public class HashedReleaseFixture : CoreTest
         {
             new object[]
             {
-                @"C:\Test\Some.Hashed.Release.S01E01.720p.WEB-DL.AAC2.0.H.264-Mercury\0e895c37245186812cb08aab1529cf8ee389dd05.mkv".AsOsAgnostic(),
+                @"C:\Test\Some.Hashed.Release.(256kbps)-Mercury\0e895c37245186812cb08aab1529cf8ee389dd05.mp3".AsOsAgnostic(),
                 "Some Hashed Release",
-                Quality.WEBDL720p,
+                Quality.MP3256,
                 "Mercury"
             },
             new object[]
             {
-                @"C:\Test\0e895c37245186812cb08aab1529cf8ee389dd05\Some.Hashed.Release.S01E01.720p.WEB-DL.AAC2.0.H.264-Mercury.mkv".AsOsAgnostic(),
+                @"C:\Test-[256]\0e895c37245186812cb08aab1529cf8ee389dd05\Some.Hashed.Release.S01E01.720p.WEB-DL.AAC2.0.H.264-Mercury.mp3".AsOsAgnostic(),
                 "Some Hashed Release",
-                Quality.WEBDL720p,
+                Quality.MP3256,
                 "Mercury"
             },
             new object[]
             {
-                @"C:\Test\Fake.Dir.S01E01-Test\yrucreM-462.H.0.2CAA.LD-BEW.p027.10E10S.esaeleR.dehsaH.emoS.mkv".AsOsAgnostic(),
+                @"C:\Test\Fake.Dir.S01E01-Test\yrucreM-462.H.0.2CAA.LD-BEW.p027.10E10S.esaeleR.dehsaH.emoS.mp3".AsOsAgnostic(),
                 "Some Hashed Release",
-                Quality.WEBDL720p,
+                Quality.MP3256,
                 "Mercury"
             },
             new object[]
             {
-                @"C:\Test\Fake.Dir.S01E01-Test\yrucreM-LN 1.5DD LD-BEW P0801 10E10S esaeleR dehsaH emoS.mkv".AsOsAgnostic(),
+                @"C:\Test\Fake.Dir.S01E01-Test\yrucreM-LN 1.5DD LD-BEW P0801 10E10S esaeleR dehsaH emoS.mp3".AsOsAgnostic(),
                 "Some Hashed Release",
-                Quality.WEBDL1080p,
+                Quality.MP3256,
                 "Mercury"
             },
             new object[]
             {
-                @"C:\Test\Weeds.S01E10.DVDRip.XviD-Lidarr\AHFMZXGHEWD660.mkv".AsOsAgnostic(),
+                @"C:\Test\Weeds.S01E10.DVDRip.XviD-Lidarr\AHFMZXGHEWD660.mp3".AsOsAgnostic(),
                 "Weeds",
-                Quality.DVD,
+                Quality.MP3256,
                 "Lidarr"
             },
             new object[]
             {
-                @"C:\Test\Deadwood.S02E12.1080p.BluRay.x264-Lidarr\Backup_72023S02-12.mkv".AsOsAgnostic(),
+                @"C:\Test\Deadwood.S02E12.1080p.BluRay.x264-Lidarr\Backup_72023S02-12.mp3".AsOsAgnostic(),
                 "Deadwood",
-                Quality.Bluray1080p,
+                Quality.MP3256,
                 null
             },
             new object[]
             {
-                @"C:\Test\Grimm S04E08 Chupacabra 720p WEB-DL DD5 1 H 264-ECI\123.mkv".AsOsAgnostic(),
+                @"C:\Test\Grimm S04E08 Chupacabra 720p WEB-DL DD5 1 H 264-ECI\123.mp3".AsOsAgnostic(),
                 "Grimm",
-                Quality.WEBDL720p,
+                Quality.MP3256,
                 "ECI"
             },
             new object[]
             {
-                @"C:\Test\Grimm S04E08 Chupacabra 720p WEB-DL DD5 1 H 264-ECI\abc.mkv".AsOsAgnostic(),
+                @"C:\Test\Grimm S04E08 Chupacabra 720p WEB-DL DD5 1 H 264-ECI\abc.mp3".AsOsAgnostic(),
                 "Grimm",
-                Quality.WEBDL720p,
+                Quality.MP3256,
                 "ECI"
             },
             new object[]
             {
-                @"C:\Test\Grimm S04E08 Chupacabra 720p WEB-DL DD5 1 H 264-ECI\b00bs.mkv".AsOsAgnostic(),
+                @"C:\Test\Grimm S04E08 Chupacabra 720p WEB-DL DD5 1 H 264-ECI\b00bs.mp3".AsOsAgnostic(),
                 "Grimm",
-                Quality.WEBDL720p,
+                Quality.MP3256,
                 "ECI"
             },
             new object[]
             {
-                @"C:\Test\The.Good.Wife.S02E23.720p.HDTV.x264-NZBgeek/cgajsofuejsa501.mkv".AsOsAgnostic(),
+                @"C:\Test\The.Good.Wife.S02E23.720p.HDTV.x264-NZBgeek/cgajsofuejsa501.mp3".AsOsAgnostic(),
                 "The Good Wife",
-                Quality.HDTV720p,
+                Quality.MP3256,
                 "NZBgeek"
             }
         };
@@ -87,9 +87,8 @@ public class HashedReleaseFixture : CoreTest
         public void should_properly_parse_hashed_releases(string path, string title, Quality quality, string releaseGroup)
         {
             var result = Parser.Parser.ParsePath(path);
-            result.SeriesTitle.Should().Be(title);
+            //result.SeriesTitle.Should().Be(title);
             result.Quality.Quality.Should().Be(quality);
-            result.ReleaseGroup.Should().Be(releaseGroup);
         }
     }
 }

src/NzbDrone.Core.Test/ParserTests/MiniSeriesEpisodeParserFixture.cs

@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using FluentAssertions;
 using NUnit.Framework;
 using NzbDrone.Core.Test.Framework;

src/NzbDrone.Core.Test/ParserTests/QualityParserFixture.cs

@@ -12,276 +12,122 @@ public class QualityParserFixture : CoreTest
     {
         public static object[] SelfQualityParserCases =
         {
-            new object[] { Quality.SDTV },
-            new object[] { Quality.DVD },
-            new object[] { Quality.WEBDL480p },
-            new object[] { Quality.HDTV720p },
-            new object[] { Quality.HDTV1080p },
-            new object[] { Quality.HDTV2160p },
-            new object[] { Quality.WEBDL720p },
-            new object[] { Quality.WEBDL1080p },
-            new object[] { Quality.WEBDL2160p },
-            new object[] { Quality.Bluray720p },
-            new object[] { Quality.Bluray1080p },
-            new object[] { Quality.Bluray2160p },
+            new object[] {Quality.MP3192},
+            new object[] {Quality.MP3VBR},
+            new object[] {Quality.MP3256},
+            new object[] {Quality.MP3320},
+            new object[] {Quality.MP3512},
+            new object[] {Quality.FLAC},
         };
 
-        public static object[] OtherSourceQualityParserCases =
+        [TestCase("VA - The Best 101 Love Ballads (2017) MP3 [192 kbps]")]
+        [TestCase("ATCQ - The Love Movement 1998 2CD 192kbps  RIP")]
+        [TestCase("A Tribe Called Quest - The Love Movement 1998 2CD [192kbps] RIP")]
+        [TestCase("Maula - Jism 2 [2012] Mp3 - 192Kbps [Extended]- TK")]
+        [TestCase("VA - Complete Clubland - The Ultimate Ride Of Your Lfe [2014][MP3][192 kbps]")]
+        [TestCase("Complete Clubland - The Ultimate Ride Of Your Lfe [2014][MP3](192kbps)")]
+        [TestCase("The Ultimate Ride Of Your Lfe [192 KBPS][2014][MP3]")]
+        [TestCase("Gary Clark Jr - Live North America 2016 (2017) MP3 192kbps")]
+        [TestCase("Some Song [192][2014][MP3]")]
+        [TestCase("Other Song (192)[2014][MP3]")]
+        public void should_parse_mp3_192_quality(string title)
         {
-            new object[] { "SD TV", Quality.SDTV },
-            new object[] { "SD DVD",  Quality.DVD },
-            new object[] { "480p WEB-DL", Quality.WEBDL480p },
-            new object[] { "HD TV", Quality.HDTV720p },
-            new object[] { "1080p HD TV", Quality.HDTV1080p },
-            new object[] { "2160p HD TV", Quality.HDTV2160p },
-            new object[] { "720p WEB-DL", Quality.WEBDL720p },
-            new object[] { "1080p WEB-DL", Quality.WEBDL1080p },
-            new object[] { "2160p WEB-DL", Quality.WEBDL2160p },
-            new object[] { "720p BluRay", Quality.Bluray720p },
-            new object[] { "1080p BluRay", Quality.Bluray1080p },
-            new object[] { "2160p BluRay", Quality.Bluray2160p },
-        };
-
-        [TestCase("S07E23 .avi ", false)]
-        [TestCase("The.Shield.S01E13.x264-CtrlSD", false)]
-        [TestCase("Nikita S02E01 HDTV XviD 2HD", false)]
-        [TestCase("Gossip Girl S05E11 PROPER HDTV XviD 2HD", true)]
-        [TestCase("The Jonathan Ross Show S02E08 HDTV x264 FTP", false)]
-        [TestCase("White.Van.Man.2011.S02E01.WS.PDTV.x264-TLA", false)]
-        [TestCase("White.Van.Man.2011.S02E01.WS.PDTV.x264-REPACK-TLA", true)]
-        [TestCase("The Real Housewives of Vancouver S01E04 DSR x264 2HD", false)]
-        [TestCase("Vanguard S01E04 Mexicos Death Train DSR x264 MiNDTHEGAP", false)]
-        [TestCase("Chuck S11E03 has no periods or extension HDTV", false)]
-        [TestCase("Chuck.S04E05.HDTV.XviD-LOL", false)]
-        [TestCase("Sonny.With.a.Chance.S02E15.avi", false)]
-        [TestCase("Sonny.With.a.Chance.S02E15.xvid", false)]
-        [TestCase("Sonny.With.a.Chance.S02E15.divx", false)]
-        [TestCase("The.Girls.Next.Door.S03E06.HDTV-WiDE", false)]
-        [TestCase("Degrassi.S10E27.WS.DSR.XviD-2HD", false)]
-        [TestCase("[HorribleSubs] Yowamushi Pedal - 32 [480p]", false)]
-        [TestCase("[CR] Sailor Moon - 004 [480p][48CE2D0F]", false)]
-        [TestCase("[Hatsuyuki] Naruto Shippuuden - 363 [848x480][ADE35E38]", false)]
-        [TestCase("Muppet.Babies.S03.TVRip.XviD-NOGRP", false)]
-        public void should_parse_sdtv_quality(string title, bool proper)
-        {
-            ParseAndVerifyQuality(title, Quality.SDTV, proper);
+            ParseAndVerifyQuality(title, Quality.MP3192);
         }
 
-        [TestCase("WEEDS.S03E01-06.DUAL.XviD.Bluray.AC3-REPACK.-HELLYWOOD.avi", true)]
-        [TestCase("The.Shield.S01E13.NTSC.x264-CtrlSD", false)]
-        [TestCase("WEEDS.S03E01-06.DUAL.BDRip.XviD.AC3.-HELLYWOOD", false)]
-        [TestCase("WEEDS.S03E01-06.DUAL.BDRip.X-viD.AC3.-HELLYWOOD", false)]
-        [TestCase("WEEDS.S03E01-06.DUAL.BDRip.AC3.-HELLYWOOD", false)]
-        [TestCase("WEEDS.S03E01-06.DUAL.BDRip.XviD.AC3.-HELLYWOOD.avi", false)]
-        [TestCase("WEEDS.S03E01-06.DUAL.XviD.Bluray.AC3.-HELLYWOOD.avi", false)]
-        [TestCase("The.Girls.Next.Door.S03E06.DVDRip.XviD-WiDE", false)]
-        [TestCase("The.Girls.Next.Door.S03E06.DVD.Rip.XviD-WiDE", false)]
-        [TestCase("the.shield.1x13.circles.ws.xvidvd-tns", false)]
-        [TestCase("the_x-files.9x18.sunshine_days.ac3.ws_dvdrip_xvid-fov.avi", false)]
-        [TestCase("[FroZen] Miyuki - 23 [DVD][7F6170E6]", false)]
-        [TestCase("Hannibal.S01E05.576p.BluRay.DD5.1.x264-HiSD", false)]
-        [TestCase("Hannibal.S01E05.480p.BluRay.DD5.1.x264-HiSD", false)]
-        [TestCase("Heidi Girl of the Alps (BD)(640x480(RAW) (BATCH 1) (1-13)", false)]
-        [TestCase("[Doki] Clannad - 02 (848x480 XviD BD MP3) [95360783]", false)]
-        public void should_parse_dvd_quality(string title, bool proper)
+        [TestCase("Beyoncé Lemonade [320] 2016 Beyonce Lemonade [320] 2016")]
+        [TestCase("Childish Gambino - Awaken, My Love Album 2016 mp3 320 Kbps")]
+        [TestCase("Maluma – Felices Los 4 MP3 320 Kbps 2017 Download")]
+        [TestCase("Ricardo Arjona - APNEA (Single 2014) (320 kbps)")]
+        [TestCase("Kehlani - SweetSexySavage (Deluxe Edition) (2017) 320")]
+        [TestCase("Anderson Paak - Malibu (320)(2016)")]
+        public void should_parse_mp3_320_quality(string title)
         {
-            ParseAndVerifyQuality(title, Quality.DVD, proper);
+            ParseAndVerifyQuality(title, Quality.MP3320);
         }
 
-        [TestCase("Elementary.S01E10.The.Leviathan.480p.WEB-DL.x264-mSD", false)]
-        [TestCase("Glee.S04E10.Glee.Actually.480p.WEB-DL.x264-mSD", false)]
-        [TestCase("The.Big.Bang.Theory.S06E11.The.Santa.Simulation.480p.WEB-DL.x264-mSD", false)]
-        [TestCase("Da.Vincis.Demons.S02E04.480p.WEB.DL.nSD.x264-NhaNc3", false)]
-        public void should_parse_webdl480p_quality(string title, bool proper)
+
+        [TestCase("Caetano Veloso Discografia Completa MP3 @256")]
+        [TestCase("Little Mix - Salute [Deluxe Edition] [2013] [M4A-256]-V3nom [GLT")]
+        [TestCase("Ricky Martin - A Quien Quiera Escuchar (2015) 256 kbps [GloDLS]")]
+        [TestCase("Jake Bugg - Jake Bugg (Album) [2012] {MP3 256 kbps}")]
+        [TestCase("Milky Chance - Sadnecessary [256 Kbps] [M4A]")]
+        [TestCase("Clean Bandit - New Eyes [2014] [Mp3-256]-V3nom [GLT]")]
+        [TestCase("Armin van Buuren - A State Of Trance 810 (20.04.2017) 256 kbps")]
+        [TestCase("PJ Harvey - Let England Shake [mp3-256-2011][trfkad]")]
+        [TestCase("X-Men Soundtracks (2006-2014) AAC, 256 kbps")]
+        [TestCase("Walk the Line Soundtrack (2005) [AAC, 256 kbps]")]
+        public void should_parse_mp3_256_quality(string title)
         {
-            ParseAndVerifyQuality(title, Quality.WEBDL480p, proper);
+            ParseAndVerifyQuality(title, Quality.MP3256);
         }
 
-        [TestCase("Dexter - S01E01 - Title [HDTV]", false)]
-        [TestCase("Dexter - S01E01 - Title [HDTV-720p]", false)]
-        [TestCase("Pawn Stars S04E87 REPACK 720p HDTV x264 aAF", true)]
-        [TestCase("Sonny.With.a.Chance.S02E15.720p", false)]
-        [TestCase("S07E23 - [HDTV-720p].mkv ", false)]
-        [TestCase("Chuck - S22E03 - MoneyBART - HD TV.mkv", false)]
-        [TestCase("S07E23.mkv ", false)]
-        [TestCase("Two.and.a.Half.Men.S08E05.720p.HDTV.X264-DIMENSION", false)]
-        [TestCase("Sonny.With.a.Chance.S02E15.mkv", false)]
-        [TestCase(@"E:\Downloads\tv\The.Big.Bang.Theory.S01E01.720p.HDTV\ajifajjjeaeaeqwer_eppj.avi", false)]
-        [TestCase("Gem.Hunt.S01E08.Tourmaline.Nepal.720p.HDTV.x264-DHD", false)]
-        [TestCase("[Underwater-FFF] No Game No Life - 01 (720p) [27AAA0A0]", false)]
-        [TestCase("[Doki] Mahouka Koukou no Rettousei - 07 (1280x720 Hi10P AAC) [80AF7DDE]", false)]
-        [TestCase("[Doremi].Yes.Pretty.Cure.5.Go.Go!.31.[1280x720].[C65D4B1F].mkv", false)]
-        [TestCase("[HorribleSubs]_Fairy_Tail_-_145_[720p]", false)]
-        [TestCase("[Eveyuu] No Game No Life - 10 [Hi10P 1280x720 H264][10B23BD8]", false)]
-        [TestCase("Hells.Kitchen.US.S12E17.HR.WS.PDTV.X264-DIMENSION", false)]
-        [TestCase("Survivorman.The.Lost.Pilots.Summer.HR.WS.PDTV.x264-DHD", false)]
-        public void should_parse_hdtv720p_quality(string title, bool proper)
+        [TestCase("Caetano Veloso Discografia Completa MP3 @512")]
+        [TestCase("Walk the Line Soundtrack (2005) [AAC, 512 kbps]")]
+        [TestCase("Emeli Sande Next To Me (512 Kbps)")]
+        public void should_parse_mp3_512_quality(string title)
         {
-            ParseAndVerifyQuality(title, Quality.HDTV720p, proper);
+            ParseAndVerifyQuality(title, Quality.MP3512);
         }
 
-        [TestCase("Under the Dome S01E10 Let the Games Begin 1080p", false)]
-        [TestCase("DEXTER.S07E01.ARE.YOU.1080P.HDTV.X264-QCF", false)]
-        [TestCase("DEXTER.S07E01.ARE.YOU.1080P.HDTV.x264-QCF", false)]
-        [TestCase("DEXTER.S07E01.ARE.YOU.1080P.HDTV.proper.X264-QCF", true)]
-        [TestCase("Dexter - S01E01 - Title [HDTV-1080p]", false)]
-        [TestCase("[HorribleSubs] Yowamushi Pedal - 32 [1080p]", false)]
-        public void should_parse_hdtv1080p_quality(string title, bool proper)
+        [TestCase("Kendrick Lamar - DAMN (2017) FLAC")]
+        [TestCase("Alicia Keys - Vault Playlist Vol. 1 (2017) [FLAC CD]")]
+        [TestCase("Gorillaz - Humanz (Deluxe) - lossless FLAC Tracks - 2017 - CDrip")]
+        [TestCase("David Bowie - Blackstar (2016) [FLAC]")]
+        [TestCase("The Cure - Greatest Hits (2001) FLAC Soup")]
+        [TestCase("Slowdive- Souvlaki (FLAC)")]
+        [TestCase("John Coltrane - Kulu Se Mama (1965) [EAC-FLAC]")]
+        [TestCase("The Rolling Stones - The Very Best Of '75-'94 (1995) {FLAC}")]
+        [TestCase("Migos-No_Label_II-CD-FLAC-2014-FORSAKEN")]
+        [TestCase("ADELE 25 CD FLAC 2015 PERFECT")]
+        public void should_parse_flac_quality(string title)
         {
-            ParseAndVerifyQuality(title, Quality.HDTV1080p, proper);
+            ParseAndVerifyQuality(title, Quality.FLAC);
         }
 
-        [TestCase("Arrested.Development.S04E01.720p.WEBRip.AAC2.0.x264-NFRiP", false)]
-        [TestCase("Vanguard S01E04 Mexicos Death Train 720p WEB DL", false)]
-        [TestCase("Hawaii Five 0 S02E21 720p WEB DL DD5 1 H 264", false)]
-        [TestCase("Castle S04E22 720p WEB DL DD5 1 H 264 NFHD", false)]
-        [TestCase("Chuck - S11E06 - D-Yikes! - 720p WEB-DL.mkv", false)]
-        [TestCase("Sonny.With.a.Chance.S02E15.720p.WEB-DL.DD5.1.H.264-SURFER", false)]
-        [TestCase("S07E23 - [WEBDL].mkv ", false)]
-        [TestCase("Fringe S04E22 720p WEB-DL DD5.1 H264-EbP.mkv", false)]
-        [TestCase("House.S04.720p.Web-Dl.Dd5.1.h264-P2PACK", false)]
-        [TestCase("Da.Vincis.Demons.S02E04.720p.WEB.DL.nSD.x264-NhaNc3", false)]
-        [TestCase("CSI.Miami.S04E25.720p.iTunesHD.AVC-TVS", false)]
-        [TestCase("Castle.S06E23.720p.WebHD.h264-euHD", false)]
-        [TestCase("The.Nightly.Show.2016.03.14.720p.WEB.x264-spamTV", false)]
-        [TestCase("The.Nightly.Show.2016.03.14.720p.WEB.h264-spamTV", false)]
-        public void should_parse_webdl720p_quality(string title, bool proper)
+        // Flack doesn't get match for 'FLAC' quality
+        [TestCase("Roberta Flack 2006 - The Very Best of")]
+        public void should_not_parse_flac_quality(string title)
         {
-            ParseAndVerifyQuality(title, Quality.WEBDL720p, proper);
+            ParseAndVerifyQuality(title, Quality.Unknown);
         }
 
-        [TestCase("Arrested.Development.S04E01.iNTERNAL.1080p.WEBRip.x264-QRUS", false)]
-        [TestCase("CSI NY S09E03 1080p WEB DL DD5 1 H264 NFHD", false)]
-        [TestCase("Two and a Half Men S10E03 1080p WEB DL DD5 1 H 264 NFHD", false)]
-        [TestCase("Criminal.Minds.S08E01.1080p.WEB-DL.DD5.1.H264-NFHD", false)]
-        [TestCase("Its.Always.Sunny.in.Philadelphia.S08E01.1080p.WEB-DL.proper.AAC2.0.H.264", true)]
-        [TestCase("Two and a Half Men S10E03 1080p WEB DL DD5 1 H 264 REPACK NFHD", true)]
-        [TestCase("Glee.S04E09.Swan.Song.1080p.WEB-DL.DD5.1.H.264-ECI", false)]
-        [TestCase("The.Big.Bang.Theory.S06E11.The.Santa.Simulation.1080p.WEB-DL.DD5.1.H.264", false)]
-        [TestCase("Rosemary's.Baby.S01E02.Night.2.[WEBDL-1080p].mkv", false)]
-        [TestCase("The.Nightly.Show.2016.03.14.1080p.WEB.x264-spamTV", false)]
-        [TestCase("The.Nightly.Show.2016.03.14.1080p.WEB.h264-spamTV", false)]
-        [TestCase("Psych.S01.1080p.WEB-DL.AAC2.0.AVC-TrollHD", false)]
-        [TestCase("Series Title S06E08 1080p WEB h264-EXCLUSIVE", false)]
-        [TestCase("Series Title S06E08 No One PROPER 1080p WEB DD5 1 H 264-EXCLUSIVE", true)]
-        [TestCase("Series Title S06E08 No One PROPER 1080p WEB H 264-EXCLUSIVE", true)]
-        [TestCase("The.Simpsons.S25E21.Pay.Pal.1080p.WEB-DL.DD5.1.H.264-NTb", false)]
-        public void should_parse_webdl1080p_quality(string title, bool proper)
+        [TestCase("The Chainsmokers & Coldplay - Something Just Like This")]
+        [TestCase("Frank Ocean Blonde 2016")]
+        [TestCase("A - NOW Thats What I Call Music 96 (2017) [Mp3~Kbps]")]
+        [TestCase("Queen - The Ultimate Best Of Queen(2011)[mp3]")]
+        [TestCase("Maroon 5 Ft Kendrick Lamar -Dont Wanna Know MP3 2016")]
+        public void quality_parse(string title)
         {
-            ParseAndVerifyQuality(title, Quality.WEBDL1080p, proper);
-        }
-
-        [TestCase("CASANOVA S01E01.2160P AMZN WEBRIP DD2.0 HI10P X264-TROLLUHD", false)]
-        [TestCase("JUST ADD MAGIC S01E01.2160P AMZN WEBRIP DD2.0 X264-TROLLUHD", false)]
-        [TestCase("The.Man.In.The.High.Castle.S01E01.2160p.AMZN.WEBRip.DD2.0.Hi10p.X264-TrollUHD", false)]
-        [TestCase("The Man In the High Castle S01E01 2160p AMZN WEBRip DD2.0 Hi10P x264-TrollUHD", false)]
-        [TestCase("The.Nightly.Show.2016.03.14.2160p.WEB.x264-spamTV", false)]
-        [TestCase("The.Nightly.Show.2016.03.14.2160p.WEB.h264-spamTV", false)]
-        [TestCase("The.Nightly.Show.2016.03.14.2160p.WEB.PROPER.h264-spamTV", true)]
-        public void should_parse_webdl2160p_quality(string title, bool proper)
-        {
-            ParseAndVerifyQuality(title, Quality.WEBDL2160p, proper);
-        }
-
-        [TestCase("WEEDS.S03E01-06.DUAL.Bluray.AC3.-HELLYWOOD.avi", false)]
-        [TestCase("Chuck - S01E03 - Come Fly With Me - 720p BluRay.mkv", false)]
-        [TestCase("The Big Bang Theory.S03E01.The Electric Can Opener Fluctuation.m2ts", false)]
-        [TestCase("Revolution.S01E02.Chained.Heat.[Bluray720p].mkv", false)]
-        [TestCase("[FFF] DATE A LIVE - 01 [BD][720p-AAC][0601BED4]", false)]
-        [TestCase("[coldhell] Pupa v3 [BD720p][03192D4C]", false)]
-        [TestCase("[RandomRemux] Nobunagun - 01 [720p BD][043EA407].mkv", false)]
-        [TestCase("[Kaylith] Isshuukan Friends Specials - 01 [BD 720p AAC][B7EEE164].mkv", false)]
-        [TestCase("WEEDS.S03E01-06.DUAL.Blu-ray.AC3.-HELLYWOOD.avi", false)]
-        [TestCase("WEEDS.S03E01-06.DUAL.720p.Blu-ray.AC3.-HELLYWOOD.avi", false)]
-        [TestCase("[Elysium]Lucky.Star.01(BD.720p.AAC.DA)[0BB96AD8].mkv", false)]
-        [TestCase("Battlestar.Galactica.S01E01.33.720p.HDDVD.x264-SiNNERS.mkv", false)]
-        [TestCase("The.Expanse.S01E07.RERIP.720p.BluRay.x264-DEMAND", true)]
-        public void should_parse_bluray720p_quality(string title, bool proper)
-        {
-            ParseAndVerifyQuality(title, Quality.Bluray720p, proper);
-        }
-
-        [TestCase("Chuck - S01E03 - Come Fly With Me - 1080p BluRay.mkv", false)]
-        [TestCase("Sons.Of.Anarchy.S02E13.1080p.BluRay.x264-AVCDVD", false)]
-        [TestCase("Revolution.S01E02.Chained.Heat.[Bluray1080p].mkv", false)]
-        [TestCase("[FFF] Namiuchigiwa no Muromi-san - 10 [BD][1080p-FLAC][0C4091AF]", false)]
-        [TestCase("[coldhell] Pupa v2 [BD1080p][5A45EABE].mkv", false)]
-        [TestCase("[Kaylith] Isshuukan Friends Specials - 01 [BD 1080p FLAC][429FD8C7].mkv", false)]
-        [TestCase("[Zurako] Log Horizon - 01 - The Apocalypse (BD 1080p AAC) [7AE12174].mkv", false)]
-        [TestCase("WEEDS.S03E01-06.DUAL.1080p.Blu-ray.AC3.-HELLYWOOD.avi", false)]
-        [TestCase("[Coalgirls]_Durarara!!_01_(1920x1080_Blu-ray_FLAC)_[8370CB8F].mkv", false)]
-        public void should_parse_bluray1080p_quality(string title, bool proper)
-        {
-            ParseAndVerifyQuality(title, Quality.Bluray1080p, proper);
-        }
-
-        [TestCase("POI S02E11 1080i HDTV DD5.1 MPEG2-TrollHD", false)]
-        [TestCase("How I Met Your Mother S01E18 Nothing Good Happens After 2 A.M. 720p HDTV DD5.1 MPEG2-TrollHD", false)]
-        [TestCase("The Voice S01E11 The Finals 1080i HDTV DD5.1 MPEG2-TrollHD", false)]
-        [TestCase("Californication.S07E11.1080i.HDTV.DD5.1.MPEG2-NTb.ts", false)]
-        [TestCase("Game of Thrones S04E10 1080i HDTV MPEG2 DD5.1-CtrlHD.ts", false)]
-        [TestCase("VICE.S02E05.1080i.HDTV.DD2.0.MPEG2-NTb.ts", false)]
-        [TestCase("Show - S03E01 - Episode Title Raw-HD.ts", false)]
-        [TestCase("Saturday.Night.Live.Vintage.S10E09.Eddie.Murphy.The.Honeydrippers.1080i.UPSCALE.HDTV.DD5.1.MPEG2-zebra", false)]
-        [TestCase("The.Colbert.Report.2011-08-04.1080i.HDTV.MPEG-2-CtrlHD", false)]
-        public void should_parse_raw_quality(string title, bool proper)
-        {
-            ParseAndVerifyQuality(title, Quality.RAWHD, proper);
-        }
-
-        [TestCase("Sonny.With.a.Chance.S02E15", false)]
-        [TestCase("Law & Order: Special Victims Unit - 11x11 - Quickie", false)]
-        [TestCase("Series.Title.S01E01.webm", false)]
-        [TestCase("Droned.S01E01.The.Web.MT-dd", false)]
-        public void quality_parse(string title, bool proper)
-        {
-            ParseAndVerifyQuality(title, Quality.Unknown, proper);
+            ParseAndVerifyQuality(title, Quality.Unknown);
         }
 
         [Test, TestCaseSource(nameof(SelfQualityParserCases))]
         public void parsing_our_own_quality_enum_name(Quality quality)
         {
-            var fileName = string.Format("My series S01E01 [{0}]", quality.Name);
+            var fileName = string.Format("Some album [{0}]", quality.Name);
             var result = QualityParser.ParseQuality(fileName);
             result.Quality.Should().Be(quality);
         }
 
-        [Test, TestCaseSource(nameof(OtherSourceQualityParserCases))]
-        public void should_parse_quality_from_other_source(string qualityString, Quality quality)
-        {
-            foreach (var c in new char[] { '-', '.', ' ', '_' })
-            {
-                var title = string.Format("My series S01E01 {0}", qualityString.Replace(' ', c));
-
-                ParseAndVerifyQuality(title, quality, false);
-            }
-        }
-
-        [TestCase("Saturday.Night.Live.Vintage.S10E09.Eddie.Murphy.The.Honeydrippers.1080i.UPSCALE.HDTV.DD5.1.MPEG2-zebra")]
-        [TestCase("Dexter - S01E01 - Title [HDTV-1080p]")]
-        [TestCase("[CR] Sailor Moon - 004 [480p][48CE2D0F]")]
-        [TestCase("White.Van.Man.2011.S02E01.WS.PDTV.x264-REPACK-TLA")]
+        [TestCase("Little Mix - Salute [Deluxe Edition] [2013] [M4A-256]-V3nom [GLT")]
         public void should_parse_quality_from_name(string title)
         {
             QualityParser.ParseQuality(title).QualitySource.Should().Be(QualitySource.Name);
         }
 
-        [TestCase("Revolution.S01E02.Chained.Heat.mkv")]
-        [TestCase("Dexter - S01E01 - Title.avi")]
-        [TestCase("the_x-files.9x18.sunshine_days.avi")]
-        [TestCase("[CR] Sailor Moon - 004 [48CE2D0F].avi")]
+        [TestCase("01. Kanye West - Ultralight Beam.mp3")]
+        [TestCase("01. Kanye West - Ultralight Beam.ogg")]
+        [TestCase("01. Kanye West - Ultralight Beam.m4a")]
         public void should_parse_quality_from_extension(string title)
         {
             QualityParser.ParseQuality(title).QualitySource.Should().Be(QualitySource.Extension);
         }
 
-        private void ParseAndVerifyQuality(string title, Quality quality, bool proper)
+        private void ParseAndVerifyQuality(string title, Quality quality)
         {
             var result = QualityParser.ParseQuality(title);
             result.Quality.Should().Be(quality);
-
-            var version = proper ? 2 : 1;
-            result.Revision.Version.Should().Be(version);
         }
     }
 }

src/NzbDrone.Core.Test/Profiles/ProfileRepositoryFixture.cs

@@ -1,4 +1,4 @@
-using FluentAssertions;
+using FluentAssertions;
 using NUnit.Framework;
 using NzbDrone.Core.Profiles;
 using NzbDrone.Core.Qualities;
@@ -14,8 +14,8 @@ public void should_be_able_to_read_and_write()
         {
             var profile = new Profile
                 {
-                    Items = Qualities.QualityFixture.GetDefaultQualities(Quality.Bluray1080p, Quality.DVD, Quality.HDTV720p),
-                    Cutoff = Quality.Bluray1080p,
+                    Items = Qualities.QualityFixture.GetDefaultQualities(Quality.MP3320, Quality.MP3192, Quality.MP3256),
+                    Cutoff = Quality.MP3320,
                     Name = "TestProfile"
                 };
 

src/NzbDrone.Core.Test/Qualities/QualityDefinitionServiceFixture.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Moq;
 using NUnit.Framework;
 using NzbDrone.Core.Lifecycle;
@@ -26,7 +26,7 @@ public void init_should_insert_any_missing_definitions()
                   .Setup(s => s.All())
                   .Returns(new List<QualityDefinition>
                       {
-                              new QualityDefinition(Quality.SDTV) { Weight = 1, MinSize = 0, MaxSize = 100, Id = 20 }
+                              new QualityDefinition(Quality.MP3192) { Weight = 1, MinSize = 0, MaxSize = 100, Id = 20 }
                       });
 
             Subject.Handle(new ApplicationStartedEvent());
@@ -42,7 +42,7 @@ public void init_should_update_existing_definitions()
                   .Setup(s => s.All())
                   .Returns(new List<QualityDefinition>
                       {
-                              new QualityDefinition(Quality.SDTV) { Weight = 1, MinSize = 0, MaxSize = 100, Id = 20 }
+                              new QualityDefinition(Quality.MP3192) { Weight = 1, MinSize = 0, MaxSize = 100, Id = 20 }
                       });
 
             Subject.Handle(new ApplicationStartedEvent());

src/NzbDrone.Core.Test/Qualities/QualityFixture.cs

@@ -14,37 +14,23 @@ public class QualityFixture : CoreTest
         public static object[] FromIntCases =
                 {
                         new object[] {0, Quality.Unknown},
-                        new object[] {1, Quality.SDTV},
-                        new object[] {2, Quality.DVD},
-                        new object[] {3, Quality.WEBDL1080p},
-                        new object[] {4, Quality.HDTV720p},
-                        new object[] {5, Quality.WEBDL720p},
-                        new object[] {6, Quality.Bluray720p},
-                        new object[] {7, Quality.Bluray1080p},
-                        new object[] {8, Quality.WEBDL480p},
-                        new object[] {9, Quality.HDTV1080p},
-                        new object[] {10, Quality.RAWHD},
-                        new object[] {16, Quality.HDTV2160p},
-                        new object[] {18, Quality.WEBDL2160p},
-                        new object[] {19, Quality.Bluray2160p},
+                        new object[] {1, Quality.MP3192},
+                        new object[] {2, Quality.MP3VBR},
+                        new object[] {3, Quality.MP3256},
+                        new object[] {4, Quality.MP3320},
+                        new object[] {5, Quality.MP3512},
+                        new object[] {6, Quality.FLAC},
                 };
 
         public static object[] ToIntCases =
                 {
                         new object[] {Quality.Unknown, 0},
-                        new object[] {Quality.SDTV, 1},
-                        new object[] {Quality.DVD, 2},
-                        new object[] {Quality.WEBDL1080p, 3},
-                        new object[] {Quality.HDTV720p, 4},
-                        new object[] {Quality.WEBDL720p, 5},
-                        new object[] {Quality.Bluray720p, 6},
-                        new object[] {Quality.Bluray1080p, 7},
-                        new object[] {Quality.WEBDL480p, 8},
-                        new object[] {Quality.HDTV1080p, 9},
-                        new object[] {Quality.RAWHD, 10},
-                        new object[] {Quality.HDTV2160p, 16},
-                        new object[] {Quality.WEBDL2160p, 18},
-                        new object[] {Quality.Bluray2160p, 19},
+                        new object[] {Quality.MP3192, 1},
+                        new object[] {Quality.MP3VBR, 2},
+                        new object[] {Quality.MP3256, 3},
+                        new object[] {Quality.MP3320, 4},
+                        new object[] {Quality.MP3512, 5},
+                        new object[] {Quality.FLAC, 6},
                 };
 
         [Test, TestCaseSource(nameof(FromIntCases))]
@@ -66,19 +52,12 @@ public static List<ProfileQualityItem> GetDefaultQualities(params Quality[] allo
             var qualities = new List<Quality>
             {
                 Quality.Unknown,
-                Quality.SDTV,
-                Quality.WEBDL480p,
-                Quality.DVD,
-                Quality.HDTV720p,
-                Quality.HDTV1080p,
-                Quality.HDTV2160p,
-                Quality.RAWHD,
-                Quality.WEBDL720p,
-                Quality.WEBDL1080p,
-                Quality.WEBDL2160p,
-                Quality.Bluray720p,
-                Quality.Bluray1080p,
-                Quality.Bluray2160p,
+                Quality.MP3192,
+                Quality.MP3VBR,
+                Quality.MP3256,
+                Quality.MP3320,
+                Quality.MP3512,
+                Quality.FLAC,
             };
 
             if (allowed.Length == 0)

src/NzbDrone.Core.Test/Qualities/QualityModelComparerFixture.cs

@@ -18,7 +18,7 @@ private void GivenDefaultProfile()
 
         private void GivenCustomProfile()
         {
-            Subject = new QualityModelComparer(new Profile { Items = QualityFixture.GetDefaultQualities(Quality.Bluray720p, Quality.DVD) });
+            Subject = new QualityModelComparer(new Profile { Items = QualityFixture.GetDefaultQualities(Quality.MP3320, Quality.MP3192) });
         }
 
         [Test]
@@ -26,8 +26,8 @@ public void should_be_greater_when_first_quality_is_greater_than_second()
         {
             GivenDefaultProfile();
 
-            var first = new QualityModel(Quality.Bluray1080p);
-            var second = new QualityModel(Quality.DVD);
+            var first = new QualityModel(Quality.MP3320);
+            var second = new QualityModel(Quality.MP3192);
 
             var compare = Subject.Compare(first, second);
 
@@ -39,8 +39,8 @@ public void should_be_lesser_when_second_quality_is_greater_than_first()
         {
             GivenDefaultProfile();
 
-            var first = new QualityModel(Quality.DVD);
-            var second = new QualityModel(Quality.Bluray1080p);
+            var first = new QualityModel(Quality.MP3192);
+            var second = new QualityModel(Quality.MP3320);
 
             var compare = Subject.Compare(first, second);
 
@@ -52,8 +52,8 @@ public void should_be_greater_when_first_quality_is_a_proper_for_the_same_qualit
         {
             GivenDefaultProfile();
 
-            var first = new QualityModel(Quality.Bluray1080p, new Revision(version: 2));
-            var second = new QualityModel(Quality.Bluray1080p, new Revision(version: 1));
+            var first = new QualityModel(Quality.MP3320, new Revision(version: 2));
+            var second = new QualityModel(Quality.MP3320, new Revision(version: 1));
 
             var compare = Subject.Compare(first, second);
 
@@ -65,8 +65,8 @@ public void should_be_greater_when_using_a_custom_profile()
         {
             GivenCustomProfile();
 
-            var first = new QualityModel(Quality.DVD);
-            var second = new QualityModel(Quality.Bluray720p);
+            var first = new QualityModel(Quality.MP3192);
+            var second = new QualityModel(Quality.MP3320);
 
             var compare = Subject.Compare(first, second);
 

src/NzbDrone.Core.Test/SeriesStatsTests/SeriesStatisticsFixture.cs

@@ -36,7 +36,7 @@ public void Setup()
 
             _episodeFile = Builder<EpisodeFile>.CreateNew()
                                            .With(e => e.SeriesId = _series.Id)
-                                           .With(e => e.Quality = new QualityModel(Quality.HDTV720p))
+                                           .With(e => e.Quality = new QualityModel(Quality.MP3256))
                                            .BuildNew();
 
         }

src/NzbDrone.Core.Test/TvTests/EpisodeRepositoryTests/EpisodesWhereCutoffUnmetFixture.cs

@@ -28,12 +28,12 @@ public void Setup()
             var profile = new Profile 
             {  
                 Id = 1,
-                Cutoff = Quality.WEBDL480p,
+                Cutoff = Quality.MP3256,
                 Items = new List<ProfileQualityItem> 
                 { 
-                    new ProfileQualityItem { Allowed = true, Quality = Quality.SDTV },
-                    new ProfileQualityItem { Allowed = true, Quality = Quality.WEBDL480p },
-                    new ProfileQualityItem { Allowed = true, Quality = Quality.RAWHD }
+                    new ProfileQualityItem { Allowed = true, Quality = Quality.MP3192 },
+                    new ProfileQualityItem { Allowed = true, Quality = Quality.MP3256 },
+                    new ProfileQualityItem { Allowed = true, Quality = Quality.FLAC }
                 }
             };
 
@@ -66,12 +66,12 @@ public void Setup()
 
             _qualitiesBelowCutoff = new List<QualitiesBelowCutoff>
                                     {
-                                        new QualitiesBelowCutoff(profile.Id, new[] {Quality.SDTV.Id})
+                                        new QualitiesBelowCutoff(profile.Id, new[] {Quality.MP3192.Id})
                                     };
 
-            var qualityMet = new EpisodeFile { RelativePath = "a", Quality = new QualityModel { Quality = Quality.WEBDL480p } };
-            var qualityUnmet = new EpisodeFile { RelativePath = "b", Quality = new QualityModel { Quality = Quality.SDTV } };
-            var qualityRawHD = new EpisodeFile { RelativePath = "c", Quality = new QualityModel { Quality = Quality.RAWHD } };
+            var qualityMet = new EpisodeFile { RelativePath = "a", Quality = new QualityModel { Quality = Quality.MP3256 } };
+            var qualityUnmet = new EpisodeFile { RelativePath = "b", Quality = new QualityModel { Quality = Quality.MP3192 } };
+            var qualityRawHD = new EpisodeFile { RelativePath = "c", Quality = new QualityModel { Quality = Quality.FLAC } };
 
             MediaFileRepository fileRepository = Mocker.Resolve<MediaFileRepository>();
 
@@ -142,7 +142,7 @@ public void should_include_episodes_where_cutoff_has_not_be_met()
             var spec = Subject.EpisodesWhereCutoffUnmet(_pagingSpec, _qualitiesBelowCutoff, false);
 
             spec.Records.Should().HaveCount(1);
-            spec.Records.Should().OnlyContain(e => e.EpisodeFile.Value.Quality.Quality == Quality.SDTV);
+            spec.Records.Should().OnlyContain(e => e.EpisodeFile.Value.Quality.Quality == Quality.MP3192);
         }
 
         [Test]

src/NzbDrone.Core.Test/TvTests/SeriesRepositoryTests/SeriesRepositoryFixture.cs

@@ -1,4 +1,4 @@
-using FizzWare.NBuilder;
+using FizzWare.NBuilder;
 using FluentAssertions;
 using NUnit.Framework;
 using NzbDrone.Core.Profiles;
@@ -17,9 +17,9 @@ public void should_lazyload_quality_profile()
         {
             var profile = new Profile
                 {
-                    Items = Qualities.QualityFixture.GetDefaultQualities(Quality.Bluray1080p, Quality.DVD, Quality.HDTV720p),
+                    Items = Qualities.QualityFixture.GetDefaultQualities(Quality.MP3320, Quality.MP3256, Quality.MP3192),
 
-                    Cutoff = Quality.Bluray1080p,
+                    Cutoff = Quality.MP3320,
                     Name = "TestProfile"
                 };
 

src/NzbDrone.Core.Test/packages.config

@@ -6,11 +6,13 @@
   <package id="FluentMigrator" version="1.6.2" targetFramework="net40" />
   <package id="FluentMigrator.Runner" version="1.6.2" targetFramework="net40" />
   <package id="FluentValidation" version="6.2.1.0" targetFramework="net40" />
-  <package id="Moq" version="4.0.10827" />
+  <package id="Microsoft.TestPlatform.TestHost" version="15.0.0" targetFramework="net461" requireReinstallation="true" />
+  <package id="Moq" version="4.0.10827" requireReinstallation="true" />
   <package id="NBuilder" version="4.0.0" targetFramework="net40" />
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net40" />
   <package id="NLog" version="4.4.3" targetFramework="net40" />
   <package id="NUnit" version="3.6.0" targetFramework="net40" />
+  <package id="NUnit3TestAdapter" version="3.7.0" targetFramework="net40" />
   <package id="Prowlin" version="0.9.4456.26422" targetFramework="net40" />
   <package id="Unity" version="2.1.505.2" targetFramework="net40" />
 </packages>

src/NzbDrone.Core/Datastore/Migration/111_setup_music.cs

@@ -13,7 +13,7 @@ public class setup_music : NzbDroneMigrationBase
         protected override void MainDbUpgrade()
         {
             Create.TableForModel("Artist")
-                .WithColumn("ItunesId").AsInt32().Unique()
+                .WithColumn("SpotifyId").AsString().Nullable().Unique()
                 .WithColumn("ArtistName").AsString().Unique()
                 .WithColumn("ArtistSlug").AsString().Nullable() //.Unique()
                 .WithColumn("CleanTitle").AsString().Nullable() // Do we need this?
@@ -37,8 +37,8 @@ protected override void MainDbUpgrade()
                 ;
 
             Create.TableForModel("Albums")
-                .WithColumn("AlbumId").AsInt32()
-                .WithColumn("ArtistId").AsInt32()
+                .WithColumn("AlbumId").AsString().Unique()
+                .WithColumn("ArtistId").AsInt32() // Should this be artistId (string)
                 .WithColumn("Title").AsString()
                 .WithColumn("Year").AsInt32()
                 .WithColumn("Image").AsInt32()
@@ -48,15 +48,16 @@ protected override void MainDbUpgrade()
                 .WithColumn("Overview").AsString();
 
             Create.TableForModel("Tracks")
-                .WithColumn("ItunesTrackId").AsInt32().Unique()
-                .WithColumn("AlbumId").AsInt32()
-                .WithColumn("ArtistsId").AsString().Nullable()
+                .WithColumn("SpotifyTrackId").AsString().Nullable() // This shouldn't be nullable, but TrackRepository won't behave. Someone please fix this.
+                .WithColumn("AlbumId").AsString()
+                .WithColumn("ArtistId").AsString() // This may be a list of Ids in future for compilations
+                .WithColumn("ArtistSpotifyId").AsString()
+                .WithColumn("Compilation").AsBoolean()
                 .WithColumn("TrackNumber").AsInt32()
                 .WithColumn("Title").AsString().Nullable()
                 .WithColumn("Ignored").AsBoolean().Nullable()
                 .WithColumn("Explict").AsBoolean()
-                .WithColumn("TrackExplicitName").AsString().Nullable()
-                .WithColumn("TrackCensoredName").AsString().Nullable()
+                .WithColumn("Monitored").AsBoolean()
                 .WithColumn("TrackFileId").AsInt32().Nullable()
                 .WithColumn("ReleaseDate").AsDateTime().Nullable();
 

src/NzbDrone.Core/Datastore/TableMapping.cs

@@ -102,7 +102,7 @@ public static void Map()
                   .Relationships.AutoMapICollectionOrComplexProperties()
                   .For("Tracks")
                   .LazyLoad(condition: parent => parent.Id > 0,
-                            query: (db, parent) => db.Query<Track>().Where(c => c.ItunesTrackId == parent.Id).ToList())
+                            query: (db, parent) => db.Query<Track>().Where(c => c.ArtistId == parent.Id).ToList()) // TODO: Figure what the hell to do here
                   .HasOne(file => file.Artist, file => file.AlbumId); 
 
             Mapper.Entity<Track>().RegisterModel("Tracks")
@@ -110,6 +110,7 @@ public static void Map()
                   .Ignore(e => e.Album)
                   .Ignore(e => e.HasFile)
                   .Relationship()
+                  // TODO: Need to implement ArtistId to Artist.Id here
                   .HasOne(track => track.TrackFile, track => track.TrackFileId); // TODO: Check lazy load for artists
 
             Mapper.Entity<QualityDefinition>().RegisterModel("QualityDefinitions")

src/NzbDrone.Core/Download/Clients/Deluge/DelugeSettings.cs

@@ -25,7 +25,7 @@ public DelugeSettings()
             Host = "localhost";
             Port = 8112;
             Password = "deluge";
-            TvCategory = "tv-Lidarr";
+            TvCategory = "lidarr";
         }
 
         [FieldDefinition(0, Label = "Host", Type = FieldType.Textbox)]
@@ -43,10 +43,10 @@ public DelugeSettings()
         [FieldDefinition(4, Label = "Category", Type = FieldType.Textbox, HelpText = "Adding a category specific to Lidarr avoids conflicts with unrelated downloads, but it's optional")]
         public string TvCategory { get; set; }
 
-        [FieldDefinition(5, Label = "Recent Priority", Type = FieldType.Select, SelectOptions = typeof(DelugePriority), HelpText = "Priority to use when grabbing episodes that aired within the last 14 days")]
+        [FieldDefinition(5, Label = "Recent Priority", Type = FieldType.Select, SelectOptions = typeof(DelugePriority), HelpText = "Priority to use when grabbing albums released within the last 14 days")]
         public int RecentTvPriority { get; set; }
 
-        [FieldDefinition(6, Label = "Older Priority", Type = FieldType.Select, SelectOptions = typeof(DelugePriority), HelpText = "Priority to use when grabbing episodes that aired over 14 days ago")]
+        [FieldDefinition(6, Label = "Older Priority", Type = FieldType.Select, SelectOptions = typeof(DelugePriority), HelpText = "Priority to use when grabbing albums released over 14 days ago")]
         public int OlderTvPriority { get; set; }
 
         [FieldDefinition(7, Label = "Use SSL", Type = FieldType.Checkbox)]

src/NzbDrone.Core/Download/Clients/NzbVortex/NzbVortexSettings.cs

@@ -29,7 +29,7 @@ public NzbVortexSettings()
         {
             Host = "localhost";
             Port = 4321;
-            TvCategory = "TV Shows";
+            TvCategory = "Music";
             RecentTvPriority = (int)NzbVortexPriority.Normal;
             OlderTvPriority = (int)NzbVortexPriority.Normal;
         }
@@ -46,10 +46,10 @@ public NzbVortexSettings()
         [FieldDefinition(3, Label = "Group", Type = FieldType.Textbox, HelpText = "Adding a category specific to Lidarr avoids conflicts with unrelated downloads, but it's optional")]
         public string TvCategory { get; set; }
 
-        [FieldDefinition(4, Label = "Recent Priority", Type = FieldType.Select, SelectOptions = typeof(NzbVortexPriority), HelpText = "Priority to use when grabbing episodes that aired within the last 14 days")]
+        [FieldDefinition(4, Label = "Recent Priority", Type = FieldType.Select, SelectOptions = typeof(NzbVortexPriority), HelpText = "Priority to use when grabbing albums released within the last 14 days")]
         public int RecentTvPriority { get; set; }
 
-        [FieldDefinition(5, Label = "Older Priority", Type = FieldType.Select, SelectOptions = typeof(NzbVortexPriority), HelpText = "Priority to use when grabbing episodes that aired over 14 days ago")]
+        [FieldDefinition(5, Label = "Older Priority", Type = FieldType.Select, SelectOptions = typeof(NzbVortexPriority), HelpText = "Priority to use when grabbing albums released over 14 days ago")]
         public int OlderTvPriority { get; set; }
 
         public NzbDroneValidationResult Validate()

src/NzbDrone.Core/Download/Clients/Nzbget/NzbgetSettings.cs

@@ -26,7 +26,9 @@ public NzbgetSettings()
         {
             Host = "localhost";
             Port = 6789;
-            TvCategory = "tv";
+            TvCategory = "Music";
+            Username = "nzbget";
+            Password = "tegbzn6789";
             RecentTvPriority = (int)NzbgetPriority.Normal;
             OlderTvPriority = (int)NzbgetPriority.Normal;
         }
@@ -46,10 +48,10 @@ public NzbgetSettings()
         [FieldDefinition(4, Label = "Category", Type = FieldType.Textbox, HelpText = "Adding a category specific to Lidarr avoids conflicts with unrelated downloads, but it's optional")]
         public string TvCategory { get; set; }
 
-        [FieldDefinition(5, Label = "Recent Priority", Type = FieldType.Select, SelectOptions = typeof(NzbgetPriority), HelpText = "Priority to use when grabbing episodes that aired within the last 14 days")]
+        [FieldDefinition(5, Label = "Recent Priority", Type = FieldType.Select, SelectOptions = typeof(NzbgetPriority), HelpText = "Priority to use when grabbing albums released within the last 14 days")]
         public int RecentTvPriority { get; set; }
 
-        [FieldDefinition(6, Label = "Older Priority", Type = FieldType.Select, SelectOptions = typeof(NzbgetPriority), HelpText = "Priority to use when grabbing episodes that aired over 14 days ago")]
+        [FieldDefinition(6, Label = "Older Priority", Type = FieldType.Select, SelectOptions = typeof(NzbgetPriority), HelpText = "Priority to use when grabbing albums released over 14 days ago")]
         public int OlderTvPriority { get; set; }
 
         [FieldDefinition(7, Label = "Use SSL", Type = FieldType.Checkbox)]

src/NzbDrone.Core/Download/Clients/QBittorrent/QBittorrentSettings.cs

@@ -22,7 +22,7 @@ public QBittorrentSettings()
         {
             Host = "localhost";
             Port = 9091;
-            TvCategory = "tv-Lidarr";
+            TvCategory = "lidarr";
         }
 
         [FieldDefinition(0, Label = "Host", Type = FieldType.Textbox)]
@@ -40,10 +40,10 @@ public QBittorrentSettings()
         [FieldDefinition(4, Label = "Category", Type = FieldType.Textbox, HelpText = "Adding a category specific to Lidarr avoids conflicts with unrelated downloads, but it's optional")]
         public string TvCategory { get; set; }
 
-        [FieldDefinition(5, Label = "Recent Priority", Type = FieldType.Select, SelectOptions = typeof(QBittorrentPriority), HelpText = "Priority to use when grabbing episodes that aired within the last 14 days")]
+        [FieldDefinition(5, Label = "Recent Priority", Type = FieldType.Select, SelectOptions = typeof(QBittorrentPriority), HelpText = "Priority to use when grabbing albums released within the last 14 days")]
         public int RecentTvPriority { get; set; }
 
-        [FieldDefinition(6, Label = "Older Priority", Type = FieldType.Select, SelectOptions = typeof(QBittorrentPriority), HelpText = "Priority to use when grabbing episodes that aired over 14 days ago")]
+        [FieldDefinition(6, Label = "Older Priority", Type = FieldType.Select, SelectOptions = typeof(QBittorrentPriority), HelpText = "Priority to use when grabbing albums released over 14 days ago")]
         public int OlderTvPriority { get; set; }
 
         [FieldDefinition(7, Label = "Use SSL", Type = FieldType.Checkbox, HelpText = "Use a secure connection. See Options -> Web UI -> 'Use HTTPS instead of HTTP' in qBittorrent.")]

src/NzbDrone.Core/Download/Clients/Sabnzbd/SabnzbdSettings.cs

@@ -38,7 +38,7 @@ public SabnzbdSettings()
         {
             Host = "localhost";
             Port = 8080;
-            TvCategory = "tv";
+            TvCategory = "music";
             RecentTvPriority = (int)SabnzbdPriority.Default;
             OlderTvPriority = (int)SabnzbdPriority.Default;
         }
@@ -61,10 +61,10 @@ public SabnzbdSettings()
         [FieldDefinition(5, Label = "Category", Type = FieldType.Textbox, HelpText = "Adding a category specific to Lidarr avoids conflicts with unrelated downloads, but it's optional")]
         public string TvCategory { get; set; }
 
-        [FieldDefinition(6, Label = "Recent Priority", Type = FieldType.Select, SelectOptions = typeof(SabnzbdPriority), HelpText = "Priority to use when grabbing episodes that aired within the last 14 days")]
+        [FieldDefinition(6, Label = "Recent Priority", Type = FieldType.Select, SelectOptions = typeof(SabnzbdPriority), HelpText = "Priority to use when grabbing albums released within the last 14 days")]
         public int RecentTvPriority { get; set; }
 
-        [FieldDefinition(7, Label = "Older Priority", Type = FieldType.Select, SelectOptions = typeof(SabnzbdPriority), HelpText = "Priority to use when grabbing episodes that aired over 14 days ago")]
+        [FieldDefinition(7, Label = "Older Priority", Type = FieldType.Select, SelectOptions = typeof(SabnzbdPriority), HelpText = "Priority to use when grabbing albums released over 14 days ago")]
         public int OlderTvPriority { get; set; }
 
         [FieldDefinition(8, Label = "Use SSL", Type = FieldType.Checkbox)]

src/NzbDrone.Core/Download/Clients/Transmission/TransmissionSettings.cs

@@ -56,10 +56,10 @@ public TransmissionSettings()
         [FieldDefinition(6, Label = "Directory", Type = FieldType.Textbox, Advanced = true, HelpText = "Optional location to put downloads in, leave blank to use the default Transmission location")]
         public string TvDirectory { get; set; }
 
-        [FieldDefinition(7, Label = "Recent Priority", Type = FieldType.Select, SelectOptions = typeof(TransmissionPriority), HelpText = "Priority to use when grabbing episodes that aired within the last 14 days")]
+        [FieldDefinition(7, Label = "Recent Priority", Type = FieldType.Select, SelectOptions = typeof(TransmissionPriority), HelpText = "Priority to use when grabbing albums released within the last 14 days")]
         public int RecentTvPriority { get; set; }
 
-        [FieldDefinition(8, Label = "Older Priority", Type = FieldType.Select, SelectOptions = typeof(TransmissionPriority), HelpText = "Priority to use when grabbing episodes that aired over 14 days ago")]
+        [FieldDefinition(8, Label = "Older Priority", Type = FieldType.Select, SelectOptions = typeof(TransmissionPriority), HelpText = "Priority to use when grabbing albums released over 14 days ago")]
         public int OlderTvPriority { get; set; }
 
         [FieldDefinition(9, Label = "Use SSL", Type = FieldType.Checkbox)]

src/NzbDrone.Core/Download/Clients/rTorrent/RTorrentSettings.cs

@@ -26,7 +26,7 @@ public RTorrentSettings()
             Host = "localhost";
             Port = 8080;
             UrlBase = "RPC2";
-            TvCategory = "tv-Lidarr";
+            TvCategory = "lidarr";
             OlderTvPriority = (int)RTorrentPriority.Normal;
             RecentTvPriority = (int)RTorrentPriority.Normal;
         }
@@ -55,10 +55,10 @@ public RTorrentSettings()
         [FieldDefinition(7, Label = "Directory", Type = FieldType.Textbox, Advanced = true, HelpText = "Optional location to put downloads in, leave blank to use the default rTorrent location")]
         public string TvDirectory { get; set; }
 
-        [FieldDefinition(8, Label = "Recent Priority", Type = FieldType.Select, SelectOptions = typeof(RTorrentPriority), HelpText = "Priority to use when grabbing episodes that aired within the last 14 days")]
+        [FieldDefinition(8, Label = "Recent Priority", Type = FieldType.Select, SelectOptions = typeof(RTorrentPriority), HelpText = "Priority to use when grabbing albums released within the last 14 days")]
         public int RecentTvPriority { get; set; }
 
-        [FieldDefinition(9, Label = "Older Priority", Type = FieldType.Select, SelectOptions = typeof(RTorrentPriority), HelpText = "Priority to use when grabbing episodes that aired over 14 days ago")]
+        [FieldDefinition(9, Label = "Older Priority", Type = FieldType.Select, SelectOptions = typeof(RTorrentPriority), HelpText = "Priority to use when grabbing albums released over 14 days ago")]
         public int OlderTvPriority { get; set; }
 
         public NzbDroneValidationResult Validate()

src/NzbDrone.Core/Download/Clients/uTorrent/UTorrentSettings.cs

@@ -23,7 +23,7 @@ public UTorrentSettings()
         {
             Host = "localhost";
             Port = 9091;
-            TvCategory = "tv-Lidarr";
+            TvCategory = "lidarr";
         }
 
         [FieldDefinition(0, Label = "Host", Type = FieldType.Textbox)]
@@ -41,10 +41,10 @@ public UTorrentSettings()
         [FieldDefinition(4, Label = "Category", Type = FieldType.Textbox, HelpText = "Adding a category specific to Lidarr avoids conflicts with unrelated downloads, but it's optional")]
         public string TvCategory { get; set; }
 
-        [FieldDefinition(5, Label = "Recent Priority", Type = FieldType.Select, SelectOptions = typeof(UTorrentPriority), HelpText = "Priority to use when grabbing episodes that aired within the last 14 days")]
+        [FieldDefinition(5, Label = "Recent Priority", Type = FieldType.Select, SelectOptions = typeof(UTorrentPriority), HelpText = "Priority to use when grabbing albums released within the last 14 days")]
         public int RecentTvPriority { get; set; }
 
-        [FieldDefinition(6, Label = "Older Priority", Type = FieldType.Select, SelectOptions = typeof(UTorrentPriority), HelpText = "Priority to use when grabbing episodes that aired over 14 days ago")]
+        [FieldDefinition(6, Label = "Older Priority", Type = FieldType.Select, SelectOptions = typeof(UTorrentPriority), HelpText = "Priority to use when grabbing albums released over 14 days ago")]
         public int OlderTvPriority { get; set; }
 
         public NzbDroneValidationResult Validate()

src/NzbDrone.Core/Download/TorrentClientBase.cs

@@ -154,7 +154,7 @@ private string DownloadFromWebUrl(RemoteEpisode remoteEpisode, string torrentUrl
 
                 torrentFile = response.ResponseData;
 
-                _logger.Debug("Downloading torrent for episode '{0}' finished ({1} bytes from {2})", remoteEpisode.Release.Title, torrentFile.Length, torrentUrl);
+                _logger.Debug("Downloading torrent for release '{0}' finished ({1} bytes from {2})", remoteEpisode.Release.Title, torrentFile.Length, torrentUrl);
             }
             catch (HttpException ex)
             {
@@ -164,14 +164,14 @@ private string DownloadFromWebUrl(RemoteEpisode remoteEpisode, string torrentUrl
                 }
                 else
                 {
-                    _logger.Error(ex, "Downloading torrent file for episode '{0}' failed ({1})", remoteEpisode.Release.Title, torrentUrl);
+                    _logger.Error(ex, "Downloading torrent file for release '{0}' failed ({1})", remoteEpisode.Release.Title, torrentUrl);
                 }
 
                 throw new ReleaseDownloadException(remoteEpisode.Release, "Downloading torrent failed", ex);
             }
             catch (WebException ex)
             {
-                _logger.Error(ex, "Downloading torrent file for episode '{0}' failed ({1})", remoteEpisode.Release.Title, torrentUrl);
+                _logger.Error(ex, "Downloading torrent file for release '{0}' failed ({1})", remoteEpisode.Release.Title, torrentUrl);
 
                 throw new ReleaseDownloadException(remoteEpisode.Release, "Downloading torrent failed", ex);
             }
@@ -201,7 +201,7 @@ private string DownloadFromMagnetUrl(RemoteEpisode remoteEpisode, string magnetU
             }
             catch (FormatException ex)
             {
-                _logger.Error(ex, "Failed to parse magnetlink for episode '{0}': '{1}'", remoteEpisode.Release.Title, magnetUrl);
+                _logger.Error(ex, "Failed to parse magnetlink for release '{0}': '{1}'", remoteEpisode.Release.Title, magnetUrl);
 
                 return null;
             }

src/NzbDrone.Core/Download/UsenetClientBase.cs

@@ -42,7 +42,7 @@ public override string Download(RemoteEpisode remoteEpisode)
             {
                 nzbData = _httpClient.Get(new HttpRequest(url)).ResponseData;
 
-                _logger.Debug("Downloaded nzb for episode '{0}' finished ({1} bytes from {2})", remoteEpisode.Release.Title, nzbData.Length, url);
+                _logger.Debug("Downloaded nzb for release '{0}' finished ({1} bytes from {2})", remoteEpisode.Release.Title, nzbData.Length, url);
             }
             catch (HttpException ex)
             {
@@ -52,14 +52,14 @@ public override string Download(RemoteEpisode remoteEpisode)
                 }
                 else
                 {
-                    _logger.Error(ex, "Downloading nzb for episode '{0}' failed ({1})", remoteEpisode.Release.Title, url);
+                    _logger.Error(ex, "Downloading nzb for release '{0}' failed ({1})", remoteEpisode.Release.Title, url);
                 }
 
                 throw new ReleaseDownloadException(remoteEpisode.Release, "Downloading nzb failed", ex);
             }
             catch (WebException ex)
             {
-                _logger.Error(ex, "Downloading nzb for episode '{0}' failed ({1})", remoteEpisode.Release.Title, url);
+                _logger.Error(ex, "Downloading nzb for release '{0}' failed ({1})", remoteEpisode.Release.Title, url);
 
                 throw new ReleaseDownloadException(remoteEpisode.Release, "Downloading nzb failed", ex);
             }

src/NzbDrone.Core/Exceptions/ArtistNotFoundException.cs

@@ -8,24 +8,24 @@ namespace NzbDrone.Core.Exceptions
 {
     public class ArtistNotFoundException : NzbDroneException
     {
-        public int ItunesId { get; set; }
+        public string SpotifyId { get; set; }
 
-        public ArtistNotFoundException(int itunesId)
-            : base(string.Format("Series with iTunesId {0} was not found, it may have been removed from iTunes.", itunesId))
+        public ArtistNotFoundException(string spotifyId)
+            : base(string.Format("Artist with SpotifyId {0} was not found, it may have been removed from Spotify.", spotifyId))
         {
-            ItunesId = itunesId;
+            SpotifyId = spotifyId;
         }
 
-        public ArtistNotFoundException(int itunesId, string message, params object[] args)
+        public ArtistNotFoundException(string spotifyId, string message, params object[] args)
             : base(message, args)
         {
-            ItunesId = itunesId;
+            SpotifyId = spotifyId;
         }
 
-        public ArtistNotFoundException(int itunesId, string message)
+        public ArtistNotFoundException(string spotifyId, string message)
             : base(message)
         {
-            ItunesId = itunesId;
+            SpotifyId = spotifyId;
         }
     }
 }

src/NzbDrone.Core/Indexers/Newznab/Newznab.cs

@@ -43,10 +43,10 @@ public override IEnumerable<ProviderDefinition> DefaultDefinitions
                 yield return GetDefinition("DrunkenSlug", GetSettings("https://api.drunkenslug.com"));
                 yield return GetDefinition("Nzb.su", GetSettings("https://api.nzb.su"));
                 yield return GetDefinition("NZBCat", GetSettings("https://nzb.cat"));
-                yield return GetDefinition("NZBFinder.ws", GetSettings("https://nzbfinder.ws", 5010, 5030, 5040, 5045));
+                yield return GetDefinition("NZBFinder.ws", GetSettings("https://nzbfinder.ws"));
                 yield return GetDefinition("NZBgeek", GetSettings("https://api.nzbgeek.info"));
                 yield return GetDefinition("nzbplanet.net", GetSettings("https://api.nzbplanet.net"));
-                yield return GetDefinition("Nzbs.org", GetSettings("http://nzbs.org", 5000));
+                yield return GetDefinition("Nzbs.org", GetSettings("http://nzbs.org"));
                 yield return GetDefinition("omgwtfnzbs", GetSettings("https://api.omgwtfnzbs.me"));
                 yield return GetDefinition("OZnzb.com", GetSettings("https://api.oznzb.com"));
                 yield return GetDefinition("PFmonkey", GetSettings("https://www.pfmonkey.com"));

src/NzbDrone.Core/Indexers/Newznab/NewznabSettings.cs

@@ -60,7 +60,7 @@ public class NewznabSettings : IProviderConfig
 
         public NewznabSettings()
         {
-            Categories = new[] { 5030, 5040 };
+            Categories = new[] { 3000, 3010, 3020, 3030, 3040 };
             AnimeCategories = Enumerable.Empty<int>();
         }
 

src/NzbDrone.Core/Jobs/TaskManager.cs

@@ -16,6 +16,7 @@
 using NzbDrone.Core.Messaging.Events;
 using NzbDrone.Core.Tv.Commands;
 using NzbDrone.Core.Update.Commands;
+using NzbDrone.Core.Music.Commands;
 
 namespace NzbDrone.Core.Jobs
 {
@@ -64,9 +65,10 @@ public void Handle(ApplicationStartedEvent message)
                     new ScheduledTask{ Interval = 1, TypeName = typeof(CheckForFinishedDownloadCommand).FullName},
                     new ScheduledTask{ Interval = 5, TypeName = typeof(MessagingCleanupCommand).FullName},
                     new ScheduledTask{ Interval = 6*60, TypeName = typeof(ApplicationUpdateCommand).FullName},
-                    new ScheduledTask{ Interval = 3*60, TypeName = typeof(UpdateSceneMappingCommand).FullName},
+                    //new ScheduledTask{ Interval = 3*60, TypeName = typeof(UpdateSceneMappingCommand).FullName},
                     new ScheduledTask{ Interval = 6*60, TypeName = typeof(CheckHealthCommand).FullName},
-                    new ScheduledTask{ Interval = 12*60, TypeName = typeof(RefreshSeriesCommand).FullName},
+                    new ScheduledTask{ Interval = 12*60, TypeName = typeof(RefreshArtistCommand).FullName},
+                    //new ScheduledTask{ Interval = 12*60, TypeName = typeof(RefreshSeriesCommand).FullName}, // TODO: Remove
                     new ScheduledTask{ Interval = 24*60, TypeName = typeof(HousekeepingCommand).FullName},
                     new ScheduledTask{ Interval = 7*24*60, TypeName = typeof(BackupCommand).FullName},
 

src/NzbDrone.Core/MediaFiles/EpisodeImport/DetectSample.cs

@@ -18,7 +18,7 @@ public class DetectSample : IDetectSample
         private readonly IVideoFileInfoReader _videoFileInfoReader;
         private readonly Logger _logger;
 
-        private static List<Quality> _largeSampleSizeQualities = new List<Quality> { Quality.HDTV1080p, Quality.WEBDL1080p, Quality.Bluray1080p };
+        private static List<Quality> _largeSampleSizeQualities = new List<Quality> { Quality.FLAC };
 
         public DetectSample(IVideoFileInfoReader videoFileInfoReader, Logger logger)
         {

src/NzbDrone.Core/MediaFiles/Events/TrackFileAddedEvent.cs

@@ -0,0 +1,18 @@
+using NzbDrone.Common.Messaging;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace NzbDrone.Core.MediaFiles.Events
+{
+    public class TrackFileAddedEvent : IEvent
+    {
+        public TrackFile TrackFile { get; private set; }
+
+        public TrackFileAddedEvent(TrackFile trackFile)
+        {
+            TrackFile = trackFile;
+        }
+    }
+}

src/NzbDrone.Core/MediaFiles/MediaFileExtensions.cs

@@ -12,62 +12,10 @@ static MediaFileExtensions()
         {
             _fileExtensions = new Dictionary<string, Quality>
             {
-                //Unknown
-                // { ".webm", Quality.Unknown },
                 { ".mp3", Quality.Unknown },
-                //SDTV
-                //{ ".m4v", Quality.SDTV },
-                //{ ".3gp", Quality.SDTV },
-                //{ ".nsv", Quality.SDTV },
-                //{ ".ty", Quality.SDTV },
-                //{ ".strm", Quality.SDTV },
-                //{ ".rm", Quality.SDTV },
-                //{ ".rmvb", Quality.SDTV },
-                //{ ".m3u", Quality.SDTV },
-                //{ ".ifo", Quality.SDTV },
-                //{ ".mov", Quality.SDTV },
-                //{ ".qt", Quality.SDTV },
-                //{ ".divx", Quality.SDTV },
-                //{ ".xvid", Quality.SDTV },
-                //{ ".bivx", Quality.SDTV },
-                //{ ".nrg", Quality.SDTV },
-                //{ ".pva", Quality.SDTV },
-                //{ ".wmv", Quality.SDTV },
-                //{ ".asf", Quality.SDTV },
-                //{ ".asx", Quality.SDTV },
-                //{ ".ogm", Quality.SDTV },
-                //{ ".ogv", Quality.SDTV },
-                //{ ".m2v", Quality.SDTV },
-                //{ ".avi", Quality.SDTV },
-                //{ ".bin", Quality.SDTV },
-                //{ ".dat", Quality.SDTV },
-                //{ ".dvr-ms", Quality.SDTV },
-                //{ ".mpg", Quality.SDTV },
-                //{ ".mpeg", Quality.SDTV },
-                //{ ".mp4", Quality.SDTV },
-                //{ ".avc", Quality.SDTV },
-                //{ ".vp3", Quality.SDTV },
-                //{ ".svq3", Quality.SDTV },
-                //{ ".nuv", Quality.SDTV },
-                //{ ".viv", Quality.SDTV },
-                //{ ".dv", Quality.SDTV },
-                //{ ".fli", Quality.SDTV },
-                //{ ".flv", Quality.SDTV },
-                //{ ".wpl", Quality.SDTV },
-                { ".m4a", Quality.DVD },
-                //DVD
-                //{ ".img", Quality.DVD },
-                //{ ".iso", Quality.DVD },
-                //{ ".vob", Quality.DVD },
-
-                //HD
-                //{ ".mkv", Quality.HDTV720p },
-                //{ ".ts", Quality.HDTV720p },
-                //{ ".wtv", Quality.HDTV720p },
-
-                //Bluray
-                //{ ".m2ts", Quality.Bluray720p }
-                { ".flac", Quality.RAWHD },
+                { ".m4a", Quality.Unknown },
+                { ".ogg", Quality.Unknown },
+                { ".flac", Quality.FLAC },
             };
         }
 

src/NzbDrone.Core/MetadataSource/IProvideArtistInfo.cs

@@ -6,6 +6,6 @@ namespace NzbDrone.Core.MetadataSource.SkyHook
 {
     public interface IProvideArtistInfo
     {
-        Tuple<Artist, List<Track>> GetArtistInfo(int itunesId);
+        Tuple<Artist, List<Track>> GetArtistInfo(string spotifyId);
     }
 }

src/NzbDrone.Core/MetadataSource/SkyHook/Resource/AlbumInfoResource.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace NzbDrone.Core.MetadataSource.SkyHook.Resource
+{
+    public class AlbumInfoResource
+    {
+        public AlbumInfoResource()
+        {
+
+        }
+        public string AlbumType { get; set; } // Might need to make this a separate class
+        public List<ArtistInfoResource> Artists { get; set; } // Will always be length of 1 unless a compilation
+        public string Url { get; set; } // Link to the endpoint api to give full info for this object
+        public string Id { get; set; } // This is a unique Album ID. Needed for all future API calls
+        public List<ImageResource> Images { get; set; }
+        public string Name { get; set; } // In case of a takedown, this may be empty
+    }
+
+    
+}

src/NzbDrone.Core/MetadataSource/SkyHook/Resource/ArtistInfoResource.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace NzbDrone.Core.MetadataSource.SkyHook.Resource
+{
+    public class ArtistInfoResource
+    {
+        public ArtistInfoResource() { }
+
+        public List<string> Genres { get; set; }
+        public string AristUrl { get; set; }
+        public string Id { get; set; }
+        public List<ImageResource> Images { get; set; }
+        public string Name { get; set; }
+
+        // We may need external_urls.spotify to external linking...
+    }
+}

src/NzbDrone.Core/MetadataSource/SkyHook/Resource/ArtistResource.cs

@@ -5,63 +5,36 @@
 
 namespace NzbDrone.Core.MetadataSource.SkyHook.Resource
 {
-    public class StorePlatformDataResource
+
+    public class AristResultResource
     {
-        public StorePlatformDataResource() { }
-        public ArtistInfoResource Artist { get; set; }
-        //public Lockup lockup { get; set; }
-    }
-
-    public class ArtistInfoResource
-    {
-        public ArtistInfoResource() { }
-        public Dictionary<int, ArtistInfoResource> Results { get; set; }
-
-        public bool HasArtistBio { get; set; }
-
-        public string url { get; set; }
-        public string shortUrl { get; set; }
-       
-        public List<string> artistContemporaries { get; set; }
-        public List<string> genreNames { get; set; }
-        public bool hasSocialPosts { get; set; }
-        public string artistBio { get; set; }
-        public bool isGroup { get; set; }
-        public string id { get; set; }
-        public string bornOrFormed { get; set; }
-        public string name { get; set; }
-        public string latestAlbumContentId { get; set; }
-        public string nameRaw { get; set; }
-
-        //public string kind { get; set; }
-        //public List<Gallery> gallery { get; set; }
-        //public List<Genre> genres { get; set; }
-        public List<object> artistInfluencers { get; set; }
-        public List<object> artistFollowers { get; set; }
-        //public string umcArtistImageUrl { get; set; }
-    }
-
-    public class AlbumResource
-    { 
-        public AlbumResource()
+        public AristResultResource()
         {
 
         }
 
-        public string ArtistName { get; set; }
-        public int ArtistId { get; set; }
-        public string CollectionName { get; set; }
-        public int CollectionId { get; set; }
-        public string PrimaryGenreName { get; set; }
-        public string ArtworkUrl100 { get; set; }
-        public string Country { get; set; }
-        public string CollectionExplicitness { get; set; }
-        public int TrackCount { get; set; }
-        public string Copyright { get; set; }
-        public DateTime ReleaseDate { get; set; }
-
+        public List<ArtistInfoResource> Items { get; set; }
     }
 
+    public class AlbumResultResource
+    {
+        public AlbumResultResource()
+        {
+
+        }
+
+        public List<AlbumInfoResource> Items { get; set; }
+    }
+
+    public class TrackResultResource
+    {
+        public TrackResultResource()
+        {
+
+        }
+
+        public List<TrackInfoResource> Items { get; set; }
+    }
     public class ArtistResource
     {
         public ArtistResource()
@@ -69,10 +42,7 @@ public ArtistResource()
 
         }
 
-        public int ResultCount { get; set; }
-        public List<AlbumResource> Results { get; set; }
-        //public string ArtistName { get; set; }
-        //public List<AlbumResource> Albums { get; set; }
-        public StorePlatformDataResource StorePlatformData { get; set; }
+        public AristResultResource Artists { get; set; }
+        public AristResultResource Albums { get; set; }
     }
 }

src/NzbDrone.Core/MetadataSource/SkyHook/Resource/ImageResource.cs

@@ -3,6 +3,10 @@ namespace NzbDrone.Core.MetadataSource.SkyHook.Resource
     public class ImageResource
     {
         public string CoverType { get; set; }
+
+        // Spotify Mapping
         public string Url { get; set; }
+        public int Height { get; set; }
+        public int Width { get; set; }
     }
 }