Merge pull request #383 from Bond-009/unused

Remove firebase and empty resource config file

2 files changed, 11 insertions, 89 deletions

diff --git a/MediaBrowser.Providers/Music/MusicBrainzAlbumProvider.cs b/MediaBrowser.Providers/Music/MusicBrainzAlbumProvider.cs
index 0dbc43313..2c94d6a07 100644
--- a/MediaBrowser.Providers/Music/MusicBrainzAlbumProvider.cs
+++ b/MediaBrowser.Providers/Music/MusicBrainzAlbumProvider.cs
@@ -720,82 +720,6 @@ namespace MediaBrowser.Providers.Music
             return null;
         }
 
-        private long _lastMbzUrlQueryTicks = 0;
-        private List<MbzUrl> _mbzUrls = null;
-        private MbzUrl _chosenUrl;
-
-        private async Task<MbzUrl> GetMbzUrl(bool forceMusicBrainzProper = false)
-        {
-            if (_chosenUrl == null || _mbzUrls == null || (DateTime.UtcNow.Ticks - _lastMbzUrlQueryTicks) > TimeSpan.FromHours(12).Ticks)
-            {
-                var urls = await RefreshMzbUrls(forceMusicBrainzProper).ConfigureAwait(false);
-
-                if (urls.Count > 1)
-                {
-                    _chosenUrl = urls[new Random().Next(0, urls.Count)];
-                }
-                else
-                {
-                    _chosenUrl = urls[0];
-                }
-            }
-
-            return _chosenUrl;
-        }
-
-        private async Task<List<MbzUrl>> RefreshMzbUrls(bool forceMusicBrainzProper = false)
-        {
-            List<MbzUrl> list = null;
-
-            if (!forceMusicBrainzProper)
-            {
-                var musicbrainzadminurl = _appHost.GetValue("musicbrainzadminurl");
-
-                if (!string.IsNullOrEmpty(musicbrainzadminurl))
-                {
-                    try
-                    {
-                        var options = new HttpRequestOptions
-                        {
-                            Url = musicbrainzadminurl,
-                            UserAgent = _appHost.Name + "/" + _appHost.ApplicationVersion
-                        };
-
-                        using (var response = await _httpClient.SendAsync(options, "GET").ConfigureAwait(false))
-                        {
-                            using (var stream = response.Content)
-                            {
-                                var results = await _json.DeserializeFromStreamAsync<List<MbzUrl>>(stream).ConfigureAwait(false);
-
-                                list = results;
-                            }
-                        }
-                        _lastMbzUrlQueryTicks = DateTime.UtcNow.Ticks;
-                    }
-                    catch (Exception ex)
-                    {
-                        _logger.LogError(ex, "Error getting music brainz info");
-                    }
-                }
-            }
-
-            if (list == null)
-            {
-                list = new List<MbzUrl>
-                {
-                    new MbzUrl
-                    {
-                        url = MusicBrainzBaseUrl,
-                        throttleMs = 1000
-                    }
-                };
-            }
-
-            _mbzUrls = list.ToList();
-
-            return list;
-        }
-
         internal Task<HttpResponseInfo> GetMusicBrainzResponse(string url, bool isSearch, CancellationToken cancellationToken)
         {
             return GetMusicBrainzResponse(url, isSearch, false, cancellationToken);
@@ -806,7 +730,7 @@ namespace MediaBrowser.Providers.Music
         /// </summary>
         internal async Task<HttpResponseInfo> GetMusicBrainzResponse(string url, bool isSearch, bool forceMusicBrainzProper, CancellationToken cancellationToken)
         {
-            var urlInfo = await GetMbzUrl(forceMusicBrainzProper).ConfigureAwait(false);
+            var urlInfo = new MbzUrl(MusicBrainzBaseUrl, 1000);
             var throttleMs = urlInfo.throttleMs;
 
             if (throttleMs > 0)
@@ -841,6 +765,12 @@ namespace MediaBrowser.Providers.Music
 
         internal class MbzUrl
         {
+            internal MbzUrl(string url, int throttleMs)
+            {
+                this.url = url;
+                this.throttleMs = throttleMs;
+            }
+
             public string url { get; set; }
             public int throttleMs { get; set; }
         }
diff --git a/MediaBrowser.Providers/Omdb/OmdbProvider.cs b/MediaBrowser.Providers/Omdb/OmdbProvider.cs
index 5c4eb62a8..bb4624b5c 100644
--- a/MediaBrowser.Providers/Omdb/OmdbProvider.cs
+++ b/MediaBrowser.Providers/Omdb/OmdbProvider.cs
@@ -270,21 +270,13 @@ namespace MediaBrowser.Providers.Omdb
 
         public static string GetOmdbUrl(string query, IApplicationHost appHost, CancellationToken cancellationToken)
         {
-            var baseUrl = appHost.GetValue("omdb_baseurl");
+            const string url = "https://www.omdbapi.com?apikey=fe53f97e";
 
-            if (string.IsNullOrEmpty(baseUrl))
+            if (string.IsNullOrWhiteSpace(query))
             {
-                baseUrl = "https://www.omdbapi.com";
+                return url;
             }
-
-            var url = baseUrl + "?apikey=fe53f97e";
-
-            if (!string.IsNullOrWhiteSpace(query))
-            {
-                url += "&" + query;
-            }
-
-            return url;
+            return url + "&" + query;
         }
 
         private async Task<string> EnsureItemInfo(string imdbId, CancellationToken cancellationToken)