From 9fb1e8c00fcb47f1be0d3d77cc1cf644323dcf24 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Wed, 24 Apr 2013 18:34:38 -0400
Subject: [PATCH] updated nuget

---
 Bootstrapper/readme.txt                       |  3 --
 Bootstrapper/vcredist10_x86/en/package.xml    | 20 ---------
 Bootstrapper/vcredist10_x86/product.xml       | 45 -------------------
 .../Tasks/DeleteCacheFileTask.cs              |  2 +-
 MediaBrowser.Controller/Dto/DtoBuilder.cs     | 25 +++++++++--
 .../Providers/Music/LastfmBaseProvider.cs     |  2 +-
 .../BaseApplicationConfiguration.cs           |  2 +-
 MediaBrowser.Model/DTO/BaseItemDto.cs         |  6 +++
 .../Querying/ItemsByNameQuery.cs              | 29 ++++++++++++
 Nuget/MediaBrowser.Common.Internal.nuspec     |  4 +-
 Nuget/MediaBrowser.Common.nuspec              |  2 +-
 Nuget/MediaBrowser.Server.Core.nuspec         |  4 +-
 12 files changed, 64 insertions(+), 80 deletions(-)
 delete mode 100644 Bootstrapper/readme.txt
 delete mode 100644 Bootstrapper/vcredist10_x86/en/package.xml
 delete mode 100644 Bootstrapper/vcredist10_x86/product.xml

diff --git a/Bootstrapper/readme.txt b/Bootstrapper/readme.txt
deleted file mode 100644
index 0fdcf2aa5..000000000
--- a/Bootstrapper/readme.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-If Publishing, the folders in here must be copied to:
-
-C:\Program Files (x86)\Microsoft SDKs\Windows\v8.0A\Bootstrapper\Packages
\ No newline at end of file
diff --git a/Bootstrapper/vcredist10_x86/en/package.xml b/Bootstrapper/vcredist10_x86/en/package.xml
deleted file mode 100644
index 613fc0b84..000000000
--- a/Bootstrapper/vcredist10_x86/en/package.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-
-<Package
-  xmlns="http://schemas.microsoft.com/developer/2004/01/bootstrapper"
-  Name="DisplayName"
-  Culture="Culture"
->
-
-    <!-- Defines a localizable string table for error messages-->
-    <Strings>
-        <String Name="DisplayName">Visual C++ 2010 Runtime Libraries (x86)</String>
-        <String Name="Culture">en</String>
-        <String Name="AdminRequired">You do not have the permissions required to install Visual C++ 2010 Runtime Libraries (x86). Please contact your administrator.</String>
-        <String Name="InvalidPlatformWin9x">Installation of Visual C++ 2010 Runtime Libraries (x86) is not supported on Windows 95. Contact your application vendor.</String>
-        <String Name="InvalidPlatformWinNT">Installation of Visual C++ 2010 Runtime Libraries (x86) is not supported on Windows NT 4.0. Contact your application vendor.</String>
-        <String Name="GeneralFailure">A failure occurred attempting to install Visual C++ 2010 Runtime Libraries (x86).</String>
-        <String Name="VCRedistExe">http://go.microsoft.com/fwlink/?LinkID=210621</String>
-    </Strings>
-
-</Package>
diff --git a/Bootstrapper/vcredist10_x86/product.xml b/Bootstrapper/vcredist10_x86/product.xml
deleted file mode 100644
index 76edde618..000000000
--- a/Bootstrapper/vcredist10_x86/product.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?> 
-
-<Product
-  xmlns="http://schemas.microsoft.com/developer/2004/01/bootstrapper"
-  ProductCode="Microsoft.Visual.C++.10.0.x86"
->
-
-  <!-- Defines list of files to be copied on build -->
-  <PackageFiles>
-    <PackageFile Name="vcredist_x86.exe" HomeSite="VCRedistExe"/>
-  </PackageFiles>
-<InstallChecks>
-    <MsiProductCheck Property="VCRedistInstalled" Product="{F0C3E5D1-1ADE-321E-8167-68EF0DE699A5}"/>
-</InstallChecks>
-  
-  <!-- Defines how to invoke the setup for the Visual C++ 10.0 redist -->
-  <!-- TODO: Needs EstrimatedTempSpace, LogFile, and an update of EstimatedDiskSpace -->
-  <Commands Reboot="Defer">
-    <Command PackageFile="vcredist_x86.exe" 
-	     Arguments=' /q:a ' 
-	     >
-
-      <!-- These checks determine whether the package is to be installed -->
-      <InstallConditions>
-        <BypassIf Property="VCRedistInstalled" Compare="ValueGreaterThanOrEqualTo" Value="3"/>
-        <!-- Block install if user does not have admin privileges -->
-        <FailIf Property="AdminUser" Compare="ValueEqualTo" Value="false" String="AdminRequired"/>
-
-        <!-- Block install on Win95 -->
-        <FailIf Property="Version9X" Compare="VersionLessThan" Value="4.10" String="InvalidPlatformWin9x"/>
-
-        <!-- Block install on NT 4 or less -->
-        <FailIf Property="VersionNT" Compare="VersionLessThan" Value="5.00" String="InvalidPlatformWinNT"/>
-
-      </InstallConditions>
-      
-      <ExitCodes>
-        <ExitCode Value="0" Result="Success"/>
-        <ExitCode Value="3010" Result="SuccessReboot"/>
-        <DefaultExitCode Result="Fail" FormatMessageFromSystem="true" String="GeneralFailure" />
-      </ExitCodes>
-      
-    </Command>
-  </Commands>
-</Product>
diff --git a/MediaBrowser.Common.Implementations/ScheduledTasks/Tasks/DeleteCacheFileTask.cs b/MediaBrowser.Common.Implementations/ScheduledTasks/Tasks/DeleteCacheFileTask.cs
index be3dd89f7..8a574a70d 100644
--- a/MediaBrowser.Common.Implementations/ScheduledTasks/Tasks/DeleteCacheFileTask.cs
+++ b/MediaBrowser.Common.Implementations/ScheduledTasks/Tasks/DeleteCacheFileTask.cs
@@ -50,7 +50,7 @@ namespace MediaBrowser.Common.Implementations.ScheduledTasks.Tasks
         {
             return Task.Run(() =>
             {
-                var minDateModified = DateTime.UtcNow.AddMonths(-2);
+                var minDateModified = DateTime.UtcNow.AddDays(-45);
 
                 DeleteCacheFilesFromDirectory(cancellationToken, ApplicationPaths.CachePath, minDateModified, progress);
             });
diff --git a/MediaBrowser.Controller/Dto/DtoBuilder.cs b/MediaBrowser.Controller/Dto/DtoBuilder.cs
index e66235510..ede1a1e84 100644
--- a/MediaBrowser.Controller/Dto/DtoBuilder.cs
+++ b/MediaBrowser.Controller/Dto/DtoBuilder.cs
@@ -420,15 +420,25 @@ namespace MediaBrowser.Controller.Dto
             }
 
             // Add audio info
