From 86c35d8c8c17c7b5de7d886aaf3cf80902f71492 Mon Sep 17 00:00:00 2001 From: "kay.one" Date: Mon, 4 Jul 2011 23:45:17 -0700 Subject: [PATCH 01/15] Added missing IISExpress file --- IISExpress/iisexpress.exe.manifest | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 IISExpress/iisexpress.exe.manifest diff --git a/IISExpress/iisexpress.exe.manifest b/IISExpress/iisexpress.exe.manifest new file mode 100644 index 000000000..20778a00a --- /dev/null +++ b/IISExpress/iisexpress.exe.manifest @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 2a64014c9656cc4fab97c16b317ff973eaf3109d Mon Sep 17 00:00:00 2001 From: "kay.one" Date: Mon, 4 Jul 2011 23:46:03 -0700 Subject: [PATCH 02/15] Added version to page footer, minor tweaks. --- NzbDrone.Core/CentralDispatch.cs | 7 ++++++ .../Datastore/Migrations/Migration20110703.cs | 22 +++++++++++++++++++ NzbDrone.Core/NzbDrone.Core.csproj | 1 + NzbDrone.Core/Properties/AssemblyInfo.cs | 2 +- NzbDrone.Core/Providers/Jobs/JobProvider.cs | 2 +- NzbDrone.Core/Providers/Jobs/UpdateInfoJob.cs | 2 +- NzbDrone.Web/Properties/AssemblyInfo.cs | 2 +- NzbDrone.Web/Views/Series/Index.cshtml | 2 +- NzbDrone.Web/Views/Shared/Footer.cshtml | 7 ++++-- NzbDrone/Program.cs | 2 +- NzbDrone/Properties/AssemblyInfo.cs | 2 +- 11 files changed, 42 insertions(+), 9 deletions(-) create mode 100644 NzbDrone.Core/Datastore/Migrations/Migration20110703.cs diff --git a/NzbDrone.Core/CentralDispatch.cs b/NzbDrone.Core/CentralDispatch.cs index b312bf5e7..eaa1d1cd4 100644 --- a/NzbDrone.Core/CentralDispatch.cs +++ b/NzbDrone.Core/CentralDispatch.cs @@ -2,6 +2,7 @@ using System.Diagnostics; using System.IO; using System.Linq; +using System.Reflection; using System.Web.Hosting; using Ninject; using NLog; @@ -21,6 +22,12 @@ namespace NzbDrone.Core private static readonly Object KernelLock = new object(); private static readonly Logger Logger = LogManager.GetCurrentClassLogger(); + + public static Version Version + { + get { return Assembly.GetExecutingAssembly().GetName().Version; } + } + public static String AppPath { get diff --git a/NzbDrone.Core/Datastore/Migrations/Migration20110703.cs b/NzbDrone.Core/Datastore/Migrations/Migration20110703.cs new file mode 100644 index 000000000..e1f176e99 --- /dev/null +++ b/NzbDrone.Core/Datastore/Migrations/Migration20110703.cs @@ -0,0 +1,22 @@ +using System; +using System.Data; +using Migrator.Framework; + +namespace NzbDrone.Core.Datastore.Migrations +{ + + [Migration(20110703)] + public class Migration20110703 : Migration + { + public override void Up() + { + + } + + + public override void Down() + { + throw new NotImplementedException(); + } + } +} \ No newline at end of file diff --git a/NzbDrone.Core/NzbDrone.Core.csproj b/NzbDrone.Core/NzbDrone.Core.csproj index 79184f712..ae18cc3bb 100644 --- a/NzbDrone.Core/NzbDrone.Core.csproj +++ b/NzbDrone.Core/NzbDrone.Core.csproj @@ -176,6 +176,7 @@ + diff --git a/NzbDrone.Core/Properties/AssemblyInfo.cs b/NzbDrone.Core/Properties/AssemblyInfo.cs index d6e8b0bfe..77251d559 100644 --- a/NzbDrone.Core/Properties/AssemblyInfo.cs +++ b/NzbDrone.Core/Properties/AssemblyInfo.cs @@ -50,5 +50,5 @@ using System.Runtime.InteropServices; // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("0.2.0.*")] +[assembly: AssemblyVersion("0.5.0.*")] [assembly: InternalsVisibleTo("NzbDrone.Core.Test")] \ No newline at end of file diff --git a/NzbDrone.Core/Providers/Jobs/JobProvider.cs b/NzbDrone.Core/Providers/Jobs/JobProvider.cs index ed19fa093..29beebcae 100644 --- a/NzbDrone.Core/Providers/Jobs/JobProvider.cs +++ b/NzbDrone.Core/Providers/Jobs/JobProvider.cs @@ -252,7 +252,7 @@ namespace NzbDrone.Core.Providers.Jobs settings.Success = true; sw.Stop(); - Logger.Debug("Job '{0}' successfully completed in {1} seconds", jobImplementation.Name, sw.Elapsed.Minutes, + Logger.Debug("Job '{0}' successfully completed in {1}.{2} seconds.", jobImplementation.Name, sw.Elapsed.Seconds,sw.Elapsed.Milliseconds/100, sw.Elapsed.Seconds); } catch (Exception e) diff --git a/NzbDrone.Core/Providers/Jobs/UpdateInfoJob.cs b/NzbDrone.Core/Providers/Jobs/UpdateInfoJob.cs index 8b507227f..ac4bd2fb3 100644 --- a/NzbDrone.Core/Providers/Jobs/UpdateInfoJob.cs +++ b/NzbDrone.Core/Providers/Jobs/UpdateInfoJob.cs @@ -25,7 +25,7 @@ namespace NzbDrone.Core.Providers.Jobs public string Name { - get { return "Update Info"; } + get { return "Update Episode Info"; } } public int DefaultInterval diff --git a/NzbDrone.Web/Properties/AssemblyInfo.cs b/NzbDrone.Web/Properties/AssemblyInfo.cs index 5cce0429f..752fec6d1 100644 --- a/NzbDrone.Web/Properties/AssemblyInfo.cs +++ b/NzbDrone.Web/Properties/AssemblyInfo.cs @@ -34,4 +34,4 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("0.2.0.*")] \ No newline at end of file +[assembly: AssemblyVersion("0.5.0.*")] \ No newline at end of file diff --git a/NzbDrone.Web/Views/Series/Index.cshtml b/NzbDrone.Web/Views/Series/Index.cshtml index de912c029..6746f751a 100644 --- a/NzbDrone.Web/Views/Series/Index.cshtml +++ b/NzbDrone.Web/Views/Series/Index.cshtml @@ -2,7 +2,7 @@ @using NzbDrone.Web.Models; @model IEnumerable @section TitleContent{ -Series +NZBDrone }