Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-08 02:34:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev

Browse Source
This commit is contained in:
Luke Pulverenti 2016-06-24 13:29:59 -04:00
commit 1ce1f15a95
5 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MediaBrowser.Providers/Music/FanArtAlbumProvider.cs
View File

@ -12,6 +12,7 @@ using System.Collections.Generic;
using System.Globalization; using System.Globalization;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Text.RegularExpressions;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using CommonIO; using CommonIO;
@ -151,6 +152,7 @@ namespace MediaBrowser.Providers.Music
} }
} }
private Regex _regex_http = new Regex("^http://");
private void PopulateImages(List<RemoteImageInfo> list, private void PopulateImages(List<RemoteImageInfo> list,
List<FanartArtistProvider.FanartArtistImage> images, List<FanartArtistProvider.FanartArtistImage> images,
ImageType type, ImageType type,
@ -178,7 +180,7 @@ namespace MediaBrowser.Providers.Music
Width = width, Width = width,
Height = height, Height = height,
ProviderName = Name, ProviderName = Name,
Url = url, Url = _regex_http.Replace(url, "https://", 1),
Language = i.lang Language = i.lang
}; };

4
MediaBrowser.Providers/Music/FanArtArtistProvider.cs
View File

@ -14,6 +14,7 @@ using System.Globalization;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Net; using System.Net;
using System.Text.RegularExpressions;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using CommonIO; using CommonIO;
@ -149,6 +150,7 @@ namespace MediaBrowser.Providers.Music
PopulateImages(list, obj.musicarts, ImageType.Art, 500, 281); PopulateImages(list, obj.musicarts, ImageType.Art, 500, 281);
} }
private Regex _regex_http = new Regex("^http://");
private void PopulateImages(List<RemoteImageInfo> list, private void PopulateImages(List<RemoteImageInfo> list,
List<FanartArtistImage> images, List<FanartArtistImage> images,
ImageType type, ImageType type,
@ -176,7 +178,7 @@ namespace MediaBrowser.Providers.Music
Width = width, Width = width,
Height = height, Height = height,
ProviderName = Name, ProviderName = Name,
Url = url, Url = _regex_http.Replace(url, "https://", 1),
Language = i.lang Language = i.lang
}; };

4
MediaBrowser.Providers/TV/FanArt/FanArtSeasonProvider.cs
View File

@ -15,6 +15,7 @@ using System.Collections.Generic;
using System.Globalization; using System.Globalization;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Text.RegularExpressions;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using CommonIO; using CommonIO;
@ -160,6 +161,7 @@ namespace MediaBrowser.Providers.TV
PopulateImages(list, obj.showbackground, ImageType.Backdrop, 1920, 1080, seasonNumber); PopulateImages(list, obj.showbackground, ImageType.Backdrop, 1920, 1080, seasonNumber);
} }
private Regex _regex_http = new Regex("^http://");
private void PopulateImages(List<RemoteImageInfo> list, private void PopulateImages(List<RemoteImageInfo> list,
List<FanartSeriesProvider.Image> images, List<FanartSeriesProvider.Image> images,
ImageType type, ImageType type,
@ -194,7 +196,7 @@ namespace MediaBrowser.Providers.TV
Width = width, Width = width,
Height = height, Height = height,
ProviderName = Name, ProviderName = Name,
Url = url, Url = _regex_http.Replace(url, "https://", 1),
Language = i.lang Language = i.lang
}; };

4
MediaBrowser.Providers/TV/FanArt/FanartSeriesProvider.cs
View File

@ -17,6 +17,7 @@ using System.Globalization;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Net; using System.Net;
using System.Text.RegularExpressions;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using CommonIO; using CommonIO;
@ -162,6 +163,7 @@ namespace MediaBrowser.Providers.TV
PopulateImages(list, obj.tvposter, ImageType.Primary, 1000, 1426); PopulateImages(list, obj.tvposter, ImageType.Primary, 1000, 1426);
} }
private Regex _regex_http = new Regex("^http://");
private void PopulateImages(List<RemoteImageInfo> list, private void PopulateImages(List<RemoteImageInfo> list,
List<Image> images, List<Image> images,
ImageType type, ImageType type,
@ -194,7 +196,7 @@ namespace MediaBrowser.Providers.TV
Width = width, Width = width,
Height = height, Height = height,
ProviderName = Name, ProviderName = Name,
Url = url, Url = _regex_http.Replace(url, "https://", 1),
Language = i.lang Language = i.lang
}; };

3
MediaBrowser.Server.Implementations/Channels/ChannelManager.cs
View File

@ -1172,8 +1172,7 @@ namespace MediaBrowser.Server.Implementations.Channels
{ {
items = ApplyFilters(items, query.Filters, user); items = ApplyFilters(items, query.Filters, user);
var sortBy = query.SortBy.Length == 0 ? new[] { ItemSortBy.SortName } : query.SortBy; items = _libraryManager.Sort(items, user, query.SortBy, query.SortOrder ?? SortOrder.Ascending);
items = _libraryManager.Sort(items, user, sortBy, query.SortOrder ?? SortOrder.Ascending);
var all = items.ToList(); var all = items.ToList();
var totalCount = totalCountFromProvider ?? all.Count; var totalCount = totalCountFromProvider ?? all.Count;