use shared alpha picker

3 files changed, 16 insertions, 10 deletions

diff --git a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
index 032f8dbb7..503fb1aa7 100644
--- a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
@@ -362,6 +362,10 @@ namespace MediaBrowser.Server.Implementations.Library
                     return;
                 }
             }
+            if (item is Photo)
+            {
+                return;
+            }
             //if (!(item is Folder))
             //{
             //    return;
diff --git a/MediaBrowser.Server.Implementations/LiveTv/Listings/XmlTvListingsProvider.cs b/MediaBrowser.Server.Implementations/LiveTv/Listings/XmlTvListingsProvider.cs
index 4d2fc8bfe..e0ef67dcd 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/Listings/XmlTvListingsProvider.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/Listings/XmlTvListingsProvider.cs
@@ -71,31 +71,36 @@ namespace MediaBrowser.Server.Implementations.LiveTv.Listings
             }));
         }
 
-        public async Task AddMetadata(ListingsProviderInfo info, List<ChannelInfo> channels, CancellationToken cancellationToken)
+        public Task AddMetadata(ListingsProviderInfo info, List<ChannelInfo> channels, CancellationToken cancellationToken)
         {
             // Add the channel image url
             var reader = new XmlTvReader(info.Path, GetLanguage(), null);
             var results = reader.GetChannels().ToList();
 
             if (channels != null && channels.Count > 0)
-	        {
-                channels.ForEach(c => {
+            {
+                channels.ForEach(c =>
+                {
                     var match = results.FirstOrDefault(r => r.Id == c.Id);
                     if (match != null && match.Icon != null && !String.IsNullOrEmpty(match.Icon.Source))
                     {
                         c.ImageUrl = match.Icon.Source;
                     }
                 });
-	        }
+            }
+
+            return Task.FromResult(true);
         }
 
-        public async Task Validate(ListingsProviderInfo info, bool validateLogin, bool validateListings)
+        public Task Validate(ListingsProviderInfo info, bool validateLogin, bool validateListings)
         {
-            // Check that the path or url is valid. If not, throw a file not found exception
-            if (!File.Exists(info.Path))
+            // Assume all urls are valid. check files for existence
+            if (!info.Path.StartsWith("http", StringComparison.OrdinalIgnoreCase) && !File.Exists(info.Path))
             {
                 throw new FileNotFoundException("Could not find the XmlTv file specified:", info.Path);
             }
+
+            return Task.FromResult(true);
         }
 
         public Task<List<NameIdPair>> GetLineups(ListingsProviderInfo info, string country, string location)
diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
index d6c1ad6bc..94b2adf2c 100644
--- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
+++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
@@ -1122,9 +1122,6 @@
     <Content Include="dashboard-ui\music.html">

       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

     </Content>

-    <Content Include="dashboard-ui\scripts\alphapicker.js">

-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

-    </Content>

     <Content Include="dashboard-ui\components\imageeditor\imageeditor.js">

       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

     </Content>