Skip to content

Commit

Permalink
1.1.7 更新
Browse files Browse the repository at this point in the history
  • Loading branch information
SpaceTimee committed Feb 18, 2024
1 parent 54f6ca1 commit 86ed0b6
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
14 changes: 7 additions & 7 deletions Ona-Pix.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
<PackageReleaseNotes>Yet Another Pixiv Tool</PackageReleaseNotes>
<Authors>Space Time</Authors>
<Company>Space Time</Company>
<AssemblyVersion>1.1.6</AssemblyVersion>
<Version>1.1.6</Version>
<FileVersion>1.1.6</FileVersion>
<InformationalVersion>1.1.6</InformationalVersion>
<AssemblyVersion>1.1.7</AssemblyVersion>
<Version>1.1.7</Version>
<FileVersion>1.1.7</FileVersion>
<InformationalVersion>1.1.7</InformationalVersion>
<PackageTags>Tool;Pixiv;Ona;Pix</PackageTags>
<ApplicationIcon>Ona-Pix-Logo.ico</ApplicationIcon>
<PackageIcon>Ona Pix Logo.png</PackageIcon>
Expand All @@ -21,7 +21,7 @@
<RepositoryType>git</RepositoryType>
<Copyright>Copyright © 2077</Copyright>
<OutputType>WinExe</OutputType>
<TargetFramework>net5.0-windows10.0.22000.0</TargetFramework>
<TargetFramework>net8.0-windows10.0.22000.0</TargetFramework>
<SupportedOSPlatformVersion>10.0.17763.0</SupportedOSPlatformVersion>
<RootNamespace>Ona_Pix</RootNamespace>
<Nullable>enable</Nullable>
Expand Down Expand Up @@ -69,8 +69,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="MaterialDesignThemes" Version="4.6.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="MaterialDesignThemes" Version="4.9.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="SauceNET" Version="1.1.1" />
<PackageReference Include="WpfAnimatedGif" Version="2.0.2" />
</ItemGroup>
Expand Down
8 changes: 4 additions & 4 deletions Windows/MainWindow.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -351,22 +351,22 @@ private async Task IsUri()
Title = "正在解析链接";

if ((IS_ACTIVE ? ActiveSearchBox : InactiveSearchBox).Text.Contains(@"www.pixiv.net/artworks")) //Pixiv Url
await GetImage((IS_ACTIVE ? ActiveSearchBox : InactiveSearchBox).Text.Replace(@"www.pixiv.net/artworks", @"pixiv.re") + ".png");
await GetImage((IS_ACTIVE ? ActiveSearchBox : InactiveSearchBox).Text.Replace(@"www.pixiv.net/artworks", @"pixiv.nl") + ".png");
else if ((IS_ACTIVE ? ActiveSearchBox : InactiveSearchBox).Text.Contains(@"www.pixiv.net/member_illust.php?") && (IS_ACTIVE ? ActiveSearchBox : InactiveSearchBox).Text.Contains("illust_id")) //Pixiv Illust Url
{
NameValueCollection paramCollection = GetParamCollection(new Uri((IS_ACTIVE ? ActiveSearchBox : InactiveSearchBox).Text).Query);
await GetImage(@"https://pixiv.re/" + paramCollection["illust_id"]! + ".png");
await GetImage(@"https://pixiv.nl/" + paramCollection["illust_id"]! + ".png");
}
else //其他 Uri (包括 Pximg Url)
await GetImage((IS_ACTIVE ? ActiveSearchBox : InactiveSearchBox).Text.Replace(@"i.pximg.net", Define.BEHAVIOR_PAGE.PixivCatToggle.IS_TOGGLED ? @"i.pixiv.re" : @"pximg.moezx.cc"));
await GetImage((IS_ACTIVE ? ActiveSearchBox : InactiveSearchBox).Text.Replace(@"i.pximg.net", Define.BEHAVIOR_PAGE.PixivCatToggle.IS_TOGGLED ? @"i.pixiv.nl" : @"pximg.moezx.cc"));

Title = "链接解析完成";
}
private async Task IsPixivID()
{
Title = "正在解析 PixivID";

await GetImage(@"https://pixiv.re/" + (IS_ACTIVE ? ActiveSearchBox : InactiveSearchBox).Text + ".png");
await GetImage(@"https://pixiv.nl/" + (IS_ACTIVE ? ActiveSearchBox : InactiveSearchBox).Text + ".png");

Title = "PixivID 解析完成";
}
Expand Down

0 comments on commit 86ed0b6

Please sign in to comment.