From 04ef63ccc3c6b3283f81a5566f82a5fb6faccf48 Mon Sep 17 00:00:00 2001 From: Tsanie Date: Thu, 12 Aug 2021 17:29:57 +0800 Subject: [PATCH] adjustment --- Gallery.Share/App.cs | 7 +- Gallery.Share/Gallery.Share.projitems | 2 + Gallery.Share/Resources/Languages/zh-CN.xml | 1 + .../Resources/UI/GalleryCollectionPage.cs | 10 ++- Gallery.Share/Sources/Facets/GallerySource.cs | 73 +++++++++++++++++++ Gallery.Share/Sources/Yandere/YandereItem.cs | 4 +- Gallery.Share/Util/Store.cs | 12 +-- Gallery.Share/Views/GalleryItemPage.xaml.cs | 2 +- Gallery.Share/Views/GalleryPage.xaml | 3 +- Gallery.Share/Views/GalleryPage.xaml.cs | 2 + .../AppShellSection/AppAppearanceTracker.cs | 26 ++++--- 11 files changed, 116 insertions(+), 26 deletions(-) create mode 100644 Gallery.Share/Sources/Facets/GallerySource.cs diff --git a/Gallery.Share/App.cs b/Gallery.Share/App.cs index d2a92e9..585555e 100644 --- a/Gallery.Share/App.cs +++ b/Gallery.Share/App.cs @@ -109,9 +109,10 @@ namespace Gallery { new Sources.FavoriteGallerySource(), - new Sources.Yandere.GallerySource(), // https://yande.re - new Sources.Danbooru.GallerySource(), // https://danbooru.donmai.us - new Sources.Gelbooru.GallerySource(), // https://gelbooru.com + //new Sources.Facets.GallerySource(), + new Sources.Yandere.GallerySource(), + new Sources.Danbooru.GallerySource(), + new Sources.Gelbooru.GallerySource(), }; MainPage = new AppShell(); diff --git a/Gallery.Share/Gallery.Share.projitems b/Gallery.Share/Gallery.Share.projitems index da561fe..d8ce856 100644 --- a/Gallery.Share/Gallery.Share.projitems +++ b/Gallery.Share/Gallery.Share.projitems @@ -47,6 +47,7 @@ + @@ -62,6 +63,7 @@ + diff --git a/Gallery.Share/Resources/Languages/zh-CN.xml b/Gallery.Share/Resources/Languages/zh-CN.xml index ad967b7..654fcbf 100644 --- a/Gallery.Share/Resources/Languages/zh-CN.xml +++ b/Gallery.Share/Resources/Languages/zh-CN.xml @@ -12,4 +12,5 @@ 代理主机 代理端口 收藏夹 + 花瓣网 \ No newline at end of file diff --git a/Gallery.Share/Resources/UI/GalleryCollectionPage.cs b/Gallery.Share/Resources/UI/GalleryCollectionPage.cs index 7337c55..b8378a5 100644 --- a/Gallery.Share/Resources/UI/GalleryCollectionPage.cs +++ b/Gallery.Share/Resources/UI/GalleryCollectionPage.cs @@ -446,11 +446,19 @@ namespace Gallery.Resources.UI { if (item.PreviewImage == null) { - var image = await Store.LoadPreviewImage(item, false); + var image = await Store.LoadRawImage(item, false); if (image != null) { item.PreviewImage = image; } + else + { + image = await Store.LoadPreviewImage(item, false); + if (image != null) + { + item.PreviewImage = image; + } + } } item.IsFavorite = favorites.Any(i => i.SourceEquals(item)); } diff --git a/Gallery.Share/Sources/Facets/GallerySource.cs b/Gallery.Share/Sources/Facets/GallerySource.cs new file mode 100644 index 0000000..b72800f --- /dev/null +++ b/Gallery.Share/Sources/Facets/GallerySource.cs @@ -0,0 +1,73 @@ +using System; +using System.Collections.Generic; +using System.Text.RegularExpressions; +using System.Threading.Tasks; +using Gallery.Util; +using Gallery.Util.Interface; +using Gallery.Util.Model; +using Xamarin.Forms; + +namespace Gallery.Sources.Facets +{ + public class GallerySource : GallerySourceBase + { + public override string Name => "FACETS"; + public override string Route => "facets"; + public override string FlyoutIconKey => "Facets"; + public override string HomePage => "http://www.facets.la"; + + public override async Task> GetRecentItemsAsync(int page) + { + var offset = (page - 1) * 63; + var url = $"http://www.facets.la/offset/{offset}/"; + var (result, error) = await NetHelper.RequestObject(url, @return: content => ResolveGalleryItems(content)); + + if (result == null || !string.IsNullOrEmpty(error)) + { + Log.Error("facets.content.load", $"failed to load content array, error: {error}"); + return null; + } + + return result; + } + + private GalleryItem[] ResolveGalleryItems(string content) + { + var regex = new Regex( + @"
]+?>([^<]+?)", + RegexOptions.Multiline); + var matches = regex.Matches(content); + var items = new GalleryItem[matches.Count]; + for (var i = 0; i < items.Length; i++) + { + var g = matches[i].Groups; + items[i] = new GalleryItem(int.Parse(g[1].Value)) + { + Tags = new[] { g[6].Value }, + //Width = int.Parse(g[4].Value), + Source = Route, + RawUrl = g[3].Value, + PreviewUrl = g[3].Value + }; + } + return items; + } + + public override void InitDynamicResources(string family, ResourceDictionary light, ResourceDictionary dark) + { + var icon = new FontImageSource + { + FontFamily = family, + Glyph = "\uf302", + Size = 18.0 + }; + light.Add(FlyoutIconKey, icon); + dark.Add(FlyoutIconKey, icon); + } + + public override void SetCookie() + { + throw new NotImplementedException(); + } + } +} diff --git a/Gallery.Share/Sources/Yandere/YandereItem.cs b/Gallery.Share/Sources/Yandere/YandereItem.cs index e36cbbc..549629f 100644 --- a/Gallery.Share/Sources/Yandere/YandereItem.cs +++ b/Gallery.Share/Sources/Yandere/YandereItem.cs @@ -1,6 +1,4 @@ -using System; - -namespace Gallery.Sources.Yandere +namespace Gallery.Sources.Yandere { public class YandereItem { diff --git a/Gallery.Share/Util/Store.cs b/Gallery.Share/Util/Store.cs index b961620..f8147d2 100644 --- a/Gallery.Share/Util/Store.cs +++ b/Gallery.Share/Util/Store.cs @@ -111,9 +111,9 @@ namespace Gallery.Util } } - public static async Task LoadRawImage(GalleryItem item, bool force = false, Action<(int loc, int size)> action = null) + public static async Task LoadRawImage(GalleryItem item, bool downloading, bool force = false, Action<(int loc, int size)> action = null) { - return await LoadImageAsync(item.RawUrl, null, PersonalFolder, Path.Combine(imageFolder, item.Source), force, action); + return await LoadImageAsync(item.RawUrl, null, PersonalFolder, Path.Combine(imageFolder, item.Source), downloading, force, action); } public static string GetRawImagePath(GalleryItem item) @@ -128,10 +128,10 @@ namespace Gallery.Util public static async Task LoadPreviewImage(GalleryItem item, bool downloading, bool force = false) { - return await LoadImage(item.PreviewUrl, CacheFolder, Path.Combine(previewFolder, item.Source), downloading, force: force); + return await LoadImage(item.PreviewUrl, CacheFolder, Path.Combine(previewFolder, item.Source), downloading, force); } - private static async Task LoadImage(string url, string working, string folder, bool downloading, bool force = false) + private static async Task LoadImage(string url, string working, string folder, bool downloading, bool force) { var file = Path.Combine(working, folder, Path.GetFileName(url)); ImageSource image; @@ -154,7 +154,7 @@ namespace Gallery.Util return image; } - private static async Task LoadImageAsync(string url, string id, string working, string folder, bool force, Action<(int loc, int size)> action) + private static async Task LoadImageAsync(string url, string id, string working, string folder, bool downloading, bool force, Action<(int loc, int size)> action) { var file = Path.Combine(working, folder, Path.GetFileName(url)); ImageSource image; @@ -166,7 +166,7 @@ namespace Gallery.Util { image = null; } - if (image == null) + if (downloading && image == null) { file = await NetHelper.DownloadImageAsync(url, id, working, folder, action); if (file != null) diff --git a/Gallery.Share/Views/GalleryItemPage.xaml.cs b/Gallery.Share/Views/GalleryItemPage.xaml.cs index d19a17f..83dc257 100644 --- a/Gallery.Share/Views/GalleryItemPage.xaml.cs +++ b/Gallery.Share/Views/GalleryItemPage.xaml.cs @@ -115,7 +115,7 @@ namespace Gallery.Views } } } - var image = await Store.LoadRawImage(item, force: force, o => + var image = await Store.LoadRawImage(item, true, force: force, o => { var val = o.loc / (double)o.size; if (val > progress.Progress) diff --git a/Gallery.Share/Views/GalleryPage.xaml b/Gallery.Share/Views/GalleryPage.xaml index 7e73ecf..f309f7d 100644 --- a/Gallery.Share/Views/GalleryPage.xaml +++ b/Gallery.Share/Views/GalleryPage.xaml @@ -6,8 +6,7 @@ x:Class="Gallery.Views.GalleryPage" x:Name="yanderePage" BackgroundColor="{DynamicResource WindowColor}" - BindingContext="{x:Reference yanderePage}" - Title="{Binding Source.Name}"> + BindingContext="{x:Reference yanderePage}"> !IsLoading && !IsBottomLoading)); InitializeComponent(); diff --git a/Gallery.iOS/Renderers/AppShellSection/AppAppearanceTracker.cs b/Gallery.iOS/Renderers/AppShellSection/AppAppearanceTracker.cs index 2c36bc0..7de9244 100644 --- a/Gallery.iOS/Renderers/AppShellSection/AppAppearanceTracker.cs +++ b/Gallery.iOS/Renderers/AppShellSection/AppAppearanceTracker.cs @@ -151,20 +151,26 @@ namespace Gallery.iOS.Renderers.AppShellSection public void UpdateLayout(UITabBarController controller) { var tabBar = controller.TabBar; - if (tabBar != null && tabBar.Items != null && tabBar.Items.Length >= 4) + if (tabBar != null && tabBar.Items != null && tabBar.Items.Length > 0) { var tabBarItem = tabBar.Items[0]; tabBarItem.Image = UIImage.FromBundle("IconBookmarkRegular"); tabBarItem.SelectedImage = UIImage.FromBundle("IconBookmark"); - tabBarItem = tabBar.Items[1]; - tabBarItem.Image = UIImage.FromBundle("IconYandereRegular"); - tabBarItem.SelectedImage = UIImage.FromBundle("IconYandere"); - tabBarItem = tabBar.Items[2]; - tabBarItem.Image = UIImage.FromBundle("IconSourceRegular"); - tabBarItem.SelectedImage = UIImage.FromBundle("IconSource"); - tabBarItem = tabBar.Items[3]; - tabBarItem.Image = UIImage.FromBundle("IconSourceRegular"); - tabBarItem.SelectedImage = UIImage.FromBundle("IconSource"); + if (tabBar.Items.Length > 1) + { + tabBarItem = tabBar.Items[1]; + tabBarItem.Image = UIImage.FromBundle("IconYandereRegular"); + tabBarItem.SelectedImage = UIImage.FromBundle("IconYandere"); + } + if (tabBar.Items.Length > 2) + { + for (var i = 2; i < tabBar.Items.Length; i++) + { + tabBarItem = tabBar.Items[i]; + tabBarItem.Image = UIImage.FromBundle("IconSourceRegular"); + tabBarItem.SelectedImage = UIImage.FromBundle("IconSource"); + } + } } } }