-            var audio = item as Audio;
-            if (audio != null)
+            if (fields.Contains(ItemFields.AudioInfo))
             {
-                if (fields.Contains(ItemFields.AudioInfo))
+                var audio = item as Audio;
+                if (audio != null)
                 {
                     dto.Album = audio.Album;
                     dto.AlbumArtist = audio.AlbumArtist;
                     dto.Artist = audio.Artist;
                 }
+
+                var album = item as MusicAlbum;
+
+                if (album != null)
+                {
+                    var songs = album.Children.OfType<Audio>().ToList();
+
+                    dto.AlbumArtist = songs.Select(i => i.AlbumArtist).FirstOrDefault(i => !string.IsNullOrEmpty(i));
+                    dto.Artist = songs.Select(i => i.Artist).FirstOrDefault(i => !string.IsNullOrEmpty(i));
+                }
             }
 
             // Add video info
@@ -503,6 +513,13 @@ namespace MediaBrowser.Controller.Dto
                     dto.SeriesName = series.Name;
                 }
             }
+
+            var game = item as BaseGame;
+
+            if (game != null)
+            {
+                dto.Players = game.PlayersSupported;
+            }
         }
 
         /// <summary>
@@ -521,7 +538,7 @@ namespace MediaBrowser.Controller.Dto
             double totalPercentPlayed = 0;
 
             // Loop through each recursive child
