tsanie/Gallery
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

adjustment

Browse Source
This commit is contained in:
Tsanie 2021-08-12 17:29:57 +08:00
parent fa0b033f2a
commit 04ef63ccc3
11 changed files with 116 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Gallery.Share/App.cs
View File

@ -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();

2
Gallery.Share/Gallery.Share.projitems
View File

@ -47,6 +47,7 @@
<Compile Include="$(MSBuildThisFileDirectory)Sources\Gelbooru\GallerySource.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Util\Consts.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Sources\FavoriteGallerySource.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Sources\Facets\GallerySource.cs" />
</ItemGroup>
<ItemGroup>
<Folder Include="$(MSBuildThisFileDirectory)Services\" />
@ -62,6 +63,7 @@
<Folder Include="$(MSBuildThisFileDirectory)Sources\Yandere\" />
<Folder Include="$(MSBuildThisFileDirectory)Sources\Danbooru\" />
<Folder Include="$(MSBuildThisFileDirectory)Sources\Gelbooru\" />
<Folder Include="$(MSBuildThisFileDirectory)Sources\Facets\" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="$(MSBuildThisFileDirectory)AppShell.xaml">

1
Gallery.Share/Resources/Languages/zh-CN.xml
View File

@ -12,4 +12,5 @@
<ProxyHost>代理主机</ProxyHost>
<ProxyPort>代理端口</ProxyPort>
<Favorite>收藏夹</Favorite>
<Huaban>花瓣网</Huaban>
</root>

10
Gallery.Share/Resources/UI/GalleryCollectionPage.cs
View File

@ -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));
}

73
Gallery.Share/Sources/Facets/GallerySource.cs Normal file
View File

@ -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<IEnumerable<GalleryItem>> 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(
@"<div id=""piece-(\d+?)""(.|\n)+?<img src=""([^""]+?)"".+?width=""(\d+?)""(.|\n)+?<span [^>]+?>([^<]+?)</span>",
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();
}
}
}

4
Gallery.Share/Sources/Yandere/YandereItem.cs
View File

@ -1,6 +1,4 @@
using System;
namespace Gallery.Sources.Yandere
namespace Gallery.Sources.Yandere
{
public class YandereItem
{

12
Gallery.Share/Util/Store.cs
View File

@ -111,9 +111,9 @@ namespace Gallery.Util
}
}
public static async Task<ImageSource> LoadRawImage(GalleryItem item, bool force = false, Action<(int loc, int size)> action = null)
public static async Task<ImageSource> 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<ImageSource> 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<ImageSource> LoadImage(string url, string working, string folder, bool downloading, bool force = false)
private static async Task<ImageSource> 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<ImageSource> LoadImageAsync(string url, string id, string working, string folder, bool force, Action<(int loc, int size)> action)
private static async Task<ImageSource> 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)

2
Gallery.Share/Views/GalleryItemPage.xaml.cs
View File

@ -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)

3
Gallery.Share/Views/GalleryPage.xaml
View File

@ -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}">
<ContentPage.ToolbarItems>
<ToolbarItem Order="Primary" Command="{Binding ToolbarCommand}"

2
Gallery.Share/Views/GalleryPage.xaml.cs
View File

@ -1,5 +1,6 @@
using System.Collections.Generic;
using System.Threading.Tasks;
using Gallery.Resources;
using Gallery.Resources.UI;
using Gallery.Util;
using Gallery.Util.Interface;
@ -21,6 +22,7 @@ namespace Gallery.Views
public GalleryPage(IGallerySource source) : base(source)
{
Title = Helper.GetResource(source.Name);
Resources.Add("cardView", GetCardViewTemplate());
SetValue(ToolbarCommandProperty, new Command(DoRefresh, () => !IsLoading && !IsBottomLoading));
InitializeComponent();

26
Gallery.iOS/Renderers/AppShellSection/AppAppearanceTracker.cs
View File

@ -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");
}
}
}
}
}