Updated all AssemblyInfos so version info only needs to be changed once

dirty fix for rtorrent

.gitignore

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

package.sh

@@ -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,15 @@ cp -r $outputFolder/ Radarr_Windows_$VERSION
 cp -r $outputFolderMono/ Radarr_Mono_$VERSION
 cp -r $outputFolderOsxApp/ Radarr_OSX_$VERSION
 
+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 Radarr_OSX_$VERSION | ./7za.exe a -si Radarr_OSX_$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
 zip -r Radarr_OSX_$VERSION.zip Radarr_OSX_$VERSION >& /dev/null
-
+fi
 ftp -n ftp.leonardogalli.ch << END_SCRIPT
 passive
 quote USER $FTP_USER

src/NzbDrone.Api.Test/Properties/AssemblyInfo.cs

@@ -21,4 +21,3 @@ using System.Runtime.InteropServices;
 // 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.*")]

src/NzbDrone.Api/Properties/AssemblyInfo.cs

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

src/NzbDrone.App.Test/Properties/AssemblyInfo.cs

@@ -21,4 +21,3 @@ using System.Runtime.InteropServices;
 // 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.*")]

src/NzbDrone.Automation.Test/Properties/AssemblyInfo.cs

@@ -20,5 +20,3 @@ using System.Runtime.InteropServices;
 
 // 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.*")]

src/NzbDrone.Common/Properties/AssemblyInfo.cs

@@ -9,4 +9,3 @@ using System.Runtime.InteropServices;
 // 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.*")]

src/NzbDrone.Common/Properties/SharedAssemblyInfo.cs

@@ -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("")]

src/NzbDrone.Console/NzbDrone.Console.csproj

@@ -54,7 +54,7 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup>
-    <ApplicationIcon>..\NzbDrone.Host\NzbDrone.ico</ApplicationIcon>
+    <ApplicationIcon>Radarr.ico</ApplicationIcon>
   </PropertyGroup>
   <PropertyGroup>
     <StartupObject>NzbDrone.Console.ConsoleApp</StartupObject>
@@ -139,6 +139,9 @@
     </None>
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="Radarr.ico" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PreBuildEvent>

src/NzbDrone.Console/Properties/AssemblyInfo.cs

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

src/NzbDrone.Core.Test/Properties/AssemblyInfo.cs

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

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

@@ -37,6 +37,37 @@ namespace NzbDrone.Core.Download.Clients.RTorrent
             _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 @@ namespace NzbDrone.Core.Download.Clients.RTorrent
             }
         }
 
+        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 @@ namespace NzbDrone.Core.Download.Clients.RTorrent
 
         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()
         {

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

@@ -26,7 +26,7 @@ namespace NzbDrone.Core.Download.Clients.RTorrent
             Host = "localhost";
             Port = 8080;
             UrlBase = "RPC2";
-            TvCategory = "tv-sonarr";
+            TvCategory = "movies-radarr";
             OlderTvPriority = (int)RTorrentPriority.Normal;
             RecentTvPriority = (int)RTorrentPriority.Normal;
         }

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

@@ -46,7 +46,7 @@ namespace NzbDrone.Core.Indexers.Newznab
                 yield return GetDefinition("NZBFinder.ws", GetSettings("https://nzbfinder.ws", 5010, 5030, 5040, 5045));
                 yield return GetDefinition("NZBgeek", GetSettings("https://api.nzbgeek.info"));
                 yield return GetDefinition("nzbplanet.net", GetSettings("https://api.nzbplanet.net"));
-                yield return GetDefinition("Nzbs.org", GetSettings("http://nzbs.org", 5000));
+                yield return GetDefinition("Nzbs.org", GetSettings("http://nzbs.org", 2000));
                 yield return GetDefinition("OZnzb.com", GetSettings("https://api.oznzb.com"));
                 yield return GetDefinition("PFmonkey", GetSettings("https://www.pfmonkey.com"));
                 yield return GetDefinition("SimplyNZBs", GetSettings("https://simplynzbs.com"));

src/NzbDrone.Core/Indexers/TorrentPotato/TorrentPotatoRequestGenerator.cs

@@ -79,9 +79,8 @@ namespace NzbDrone.Core.Indexers.TorrentPotato
 
             requestBuilder.AddQueryParam("passkey", Settings.Passkey);
             requestBuilder.AddQueryParam("user", Settings.User);
-            requestBuilder.AddQueryParam("imdbid", "tt0076759"); //For now just search for Star Wars.
-
-
+            // requestBuilder.AddQueryParam("imdbid", "tt0076759"); //For now just search for Star Wars.
+            requestBuilder.AddQueryParam("search", "the"); // there has to be movies with 'the' in the title on any indexer
 
             yield return new IndexerRequest(requestBuilder.Build());
         }

