From e9f084fd81d49d31dc8c4cd9b7cd784635b9ddbc Mon Sep 17 00:00:00 2001 From: Leonardo Galli Date: Mon, 10 Apr 2017 13:15:06 +0200 Subject: [PATCH 01/12] Update README.md --- README.md | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index d59d66078..106da2bff 100644 --- a/README.md +++ b/README.md @@ -72,14 +72,21 @@ Radarr is currently undergoing rapid development and pull requests are actively * New PassThePopcorn Indexer * QBittorrent, Deluge, rTorrent, Transmission and uTorrent download client (Other clients are coming) * New TorrentPotato Indexer (Works well with [Jackett](https://github.com/Jackett/Jackett)) +* Scanning PreDB to know when a new release is available +* Importing movies from various online sources, such as IMDb Watchlists (A complete list can be found [here](https://github.com/Radarr/Radarr/issues/114)) +* Full integration with Kodi, Plex (notification, library update) * And a beautiful UI ### Planned Features -* Scanning PreDB to know when a new release is available -* Fixing the other Indexers and download clients -* Importing movies from various online sources, such as IMDb Watchlists (A complete list can be found [here](https://github.com/Radarr/Radarr/issues/114)) -* Full integration with Kodi, Plex (notification, library update, metadata) +* Downloading Metadata such as trailers or subtitles (\*) +* Adding metadata such as posters and information for Kodi and others to use (\*) +* Dynamically renaming folders with quality info, etc. (\*) +* Supporting custom folder structures, such as all movie files in one folder (\*) +* Supporting multiple editions per movies (waiting on The Movie Database to finish their implementation) +* Supporting collections of movies, such as James Bond + +**Note:** All features marked with (\*) are set to be in the first release of Radarr. #### [Feature Requests](http://feathub.com/Radarr/Radarr) From 454d5c37f91c6937a211ea90a9fcbab1186b1aa3 Mon Sep 17 00:00:00 2001 From: Leonardo Galli Date: Mon, 10 Apr 2017 14:24:06 +0200 Subject: [PATCH 02/12] Update nzbdrone.iss --- setup/nzbdrone.iss | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/setup/nzbdrone.iss b/setup/nzbdrone.iss index e667c0d03..382247219 100644 --- a/setup/nzbdrone.iss +++ b/setup/nzbdrone.iss @@ -1,35 +1,35 @@ ; 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 AppExeName "NzbDrone.exe" +#define AppName "Radarr" +#define AppPublisher "Team Radarr" +#define AppURL "https://radarr.video/" +#define ForumsURL "https://github.com/Radarr/Radarr/issues" +#define AppExeName "Radarr.exe" #define BuildNumber "2.0" -#define BuildNumber GetEnv('BUILD_NUMBER') -#define BranchName GetEnv('branch') +#define BuildVersion GetEnv('APPVEYOR_BUILD_VERSION') +#define BranchName GetEnv('APPVEYOR_REPO_BRANCH') [Setup] ; NOTE: The value of AppId uniquely identifies this application. ; Do not use the same AppId value in installers for other applications. ; (To generate a new GUID, click Tools | Generate GUID inside the IDE.) -AppId={{56C1065D-3523-4025-B76D-6F73F67F7F71} +AppId={{56C1065D-3523-4025-B76D-6F73F67F7F82} AppName={#AppName} -AppVersion=2.0 +AppVersion=0.2 AppPublisher={#AppPublisher} AppPublisherURL={#AppURL} AppSupportURL={#ForumsURL} AppUpdatesURL={#AppURL} -DefaultDirName={commonappdata}\NzbDrone\bin +DefaultDirName={commonappdata}\Radarr\bin DisableDirPage=yes DefaultGroupName={#AppName} DisableProgramGroupPage=yes -OutputBaseFilename=NzbDrone.{#BranchName}.{#BuildNumber} +OutputBaseFilename=Radarr.{#BranchName}.{#BuildVersion} SolidCompression=yes AppCopyright=Creative Commons 3.0 License AllowUNCPath=False -UninstallDisplayIcon={app}\NzbDrone.exe +UninstallDisplayIcon={app}\Radarr.exe DisableReadyPage=True CompressionThreads=2 Compression=lzma2/normal @@ -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\Radarr.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}\radarr.console.exe"; Parameters: "/u"; Flags: waituntilterminated; +Filename: "{app}\radarr.console.exe"; Parameters: "/i"; Flags: waituntilterminated; Tasks: windowsService [UninstallRun] -Filename: "{app}\nzbdrone.console.exe"; Parameters: "/u"; Flags: waituntilterminated skipifdoesntexist +Filename: "{app}\radarr.console.exe"; Parameters: "/u"; Flags: waituntilterminated skipifdoesntexist From c54f8806b332e146eb15364ded8074830f72cb09 Mon Sep 17 00:00:00 2001 From: Leonardo Galli Date: Mon, 10 Apr 2017 14:29:08 +0200 Subject: [PATCH 03/12] Update nzbdrone.iss --- setup/nzbdrone.iss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup/nzbdrone.iss b/setup/nzbdrone.iss index 382247219..78b17bf65 100644 --- a/setup/nzbdrone.iss +++ b/setup/nzbdrone.iss @@ -44,8 +44,8 @@ Name: "english"; MessagesFile: "compiler:Default.isl" Name: "windowsService"; Description: "Install as a Windows Service" [Files] -Source: "..\_output\Radarr.exe"; DestDir: "{app}"; Flags: ignoreversion -Source: "..\_output\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs +Source: "_output\Radarr.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] From 98c117a460dc56b71d9c44ee69e5e0e25a340acb Mon Sep 17 00:00:00 2001 From: Leonardo Galli Date: Mon, 10 Apr 2017 14:30:55 +0200 Subject: [PATCH 04/12] Installer should be built too now. --- build-appveyor.cake | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/build-appveyor.cake b/build-appveyor.cake index 12cf0fa0f..63e6f1e11 100644 --- a/build-appveyor.cake +++ b/build-appveyor.cake @@ -264,6 +264,12 @@ Task("ArtifactsWindows").Does(() => { CopyDirectory(outputFolder, artifactsFolderWindows + "/Radarr"); }); +Task("ArtifactsWindowsInstaller").Does(() => { + InnoSetup("./setup/nzbdrone.iss", new InnoSetupSettings { + OutputDir = artifactsFolderWindows + "/Radarr" + }) +}); + Task("ArtifactsLinux").Does(() => { CopyDirectory(outputFolderMono, artifactsFolderLinux + "/Radarr"); }); @@ -293,6 +299,7 @@ Task("CompressArtifacts").Does(() => { Task("Artifacts") .IsDependentOn("CleanArtifacts") .IsDependentOn("ArtifactsWindows") + .IsDependentOn("ArtifactsWindowsInstaller") .IsDependentOn("ArtifactsLinux") .IsDependentOn("ArtifactsOsx") .IsDependentOn("ArtifactsOsxApp") From e2ae7536ad9c34a300c54d5d244ecc83b795236e Mon Sep 17 00:00:00 2001 From: Leonardo Galli Date: Mon, 10 Apr 2017 14:32:03 +0200 Subject: [PATCH 05/12] Update appveyor.yml --- appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/appveyor.yml b/appveyor.yml index 7ae313915..9e2b0c917 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -27,6 +27,7 @@ test: artifacts: - path: '_artifacts\*.zip' + - path: '_artifacts\*.exe' - path: '_artifacts\*.tar.gz' cache: From 680681c8bdf3d378e518062bd205b8865e7335cf Mon Sep 17 00:00:00 2001 From: Leonardo Galli Date: Mon, 10 Apr 2017 14:32:49 +0200 Subject: [PATCH 06/12] Just getting Appveyor to build --- src/NzbDrone.sln | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/NzbDrone.sln b/src/NzbDrone.sln index 0bed10417..2a8af263d 100644 --- a/src/NzbDrone.sln +++ b/src/NzbDrone.sln @@ -1,6 +1,6 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 +# Visual Studio 14 VisualStudioVersion = 14.0.24720.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{57A04B72-8088-4F75-A582-1158CF8291F7}" From ad222570be71fade18c67159dc50e75ea1badff5 Mon Sep 17 00:00:00 2001 From: Leonardo Galli Date: Mon, 10 Apr 2017 14:45:59 +0200 Subject: [PATCH 07/12] Update build-appveyor.cake --- build-appveyor.cake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-appveyor.cake b/build-appveyor.cake index 63e6f1e11..7cb0b54d2 100644 --- a/build-appveyor.cake +++ b/build-appveyor.cake @@ -267,7 +267,7 @@ Task("ArtifactsWindows").Does(() => { Task("ArtifactsWindowsInstaller").Does(() => { InnoSetup("./setup/nzbdrone.iss", new InnoSetupSettings { OutputDir = artifactsFolderWindows + "/Radarr" - }) + }); }); Task("ArtifactsLinux").Does(() => { From 87ee360818778d6a0a08413001bc96e954d38977 Mon Sep 17 00:00:00 2001 From: Leonardo Galli Date: Mon, 10 Apr 2017 14:47:07 +0200 Subject: [PATCH 08/12] Update appveyor.yml --- appveyor.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index 9e2b0c917..f495b6bb7 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -43,3 +43,5 @@ only_commits: - osx/ - gulp/ - logo/ + - appveyor.yml + - build-appveyor.cake From 7182081fcadc908699bab981077d6481a4c5c6f6 Mon Sep 17 00:00:00 2001 From: Leonardo Galli Date: Mon, 10 Apr 2017 14:52:13 +0200 Subject: [PATCH 09/12] Update build-appveyor.cake --- build-appveyor.cake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-appveyor.cake b/build-appveyor.cake index 7cb0b54d2..84ed53dc4 100644 --- a/build-appveyor.cake +++ b/build-appveyor.cake @@ -266,8 +266,8 @@ Task("ArtifactsWindows").Does(() => { Task("ArtifactsWindowsInstaller").Does(() => { InnoSetup("./setup/nzbdrone.iss", new InnoSetupSettings { - OutputDir = artifactsFolderWindows + "/Radarr" - }); + OutputDirectory = artifactsFolderWindows + "/Radarr" + }); }); Task("ArtifactsLinux").Does(() => { From 6963078669457767535f045d32ff38714b21d6fd Mon Sep 17 00:00:00 2001 From: Leonardo Galli Date: Mon, 10 Apr 2017 15:18:11 +0200 Subject: [PATCH 10/12] Update build-appveyor.cake --- build-appveyor.cake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build-appveyor.cake b/build-appveyor.cake index 84ed53dc4..6764e438a 100644 --- a/build-appveyor.cake +++ b/build-appveyor.cake @@ -266,7 +266,8 @@ Task("ArtifactsWindows").Does(() => { Task("ArtifactsWindowsInstaller").Does(() => { InnoSetup("./setup/nzbdrone.iss", new InnoSetupSettings { - OutputDirectory = artifactsFolderWindows + "/Radarr" + OutputDirectory = artifactsFolderWindows + "/Radarr", + ToolPath = "./setup/inno/ISCC.exe" }); }); From 685012280be445b22f1f375f3b9cb419807c607d Mon Sep 17 00:00:00 2001 From: Leonardo Galli Date: Mon, 10 Apr 2017 15:51:11 +0200 Subject: [PATCH 11/12] Update nzbdrone.iss --- setup/nzbdrone.iss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup/nzbdrone.iss b/setup/nzbdrone.iss index 78b17bf65..382247219 100644 --- a/setup/nzbdrone.iss +++ b/setup/nzbdrone.iss @@ -44,8 +44,8 @@ Name: "english"; MessagesFile: "compiler:Default.isl" Name: "windowsService"; Description: "Install as a Windows Service" [Files] -Source: "_output\Radarr.exe"; DestDir: "{app}"; Flags: ignoreversion -Source: "_output\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs +Source: "..\_output\Radarr.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] From 4a0ef984fb36dfb4f893da7cae886881da456086 Mon Sep 17 00:00:00 2001 From: Leonardo Galli Date: Mon, 10 Apr 2017 15:51:36 +0200 Subject: [PATCH 12/12] Update appveyor.yml --- appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/appveyor.yml b/appveyor.yml index f495b6bb7..ce00cb4f7 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -43,5 +43,6 @@ only_commits: - osx/ - gulp/ - logo/ + - setup/ - appveyor.yml - build-appveyor.cake