diff --git a/build.sh b/build.sh index 1ef8a7209..0bf2e1966 100755 --- a/build.sh +++ b/build.sh @@ -1,15 +1,15 @@ #! /bin/bash msBuild='/c/Program Files (x86)/MSBuild/14.0/Bin' outputFolder='./_output' -outputFolderMono='./_output_mono' -outputFolderOsx='./_output_osx' -outputFolderOsxApp='./_output_osx_app' +outputFolderLinux='./_output_linux' +outputFolderMacOS='./_output_macos' +outputFolderMacOSApp='./_output_macos_app' testPackageFolder='./_tests/' testSearchPattern='*.Test/bin/x86/Release' sourceFolder='./src' -slnFile=$sourceFolder/NzbDrone.sln -updateFolder=$outputFolder/NzbDrone.Update -updateFolderMono=$outputFolderMono/NzbDrone.Update +slnFile=$sourceFolder/Sonarr.sln +updateFolder=$outputFolder/Sonarr.Update +updateFolderMono=$outputFolderLinux/Sonarr.Update nuget='tools/nuget/nuget.exe'; CheckExitCode() @@ -23,12 +23,23 @@ CheckExitCode() return $status } +ProgressStart() +{ + echo "##teamcity[blockOpened name='$1']" + echo "##teamcity[progressStart '$1']" +} + +ProgressEnd() +{ + echo "##teamcity[progressFinish '$1']" + echo "##teamcity[blockClosed name='$1']" +} + CleanFolder() { local path=$1 local keepConfigFiles=$2 - find $path -name "*.transform" -exec rm "{}" \; if [ $keepConfigFiles != true ] ; then @@ -67,7 +78,7 @@ BuildWithXbuild() Build() { - echo "##teamcity[progressStart 'Build']" + ProgressStart 'Build' rm -rf $outputFolder @@ -82,7 +93,7 @@ Build() echo "Removing Mono.Posix.dll" rm $outputFolder/Mono.Posix.dll - echo "##teamcity[progressFinish 'Build']" + ProgressEnd 'Build' } RunGulp() @@ -91,9 +102,9 @@ RunGulp() yarn install ProgressEnd 'yarn install' - echo "##teamcity[progressStart 'Running gulp']" + ProgressStart 'Running gulp' CheckExitCode yarn run build --production - echo "##teamcity[progressFinish 'Running gulp']" + ProgressEnd 'Running gulp' } CreateMdbs() @@ -115,79 +126,103 @@ CreateMdbs() PackageMono() { - echo "##teamcity[progressStart 'Creating Mono Package']" - rm -rf $outputFolderMono - cp -r $outputFolder $outputFolderMono + ProgressStart 'Creating Mono Package' + + rm -rf $outputFolderLinux + + echo "Copying Binaries" + cp -r $outputFolder $outputFolderLinux echo "Creating MDBs" - CreateMdbs $outputFolderMono + CreateMdbs $outputFolderLinux echo "Removing PDBs" - find $outputFolderMono -name "*.pdb" -exec rm "{}" \; + find $outputFolderLinux -name "*.pdb" -exec rm "{}" \; echo "Removing Service helpers" - rm -f $outputFolderMono/ServiceUninstall.* - rm -f $outputFolderMono/ServiceInstall.* + rm -f $outputFolderLinux/ServiceUninstall.* + rm -f $outputFolderLinux/ServiceInstall.* echo "Removing native windows binaries Sqlite, MediaInfo" - rm -f $outputFolderMono/sqlite3.* - rm -f $outputFolderMono/MediaInfo.* + rm -f $outputFolderLinux/sqlite3.* + rm -f $outputFolderLinux/MediaInfo.* - echo "Adding NzbDrone.Core.dll.config (for dllmap)" - cp $sourceFolder/NzbDrone.Core/NzbDrone.Core.dll.config $outputFolderMono + echo "Adding Sonarr.Core.dll.config (for dllmap)" + cp $sourceFolder/NzbDrone.Core/Sonarr.Core.dll.config $outputFolderLinux echo "Adding CurlSharp.dll.config (for dllmap)" - cp $sourceFolder/NzbDrone.Common/CurlSharp.dll.config $outputFolderMono + cp $sourceFolder/NzbDrone.Common/CurlSharp.dll.config $outputFolderLinux - echo "Renaming NzbDrone.Console.exe to NzbDrone.exe" - rm $outputFolderMono/NzbDrone.exe* - for file in $outputFolderMono/NzbDrone.Console.exe*; do + echo "Renaming Sonarr.Console.exe to Sonarr.exe" + rm $outputFolderLinux/Sonarr.exe* + for file in $outputFolderLinux/Sonarr.Console.exe*; do mv "$file" "${file//.Console/}" done - echo "Removing NzbDrone.Windows" - rm $outputFolderMono/NzbDrone.Windows.* + echo "Removing Sonarr.Windows" + rm $outputFolderLinux/Sonarr.Windows.* - echo "Adding NzbDrone.Mono to UpdatePackage" - cp $outputFolderMono/NzbDrone.Mono.* $updateFolderMono + echo "Adding Sonarr.Mono to UpdatePackage" + cp $outputFolderLinux/Sonarr.Mono.* $updateFolderMono - echo "##teamcity[progressFinish 'Creating Mono Package']" + ProgressEnd 'Creating Mono Package' } -PackageOsx() +PackageMacOS() { - echo "##teamcity[progressStart 'Creating OS X Package']" - rm -rf $outputFolderOsx - cp -r $outputFolderMono $outputFolderOsx + ProgressStart 'Creating MacOS Package' - echo "Adding sqlite dylibs" - cp $sourceFolder/Libraries/Sqlite/*.dylib $outputFolderOsx - - echo "Adding MediaInfo dylib" - cp $sourceFolder/Libraries/MediaInfo/*.dylib $outputFolderOsx + rm -rf $outputFolderMacOS + mkdir $outputFolderMacOS echo "Adding Startup script" - cp ./osx/Sonarr $outputFolderOsx + cp ./macOS/Sonarr $outputFolderMacOS + dos2unix $outputFolderMacOS/Sonarr - echo "##teamcity[progressFinish 'Creating OS X Package']" + echo "Copying Binaries" + cp -r $outputFolderLinux/* $outputFolderMacOS + + echo "Adding sqlite dylibs" + cp $sourceFolder/Libraries/Sqlite/*.dylib $outputFolderMacOS + + echo "Adding MediaInfo dylib" + cp $sourceFolder/Libraries/MediaInfo/*.dylib $outputFolderMacOS + + ProgressEnd 'Creating MacOS Package' } -PackageOsxApp() +PackageMacOSApp() { - echo "##teamcity[progressStart 'Creating OS X App Package']" - rm -rf $outputFolderOsxApp - mkdir $outputFolderOsxApp + ProgressStart 'Creating macOS App Package' - cp -r ./osx/Sonarr.app $outputFolderOsxApp - cp -r $outputFolderOsx $outputFolderOsxApp/Sonarr.app/Contents/MacOS + rm -rf $outputFolderMacOSApp + mkdir $outputFolderMacOSApp + cp -r ./macOS/Sonarr.app $outputFolderMacOSApp + mkdir -p $outputFolderMacOSApp/Sonarr.app/Contents/MacOS - echo "##teamcity[progressFinish 'Creating OS X App Package']" + echo "Adding Startup script" + cp ./macOS/Sonarr $outputFolderMacOSApp/Sonarr.app/Contents/MacOS + dos2unix $outputFolderMacOSApp/Sonarr.app/Contents/MacOS/Sonarr + + echo "Copying Binaries" + cp -r $outputFolderLinux/* $outputFolderMacOSApp/Sonarr.app/Contents/MacOS + + echo "Adding sqlite dylibs" + cp $sourceFolder/Libraries/Sqlite/*.dylib $outputFolderMacOSApp/Sonarr.app/Contents/MacOS + + echo "Adding MediaInfo dylib" + cp $sourceFolder/Libraries/MediaInfo/*.dylib $outputFolderMacOSApp/Sonarr.app/Contents/MacOS + + echo "Removing Update Folder" + rm -r $outputFolderMacOSApp/Sonarr.app/Contents/MacOS/Sonarr.Update + + ProgressEnd 'Creating macOS App Package' } PackageTests() { - echo "Packaging Tests" - echo "##teamcity[progressStart 'Creating Test Package']" + ProgressStart 'Creating Test Package' + rm -rf $testPackageFolder mkdir $testPackageFolder @@ -209,8 +244,8 @@ PackageTests() CleanFolder $testPackageFolder true - echo "Adding NzbDrone.Core.dll.config (for dllmap)" - cp $sourceFolder/NzbDrone.Core/NzbDrone.Core.dll.config $testPackageFolder + echo "Adding Sonarr.Core.dll.config (for dllmap)" + cp $sourceFolder/NzbDrone.Core/Sonarr.Core.dll.config $testPackageFolder echo "Adding CurlSharp.dll.config (for dllmap)" cp $sourceFolder/NzbDrone.Common/CurlSharp.dll.config $testPackageFolder @@ -218,16 +253,30 @@ PackageTests() echo "Copying CurlSharp libraries" cp $sourceFolder/ExternalModules/CurlSharp/libs/i386/* $testPackageFolder - echo "##teamcity[progressFinish 'Creating Test Package']" + ProgressEnd 'Creating Test Package' } CleanupWindowsPackage() { - echo "Removing NzbDrone.Mono" - rm -f $outputFolder/NzbDrone.Mono.* + ProgressStart 'Cleaning Windows Package' - echo "Adding NzbDrone.Windows to UpdatePackage" - cp $outputFolder/NzbDrone.Windows.* $updateFolder + echo "Removing Sonarr.Mono" + rm -f $outputFolder/Sonarr.Mono.* + + echo "Adding Sonarr.Windows to UpdatePackage" + cp $outputFolder/Sonarr.Windows.* $updateFolder + + ProgressEnd 'Cleaning Windows Package' +} + +PublishArtifacts() +{ + echo "##teamcity[publishArtifacts '_tests/** => tests.zip']" + echo "##teamcity[publishArtifacts '$outputFolder/** => Sonarr.$BRANCH.$BUILD_NUMBER.windows.zip!Sonarr']" + echo "##teamcity[publishArtifacts '$outputFolderLinux/** => Sonarr.$BRANCH.$BUILD_NUMBER.linux.tar.gz!Sonarr']" + echo "##teamcity[publishArtifacts '$outputFolderMacOS/** => Sonarr.$BRANCH.$BUILD_NUMBER.macos.tar.gz!Sonarr']" + echo "##teamcity[publishArtifacts '$outputFolderMacOSApp/** => Sonarr.$BRANCH.$BUILD_NUMBER.macos.zip']" + echo "##teamcity[publishArtifacts 'debian => debian.zip/debian']" } # Use mono or .net depending on OS @@ -245,7 +294,8 @@ esac Build RunGulp PackageMono -PackageOsx -PackageOsxApp +PackageMacOS +PackageMacOSApp PackageTests CleanupWindowsPackage +PublishArtifacts diff --git a/osx/Sonarr b/macOS/Sonarr similarity index 95% rename from osx/Sonarr rename to macOS/Sonarr index a72332a6e..33c3230b5 100644 --- a/osx/Sonarr +++ b/macOS/Sonarr @@ -4,7 +4,7 @@ DIR=$(cd "$(dirname "$0")"; pwd) #change these values to match your app -EXE_PATH="$DIR/NzbDrone.exe" +EXE_PATH="$DIR/Sonarr.exe" APPNAME="Sonarr" #set up environment @@ -31,8 +31,8 @@ fi export DYLD_FALLBACK_LIBRARY_PATH="$DYLD_FALLBACK_LIBRARY_PATH:$HOME/lib:/usr/local/lib:/lib:/usr/lib" #mono version check -REQUIRED_MAJOR=3 -REQUIRED_MINOR=10 +REQUIRED_MAJOR=4 +REQUIRED_MINOR=6 VERSION_TITLE="Cannot launch $APPNAME" VERSION_MSG="$APPNAME requires Mono Runtime Environment(MRE) $REQUIRED_MAJOR.$REQUIRED_MINOR or later." @@ -59,4 +59,4 @@ fi MONO_EXEC="exec mono --debug" #run app using mono -$MONO_EXEC "$EXE_PATH" \ No newline at end of file +$MONO_EXEC "$EXE_PATH" diff --git a/osx/Sonarr.app/Contents/Info.plist b/macOS/Sonarr.app/Contents/Info.plist similarity index 95% rename from osx/Sonarr.app/Contents/Info.plist rename to macOS/Sonarr.app/Contents/Info.plist index eeae50f41..91fe06105 100644 --- a/osx/Sonarr.app/Contents/Info.plist +++ b/macOS/Sonarr.app/Contents/Info.plist @@ -23,11 +23,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 2.0 + 3.0 CFBundleSignature xmmd CFBundleVersion - 2.0 + 3.0 NSAppleScriptEnabled YES diff --git a/macOS/Sonarr.app/Contents/Resources/sonarr.icns b/macOS/Sonarr.app/Contents/Resources/sonarr.icns new file mode 100644 index 000000000..a3c2e21ad Binary files /dev/null and b/macOS/Sonarr.app/Contents/Resources/sonarr.icns differ diff --git a/osx/Sonarr.app/Contents/Resources/sonarr.icns b/osx/Sonarr.app/Contents/Resources/sonarr.icns deleted file mode 100644 index 884633ff3..000000000 Binary files a/osx/Sonarr.app/Contents/Resources/sonarr.icns and /dev/null differ diff --git a/setup/build.bat b/setup/build.bat index 964fe8abf..7d0215988 100644 --- a/setup/build.bat +++ b/setup/build.bat @@ -1,3 +1,7 @@ REM SET BUILD_NUMBER=1 -REM SET branch=develop -inno\ISCC.exe nzbdrone.iss \ No newline at end of file +REM SET BRANCH=develop +echo ##teamcity[progressStart 'Building setup file'] +inno\ISCC.exe nzbdrone.iss +echo ##teamcity[progressFinish 'Building setup file'] + +echo ##teamcity[publishArtifacts 'setup\output\*.exe'] diff --git a/setup/nzbdrone.iss b/setup/nzbdrone.iss index 3e471e100..afe1032aa 100644 --- a/setup/nzbdrone.iss +++ b/setup/nzbdrone.iss @@ -5,10 +5,10 @@ #define AppPublisher "Team Sonarr" #define AppURL "https://sonarr.tv/" #define ForumsURL "https://forums.sonarr.tv/" -#define AppExeName "NzbDrone.exe" +#define AppExeName "Sonarr.exe" #define BuildNumber "2.0" #define BuildNumber GetEnv('BUILD_NUMBER') -#define BranchName GetEnv('branch') +#define BranchName GetEnv('BRANCH') [Setup] ; NOTE: The value of AppId uniquely identifies this application. @@ -16,20 +16,21 @@ ; (To generate a new GUID, click Tools | Generate GUID inside the IDE.) AppId={{56C1065D-3523-4025-B76D-6F73F67F7F71} AppName={#AppName} -AppVersion=2.0 +AppVersion=3.0 AppPublisher={#AppPublisher} AppPublisherURL={#AppURL} AppSupportURL={#ForumsURL} AppUpdatesURL={#AppURL} -DefaultDirName={commonappdata}\NzbDrone\bin +UsePreviousAppDir=no +DefaultDirName={commonappdata}\Sonarr\bin DisableDirPage=yes DefaultGroupName={#AppName} DisableProgramGroupPage=yes -OutputBaseFilename=NzbDrone.{#BranchName}.{#BuildNumber} +OutputBaseFilename=Sonarr.{#BranchName}.{#BuildNumber}.windows SolidCompression=yes AppCopyright=Creative Commons 3.0 License AllowUNCPath=False -UninstallDisplayIcon={app}\NzbDrone.exe +UninstallDisplayIcon={app}\Sonarr.exe DisableReadyPage=True CompressionThreads=2 Compression=lzma2/normal @@ -45,22 +46,32 @@ Name: "windowsService"; Description: "Install Windows Service (Starts when the c Name: "startupShortcut"; Description: "Create shortcut in Startup folder (Starts when you log into Windows)"; GroupDescription: "Start automatically"; Flags: exclusive unchecked Name: "none"; Description: "Do not start automatically"; GroupDescription: "Start automatically"; Flags: exclusive unchecked - [Files] -Source: "..\_output\NzbDrone.exe"; DestDir: "{app}"; Flags: ignoreversion +Source: "..\_output\Sonarr.exe"; DestDir: "{app}"; Flags: ignoreversion Source: "..\_output\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs ; NOTE: Don't use "Flags: ignoreversion" on any shared system files [Icons] Name: "{group}\{#AppName}"; Filename: "{app}\{#AppExeName}"; Parameters: "/icon" Name: "{commondesktop}\{#AppName}"; Filename: "{app}\{#AppExeName}"; Parameters: "/icon" -Name: "{userstartup}\{#AppName}"; Filename: "{app}\NzbDrone.exe"; WorkingDir: "{app}"; Tasks: startupShortcut +Name: "{userstartup}\{#AppName}"; Filename: "{app}\Sonarr.exe"; WorkingDir: "{app}"; Tasks: startupShortcut + +[InstallDelete] +Name: "{commonappdata}\NzbDrone\bin"; Type: filesandordirs [Run] -Filename: "{app}\nzbdrone.console.exe"; Parameters: "/u"; Flags: runhidden waituntilterminated; -Filename: "{app}\nzbdrone.console.exe"; Parameters: "/i"; Flags: runhidden waituntilterminated; Tasks: windowsService -Filename: "{app}\NzbDrone.exe"; Description: "Open Sonarr"; Flags: postinstall skipifsilent nowait; Tasks: windowsService; -Filename: "{app}\NzbDrone.exe"; Description: "Start Sonarr"; Flags: postinstall skipifsilent nowait; Tasks: startupShortcut none; +Filename: "{app}\Sonarr.Console.exe"; Parameters: "/u"; Flags: runhidden waituntilterminated; +Filename: "{app}\Sonarr.Console.exe"; Parameters: "/i"; Flags: runhidden waituntilterminated; Tasks: windowsService +Filename: "{app}\Sonarr.exe"; Description: "Open Sonarr Web UI"; Flags: postinstall skipifsilent nowait; Tasks: windowsService; +Filename: "{app}\Sonarr.exe"; Description: "Start Sonarr"; Flags: postinstall skipifsilent nowait; Tasks: startupShortcut none; [UninstallRun] -Filename: "{app}\nzbdrone.console.exe"; Parameters: "/u"; Flags: waituntilterminated skipifdoesntexist +Filename: "{app}\Sonarr.Console.exe"; Parameters: "/u"; Flags: runhidden waituntilterminated skipifdoesntexist + +[Code] +function PrepareToInstall(var NeedsRestart: Boolean): String; +var + ResultCode: Integer; +begin + Exec(ExpandConstant('{commonappdata}\NzbDrone\bin\NzbDrone.Console.exe'), '/u', '', 0, ewWaitUntilTerminated, ResultCode) +end; diff --git a/src/NzbDrone.Api.Test/NzbDrone.Api.Test.csproj b/src/NzbDrone.Api.Test/NzbDrone.Api.Test.csproj index 86bc11eff..c984d63a2 100644 --- a/src/NzbDrone.Api.Test/NzbDrone.Api.Test.csproj +++ b/src/NzbDrone.Api.Test/NzbDrone.Api.Test.csproj @@ -8,7 +8,7 @@ Library Properties NzbDrone.Api.Test - NzbDrone.Api.Test + Sonarr.Api.Test v4.6.1 512 ..\ diff --git a/src/NzbDrone.Api.Test/Properties/AssemblyInfo.cs b/src/NzbDrone.Api.Test/Properties/AssemblyInfo.cs index 4d2901c1a..bc1d4a443 100644 --- a/src/NzbDrone.Api.Test/Properties/AssemblyInfo.cs +++ b/src/NzbDrone.Api.Test/Properties/AssemblyInfo.cs @@ -4,11 +4,11 @@ using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("NzbDrone.Api.Test")] +[assembly: AssemblyTitle("Sonarr.Api.Test")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("NzbDrone.Api.Test")] +[assembly: AssemblyProduct("Sonarr.Api.Test")] [assembly: AssemblyCopyright("Copyright © 2013")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/src/NzbDrone.Api/NzbDrone.Api.csproj b/src/NzbDrone.Api/NzbDrone.Api.csproj index 3db4e813d..fde3b254f 100644 --- a/src/NzbDrone.Api/NzbDrone.Api.csproj +++ b/src/NzbDrone.Api/NzbDrone.Api.csproj @@ -8,7 +8,7 @@ Library Properties NzbDrone.Api - NzbDrone.Api + Sonarr.Api v4.6.1 512 ..\ diff --git a/src/NzbDrone.Api/Properties/AssemblyInfo.cs b/src/NzbDrone.Api/Properties/AssemblyInfo.cs index 6149a06c4..3848d0c83 100644 --- a/src/NzbDrone.Api/Properties/AssemblyInfo.cs +++ b/src/NzbDrone.Api/Properties/AssemblyInfo.cs @@ -2,10 +2,10 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -[assembly: AssemblyTitle("NzbDrone.Api")] +[assembly: AssemblyTitle("Sonarr.Api")] [assembly: Guid("4c0922d7-979e-4ff7-b44b-b8ac2100eeb5")] [assembly: AssemblyVersion("10.0.0.*")] -[assembly: InternalsVisibleTo("NzbDrone.Core")] +[assembly: InternalsVisibleTo("Sonarr.Core")] diff --git a/src/NzbDrone.App.Test/NzbDrone.Host.Test.csproj b/src/NzbDrone.App.Test/NzbDrone.Host.Test.csproj index 8b08da58c..eb26f7148 100644 --- a/src/NzbDrone.App.Test/NzbDrone.Host.Test.csproj +++ b/src/NzbDrone.App.Test/NzbDrone.Host.Test.csproj @@ -9,7 +9,7 @@ Library Properties NzbDrone.App.Test - NzbDrone.App.Test + Sonarr.App.Test v4.6.1 512 ..\ diff --git a/src/NzbDrone.App.Test/NzbDroneProcessServiceFixture.cs b/src/NzbDrone.App.Test/NzbDroneProcessServiceFixture.cs index 1ee1ee522..1354e91d5 100644 --- a/src/NzbDrone.App.Test/NzbDroneProcessServiceFixture.cs +++ b/src/NzbDrone.App.Test/NzbDroneProcessServiceFixture.cs @@ -20,11 +20,11 @@ namespace NzbDrone.App.Test .Returns(new ProcessInfo() { Id = CURRENT_PROCESS_ID }); Mocker.GetMock() - .Setup(s => s.FindProcessByName(ProcessProvider.NZB_DRONE_CONSOLE_PROCESS_NAME)) + .Setup(s => s.FindProcessByName(ProcessProvider.SONARR_CONSOLE_PROCESS_NAME)) .Returns(new List()); Mocker.GetMock() - .Setup(s => s.FindProcessByName(ProcessProvider.NZB_DRONE_PROCESS_NAME)) + .Setup(s => s.FindProcessByName(ProcessProvider.SONARR_PROCESS_NAME)) .Returns(new List()); } @@ -47,7 +47,7 @@ namespace NzbDrone.App.Test public void should_enforce_if_another_console_is_running() { Mocker.GetMock() - .Setup(c => c.FindProcessByName(ProcessProvider.NZB_DRONE_CONSOLE_PROCESS_NAME)) + .Setup(c => c.FindProcessByName(ProcessProvider.SONARR_CONSOLE_PROCESS_NAME)) .Returns(new List { new ProcessInfo {Id = 10}, @@ -63,7 +63,7 @@ namespace NzbDrone.App.Test public void should_return_false_if_another_gui_is_running() { Mocker.GetMock() - .Setup(c => c.FindProcessByName(ProcessProvider.NZB_DRONE_PROCESS_NAME)) + .Setup(c => c.FindProcessByName(ProcessProvider.SONARR_PROCESS_NAME)) .Returns(new List { new ProcessInfo {Id = CURRENT_PROCESS_ID}, diff --git a/src/NzbDrone.App.Test/Properties/AssemblyInfo.cs b/src/NzbDrone.App.Test/Properties/AssemblyInfo.cs index 86a324eef..e04468025 100644 --- a/src/NzbDrone.App.Test/Properties/AssemblyInfo.cs +++ b/src/NzbDrone.App.Test/Properties/AssemblyInfo.cs @@ -4,11 +4,11 @@ using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("NzbDrone.App.Test")] +[assembly: AssemblyTitle("Sonarr.App.Test")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Microsoft")] -[assembly: AssemblyProduct("NzbDrone.App.Test")] +[assembly: AssemblyProduct("Sonarr.App.Test")] [assembly: AssemblyCopyright("Copyright © Microsoft 2011")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/src/NzbDrone.App.Test/RouterTest.cs b/src/NzbDrone.App.Test/RouterTest.cs index 0cf7b6c3d..905d39dbb 100644 --- a/src/NzbDrone.App.Test/RouterTest.cs +++ b/src/NzbDrone.App.Test/RouterTest.cs @@ -3,6 +3,7 @@ using Moq; using NUnit.Framework; using NzbDrone.Common; using NzbDrone.Common.EnvironmentInfo; +using NzbDrone.Common.Processes; using NzbDrone.Host; using NzbDrone.Test.Common; @@ -22,14 +23,18 @@ namespace NzbDrone.App.Test public void Route_should_call_install_service_when_application_mode_is_install() { var serviceProviderMock = Mocker.GetMock(MockBehavior.Strict); - serviceProviderMock.Setup(c => c.Install(ServiceProvider.NZBDRONE_SERVICE_NAME)); - serviceProviderMock.Setup(c => c.ServiceExist(ServiceProvider.NZBDRONE_SERVICE_NAME)).Returns(false); - serviceProviderMock.Setup(c => c.Start(ServiceProvider.NZBDRONE_SERVICE_NAME)); + serviceProviderMock.Setup(c => c.ServiceExist(ServiceProvider.SERVICE_NAME)).Returns(false); + serviceProviderMock.Setup(c => c.Install(ServiceProvider.SERVICE_NAME)); + serviceProviderMock.Setup(c => c.SetPermissions(ServiceProvider.SERVICE_NAME)); + + Mocker.GetMock() + .Setup(c => c.SpawnNewProcess("sc.exe", It.IsAny(), null, true)); + Mocker.GetMock().SetupGet(c => c.IsUserInteractive).Returns(true); Subject.Route(ApplicationModes.InstallService); - serviceProviderMock.Verify(c => c.Install(ServiceProvider.NZBDRONE_SERVICE_NAME), Times.Once()); + serviceProviderMock.Verify(c => c.Install(ServiceProvider.SERVICE_NAME), Times.Once()); } @@ -37,13 +42,13 @@ namespace NzbDrone.App.Test public void Route_should_call_uninstall_service_when_application_mode_is_uninstall() { var serviceProviderMock = Mocker.GetMock(); - serviceProviderMock.Setup(c => c.UnInstall(ServiceProvider.NZBDRONE_SERVICE_NAME)); + serviceProviderMock.Setup(c => c.UnInstall(ServiceProvider.SERVICE_NAME)); Mocker.GetMock().SetupGet(c => c.IsUserInteractive).Returns(true); - serviceProviderMock.Setup(c => c.ServiceExist(ServiceProvider.NZBDRONE_SERVICE_NAME)).Returns(true); + serviceProviderMock.Setup(c => c.ServiceExist(ServiceProvider.SERVICE_NAME)).Returns(true); Subject.Route(ApplicationModes.UninstallService); - serviceProviderMock.Verify(c => c.UnInstall(ServiceProvider.NZBDRONE_SERVICE_NAME), Times.Once()); + serviceProviderMock.Verify(c => c.UnInstall(ServiceProvider.SERVICE_NAME), Times.Once()); } [Test] @@ -82,7 +87,7 @@ namespace NzbDrone.App.Test Mocker.GetMock().SetupGet(c => c.IsUserInteractive).Returns(true); consoleMock.Setup(c => c.PrintServiceAlreadyExist()); - serviceMock.Setup(c => c.ServiceExist(ServiceProvider.NZBDRONE_SERVICE_NAME)).Returns(true); + serviceMock.Setup(c => c.ServiceExist(ServiceProvider.SERVICE_NAME)).Returns(true); Subject.Route(ApplicationModes.InstallService); @@ -96,7 +101,7 @@ namespace NzbDrone.App.Test Mocker.GetMock().SetupGet(c => c.IsUserInteractive).Returns(true); consoleMock.Setup(c => c.PrintServiceDoesNotExist()); - serviceMock.Setup(c => c.ServiceExist(ServiceProvider.NZBDRONE_SERVICE_NAME)).Returns(false); + serviceMock.Setup(c => c.ServiceExist(ServiceProvider.SERVICE_NAME)).Returns(false); Subject.Route(ApplicationModes.UninstallService); diff --git a/src/NzbDrone.Automation.Test/NzbDrone.Automation.Test.csproj b/src/NzbDrone.Automation.Test/NzbDrone.Automation.Test.csproj index 64d9a27d5..3462ef5c2 100644 --- a/src/NzbDrone.Automation.Test/NzbDrone.Automation.Test.csproj +++ b/src/NzbDrone.Automation.Test/NzbDrone.Automation.Test.csproj @@ -8,7 +8,7 @@ Library Properties NzbDrone.Automation.Test - NzbDrone.Automation.Test + Sonarr.Automation.Test v4.6.1 512 ..\ diff --git a/src/NzbDrone.Automation.Test/Properties/AssemblyInfo.cs b/src/NzbDrone.Automation.Test/Properties/AssemblyInfo.cs index a5d255084..2a5688499 100644 --- a/src/NzbDrone.Automation.Test/Properties/AssemblyInfo.cs +++ b/src/NzbDrone.Automation.Test/Properties/AssemblyInfo.cs @@ -4,11 +4,11 @@ using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("NzbDrone.Automation.Test")] +[assembly: AssemblyTitle("Sonarr.Automation.Test")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("NzbDrone.Automation.Test")] +[assembly: AssemblyProduct("Sonarr.Automation.Test")] [assembly: AssemblyCopyright("Copyright © 2013")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/src/NzbDrone.Common.Test/NzbDrone.Common.Test.csproj b/src/NzbDrone.Common.Test/NzbDrone.Common.Test.csproj index d1ddb7ec8..2d0ff9772 100644 --- a/src/NzbDrone.Common.Test/NzbDrone.Common.Test.csproj +++ b/src/NzbDrone.Common.Test/NzbDrone.Common.Test.csproj @@ -9,7 +9,7 @@ Library Properties NzbDrone.Common.Test - NzbDrone.Common.Test + Sonarr.Common.Test v4.6.1 512 ..\ diff --git a/src/NzbDrone.Common.Test/PathExtensionFixture.cs b/src/NzbDrone.Common.Test/PathExtensionFixture.cs index ec5451029..febd93a7d 100644 --- a/src/NzbDrone.Common.Test/PathExtensionFixture.cs +++ b/src/NzbDrone.Common.Test/PathExtensionFixture.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.IO; using FluentAssertions; using Moq; @@ -19,7 +19,7 @@ namespace NzbDrone.Common.Test { var fakeEnvironment = new Mock(); - fakeEnvironment.SetupGet(c => c.AppDataFolder).Returns(@"C:\NzbDrone\".AsOsAgnostic()); + fakeEnvironment.SetupGet(c => c.AppDataFolder).Returns(@"C:\Sonarr\".AsOsAgnostic()); fakeEnvironment.SetupGet(c => c.TempFolder).Returns(@"C:\Temp\".AsOsAgnostic()); @@ -234,43 +234,43 @@ namespace NzbDrone.Common.Test [Test] public void AppDataDirectory_path_test() { - GetIAppDirectoryInfo().GetAppDataPath().Should().BeEquivalentTo(@"C:\NzbDrone\".AsOsAgnostic()); + GetIAppDirectoryInfo().GetAppDataPath().Should().BeEquivalentTo(@"C:\Sonarr\".AsOsAgnostic()); } [Test] public void Config_path_test() { - GetIAppDirectoryInfo().GetConfigPath().Should().BeEquivalentTo(@"C:\NzbDrone\Config.xml".AsOsAgnostic()); + GetIAppDirectoryInfo().GetConfigPath().Should().BeEquivalentTo(@"C:\Sonarr\Config.xml".AsOsAgnostic()); } [Test] public void Sandbox() { - GetIAppDirectoryInfo().GetUpdateSandboxFolder().Should().BeEquivalentTo(@"C:\Temp\nzbdrone_update\".AsOsAgnostic()); + GetIAppDirectoryInfo().GetUpdateSandboxFolder().Should().BeEquivalentTo(@"C:\Temp\sonarr_update\".AsOsAgnostic()); } [Test] public void GetUpdatePackageFolder() { - GetIAppDirectoryInfo().GetUpdatePackageFolder().Should().BeEquivalentTo(@"C:\Temp\nzbdrone_update\NzbDrone\".AsOsAgnostic()); + GetIAppDirectoryInfo().GetUpdatePackageFolder().Should().BeEquivalentTo(@"C:\Temp\sonarr_update\Sonarr\".AsOsAgnostic()); } [Test] public void GetUpdateClientFolder() { - GetIAppDirectoryInfo().GetUpdateClientFolder().Should().BeEquivalentTo(@"C:\Temp\nzbdrone_update\NzbDrone\NzbDrone.Update\".AsOsAgnostic()); + GetIAppDirectoryInfo().GetUpdateClientFolder().Should().BeEquivalentTo(@"C:\Temp\sonarr_update\Sonarr\Sonarr.Update\".AsOsAgnostic()); } [Test] public void GetUpdateClientExePath() { - GetIAppDirectoryInfo().GetUpdateClientExePath().Should().BeEquivalentTo(@"C:\Temp\nzbdrone_update\NzbDrone.Update.exe".AsOsAgnostic()); + GetIAppDirectoryInfo().GetUpdateClientExePath().Should().BeEquivalentTo(@"C:\Temp\sonarr_update\Sonarr.Update.exe".AsOsAgnostic()); } [Test] public void GetUpdateLogFolder() { - GetIAppDirectoryInfo().GetUpdateLogFolder().Should().BeEquivalentTo(@"C:\NzbDrone\UpdateLogs\".AsOsAgnostic()); + GetIAppDirectoryInfo().GetUpdateLogFolder().Should().BeEquivalentTo(@"C:\Sonarr\UpdateLogs\".AsOsAgnostic()); } [Test] diff --git a/src/NzbDrone.Common.Test/ReflectionTests/ReflectionExtensionFixture.cs b/src/NzbDrone.Common.Test/ReflectionTests/ReflectionExtensionFixture.cs index 3e6c3fab9..6059491a7 100644 --- a/src/NzbDrone.Common.Test/ReflectionTests/ReflectionExtensionFixture.cs +++ b/src/NzbDrone.Common.Test/ReflectionTests/ReflectionExtensionFixture.cs @@ -1,4 +1,4 @@ -using System.Reflection; +using System.Reflection; using FluentAssertions; using NUnit.Framework; using NzbDrone.Common.Reflection; @@ -12,7 +12,7 @@ namespace NzbDrone.Common.Test.ReflectionTests [Test] public void should_get_properties_from_models() { - var models = Assembly.Load("NzbDrone.Core").ImplementationsOf(); + var models = Assembly.Load("Sonarr.Core").ImplementationsOf(); foreach (var model in models) { @@ -23,9 +23,9 @@ namespace NzbDrone.Common.Test.ReflectionTests [Test] public void should_be_able_to_get_implementations() { - var models = Assembly.Load("NzbDrone.Core").ImplementationsOf(); + var models = Assembly.Load("Sonarr.Core").ImplementationsOf(); models.Should().NotBeEmpty(); } } -} \ No newline at end of file +} diff --git a/src/NzbDrone.Common.Test/ServiceProviderTests.cs b/src/NzbDrone.Common.Test/ServiceProviderTests.cs index 68d7b1789..945aac2a9 100644 --- a/src/NzbDrone.Common.Test/ServiceProviderTests.cs +++ b/src/NzbDrone.Common.Test/ServiceProviderTests.cs @@ -76,8 +76,8 @@ namespace NzbDrone.Common.Test [ManualTest] public void UnInstallService() { - Subject.UnInstall(ServiceProvider.NZBDRONE_SERVICE_NAME); - Subject.ServiceExist(ServiceProvider.NZBDRONE_SERVICE_NAME).Should().BeFalse(); + Subject.UnInstall(ServiceProvider.SERVICE_NAME); + Subject.ServiceExist(ServiceProvider.SERVICE_NAME).Should().BeFalse(); } [Test] diff --git a/src/NzbDrone.Common/Composition/ContainerBuilderBase.cs b/src/NzbDrone.Common/Composition/ContainerBuilderBase.cs index a4174a26f..8162ab30c 100644 --- a/src/NzbDrone.Common/Composition/ContainerBuilderBase.cs +++ b/src/NzbDrone.Common/Composition/ContainerBuilderBase.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Reflection; @@ -18,8 +18,8 @@ namespace NzbDrone.Common.Composition { _loadedTypes = new List(); - assemblies.Add(OsInfo.IsWindows ? "NzbDrone.Windows" : "NzbDrone.Mono"); - assemblies.Add("NzbDrone.Common"); + assemblies.Add(OsInfo.IsWindows ? "Sonarr.Windows" : "Sonarr.Mono"); + assemblies.Add("Sonarr.Common"); foreach (var assembly in assemblies) { diff --git a/src/NzbDrone.Common/ConsoleService.cs b/src/NzbDrone.Common/ConsoleService.cs index 262420f24..e0dd3ae06 100644 --- a/src/NzbDrone.Common/ConsoleService.cs +++ b/src/NzbDrone.Common/ConsoleService.cs @@ -21,8 +21,8 @@ namespace NzbDrone.Common Console.WriteLine(); Console.WriteLine(" Usage: {0} ", Process.GetCurrentProcess().MainModule.ModuleName); Console.WriteLine(" Commands:"); - Console.WriteLine(" /{0} Install the application as a Windows Service ({1}).", StartupContext.INSTALL_SERVICE, ServiceProvider.NZBDRONE_SERVICE_NAME); - Console.WriteLine(" /{0} Uninstall already installed Windows Service ({1}).", StartupContext.UNINSTALL_SERVICE, ServiceProvider.NZBDRONE_SERVICE_NAME); + Console.WriteLine(" /{0} Install the application as a Windows Service ({1}).", StartupContext.INSTALL_SERVICE, ServiceProvider.SERVICE_NAME); + Console.WriteLine(" /{0} Uninstall already installed Windows Service ({1}).", StartupContext.UNINSTALL_SERVICE, ServiceProvider.SERVICE_NAME); Console.WriteLine(" /{0} Don't open Sonarr in a browser", StartupContext.NO_BROWSER); Console.WriteLine(" /{0} Start Sonarr terminating any other instances", StartupContext.TERMINATE); Console.WriteLine(" /{0}=path Path to use as the AppData location (stores database, config, logs, etc)", StartupContext.APPDATA); @@ -31,12 +31,12 @@ namespace NzbDrone.Common public void PrintServiceAlreadyExist() { - Console.WriteLine("A service with the same name ({0}) already exists. Aborting installation", ServiceProvider.NZBDRONE_SERVICE_NAME); + Console.WriteLine("A service with the same name ({0}) already exists. Aborting installation", ServiceProvider.SERVICE_NAME); } public void PrintServiceDoesNotExist() { - Console.WriteLine("Can't find service ({0})", ServiceProvider.NZBDRONE_SERVICE_NAME); + Console.WriteLine("Can't find service ({0})", ServiceProvider.SERVICE_NAME); } } } diff --git a/src/NzbDrone.Common/EnvironmentInfo/RuntimeInfo.cs b/src/NzbDrone.Common/EnvironmentInfo/RuntimeInfo.cs index 753bd91e6..5d4ca6334 100644 --- a/src/NzbDrone.Common/EnvironmentInfo/RuntimeInfo.cs +++ b/src/NzbDrone.Common/EnvironmentInfo/RuntimeInfo.cs @@ -20,8 +20,8 @@ namespace NzbDrone.Common.EnvironmentInfo IsWindowsService = !IsUserInteractive && OsInfo.IsWindows && - serviceProvider.ServiceExist(ServiceProvider.NZBDRONE_SERVICE_NAME) && - serviceProvider.GetStatus(ServiceProvider.NZBDRONE_SERVICE_NAME) == ServiceControllerStatus.StartPending; + serviceProvider.ServiceExist(ServiceProvider.SERVICE_NAME) && + serviceProvider.GetStatus(ServiceProvider.SERVICE_NAME) == ServiceControllerStatus.StartPending; //Guarded to avoid issues when running in a non-managed process var entry = Assembly.GetEntryAssembly(); @@ -29,7 +29,7 @@ namespace NzbDrone.Common.EnvironmentInfo if (entry != null) { ExecutingApplication = entry.Location; - IsWindowsTray = entry.ManifestModule.Name == $"{ProcessProvider.NZB_DRONE_PROCESS_NAME}.exe"; + IsWindowsTray = entry.ManifestModule.Name == $"{ProcessProvider.SONARR_PROCESS_NAME}.exe"; } } @@ -76,7 +76,7 @@ namespace NzbDrone.Common.EnvironmentInfo { if (OsInfo.IsWindows) { - return IsUserInteractive && Process.GetCurrentProcess().ProcessName.Equals(ProcessProvider.NZB_DRONE_PROCESS_NAME, StringComparison.InvariantCultureIgnoreCase); + return IsUserInteractive && Process.GetCurrentProcess().ProcessName.Equals(ProcessProvider.SONARR_PROCESS_NAME, StringComparison.InvariantCultureIgnoreCase); } return false; diff --git a/src/NzbDrone.Common/Extensions/PathExtensions.cs b/src/NzbDrone.Common/Extensions/PathExtensions.cs index c7fc857e8..fefa21c61 100644 --- a/src/NzbDrone.Common/Extensions/PathExtensions.cs +++ b/src/NzbDrone.Common/Extensions/PathExtensions.cs @@ -11,17 +11,17 @@ namespace NzbDrone.Common.Extensions public static class PathExtensions { private const string APP_CONFIG_FILE = "config.xml"; - private const string NZBDRONE_DB = "nzbdrone.db"; - private const string NZBDRONE_LOG_DB = "logs.db"; + private const string DB = "sonarr.db"; + private const string LOG_DB = "logs.db"; private const string NLOG_CONFIG_FILE = "nlog.config"; - private const string UPDATE_CLIENT_EXE = "NzbDrone.Update.exe"; + private const string UPDATE_CLIENT_EXE = "Sonarr.Update.exe"; private const string BACKUP_FOLDER = "Backups"; - private static readonly string UPDATE_SANDBOX_FOLDER_NAME = "nzbdrone_update" + Path.DirectorySeparatorChar; - private static readonly string UPDATE_PACKAGE_FOLDER_NAME = "NzbDrone" + Path.DirectorySeparatorChar; - private static readonly string UPDATE_BACKUP_FOLDER_NAME = "nzbdrone_backup" + Path.DirectorySeparatorChar; - private static readonly string UPDATE_BACKUP_APPDATA_FOLDER_NAME = "nzbdrone_appdata_backup" + Path.DirectorySeparatorChar; - private static readonly string UPDATE_CLIENT_FOLDER_NAME = "NzbDrone.Update" + Path.DirectorySeparatorChar; + private static readonly string UPDATE_SANDBOX_FOLDER_NAME = "sonarr_update" + Path.DirectorySeparatorChar; + private static readonly string UPDATE_PACKAGE_FOLDER_NAME = "Sonarr" + Path.DirectorySeparatorChar; + private static readonly string UPDATE_BACKUP_FOLDER_NAME = "sonarr_backup" + Path.DirectorySeparatorChar; + private static readonly string UPDATE_BACKUP_APPDATA_FOLDER_NAME = "sonarr_appdata_backup" + Path.DirectorySeparatorChar; + private static readonly string UPDATE_CLIENT_FOLDER_NAME = "Sonarr.Update" + Path.DirectorySeparatorChar; private static readonly string UPDATE_LOG_FOLDER_NAME = "UpdateLogs" + Path.DirectorySeparatorChar; public static string CleanFilePath(this string path) @@ -256,7 +256,7 @@ namespace NzbDrone.Common.Extensions public static string GetUpdateBackupDatabase(this IAppFolderInfo appFolderInfo) { - return Path.Combine(GetUpdateBackUpAppDataFolder(appFolderInfo), NZBDRONE_DB); + return Path.Combine(GetUpdateBackUpAppDataFolder(appFolderInfo), DB); } public static string GetUpdatePackageFolder(this IAppFolderInfo appFolderInfo) @@ -279,14 +279,14 @@ namespace NzbDrone.Common.Extensions return Path.Combine(GetAppDataPath(appFolderInfo), BACKUP_FOLDER); } - public static string GetNzbDroneDatabase(this IAppFolderInfo appFolderInfo) + public static string GetDatabase(this IAppFolderInfo appFolderInfo) { - return Path.Combine(GetAppDataPath(appFolderInfo), NZBDRONE_DB); + return Path.Combine(GetAppDataPath(appFolderInfo), DB); } public static string GetLogDatabase(this IAppFolderInfo appFolderInfo) { - return Path.Combine(GetAppDataPath(appFolderInfo), NZBDRONE_LOG_DB); + return Path.Combine(GetAppDataPath(appFolderInfo), LOG_DB); } public static string GetNlogConfigPath(this IAppFolderInfo appFolderInfo) diff --git a/src/NzbDrone.Common/NzbDrone.Common.csproj b/src/NzbDrone.Common/NzbDrone.Common.csproj index 235967a68..19128ecfe 100644 --- a/src/NzbDrone.Common/NzbDrone.Common.csproj +++ b/src/NzbDrone.Common/NzbDrone.Common.csproj @@ -9,7 +9,7 @@ Library Properties NzbDrone.Common - NzbDrone.Common + Sonarr.Common v4.6.1 512 ..\ diff --git a/src/NzbDrone.Common/Processes/PidFileProvider.cs b/src/NzbDrone.Common/Processes/PidFileProvider.cs index 04cca6527..650fbca69 100644 --- a/src/NzbDrone.Common/Processes/PidFileProvider.cs +++ b/src/NzbDrone.Common/Processes/PidFileProvider.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.IO; using NLog; using NzbDrone.Common.EnvironmentInfo; @@ -31,7 +31,7 @@ namespace NzbDrone.Common.Processes return; } - var filename = Path.Combine(_appFolderInfo.AppDataFolder, "nzbdrone.pid"); + var filename = Path.Combine(_appFolderInfo.AppDataFolder, "sonarr.pid"); try { File.WriteAllText(filename, _processProvider.GetCurrentProcessId().ToString()); diff --git a/src/NzbDrone.Common/Processes/ProcessProvider.cs b/src/NzbDrone.Common/Processes/ProcessProvider.cs index 0ddab771f..5488ed40d 100644 --- a/src/NzbDrone.Common/Processes/ProcessProvider.cs +++ b/src/NzbDrone.Common/Processes/ProcessProvider.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections; using System.Collections.Generic; using System.Collections.Specialized; @@ -8,7 +8,6 @@ using System.IO; using System.Linq; using NLog; using NzbDrone.Common.EnvironmentInfo; -using NzbDrone.Common.Extensions; using NzbDrone.Common.Model; namespace NzbDrone.Common.Processes @@ -36,8 +35,8 @@ namespace NzbDrone.Common.Processes { private readonly Logger _logger; - public const string NZB_DRONE_PROCESS_NAME = "NzbDrone"; - public const string NZB_DRONE_CONSOLE_PROCESS_NAME = "NzbDrone.Console"; + public const string SONARR_PROCESS_NAME = "Sonarr"; + public const string SONARR_CONSOLE_PROCESS_NAME = "Sonarr.Console"; public ProcessProvider(Logger logger) { diff --git a/src/NzbDrone.Common/Properties/AssemblyInfo.cs b/src/NzbDrone.Common/Properties/AssemblyInfo.cs index e8cdf90c1..71909244c 100644 --- a/src/NzbDrone.Common/Properties/AssemblyInfo.cs +++ b/src/NzbDrone.Common/Properties/AssemblyInfo.cs @@ -4,7 +4,7 @@ using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("NzbDrone.Common")] +[assembly: AssemblyTitle("Sonarr.Common")] // The following GUID is for the ID of the typelib if this project is exposed to COM [assembly: Guid("b6eaa144-e13b-42e5-a738-c60d89c0f728")] diff --git a/src/NzbDrone.Common/Properties/SharedAssemblyInfo.cs b/src/NzbDrone.Common/Properties/SharedAssemblyInfo.cs index 1e622af2c..0a88c5981 100644 --- a/src/NzbDrone.Common/Properties/SharedAssemblyInfo.cs +++ b/src/NzbDrone.Common/Properties/SharedAssemblyInfo.cs @@ -5,7 +5,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyConfiguration("debug")] [assembly: AssemblyCompany("sonarr.tv")] -[assembly: AssemblyProduct("NzbDrone")] +[assembly: AssemblyProduct("Sonarr")] [assembly: AssemblyCopyright("GNU General Public v3")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/src/NzbDrone.Common/Reflection/ReflectionExtensions.cs b/src/NzbDrone.Common/Reflection/ReflectionExtensions.cs index 7fbaa9ec8..ccbb61c82 100644 --- a/src/NzbDrone.Common/Reflection/ReflectionExtensions.cs +++ b/src/NzbDrone.Common/Reflection/ReflectionExtensions.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Reflection; @@ -7,7 +7,7 @@ namespace NzbDrone.Common.Reflection { public static class ReflectionExtensions { - public static readonly Assembly CoreAssembly = Assembly.Load("NzbDrone.Core"); + public static readonly Assembly CoreAssembly = Assembly.Load("Sonarr.Core"); public static List GetSimpleProperties(this Type type) { diff --git a/src/NzbDrone.Common/ServiceProvider.cs b/src/NzbDrone.Common/ServiceProvider.cs index b494381c3..6ec609426 100644 --- a/src/NzbDrone.Common/ServiceProvider.cs +++ b/src/NzbDrone.Common/ServiceProvider.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Specialized; using System.Configuration.Install; using System.Diagnostics; @@ -25,7 +25,7 @@ namespace NzbDrone.Common public class ServiceProvider : IServiceProvider { - public const string NZBDRONE_SERVICE_NAME = "NzbDrone"; + public const string SERVICE_NAME = "Sonarr"; private readonly IProcessProvider _processProvider; private readonly Logger _logger; @@ -78,7 +78,7 @@ namespace NzbDrone.Common serviceInstaller.Context = context; serviceInstaller.DisplayName = serviceName; serviceInstaller.ServiceName = serviceName; - serviceInstaller.Description = "NzbDrone Application Server"; + serviceInstaller.Description = "Sonarr Application Server"; serviceInstaller.StartType = ServiceStartMode.Automatic; serviceInstaller.ServicesDependedOn = new[] { "EventLog", "Tcpip", "http" }; @@ -190,4 +190,4 @@ namespace NzbDrone.Common _processProvider.Start("cmd.exe", args); } } -} \ No newline at end of file +} diff --git a/src/NzbDrone.Console/NzbDrone.Console.csproj b/src/NzbDrone.Console/NzbDrone.Console.csproj index 9f10c2769..437840702 100644 --- a/src/NzbDrone.Console/NzbDrone.Console.csproj +++ b/src/NzbDrone.Console/NzbDrone.Console.csproj @@ -9,7 +9,7 @@ Exe Properties NzbDrone.Console - NzbDrone.Console + Sonarr.Console v4.6.1 512 diff --git a/src/NzbDrone.Console/Properties/AssemblyInfo.cs b/src/NzbDrone.Console/Properties/AssemblyInfo.cs index ed519f028..6315d987b 100644 --- a/src/NzbDrone.Console/Properties/AssemblyInfo.cs +++ b/src/NzbDrone.Console/Properties/AssemblyInfo.cs @@ -5,7 +5,7 @@ using System.Runtime.InteropServices; // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("NzbDrone.Host")] +[assembly: AssemblyTitle("Sonarr.Host")] [assembly: Guid("67AADCD9-89AA-4D95-8281-3193740E70E5")] [assembly: AssemblyVersion("10.0.0.*")] \ No newline at end of file diff --git a/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj b/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj index 0efc9c6d6..a7b490217 100644 --- a/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj +++ b/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj @@ -9,7 +9,7 @@ Library Properties NzbDrone.Core.Test - NzbDrone.Core.Test + Sonarr.Core.Test v4.6.1 512 ..\ diff --git a/src/NzbDrone.Core.Test/Properties/AssemblyInfo.cs b/src/NzbDrone.Core.Test/Properties/AssemblyInfo.cs index fca9cdaa2..e84bb3c69 100644 --- a/src/NzbDrone.Core.Test/Properties/AssemblyInfo.cs +++ b/src/NzbDrone.Core.Test/Properties/AssemblyInfo.cs @@ -1,4 +1,4 @@ -using System.Reflection; +using System.Reflection; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; @@ -6,11 +6,11 @@ using System.Runtime.InteropServices; // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("NzbDrone.Core.Test")] +[assembly: AssemblyTitle("Sonarr.Core.Test")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Microsoft")] -[assembly: AssemblyProduct("NzbDrone.Core.Test")] +[assembly: AssemblyProduct("Sonarr.Core.Test")] [assembly: AssemblyCopyright("Copyright © Microsoft 2010")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -27,4 +27,4 @@ using System.Runtime.InteropServices; [assembly: AssemblyVersion("10.0.0.*")] -[assembly: InternalsVisibleTo("NzbDrone.Core")] \ No newline at end of file +[assembly: InternalsVisibleTo("Sonarr.Core")] diff --git a/src/NzbDrone.Core.Test/UpdateTests/UpdateServiceFixture.cs b/src/NzbDrone.Core.Test/UpdateTests/UpdateServiceFixture.cs index ef29fe797..e7eb52b27 100644 --- a/src/NzbDrone.Core.Test/UpdateTests/UpdateServiceFixture.cs +++ b/src/NzbDrone.Core.Test/UpdateTests/UpdateServiceFixture.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.IO; using FluentAssertions; @@ -52,14 +52,14 @@ namespace NzbDrone.Core.Test.UpdateTests } Mocker.GetMock().SetupGet(c => c.TempFolder).Returns(TempFolder); - Mocker.GetMock().SetupGet(c => c.StartUpFolder).Returns(@"C:\NzbDrone".AsOsAgnostic); - Mocker.GetMock().SetupGet(c => c.AppDataFolder).Returns(@"C:\ProgramData\NzbDrone".AsOsAgnostic); + Mocker.GetMock().SetupGet(c => c.StartUpFolder).Returns(@"C:\Sonarr".AsOsAgnostic); + Mocker.GetMock().SetupGet(c => c.AppDataFolder).Returns(@"C:\ProgramData\Sonarr".AsOsAgnostic); Mocker.GetMock().Setup(c => c.AvailableUpdate()).Returns(_updatePackage); Mocker.GetMock().Setup(c => c.Verify(It.IsAny(), It.IsAny())).Returns(true); Mocker.GetMock().Setup(c => c.GetCurrentProcess()).Returns(new ProcessInfo { Id = 12 }); - Mocker.GetMock().Setup(c => c.ExecutingApplication).Returns(@"C:\Test\NzbDrone.exe"); + Mocker.GetMock().Setup(c => c.ExecutingApplication).Returns(@"C:\Test\Sonarr.exe"); Mocker.GetMock() .SetupGet(s => s.UpdateAutomatically) diff --git a/src/NzbDrone.Core/Datastore/ConnectionStringFactory.cs b/src/NzbDrone.Core/Datastore/ConnectionStringFactory.cs index 96a98a073..a69883dc1 100644 --- a/src/NzbDrone.Core/Datastore/ConnectionStringFactory.cs +++ b/src/NzbDrone.Core/Datastore/ConnectionStringFactory.cs @@ -16,7 +16,7 @@ namespace NzbDrone.Core.Datastore { public ConnectionStringFactory(IAppFolderInfo appFolderInfo) { - MainDbConnectionString = GetConnectionString(appFolderInfo.GetNzbDroneDatabase()); + MainDbConnectionString = GetConnectionString(appFolderInfo.GetDatabase()); LogDbConnectionString = GetConnectionString(appFolderInfo.GetLogDatabase()); } diff --git a/src/NzbDrone.Core/Download/Clients/Deluge/DelugeTorrentStatus.cs b/src/NzbDrone.Core/Download/Clients/Deluge/DelugeTorrentStatus.cs index bb8f06396..e4a4b4586 100644 --- a/src/NzbDrone.Core/Download/Clients/Deluge/DelugeTorrentStatus.cs +++ b/src/NzbDrone.Core/Download/Clients/Deluge/DelugeTorrentStatus.cs @@ -1,4 +1,4 @@ -namespace NzbDrone.Core.Download.Clients.Deluge +namespace NzbDrone.Core.Download.Clients.Deluge { class DelugeTorrentStatus { diff --git a/src/NzbDrone.Core/Lifecycle/LifecycleService.cs b/src/NzbDrone.Core/Lifecycle/LifecycleService.cs index a5c0c2a94..e4d727b0d 100644 --- a/src/NzbDrone.Core/Lifecycle/LifecycleService.cs +++ b/src/NzbDrone.Core/Lifecycle/LifecycleService.cs @@ -40,7 +40,7 @@ namespace NzbDrone.Core.Lifecycle if (_runtimeInfo.IsWindowsService) { - _serviceProvider.Stop(ServiceProvider.NZBDRONE_SERVICE_NAME); + _serviceProvider.Stop(ServiceProvider.SERVICE_NAME); } } @@ -52,7 +52,7 @@ namespace NzbDrone.Core.Lifecycle if (_runtimeInfo.IsWindowsService) { - _serviceProvider.Restart(ServiceProvider.NZBDRONE_SERVICE_NAME); + _serviceProvider.Restart(ServiceProvider.SERVICE_NAME); } } diff --git a/src/NzbDrone.Core/NzbDrone.Core.csproj b/src/NzbDrone.Core/NzbDrone.Core.csproj index 5b61be565..753741ff7 100644 --- a/src/NzbDrone.Core/NzbDrone.Core.csproj +++ b/src/NzbDrone.Core/NzbDrone.Core.csproj @@ -9,7 +9,7 @@ Library Properties NzbDrone.Core - NzbDrone.Core + Sonarr.Core v4.6.1 @@ -1281,7 +1281,7 @@ - + Always diff --git a/src/NzbDrone.Core/Properties/AssemblyInfo.cs b/src/NzbDrone.Core/Properties/AssemblyInfo.cs index 4593d015a..4ebaab27b 100644 --- a/src/NzbDrone.Core/Properties/AssemblyInfo.cs +++ b/src/NzbDrone.Core/Properties/AssemblyInfo.cs @@ -6,11 +6,11 @@ using System.Runtime.InteropServices; // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("NzbDrone.Core")] +[assembly: AssemblyTitle("Sonarr.Core")] // The following GUID is for the ID of the typelib if this project is exposed to COM [assembly: Guid("3C29FEF7-4B07-49ED-822E-1C29DC49BFAB")] [assembly: AssemblyVersion("10.0.0.*")] -[assembly: InternalsVisibleTo("NzbDrone.Core.Test")] +[assembly: InternalsVisibleTo("Sonarr.Core.Test")] diff --git a/src/NzbDrone.Core/NzbDrone.Core.dll.config b/src/NzbDrone.Core/Sonarr.Core.dll.config similarity index 100% rename from src/NzbDrone.Core/NzbDrone.Core.dll.config rename to src/NzbDrone.Core/Sonarr.Core.dll.config diff --git a/src/NzbDrone.Core/Update/InstallUpdateService.cs b/src/NzbDrone.Core/Update/InstallUpdateService.cs index e798ff58a..d99bfb305 100644 --- a/src/NzbDrone.Core/Update/InstallUpdateService.cs +++ b/src/NzbDrone.Core/Update/InstallUpdateService.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.IO; using NLog; @@ -167,7 +167,7 @@ namespace NzbDrone.Core.Update throw new UpdateFailedException("Update Script: '{0}' does not exist", scriptPath); } - _logger.Info("Removing NzbDrone.Update"); + _logger.Info("Removing Sonarr.Update"); _diskProvider.DeleteFolder(_appFolderInfo.GetUpdateClientFolder(), true); _logger.ProgressInfo("Starting update script: {0}", _configFileProvider.UpdateScriptPath); diff --git a/src/NzbDrone.Host/MainAppContainerBuilder.cs b/src/NzbDrone.Host/MainAppContainerBuilder.cs index 63dfdabf1..2d9977fcb 100644 --- a/src/NzbDrone.Host/MainAppContainerBuilder.cs +++ b/src/NzbDrone.Host/MainAppContainerBuilder.cs @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections.Generic; using Nancy.Bootstrapper; using Sonarr.Http; using NzbDrone.Common.Composition; @@ -14,10 +14,10 @@ namespace NzbDrone.Host { var assemblies = new List { - "NzbDrone.Host", - "NzbDrone.Core", - "NzbDrone.Api", - "NzbDrone.SignalR", + "Sonarr.Host", + "Sonarr.Core", + "Sonarr.Api", + "Sonarr.SignalR", "Sonarr.Api.V3", "Sonarr.Http" }; @@ -34,4 +34,4 @@ namespace NzbDrone.Host Container.Register(); } } -} \ No newline at end of file +} diff --git a/src/NzbDrone.Host/NzbDrone.Host.csproj b/src/NzbDrone.Host/NzbDrone.Host.csproj index f81d43552..a5ddb1d9d 100644 --- a/src/NzbDrone.Host/NzbDrone.Host.csproj +++ b/src/NzbDrone.Host/NzbDrone.Host.csproj @@ -9,7 +9,7 @@ Library Properties NzbDrone.Host - NzbDrone.Host + Sonarr.Host v4.6.1 512 diff --git a/src/NzbDrone.Host/Properties/AssemblyInfo.cs b/src/NzbDrone.Host/Properties/AssemblyInfo.cs index dd667bbdd..a6b28134f 100644 --- a/src/NzbDrone.Host/Properties/AssemblyInfo.cs +++ b/src/NzbDrone.Host/Properties/AssemblyInfo.cs @@ -1,11 +1,11 @@ -using System.Reflection; +using System.Reflection; using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("NzbDrone.exe")] +[assembly: AssemblyTitle("Sonarr.exe")] [assembly: Guid("C2172AF4-F9A6-4D91-BAEE-C2E4EE680613")] [assembly: AssemblyVersion("10.0.0.*")] diff --git a/src/NzbDrone.Host/Router.cs b/src/NzbDrone.Host/Router.cs index e15c54713..f3d1598cc 100644 --- a/src/NzbDrone.Host/Router.cs +++ b/src/NzbDrone.Host/Router.cs @@ -51,27 +51,27 @@ namespace NzbDrone.Host case ApplicationModes.InstallService: { _logger.Debug("Install Service selected"); - if (_serviceProvider.ServiceExist(ServiceProvider.NZBDRONE_SERVICE_NAME)) + if (_serviceProvider.ServiceExist(ServiceProvider.SERVICE_NAME)) { _consoleService.PrintServiceAlreadyExist(); } else { - _serviceProvider.Install(ServiceProvider.NZBDRONE_SERVICE_NAME); - _serviceProvider.Start(ServiceProvider.NZBDRONE_SERVICE_NAME); + _serviceProvider.Install(ServiceProvider.SERVICE_NAME); + _serviceProvider.Start(ServiceProvider.SERVICE_NAME); } break; } case ApplicationModes.UninstallService: { _logger.Debug("Uninstall Service selected"); - if (!_serviceProvider.ServiceExist(ServiceProvider.NZBDRONE_SERVICE_NAME)) + if (!_serviceProvider.ServiceExist(ServiceProvider.SERVICE_NAME)) { _consoleService.PrintServiceDoesNotExist(); } else { - _serviceProvider.UnInstall(ServiceProvider.NZBDRONE_SERVICE_NAME); + _serviceProvider.UnInstall(ServiceProvider.SERVICE_NAME); } break; diff --git a/src/NzbDrone.Host/SingleInstancePolicy.cs b/src/NzbDrone.Host/SingleInstancePolicy.cs index a24f12207..98f070bb9 100644 --- a/src/NzbDrone.Host/SingleInstancePolicy.cs +++ b/src/NzbDrone.Host/SingleInstancePolicy.cs @@ -65,8 +65,8 @@ namespace NzbDrone.Host { var currentId = _processProvider.GetCurrentProcess().Id; - var otherProcesses = _processProvider.FindProcessByName(ProcessProvider.NZB_DRONE_CONSOLE_PROCESS_NAME) - .Union(_processProvider.FindProcessByName(ProcessProvider.NZB_DRONE_PROCESS_NAME)) + var otherProcesses = _processProvider.FindProcessByName(ProcessProvider.SONARR_CONSOLE_PROCESS_NAME) + .Union(_processProvider.FindProcessByName(ProcessProvider.SONARR_PROCESS_NAME)) .Select(c => c.Id) .Except(new[] { currentId }) .ToList(); diff --git a/src/NzbDrone.Integration.Test/NzbDrone.Integration.Test.csproj b/src/NzbDrone.Integration.Test/NzbDrone.Integration.Test.csproj index bca4fd126..155e05295 100644 --- a/src/NzbDrone.Integration.Test/NzbDrone.Integration.Test.csproj +++ b/src/NzbDrone.Integration.Test/NzbDrone.Integration.Test.csproj @@ -8,7 +8,7 @@ Library Properties NzbDrone.Integration.Test - NzbDrone.Integration.Test + Sonarr.Integration.Test v4.6.1 512 ..\ diff --git a/src/NzbDrone.Integration.Test/Properties/AssemblyInfo.cs b/src/NzbDrone.Integration.Test/Properties/AssemblyInfo.cs index 5183f6f7e..f444edc58 100644 --- a/src/NzbDrone.Integration.Test/Properties/AssemblyInfo.cs +++ b/src/NzbDrone.Integration.Test/Properties/AssemblyInfo.cs @@ -4,11 +4,11 @@ using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("NzbDrone.Smoke.Test")] +[assembly: AssemblyTitle("Sonarr.Smoke.Test")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("NzbDrone.Smoke.Test")] +[assembly: AssemblyProduct("Sonarr.Smoke.Test")] [assembly: AssemblyCopyright("Copyright © 2013")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/src/NzbDrone.Libraries.Test/NzbDrone.Libraries.Test.csproj b/src/NzbDrone.Libraries.Test/NzbDrone.Libraries.Test.csproj index d2af1ea36..e62d6ca77 100644 --- a/src/NzbDrone.Libraries.Test/NzbDrone.Libraries.Test.csproj +++ b/src/NzbDrone.Libraries.Test/NzbDrone.Libraries.Test.csproj @@ -8,7 +8,7 @@ Library Properties NzbDrone.Libraries.Test - NzbDrone.Libraries.Test + Sonarr.Libraries.Test v4.6.1 512 ..\ diff --git a/src/NzbDrone.Libraries.Test/Properties/AssemblyInfo.cs b/src/NzbDrone.Libraries.Test/Properties/AssemblyInfo.cs index 8d91461ae..ebd2dcebf 100644 --- a/src/NzbDrone.Libraries.Test/Properties/AssemblyInfo.cs +++ b/src/NzbDrone.Libraries.Test/Properties/AssemblyInfo.cs @@ -4,11 +4,11 @@ using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("NzbDrone.Libraries.Test")] +[assembly: AssemblyTitle("Sonarr.Libraries.Test")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("NzbDrone.Libraries.Test")] +[assembly: AssemblyProduct("Sonarr.Libraries.Test")] [assembly: AssemblyCopyright("Copyright © 2013")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/src/NzbDrone.Mono.Test/NzbDrone.Mono.Test.csproj b/src/NzbDrone.Mono.Test/NzbDrone.Mono.Test.csproj index 663a985f0..bb6c635da 100644 --- a/src/NzbDrone.Mono.Test/NzbDrone.Mono.Test.csproj +++ b/src/NzbDrone.Mono.Test/NzbDrone.Mono.Test.csproj @@ -8,7 +8,7 @@ Library Properties NzbDrone.Mono.Test - NzbDrone.Mono.Test + Sonarr.Mono.Test v4.6.1 512 ..\ diff --git a/src/NzbDrone.Mono.Test/Properties/AssemblyInfo.cs b/src/NzbDrone.Mono.Test/Properties/AssemblyInfo.cs index 012007b52..8351955ba 100644 --- a/src/NzbDrone.Mono.Test/Properties/AssemblyInfo.cs +++ b/src/NzbDrone.Mono.Test/Properties/AssemblyInfo.cs @@ -4,11 +4,11 @@ using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("NzbDrone.Mono.Test")] +[assembly: AssemblyTitle("Sonarr.Mono.Test")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("NzbDrone.Mono.Test")] +[assembly: AssemblyProduct("Sonarr.Mono.Test")] [assembly: AssemblyCopyright("Copyright © 2014")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/src/NzbDrone.Mono/NzbDrone.Mono.csproj b/src/NzbDrone.Mono/NzbDrone.Mono.csproj index 04841b928..da470888d 100644 --- a/src/NzbDrone.Mono/NzbDrone.Mono.csproj +++ b/src/NzbDrone.Mono/NzbDrone.Mono.csproj @@ -8,7 +8,7 @@ Library Properties NzbDrone.Mono - NzbDrone.Mono + Sonarr.Mono v4.6.1 512 diff --git a/src/NzbDrone.Mono/Properties/AssemblyInfo.cs b/src/NzbDrone.Mono/Properties/AssemblyInfo.cs index f78631ed8..f81c67622 100644 --- a/src/NzbDrone.Mono/Properties/AssemblyInfo.cs +++ b/src/NzbDrone.Mono/Properties/AssemblyInfo.cs @@ -4,11 +4,11 @@ using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("NzbDrone.Mono")] +[assembly: AssemblyTitle("Sonarr.Mono")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("NzbDrone.Mono")] +[assembly: AssemblyProduct("Sonarr.Mono")] [assembly: AssemblyCopyright("Copyright © 2014")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/src/NzbDrone.SignalR/NzbDrone.SignalR.csproj b/src/NzbDrone.SignalR/NzbDrone.SignalR.csproj index 5c9ca0e7c..e0880f382 100644 --- a/src/NzbDrone.SignalR/NzbDrone.SignalR.csproj +++ b/src/NzbDrone.SignalR/NzbDrone.SignalR.csproj @@ -8,7 +8,7 @@ Library Properties NzbDrone.SignalR - NzbDrone.SignalR + Sonarr.SignalR v4.6.1 512 ..\ diff --git a/src/NzbDrone.SignalR/Properties/AssemblyInfo.cs b/src/NzbDrone.SignalR/Properties/AssemblyInfo.cs index 7d5972415..a786eb581 100644 --- a/src/NzbDrone.SignalR/Properties/AssemblyInfo.cs +++ b/src/NzbDrone.SignalR/Properties/AssemblyInfo.cs @@ -4,7 +4,7 @@ using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("NzbDrone.SignalR")] +[assembly: AssemblyTitle("Sonarr.SignalR")] [assembly: Guid("98bd985a-4f23-4201-8ed3-f6f3d7f2a5fe")] [assembly: AssemblyVersion("10.0.0.*")] diff --git a/src/NzbDrone.Test.Common/AutoMoq/AutoMoqer.cs b/src/NzbDrone.Test.Common/AutoMoq/AutoMoqer.cs index 5cf6805a8..f3c03c93c 100644 --- a/src/NzbDrone.Test.Common/AutoMoq/AutoMoqer.cs +++ b/src/NzbDrone.Test.Common/AutoMoq/AutoMoqer.cs @@ -171,11 +171,11 @@ namespace NzbDrone.Test.Common.AutoMoq private void RegisterPlatformLibrary(IUnityContainer container) { - var assemblyName = "NzbDrone.Windows"; + var assemblyName = "Sonarr.Windows"; if (OsInfo.IsNotWindows) { - assemblyName = "NzbDrone.Mono"; + assemblyName = "Sonarr.Mono"; } if (!File.Exists(assemblyName + ".dll")) @@ -188,4 +188,4 @@ namespace NzbDrone.Test.Common.AutoMoq #endregion } -} \ No newline at end of file +} diff --git a/src/NzbDrone.Test.Common/NzbDrone.Test.Common.csproj b/src/NzbDrone.Test.Common/NzbDrone.Test.Common.csproj index 9756cf557..30c568597 100644 --- a/src/NzbDrone.Test.Common/NzbDrone.Test.Common.csproj +++ b/src/NzbDrone.Test.Common/NzbDrone.Test.Common.csproj @@ -9,7 +9,7 @@ Library Properties NzbDrone.Test.Common - NzbDrone.Test.Common + Sonarr.Test.Common v4.6.1 512 ..\ diff --git a/src/NzbDrone.Test.Common/NzbDroneRunner.cs b/src/NzbDrone.Test.Common/NzbDroneRunner.cs index 2f1d8e3f5..c4f297d63 100644 --- a/src/NzbDrone.Test.Common/NzbDroneRunner.cs +++ b/src/NzbDrone.Test.Common/NzbDroneRunner.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Diagnostics; using System.IO; using System.Threading; @@ -32,20 +32,15 @@ namespace NzbDrone.Test.Common { AppData = Path.Combine(TestContext.CurrentContext.TestDirectory, "_intg_" + DateTime.Now.Ticks); - var nzbdroneConsoleExe = "NzbDrone.Console.exe"; - - if (OsInfo.IsNotWindows) - { - nzbdroneConsoleExe = "NzbDrone.exe"; - } + var sonarrConsoleExe = OsInfo.IsWindows ? "Sonarr.Console.exe" : "Sonarr.exe"; if (BuildInfo.IsDebug) { - Start(Path.Combine(TestContext.CurrentContext.TestDirectory, "..\\..\\..\\..\\..\\_output\\NzbDrone.Console.exe")); + Start(Path.Combine(TestContext.CurrentContext.TestDirectory, "..\\..\\..\\..\\..\\_output\\Sonarr.Console.exe")); } else { - Start(Path.Combine("bin", nzbdroneConsoleExe)); + Start(Path.Combine("bin", sonarrConsoleExe)); } while (true) @@ -84,8 +79,8 @@ namespace NzbDrone.Test.Common _processProvider.Kill(_nzbDroneProcess.Id); } - _processProvider.KillAll(ProcessProvider.NZB_DRONE_CONSOLE_PROCESS_NAME); - _processProvider.KillAll(ProcessProvider.NZB_DRONE_PROCESS_NAME); + _processProvider.KillAll(ProcessProvider.SONARR_CONSOLE_PROCESS_NAME); + _processProvider.KillAll(ProcessProvider.SONARR_PROCESS_NAME); } private void Start(string outputNzbdroneConsoleExe) @@ -134,4 +129,4 @@ namespace NzbDrone.Test.Common } } } -} \ No newline at end of file +} diff --git a/src/NzbDrone.Test.Common/Properties/AssemblyInfo.cs b/src/NzbDrone.Test.Common/Properties/AssemblyInfo.cs index d82d940d5..14d420a75 100644 --- a/src/NzbDrone.Test.Common/Properties/AssemblyInfo.cs +++ b/src/NzbDrone.Test.Common/Properties/AssemblyInfo.cs @@ -4,11 +4,11 @@ using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("NzbDrone.Test.Common")] +[assembly: AssemblyTitle("Sonarr.Test.Common")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Microsoft")] -[assembly: AssemblyProduct("NzbDrone.Test.Common")] +[assembly: AssemblyProduct("Sonarr.Test.Common")] [assembly: AssemblyCopyright("Copyright © Microsoft 2011")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/src/NzbDrone.Test.Dummy/DummyApp.cs b/src/NzbDrone.Test.Dummy/DummyApp.cs index 5176dab6f..3f6419d02 100644 --- a/src/NzbDrone.Test.Dummy/DummyApp.cs +++ b/src/NzbDrone.Test.Dummy/DummyApp.cs @@ -1,11 +1,11 @@ -using System; +using System; using System.Diagnostics; namespace NzbDrone.Test.Dummy { public class DummyApp { - public const string DUMMY_PROCCESS_NAME = "NzbDrone.Test.Dummy"; + public const string DUMMY_PROCCESS_NAME = "Sonarr.Test.Dummy"; static void Main(string[] args) { diff --git a/src/NzbDrone.Test.Dummy/NzbDrone.Test.Dummy.csproj b/src/NzbDrone.Test.Dummy/NzbDrone.Test.Dummy.csproj index 0a9d39c47..055831bac 100644 --- a/src/NzbDrone.Test.Dummy/NzbDrone.Test.Dummy.csproj +++ b/src/NzbDrone.Test.Dummy/NzbDrone.Test.Dummy.csproj @@ -9,7 +9,7 @@ Exe Properties NzbDrone.Test.Dummy - NzbDrone.Test.Dummy + Sonarr.Test.Dummy v4.6.1 diff --git a/src/NzbDrone.Test.Dummy/Properties/AssemblyInfo.cs b/src/NzbDrone.Test.Dummy/Properties/AssemblyInfo.cs index d2e93dadf..cde75a801 100644 --- a/src/NzbDrone.Test.Dummy/Properties/AssemblyInfo.cs +++ b/src/NzbDrone.Test.Dummy/Properties/AssemblyInfo.cs @@ -4,11 +4,11 @@ using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("NzbDrone.Test.Dummy")] +[assembly: AssemblyTitle("Sonarr.Test.Dummy")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Microsoft")] -[assembly: AssemblyProduct("NzbDrone.Test.Dummy")] +[assembly: AssemblyProduct("Sonarr.Test.Dummy")] [assembly: AssemblyCopyright("Copyright © Microsoft 2011")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/src/NzbDrone.Update.Test/NzbDrone.Update.Test.csproj b/src/NzbDrone.Update.Test/NzbDrone.Update.Test.csproj index 271ce288a..ec216e4da 100644 --- a/src/NzbDrone.Update.Test/NzbDrone.Update.Test.csproj +++ b/src/NzbDrone.Update.Test/NzbDrone.Update.Test.csproj @@ -9,7 +9,7 @@ Library Properties NzbDrone.Update.Test - NzbDrone.Update.Test + Sonarr.Update.Test v4.6.1 diff --git a/src/NzbDrone.Update.Test/ProgramFixture.cs b/src/NzbDrone.Update.Test/ProgramFixture.cs index 5d9b7243a..36cef568a 100644 --- a/src/NzbDrone.Update.Test/ProgramFixture.cs +++ b/src/NzbDrone.Update.Test/ProgramFixture.cs @@ -1,4 +1,4 @@ -using System; +using System; using Moq; using NUnit.Framework; using NzbDrone.Common.Model; @@ -34,7 +34,7 @@ namespace NzbDrone.Update.Test [Test] public void should_call_update_with_correct_path() { - var ProcessPath = @"C:\NzbDrone\nzbdrone.exe".AsOsAgnostic(); + var ProcessPath = @"C:\Sonarr\Sonarr.exe".AsOsAgnostic(); Mocker.GetMock().Setup(c => c.GetProcessById(12)) .Returns(new ProcessInfo() { StartPath = ProcessPath }); @@ -43,7 +43,7 @@ namespace NzbDrone.Update.Test Subject.Start(new[] { "12", "", ProcessPath }); - Mocker.GetMock().Verify(c => c.Start(@"C:\NzbDrone".AsOsAgnostic(), 12), Times.Once()); + Mocker.GetMock().Verify(c => c.Start(@"C:\Sonarr".AsOsAgnostic(), 12), Times.Once()); } diff --git a/src/NzbDrone.Update.Test/Properties/AssemblyInfo.cs b/src/NzbDrone.Update.Test/Properties/AssemblyInfo.cs index 35dc227d7..93ca6a8d2 100644 --- a/src/NzbDrone.Update.Test/Properties/AssemblyInfo.cs +++ b/src/NzbDrone.Update.Test/Properties/AssemblyInfo.cs @@ -4,11 +4,11 @@ using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("NzbDrone.Update.Test")] +[assembly: AssemblyTitle("Sonarr.Update.Test")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Microsoft")] -[assembly: AssemblyProduct("NzbDrone.Update.Test")] +[assembly: AssemblyProduct("Sonarr.Update.Test")] [assembly: AssemblyCopyright("Copyright © Microsoft 2011")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/src/NzbDrone.Update.Test/StartNzbDroneService.cs b/src/NzbDrone.Update.Test/StartNzbDroneService.cs index 4cb97c91d..b7c9ae5e7 100644 --- a/src/NzbDrone.Update.Test/StartNzbDroneService.cs +++ b/src/NzbDrone.Update.Test/StartNzbDroneService.cs @@ -1,4 +1,4 @@ -using System; +using System; using Moq; using NUnit.Framework; using NzbDrone.Common; @@ -16,23 +16,23 @@ namespace NzbDrone.Update.Test [Test] public void should_start_service_if_app_type_was_serivce() { - const string targetFolder = "c:\\NzbDrone\\"; + const string targetFolder = "c:\\Sonarr\\"; Subject.Start(AppType.Service, targetFolder); - Mocker.GetMock().Verify(c => c.Start(ServiceProvider.NZBDRONE_SERVICE_NAME), Times.Once()); + Mocker.GetMock().Verify(c => c.Start(ServiceProvider.SERVICE_NAME), Times.Once()); } [Test] public void should_start_console_if_app_type_was_service_but_start_failed_because_of_permissions() { - const string targetFolder = "c:\\NzbDrone\\"; + const string targetFolder = "c:\\Sonarr\\"; - Mocker.GetMock().Setup(c => c.Start(ServiceProvider.NZBDRONE_SERVICE_NAME)).Throws(new InvalidOperationException()); + Mocker.GetMock().Setup(c => c.Start(ServiceProvider.SERVICE_NAME)).Throws(new InvalidOperationException()); Subject.Start(AppType.Service, targetFolder); - Mocker.GetMock().Verify(c => c.SpawnNewProcess("c:\\NzbDrone\\NzbDrone.Console.exe", "/" + StartupContext.NO_BROWSER, null), Times.Once()); + Mocker.GetMock().Verify(c => c.SpawnNewProcess("c:\\Sonarr\\Sonarr.Console.exe", "/" + StartupContext.NO_BROWSER, null), Times.Once()); ExceptionVerification.ExpectedWarns(1); } diff --git a/src/NzbDrone.Update.Test/UpdateProviderStartFixture.cs b/src/NzbDrone.Update.Test/UpdateProviderStartFixture.cs index 6e6456b59..5258b59ac 100644 --- a/src/NzbDrone.Update.Test/UpdateProviderStartFixture.cs +++ b/src/NzbDrone.Update.Test/UpdateProviderStartFixture.cs @@ -1,4 +1,4 @@ -/* +/* using System.Collections.Generic; using System.IO; using System.Linq; @@ -42,14 +42,14 @@ namespace NzbDrone.Update.Test private void WithInstalledService() { Mocker.GetMock() - .Setup(c => c.ServiceExist(ServiceProvider.NZBDRONE_SERVICE_NAME)) + .Setup(c => c.ServiceExist(ServiceProvider.SERVICE_NAME)) .Returns(true); } private void WithServiceRunning(bool state) { Mocker.GetMock() - .Setup(c => c.IsServiceRunning(ServiceProvider.NZBDRONE_SERVICE_NAME)).Returns(state); + .Setup(c => c.IsServiceRunning(ServiceProvider.SERVICE_NAME)).Returns(state); } [Test] @@ -62,7 +62,7 @@ namespace NzbDrone.Update.Test Mocker.Resolve().Start(TARGET_FOLDER); - Mocker.GetMock().Verify(c => c.Stop(ServiceProvider.NZBDRONE_SERVICE_NAME), Times.Once()); + Mocker.GetMock().Verify(c => c.Stop(ServiceProvider.SERVICE_NAME), Times.Once()); } [Test] @@ -75,7 +75,7 @@ namespace NzbDrone.Update.Test Mocker.Resolve().Start(TARGET_FOLDER); - Mocker.GetMock().Verify(c => c.Stop(ServiceProvider.NZBDRONE_SERVICE_NAME), Times.Never()); + Mocker.GetMock().Verify(c => c.Stop(ServiceProvider.SERVICE_NAME), Times.Never()); } [Test] @@ -220,7 +220,7 @@ namespace NzbDrone.Update.Test private void VerifyServiceRestart() { Mocker.GetMock() - .Verify(c => c.Start(ServiceProvider.NZBDRONE_SERVICE_NAME), Times.Once()); + .Verify(c => c.Start(ServiceProvider.SERVICE_NAME), Times.Once()); Mocker.GetMock() .Verify(c => c.Start(It.IsAny()), Times.Never()); @@ -232,7 +232,7 @@ namespace NzbDrone.Update.Test .Verify(c => c.Start(It.IsAny()), Times.Never()); Mocker.GetMock() - .Verify(c => c.Start(TARGET_FOLDER + "NzbDrone.exe"), Times.Once()); + .Verify(c => c.Start(TARGET_FOLDER + "Sonarr.exe"), Times.Once()); } diff --git a/src/NzbDrone.Update/NzbDrone.Update.csproj b/src/NzbDrone.Update/NzbDrone.Update.csproj index 3c675df58..ba8dcfbad 100644 --- a/src/NzbDrone.Update/NzbDrone.Update.csproj +++ b/src/NzbDrone.Update/NzbDrone.Update.csproj @@ -9,7 +9,7 @@ WinExe Properties NzbDrone.Update - NzbDrone.Update + Sonarr.Update v4.6.1 @@ -22,7 +22,7 @@ true full false - ..\..\_output\NzbDrone.Update\ + ..\..\_output\Sonarr.Update\ DEBUG;TRACE prompt 4 @@ -32,7 +32,7 @@ x86 pdbonly true - ..\..\_output\NzbDrone.Update\ + ..\..\_output\Sonarr.Update\ TRACE prompt 4 diff --git a/src/NzbDrone.Update/Properties/AssemblyInfo.cs b/src/NzbDrone.Update/Properties/AssemblyInfo.cs index 5a577baf3..802ee73b5 100644 --- a/src/NzbDrone.Update/Properties/AssemblyInfo.cs +++ b/src/NzbDrone.Update/Properties/AssemblyInfo.cs @@ -4,7 +4,7 @@ using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("NzbDrone.Update")] +[assembly: AssemblyTitle("Sonarr.Update")] // The following GUID is for the ID of the typelib if this project is exposed to COM [assembly: Guid("e4560a3d-8053-4d57-a260-bfe52f4cc357")] diff --git a/src/NzbDrone.Update/UpdateContainerBuilder.cs b/src/NzbDrone.Update/UpdateContainerBuilder.cs index 0dd0fc079..cc212d434 100644 --- a/src/NzbDrone.Update/UpdateContainerBuilder.cs +++ b/src/NzbDrone.Update/UpdateContainerBuilder.cs @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections.Generic; using NzbDrone.Common.Composition; using NzbDrone.Common.EnvironmentInfo; using NzbDrone.Common.Http.Dispatchers; @@ -17,7 +17,7 @@ namespace NzbDrone.Update { var assemblies = new List { - "NzbDrone.Update" + "Sonarr.Update" }; return new UpdateContainerBuilder(startupContext, assemblies).Container; diff --git a/src/NzbDrone.Update/UpdateEngine/BackupAppData.cs b/src/NzbDrone.Update/UpdateEngine/BackupAppData.cs index a93bca1f5..22b0b481a 100644 --- a/src/NzbDrone.Update/UpdateEngine/BackupAppData.cs +++ b/src/NzbDrone.Update/UpdateEngine/BackupAppData.cs @@ -43,11 +43,10 @@ namespace NzbDrone.Update.UpdateEngine _diskProvider.CreateFolder(backupFolderAppData); } - try { _diskTransferService.TransferFile(_appFolderInfo.GetConfigPath(), _appFolderInfo.GetUpdateBackupConfigFile(), TransferMode.Copy); - _diskTransferService.TransferFile(_appFolderInfo.GetNzbDroneDatabase(), _appFolderInfo.GetUpdateBackupDatabase(), TransferMode.Copy); + _diskTransferService.TransferFile(_appFolderInfo.GetDatabase(), _appFolderInfo.GetUpdateBackupDatabase(), TransferMode.Copy); } catch (Exception e) { diff --git a/src/NzbDrone.Update/UpdateEngine/DetectApplicationType.cs b/src/NzbDrone.Update/UpdateEngine/DetectApplicationType.cs index 7df590a66..781435606 100644 --- a/src/NzbDrone.Update/UpdateEngine/DetectApplicationType.cs +++ b/src/NzbDrone.Update/UpdateEngine/DetectApplicationType.cs @@ -28,13 +28,13 @@ namespace NzbDrone.Update.UpdateEngine return AppType.Normal; } - if (_serviceProvider.ServiceExist(ServiceProvider.NZBDRONE_SERVICE_NAME) - && _serviceProvider.IsServiceRunning(ServiceProvider.NZBDRONE_SERVICE_NAME)) + if (_serviceProvider.ServiceExist(ServiceProvider.SERVICE_NAME) + && _serviceProvider.IsServiceRunning(ServiceProvider.SERVICE_NAME)) { return AppType.Service; } - if (_processProvider.Exists(ProcessProvider.NZB_DRONE_CONSOLE_PROCESS_NAME)) + if (_processProvider.Exists(ProcessProvider.SONARR_CONSOLE_PROCESS_NAME)) { return AppType.Console; } diff --git a/src/NzbDrone.Update/UpdateEngine/DetectExistingVersion.cs b/src/NzbDrone.Update/UpdateEngine/DetectExistingVersion.cs index d27190f17..76d87580d 100644 --- a/src/NzbDrone.Update/UpdateEngine/DetectExistingVersion.cs +++ b/src/NzbDrone.Update/UpdateEngine/DetectExistingVersion.cs @@ -22,7 +22,7 @@ namespace NzbDrone.Update.UpdateEngine { try { - var targetExecutable = Path.Combine(targetFolder, "NzbDrone.exe"); + var targetExecutable = Path.Combine(targetFolder, "Sonarr.exe"); if (File.Exists(targetExecutable)) { diff --git a/src/NzbDrone.Update/UpdateEngine/InstallUpdateService.cs b/src/NzbDrone.Update/UpdateEngine/InstallUpdateService.cs index 2f9c04c2d..faa741a2d 100644 --- a/src/NzbDrone.Update/UpdateEngine/InstallUpdateService.cs +++ b/src/NzbDrone.Update/UpdateEngine/InstallUpdateService.cs @@ -86,8 +86,8 @@ namespace NzbDrone.Update.UpdateEngine var appType = _detectApplicationType.GetAppType(); - _processProvider.FindProcessByName(ProcessProvider.NZB_DRONE_CONSOLE_PROCESS_NAME); - _processProvider.FindProcessByName(ProcessProvider.NZB_DRONE_PROCESS_NAME); + _processProvider.FindProcessByName(ProcessProvider.SONARR_CONSOLE_PROCESS_NAME); + _processProvider.FindProcessByName(ProcessProvider.SONARR_PROCESS_NAME); if (OsInfo.IsWindows) { @@ -101,7 +101,7 @@ namespace NzbDrone.Update.UpdateEngine if (OsInfo.IsWindows) { - if (_processProvider.Exists(ProcessProvider.NZB_DRONE_CONSOLE_PROCESS_NAME) || _processProvider.Exists(ProcessProvider.NZB_DRONE_PROCESS_NAME)) + if (_processProvider.Exists(ProcessProvider.SONARR_CONSOLE_PROCESS_NAME) || _processProvider.Exists(ProcessProvider.SONARR_PROCESS_NAME)) { _logger.Error("Sonarr was restarted prematurely by external process."); return; @@ -141,14 +141,14 @@ namespace NzbDrone.Update.UpdateEngine { System.Threading.Thread.Sleep(1000); - if (_processProvider.Exists(ProcessProvider.NZB_DRONE_PROCESS_NAME)) + if (_processProvider.Exists(ProcessProvider.SONARR_PROCESS_NAME)) { _logger.Info("Sonarr was restarted by external process."); break; } } - if (!_processProvider.Exists(ProcessProvider.NZB_DRONE_PROCESS_NAME)) + if (!_processProvider.Exists(ProcessProvider.SONARR_PROCESS_NAME)) { _startNzbDrone.Start(appType, installationFolder); } diff --git a/src/NzbDrone.Update/UpdateEngine/StartNzbDrone.cs b/src/NzbDrone.Update/UpdateEngine/StartNzbDrone.cs index 279ee8a56..3042dd157 100644 --- a/src/NzbDrone.Update/UpdateEngine/StartNzbDrone.cs +++ b/src/NzbDrone.Update/UpdateEngine/StartNzbDrone.cs @@ -57,17 +57,17 @@ namespace NzbDrone.Update.UpdateEngine private void StartService() { _logger.Info("Starting NzbDrone service"); - _serviceProvider.Start(ServiceProvider.NZBDRONE_SERVICE_NAME); + _serviceProvider.Start(ServiceProvider.SERVICE_NAME); } private void StartWinform(string installationFolder) { - Start(installationFolder, "NzbDrone.exe"); + Start(installationFolder, "Sonarr.exe"); } private void StartConsole(string installationFolder) { - Start(installationFolder, "NzbDrone.Console.exe"); + Start(installationFolder, "Sonarr.Console.exe"); } private void Start(string installationFolder, string fileName) @@ -83,4 +83,4 @@ namespace NzbDrone.Update.UpdateEngine _processProvider.SpawnNewProcess(path, _startupContext.PreservedArguments); } } -} \ No newline at end of file +} diff --git a/src/NzbDrone.Update/UpdateEngine/TerminateNzbDrone.cs b/src/NzbDrone.Update/UpdateEngine/TerminateNzbDrone.cs index 45a584919..ce2d90812 100644 --- a/src/NzbDrone.Update/UpdateEngine/TerminateNzbDrone.cs +++ b/src/NzbDrone.Update/UpdateEngine/TerminateNzbDrone.cs @@ -31,13 +31,13 @@ namespace NzbDrone.Update.UpdateEngine { _logger.Info("Stopping all running services"); - if (_serviceProvider.ServiceExist(ServiceProvider.NZBDRONE_SERVICE_NAME) - && _serviceProvider.IsServiceRunning(ServiceProvider.NZBDRONE_SERVICE_NAME)) + if (_serviceProvider.ServiceExist(ServiceProvider.SERVICE_NAME) + && _serviceProvider.IsServiceRunning(ServiceProvider.SERVICE_NAME)) { try { _logger.Info("NzbDrone Service is installed and running"); - _serviceProvider.Stop(ServiceProvider.NZBDRONE_SERVICE_NAME); + _serviceProvider.Stop(ServiceProvider.SERVICE_NAME); } catch (Exception e) { @@ -47,15 +47,15 @@ namespace NzbDrone.Update.UpdateEngine _logger.Info("Killing all running processes"); - _processProvider.KillAll(ProcessProvider.NZB_DRONE_CONSOLE_PROCESS_NAME); - _processProvider.KillAll(ProcessProvider.NZB_DRONE_PROCESS_NAME); + _processProvider.KillAll(ProcessProvider.SONARR_CONSOLE_PROCESS_NAME); + _processProvider.KillAll(ProcessProvider.SONARR_PROCESS_NAME); } else { _logger.Info("Killing all running processes"); - _processProvider.KillAll(ProcessProvider.NZB_DRONE_CONSOLE_PROCESS_NAME); - _processProvider.KillAll(ProcessProvider.NZB_DRONE_PROCESS_NAME); + _processProvider.KillAll(ProcessProvider.SONARR_CONSOLE_PROCESS_NAME); + _processProvider.KillAll(ProcessProvider.SONARR_PROCESS_NAME); _processProvider.Kill(processId); } diff --git a/src/NzbDrone.Windows.Test/NzbDrone.Windows.Test.csproj b/src/NzbDrone.Windows.Test/NzbDrone.Windows.Test.csproj index 41115ac08..acc60065a 100644 --- a/src/NzbDrone.Windows.Test/NzbDrone.Windows.Test.csproj +++ b/src/NzbDrone.Windows.Test/NzbDrone.Windows.Test.csproj @@ -8,7 +8,7 @@ Library Properties NzbDrone.Windows.Test - NzbDrone.Windows.Test + Sonarr.Windows.Test v4.6.1 512 ..\ diff --git a/src/NzbDrone.Windows.Test/Properties/AssemblyInfo.cs b/src/NzbDrone.Windows.Test/Properties/AssemblyInfo.cs index c881ae54e..0876ee92e 100644 --- a/src/NzbDrone.Windows.Test/Properties/AssemblyInfo.cs +++ b/src/NzbDrone.Windows.Test/Properties/AssemblyInfo.cs @@ -4,11 +4,11 @@ using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("NzbDrone.Windows.Test")] +[assembly: AssemblyTitle("Sonarr.Windows.Test")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("NzbDrone.Windows.Test")] +[assembly: AssemblyProduct("Sonarr.Windows.Test")] [assembly: AssemblyCopyright("Copyright © 2014")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/src/NzbDrone.Windows/NzbDrone.Windows.csproj b/src/NzbDrone.Windows/NzbDrone.Windows.csproj index 9603336f8..322c25884 100644 --- a/src/NzbDrone.Windows/NzbDrone.Windows.csproj +++ b/src/NzbDrone.Windows/NzbDrone.Windows.csproj @@ -8,7 +8,7 @@ Library Properties NzbDrone.Windows - NzbDrone.Windows + Sonarr.Windows v4.6.1 512 ..\ diff --git a/src/NzbDrone.Windows/Properties/AssemblyInfo.cs b/src/NzbDrone.Windows/Properties/AssemblyInfo.cs index bbeee6014..17b280d9f 100644 --- a/src/NzbDrone.Windows/Properties/AssemblyInfo.cs +++ b/src/NzbDrone.Windows/Properties/AssemblyInfo.cs @@ -4,11 +4,11 @@ using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("NzbDrone.Windows")] +[assembly: AssemblyTitle("Sonarr.Windows")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("NzbDrone.Windows")] +[assembly: AssemblyProduct("Sonarr.Windows")] [assembly: AssemblyCopyright("Copyright © 2014")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/src/NzbDrone/NzbDrone.csproj b/src/NzbDrone/NzbDrone.csproj index 92ec58e9f..ac8dfb22f 100644 --- a/src/NzbDrone/NzbDrone.csproj +++ b/src/NzbDrone/NzbDrone.csproj @@ -9,7 +9,7 @@ WinExe Properties NzbDrone - NzbDrone + Sonarr v4.6.1 512 diff --git a/src/NzbDrone/Properties/AssemblyInfo.cs b/src/NzbDrone/Properties/AssemblyInfo.cs index c1bca6872..fd72b559e 100644 --- a/src/NzbDrone/Properties/AssemblyInfo.cs +++ b/src/NzbDrone/Properties/AssemblyInfo.cs @@ -1,11 +1,11 @@ -using System.Reflection; +using System.Reflection; using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("NzbDrone.exe")] +[assembly: AssemblyTitle("Sonarr.exe")] [assembly: Guid("67AADCD9-89AA-4D95-8281-3193740E70E5")] [assembly: AssemblyVersion("10.0.0.*")] diff --git a/src/ServiceHelpers/ServiceInstall/ServiceHelper.cs b/src/ServiceHelpers/ServiceInstall/ServiceHelper.cs index 78e881170..55d59c9e0 100644 --- a/src/ServiceHelpers/ServiceInstall/ServiceHelper.cs +++ b/src/ServiceHelpers/ServiceInstall/ServiceHelper.cs @@ -8,7 +8,7 @@ namespace ServiceInstall { public static class ServiceHelper { - private static string NzbDroneExe => Path.Combine(new FileInfo(Assembly.GetExecutingAssembly().Location).Directory.FullName, "NzbDrone.Console.exe"); + private static string SonarrExe => Path.Combine(new FileInfo(Assembly.GetExecutingAssembly().Location).Directory.FullName, "Sonarr.Console.exe"); private static bool IsAnAdministrator() { @@ -18,9 +18,9 @@ namespace ServiceInstall public static void Run(string arg) { - if (!File.Exists(NzbDroneExe)) + if (!File.Exists(SonarrExe)) { - Console.WriteLine("Unable to find NzbDrone.Console.exe in the current directory."); + Console.WriteLine("Unable to find Sonarr.Console.exe in the current directory."); return; } @@ -32,7 +32,7 @@ namespace ServiceInstall var startInfo = new ProcessStartInfo { - FileName = NzbDroneExe, + FileName = SonarrExe, Arguments = arg, UseShellExecute = false, RedirectStandardOutput = true, @@ -59,4 +59,4 @@ namespace ServiceInstall } } -} \ No newline at end of file +} diff --git a/src/ServiceHelpers/ServiceUninstall/ServiceHelper.cs b/src/ServiceHelpers/ServiceUninstall/ServiceHelper.cs index e5fedb19e..09620eeb2 100644 --- a/src/ServiceHelpers/ServiceUninstall/ServiceHelper.cs +++ b/src/ServiceHelpers/ServiceUninstall/ServiceHelper.cs @@ -8,7 +8,7 @@ namespace ServiceUninstall { public static class ServiceHelper { - private static string NzbDroneExe => Path.Combine(new FileInfo(Assembly.GetExecutingAssembly().Location).Directory.FullName, "NzbDrone.Console.exe"); + private static string SonarrExe => Path.Combine(new FileInfo(Assembly.GetExecutingAssembly().Location).Directory.FullName, "Sonarr.Console.exe"); private static bool IsAnAdministrator() { @@ -18,9 +18,9 @@ namespace ServiceUninstall public static void Run(string arg) { - if (!File.Exists(NzbDroneExe)) + if (!File.Exists(SonarrExe)) { - Console.WriteLine("Unable to find NzbDrone.exe in the current directory."); + Console.WriteLine("Unable to find Sonarr.exe in the current directory."); return; } @@ -32,7 +32,7 @@ namespace ServiceUninstall var startInfo = new ProcessStartInfo { - FileName = NzbDroneExe, + FileName = SonarrExe, Arguments = arg, UseShellExecute = false, RedirectStandardOutput = true, @@ -59,4 +59,4 @@ namespace ServiceUninstall } } -} \ No newline at end of file +} diff --git a/src/Sonarr.Api.V3/Properties/AssemblyInfo.cs b/src/Sonarr.Api.V3/Properties/AssemblyInfo.cs index 6149a06c4..deeee4d43 100644 --- a/src/Sonarr.Api.V3/Properties/AssemblyInfo.cs +++ b/src/Sonarr.Api.V3/Properties/AssemblyInfo.cs @@ -1,11 +1,11 @@ -using System.Reflection; +using System.Reflection; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -[assembly: AssemblyTitle("NzbDrone.Api")] +[assembly: AssemblyTitle("Sonarr.Api")] [assembly: Guid("4c0922d7-979e-4ff7-b44b-b8ac2100eeb5")] [assembly: AssemblyVersion("10.0.0.*")] -[assembly: InternalsVisibleTo("NzbDrone.Core")] +[assembly: InternalsVisibleTo("Sonarr.Core")]