src/NzbDrone.Core/Properties/AssemblyInfo.cs

@@ -11,6 +11,4 @@ using System.Runtime.InteropServices;
 // 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")]

src/NzbDrone.Host/NzbDrone.Host.csproj

@@ -56,6 +56,9 @@
   <PropertyGroup>
     <RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>Radarr.ico</ApplicationIcon>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.Owin, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -134,9 +137,6 @@
     <None Include="app.config" />
     <None Include="packages.config" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="NzbDrone.ico" />
-  </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include=".NETFramework,Version=v4.0">
       <Visible>False</Visible>
@@ -185,7 +185,9 @@
       <Name>NzbDrone.SignalR</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Content Include="Radarr.ico" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PreBuildEvent>

src/NzbDrone.Host/Properties/AssemblyInfo.cs

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

src/NzbDrone.Integration.Test/Properties/AssemblyInfo.cs

@@ -20,5 +20,3 @@ using System.Runtime.InteropServices;
 
 // 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.*")]

src/NzbDrone.Libraries.Test/Properties/AssemblyInfo.cs

@@ -21,4 +21,3 @@ using System.Runtime.InteropServices;
 // 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.*")]

src/NzbDrone.Mono/Properties/AssemblyInfo.cs

@@ -20,5 +20,3 @@ using System.Runtime.InteropServices;
 
 // 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.*")]

src/NzbDrone.SignalR/Properties/AssemblyInfo.cs

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

src/NzbDrone.Test.Common/Properties/AssemblyInfo.cs

@@ -21,4 +21,3 @@ using System.Runtime.InteropServices;
 // 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.*")]

src/NzbDrone.Test.Dummy/Properties/AssemblyInfo.cs

@@ -20,5 +20,3 @@ using System.Runtime.InteropServices;
 
 // 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.*")]

src/NzbDrone.Update.Test/Properties/AssemblyInfo.cs

@@ -20,5 +20,3 @@ using System.Runtime.InteropServices;
 
 // 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.*")]

src/NzbDrone.Update/Properties/AssemblyInfo.cs

@@ -8,5 +8,3 @@ using System.Runtime.InteropServices;
 
 // 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.*")]

src/NzbDrone/NzbDrone.csproj

@@ -54,7 +54,7 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup>
-    <ApplicationIcon>..\NzbDrone.Host\NzbDrone.ico</ApplicationIcon>
+    <ApplicationIcon>Resources\Radarr.ico</ApplicationIcon>
   </PropertyGroup>
   <PropertyGroup>
     <StartupObject>NzbDrone.WindowsApp</StartupObject>
@@ -147,6 +147,7 @@
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
@@ -155,6 +156,10 @@
     </None>
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="Radarr.ico" />
+    <None Include="Resources\Radarr.ico" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PreBuildEvent>

src/NzbDrone/Properties/AssemblyInfo.cs

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

src/NzbDrone/Properties/Resources.Designer.cs

@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.32559
+//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -9,6 +9,9 @@
 //------------------------------------------------------------------------------
 
 namespace NzbDrone.Properties {
+    using System;
+    
+    
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>
@@ -60,9 +63,9 @@ namespace NzbDrone.Properties {
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
         /// </summary>
-        internal static System.Drawing.Icon NzbDroneIcon {
+        internal static System.Drawing.Icon Radarr {
             get {
-                object obj = ResourceManager.GetObject("NzbDroneIcon", resourceCulture);
+                object obj = ResourceManager.GetObject("Radarr", resourceCulture);
                 return ((System.Drawing.Icon)(obj));
             }
         }

src/NzbDrone/Properties/Resources.resx

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

src/NzbDrone/SysTray/SysTrayApp.cs

@@ -39,7 +39,7 @@ namespace NzbDrone.SysTray
             _trayMenu.MenuItems.Add("Exit", OnExit);
 
             _trayIcon.Text = string.Format("Radarr - {0}", BuildInfo.Version);
-            _trayIcon.Icon = Properties.Resources.NzbDroneIcon;
+            _trayIcon.Icon = Properties.Resources.Radarr;
 
             _trayIcon.ContextMenu = _trayMenu;
             _trayIcon.Visible = true;

src/ServiceHelpers/ServiceInstall/Properties/AssemblyInfo.cs

@@ -5,6 +5,4 @@ using System.Runtime.InteropServices;
 
 
 // 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")]

src/ServiceHelpers/ServiceUninstall/Properties/AssemblyInfo.cs

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