Backup_Repos/Radarr
1
0
Fork 0
mirror of https://github.com/Radarr/Radarr synced 2026-05-05 23:21:03 +02:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/galli-leo/develop' into develop

Browse source
This commit is contained in:
Tim Turner 2017-01-07 11:12:26 -05:00
commit b9c98205e0
36 changed files with 89 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -130,6 +130,7 @@ output/*
#Packages
Radarr_*/
Radarr_*.zip
Radarr_*.gz
#OS X metadata files
._*

BIN
7za.dll Normal file
View file

Binary file not shown.

BIN
7za.exe Normal file
View file

Binary file not shown.

BIN
7zxa.dll Normal file
View file

Binary file not shown.

BIN
Logo/Thumbs.db Normal file
View file

Binary file not shown.

26
package.sh
View file

@ -4,6 +4,18 @@ if [ $# -eq 0 ]; then
fi
fi
# Use mono or .net depending on OS
case "$(uname -s)" in
CYGWIN*|MINGW32*|MINGW64*|MSYS*)
# on windows, use dotnet
runtime="dotnet"
;;
*)
# otherwise use mono
runtime="mono"
;;
esac
if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then
VERSION="`date +%H:%M:%S`"
YEAR="`date +%Y`"
@ -26,10 +38,16 @@ cp -r $outputFolder/ Radarr_Windows_$VERSION
cp -r $outputFolderMono/ Radarr_Mono_$VERSION
cp -r $outputFolderOsxApp/ Radarr_OSX_$VERSION
zip -r Radarr_Windows_$VERSION.zip Radarr_Windows_$VERSION >& /dev/null
zip -r Radarr_Mono_$VERSION.zip Radarr_Mono_$VERSION >& /dev/null
zip -r Radarr_OSX_$VERSION.zip Radarr_OSX_$VERSION >& /dev/null
if [ $runtime = "dotnet" ] ; then
./7za.exe a Radarr_Windows_$VERSION.zip ./Radarr_Windows_$VERSION/*
./7za.exe a -ttar -so Radarr_Mono_$VERSION.tar ./Radarr_Mono_$VERSION/* | ./7za.exe a -si Radarr_Mono_$VERSION.tar.gz
./7za.exe a -ttar -so Radarr_OSX_$VERSION.tar ./_output_osx/* | ./7za.exe a -si Radarr_OSX_$VERSION.tar.gz
./7za.exe a -ttar -so Radarr_OSX_App_$VERSION.tar ./_output_osx_app/* | ./7za.exe a -si Radarr_OSX_App_$VERSION.tar.gz
else
zip -r Radarr_Windows_$VERSION.zip Radarr_Windows_$VERSION/* >& /dev/null
zip -r Radarr_Mono_$VERSION.zip Radarr_Mono_$VERSION/* >& /dev/null #TODO update for tar.gz
zip -r Radarr_OSX_$VERSION_App.zip Radarr_OSX_$VERSION/* >& /dev/null
fi
ftp -n ftp.leonardogalli.ch << END_SCRIPT
passive
quote USER $FTP_USER

1
src/NzbDrone.Api.Test/Properties/AssemblyInfo.cs
View file

@ -21,4 +21,3 @@
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("260b2ff9-d3b7-4d8a-b720-a12c93d045e5")]
[assembly: AssemblyVersion("0.1.0.*")]

1
src/NzbDrone.Api/Properties/AssemblyInfo.cs
View file

@ -6,6 +6,5 @@
[assembly: Guid("4c0922d7-979e-4ff7-b44b-b8ac2100eeb5")]
[assembly: AssemblyVersion("0.1.0.*")]
[assembly: InternalsVisibleTo("NzbDrone.Core")]

1
src/NzbDrone.App.Test/Properties/AssemblyInfo.cs
View file

@ -21,4 +21,3 @@
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("b47d34ef-05e8-4826-8a57-9dd05106c964")]
[assembly: AssemblyVersion("0.1.0.*")]

2
src/NzbDrone.Automation.Test/Properties/AssemblyInfo.cs
View file

@ -20,5 +20,3 @@
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("6b8945f5-f5b5-4729-865d-f958fbd673d9")]
[assembly: AssemblyVersion("0.1.0.*")]

2
src/NzbDrone.Common/Extensions/PathExtensions.cs
View file

@ -17,7 +17,7 @@ public static class PathExtensions
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_PACKAGE_FOLDER_NAME = "";
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;

1
src/NzbDrone.Common/Properties/AssemblyInfo.cs
View file

@ -9,4 +9,3 @@
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("b6eaa144-e13b-42e5-a738-c60d89c0f728")]
[assembly: AssemblyVersion("0.1.0.*")]

3
src/NzbDrone.Common/Properties/SharedAssemblyInfo.cs
View file

@ -2,8 +2,9 @@
using System.Runtime.InteropServices;
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("sonarr.tv")]
[assembly: AssemblyCompany("radarr.tv")]
[assembly: AssemblyProduct("NzbDrone")]
[assembly: AssemblyVersion("0.1.0.*")]
[assembly: AssemblyCopyright("GNU General Public v3")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

2
src/NzbDrone.Console/Properties/AssemblyInfo.cs
View file

@ -7,5 +7,3 @@
[assembly: AssemblyTitle("NzbDrone.Host")]
[assembly: Guid("67AADCD9-89AA-4D95-8281-3193740E70E5")]
[assembly: AssemblyVersion("0.1.0.*")]

2
src/NzbDrone.Core.Test/Properties/AssemblyInfo.cs
View file

@ -25,6 +25,4 @@
[assembly: Guid("699aed1b-015e-4f0d-9c81-d5557b05d260")]
[assembly: AssemblyVersion("0.1.0.*")]
[assembly: InternalsVisibleTo("NzbDrone.Core")]

59
src/NzbDrone.Core/Download/Clients/rTorrent/RTorrent.cs
View file

@ -37,6 +37,37 @@ public RTorrent(IRTorrentProxy proxy,
_rTorrentDirectoryValidator = rTorrentDirectoryValidator;
}
protected override string AddFromMagnetLink(RemoteMovie remoteMovie, string hash, string magnetLink)
{
_proxy.AddTorrentFromUrl(magnetLink, Settings);
// Download the magnet to the appropriate directory.
_proxy.SetTorrentLabel(hash, Settings.TvCategory, Settings);
//SetPriority(remoteEpisode, hash);
SetDownloadDirectory(hash);
// Once the magnet meta download finishes, rTorrent replaces it with the actual torrent download with default settings.
// Schedule an event to apply the appropriate settings when that happens.
// var priority = (RTorrentPriority)(remoteEpisode.IsRecentEpisode() ? Settings.RecentTvPriority : Settings.OlderTvPriority);
//_proxy.SetDeferredMagnetProperties(hash, Settings.TvCategory, Settings.TvDirectory, priority, Settings);
_proxy.StartTorrent(hash, Settings);
// Wait for the magnet to be resolved.
var tries = 10;
var retryDelay = 500;
if (WaitForTorrent(hash, tries, retryDelay))
{
return hash;
}
else
{
_logger.Warn("rTorrent could not resolve magnet within {0} seconds, download may remain stuck: {1}.", tries * retryDelay / 1000, magnetLink);
return hash;
}
}
protected override string AddFromMagnetLink(RemoteEpisode remoteEpisode, string hash, string magnetLink)
{
_proxy.AddTorrentFromUrl(magnetLink, Settings);
@ -68,6 +99,32 @@ protected override string AddFromMagnetLink(RemoteEpisode remoteEpisode, string
}
}
protected override string AddFromTorrentFile(RemoteMovie remoteMovie, string hash, string filename, byte[] fileContent)
{
_proxy.AddTorrentFromFile(filename, fileContent, Settings);
var tries = 2;
var retryDelay = 100;
if (WaitForTorrent(hash, tries, retryDelay))
{
_proxy.SetTorrentLabel(hash, Settings.TvCategory, Settings);
//SetPriority(remoteEpisode, hash);
SetDownloadDirectory(hash);
_proxy.StartTorrent(hash, Settings);
return hash;
}
else
{
_logger.Debug("rTorrent could not add file");
RemoveItem(hash, true);
throw new ReleaseDownloadException(remoteMovie.Release, "Downloading torrent failed");
}
}
protected override string AddFromTorrentFile(RemoteEpisode remoteEpisode, string hash, string filename, byte[] fileContent)
{
_proxy.AddTorrentFromFile(filename, fileContent, Settings);
@ -96,7 +153,7 @@ protected override string AddFromTorrentFile(RemoteEpisode remoteEpisode, string
public override string Name => "rTorrent";
public override ProviderMessage Message => new ProviderMessage("Sonarr is unable to remove torrents that have finished seeding when using rTorrent", ProviderMessageType.Warning);
public override ProviderMessage Message => new ProviderMessage("Radarr is unable to remove torrents that have finished seeding when using rTorrent", ProviderMessageType.Warning);
public override IEnumerable<DownloadClientItem> GetItems()
{

2
src/NzbDrone.Core/Download/Clients/rTorrent/RTorrentSettings.cs
View file

@ -26,7 +26,7 @@ public RTorrentSettings()
Host = "localhost";
Port = 8080;
UrlBase = "RPC2";
TvCategory = "tv-sonarr";
TvCategory = "movies-radarr";
OlderTvPriority = (int)RTorrentPriority.Normal;
RecentTvPriority = (int)RTorrentPriority.Normal;
}

2
src/NzbDrone.Core/Properties/AssemblyInfo.cs
View file

@ -11,6 +11,4 @@
// 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("0.1.0.*")]
[assembly: InternalsVisibleTo("NzbDrone.Core.Test")]

1
src/NzbDrone.Host/Properties/AssemblyInfo.cs
View file

@ -8,4 +8,3 @@
[assembly: AssemblyTitle("Radarr.exe")]
[assembly: Guid("C2172AF4-F9A6-4D91-BAEE-C2E4EE680613")]
[assembly: AssemblyVersion("0.1.0.*")]

2
src/NzbDrone.Integration.Test/Properties/AssemblyInfo.cs
View file

@ -20,5 +20,3 @@
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("8a49cb1d-87ac-42f9-a582-607365a6bd79")]
[assembly: AssemblyVersion("0.1.0.*")]

1
src/NzbDrone.Libraries.Test/Properties/AssemblyInfo.cs
View file

@ -21,4 +21,3 @@
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("32ec29e2-40ba-4050-917d-e295d85d4969")]
[assembly: AssemblyVersion("0.1.0.*")]

2
src/NzbDrone.Mono/Properties/AssemblyInfo.cs
View file

@ -20,5 +20,3 @@
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("01493ea5-494f-43bf-be18-8ae4d0708fc6")]
[assembly: AssemblyVersion("0.1.0.*")]

2
src/NzbDrone.SignalR/Properties/AssemblyInfo.cs
View file

@ -6,5 +6,3 @@
// associated with an assembly.
[assembly: AssemblyTitle("NzbDrone.SignalR")]
[assembly: Guid("98bd985a-4f23-4201-8ed3-f6f3d7f2a5fe")]
[assembly: AssemblyVersion("0.1.0.*")]

1
src/NzbDrone.Test.Common/Properties/AssemblyInfo.cs
View file

@ -21,4 +21,3 @@
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("f3e91f6e-d01d-4f20-8255-147cc10f04e3")]
[assembly: AssemblyVersion("0.1.0.*")]

2
src/NzbDrone.Test.Dummy/Properties/AssemblyInfo.cs
View file

@ -20,5 +20,3 @@
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("7b773a86-574d-48c3-9e89-6f2e0dff714b")]
[assembly: AssemblyVersion("0.1.0.*")]

2
src/NzbDrone.Update.Test/Properties/AssemblyInfo.cs
View file

@ -20,5 +20,3 @@
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("b323e212-2d04-4c7f-9097-c356749ace4d")]
[assembly: AssemblyVersion("0.1.0.*")]

2
src/NzbDrone.Update/Properties/AssemblyInfo.cs
View file

@ -8,5 +8,3 @@
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("e4560a3d-8053-4d57-a260-bfe52f4cc357")]
[assembly: AssemblyVersion("0.1.0.*")]

3
src/NzbDrone/NzbDrone.csproj
View file

@ -54,7 +54,7 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup>
<ApplicationIcon>Radarr.ico</ApplicationIcon>
<ApplicationIcon>Resources\Radarr.ico</ApplicationIcon>
</PropertyGroup>
<PropertyGroup>
<StartupObject>NzbDrone.WindowsApp</StartupObject>
@ -158,6 +158,7 @@
</ItemGroup>
<ItemGroup>
<Content Include="Radarr.ico" />
<None Include="Resources\Radarr.ico" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>

1
src/NzbDrone/Properties/AssemblyInfo.cs
View file

@ -8,4 +8,3 @@
[assembly: AssemblyTitle("Radarr.exe")]
[assembly: Guid("67AADCD9-89AA-4D95-8281-3193740E70E5")]
[assembly: AssemblyVersion("0.1.0.*")]

2
src/NzbDrone/Properties/Resources.resx
View file

@ -119,6 +119,6 @@
</resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="Radarr" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Radarr.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<value>..\Resources\Radarr.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>

BIN
src/NzbDrone/Resources/Radarr.ico Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 85 KiB

BIN
src/NzbDrone/Resources/Thumbs.db Normal file
View file

Binary file not shown.

BIN
src/Radarr.ico
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 41 KiB

After

Width:  |  Height:  |  Size: 85 KiB

4
src/ServiceHelpers/ServiceInstall/Properties/AssemblyInfo.cs
View file

@ -5,6 +5,4 @@
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("13976baa-e5ba-42b2-8ad7-8d568b68a53b")]
[assembly: AssemblyVersion("0.1.0.*")]
[assembly: Guid("13976baa-e5ba-42b2-8ad7-8d568b68a53b")]

2
src/ServiceHelpers/ServiceUninstall/Properties/AssemblyInfo.cs
View file

@ -3,5 +3,3 @@
[assembly: AssemblyTitle("UninstallService")]
[assembly: Guid("0a964b21-9de9-40b3-9378-0474fd5f21a8")]
[assembly: AssemblyVersion("0.1.0.*")]

BIN
src/Thumbs.db Normal file
View file

Binary file not shown.