-            foreach (var child in folder.GetRecursiveChildren(user).Where(i => !i.IsFolder))
+            foreach (var child in folder.GetRecursiveChildren(user).Where(i => !i.IsFolder).ToList())
             {
                 var userdata = await userDataRepository.GetUserData(user.Id, child.GetUserDataKey()).ConfigureAwait(false);
 
diff --git a/MediaBrowser.Controller/Providers/Music/LastfmBaseProvider.cs b/MediaBrowser.Controller/Providers/Music/LastfmBaseProvider.cs
index dc586cb51..fefd6eed6 100644
--- a/MediaBrowser.Controller/Providers/Music/LastfmBaseProvider.cs
+++ b/MediaBrowser.Controller/Providers/Music/LastfmBaseProvider.cs
@@ -46,7 +46,7 @@ namespace MediaBrowser.Controller.Providers.Music
         {
             get
             {
-                return "3-12-13.3";
+                return "04-24-2013";
             }
         }
 
diff --git a/MediaBrowser.Model/Configuration/BaseApplicationConfiguration.cs b/MediaBrowser.Model/Configuration/BaseApplicationConfiguration.cs
index a8ee09be1..86f774a01 100644
--- a/MediaBrowser.Model/Configuration/BaseApplicationConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/BaseApplicationConfiguration.cs
@@ -50,7 +50,7 @@ namespace MediaBrowser.Model.Configuration
         public BaseApplicationConfiguration()
         {
             EnableAutoUpdate = true;
-            LogFileRetentionDays = 14;
+            LogFileRetentionDays = 7;
 
 #if (DEBUG)
             EnableDebugLevelLogging = true;
diff --git a/MediaBrowser.Model/DTO/BaseItemDto.cs b/MediaBrowser.Model/DTO/BaseItemDto.cs
index 6e30c46b7..ad454b4c2 100644
--- a/MediaBrowser.Model/DTO/BaseItemDto.cs
+++ b/MediaBrowser.Model/DTO/BaseItemDto.cs
@@ -96,6 +96,12 @@ namespace MediaBrowser.Model.Dto
         /// <value>The production year.</value>
         public int? ProductionYear { get; set; }
 
+        /// <summary>
+        /// Gets or sets the players supported by a game.
+        /// </summary>
+        /// <value>The players.</value>
+        public int? Players { get; set; }
+        
         /// <summary>
         /// Gets or sets the index number.
         /// </summary>
diff --git a/MediaBrowser.Model/Querying/ItemsByNameQuery.cs b/MediaBrowser.Model/Querying/ItemsByNameQuery.cs
index 354bc0e0f..9986f90ec 100644
--- a/MediaBrowser.Model/Querying/ItemsByNameQuery.cs
+++ b/MediaBrowser.Model/Querying/ItemsByNameQuery.cs
@@ -43,12 +43,41 @@ namespace MediaBrowser.Model.Querying
         /// <value>The fields.</value>
         public ItemFields[] Fields { get; set; }
 
+        /// <summary>
+        /// Gets or sets the exclude item types.
+        /// </summary>
+        /// <value>The exclude item types.</value>
+        public string[] ExcludeItemTypes { get; set; }
+
+        /// <summary>
+        /// Gets or sets the include item types.
+        /// </summary>
+        /// <value>The include item types.</value>
+        public string[] IncludeItemTypes { get; set; }
+
+        /// <summary>
+        /// Gets or sets the media types.
+        /// </summary>
+        /// <value>The media types.</value>
+        public string[] MediaTypes { get; set; }
+
+        /// <summary>
+        /// What to sort the results by
+        /// </summary>
+        /// <value>The sort by.</value>
+        public string[] SortBy { get; set; }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="ItemsByNameQuery"/> class.
         /// </summary>
         public ItemsByNameQuery()
         {
             Fields = new ItemFields[] {};
+            Recursive = true;
+            MediaTypes = new string[] { };
+            SortBy = new string[] { };
+            ExcludeItemTypes = new string[] { };
+            IncludeItemTypes = new string[] { };
         }
     }
 }
diff --git a/Nuget/MediaBrowser.Common.Internal.nuspec b/Nuget/MediaBrowser.Common.Internal.nuspec
index 46ee1ef75..e628088da 100644
--- a/Nuget/MediaBrowser.Common.Internal.nuspec
+++ b/Nuget/MediaBrowser.Common.Internal.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>MediaBrowser.Common.Internal</id>
-        <version>3.0.82</version>
+        <version>3.0.83</version>
         <title>MediaBrowser.Common.Internal</title>
         <authors>Luke</authors>
         <owners>ebr,Luke,scottisafool</owners>
@@ -12,7 +12,7 @@
         <description>Contains common components shared by Media Browser Theatre and Media Browser Server. Not intended for plugin developer consumption.</description>
         <copyright>Copyright © Media Browser 2013</copyright>
         <dependencies>
-            <dependency id="MediaBrowser.Common" version="3.0.82" />
+            <dependency id="MediaBrowser.Common" version="3.0.83" />
             <dependency id="NLog" version="2.0.1.2" />
             <dependency id="ServiceStack.Text" version="3.9.38" />
             <dependency id="SimpleInjector" version="2.2.1" />
diff --git a/Nuget/MediaBrowser.Common.nuspec b/Nuget/MediaBrowser.Common.nuspec
index 542234b87..6c23ea801 100644
--- a/Nuget/MediaBrowser.Common.nuspec
+++ b/Nuget/MediaBrowser.Common.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>MediaBrowser.Common</id>
-        <version>3.0.82</version>
+        <version>3.0.83</version>
         <title>MediaBrowser.Common</title>
         <authors>Media Browser Team</authors>
         <owners>ebr,Luke,scottisafool</owners>
diff --git a/Nuget/MediaBrowser.Server.Core.nuspec b/Nuget/MediaBrowser.Server.Core.nuspec
index 12608ed4d..807107091 100644
--- a/Nuget/MediaBrowser.Server.Core.nuspec
+++ b/Nuget/MediaBrowser.Server.Core.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>MediaBrowser.Server.Core</id>
-        <version>3.0.82</version>
+        <version>3.0.83</version>
         <title>Media Browser.Server.Core</title>
         <authors>Media Browser Team</authors>
         <owners>ebr,Luke,scottisafool</owners>
@@ -12,7 +12,7 @@
         <description>Contains core components required to build plugins for Media Browser Server.</description>
         <copyright>Copyright © Media Browser 2013</copyright>
         <dependencies>
-            <dependency id="MediaBrowser.Common" version="3.0.82" />
+            <dependency id="MediaBrowser.Common" version="3.0.83" />
         </dependencies>
     </metadata>
     <files>