Skip to content

Commit 2038550

Browse files
DecimationDecimation
committed
Fix Catbox API requests
1 parent 2292111 commit 2038550

File tree

6 files changed

+55
-56
lines changed

6 files changed

+55
-56
lines changed

‎SmartImage.Lib 3/Engines/Impl/Upload/BaseUploadEngine.cs‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
using System.Runtime.Intrinsics.X86;
66
using Flurl.Http;
77
using Flurl.Http.Configuration;
8+
using Flurl.Http.Content;
9+
using Kantan.Net.Utilities;
810
using Novus.OS;
911
using Novus.Utilities;
1012
using SmartImage.Lib.Utilities;
@@ -91,11 +93,17 @@ public override async Task<BaseUploadResponse> UploadFileAsync(string file, Canc
9193
rx.ExceptionHandled = true;
9294
};
9395
})
96+
.WithHeaders(new
97+
{
98+
User_Agent = HttpUtilities.UserAgent
99+
})
94100
.PostMultipartAsync(mp =>
95101
mp.AddFile("fileToUpload", file)
96102
.AddString("reqtype", "fileupload")
97103
.AddString("time", "1h")
98-
, cancellationToken: ct);
104+
.AddString("userhash", string.Empty)
105+
, cancellationToken: ct,
106+
completionOption: HttpCompletionOption.ResponseHeadersRead);
99107

100108
return await VerifyResultAsync(response, ct).ConfigureAwait(false);
101109
}

‎SmartImage.Lib 3/SearchClient.cs‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -94,10 +94,8 @@ static SearchClient()
9494
/// </summary>
9595
/// <param name="query">Search query</param>
9696
/// <param name="reload"></param>
97-
/// <param name="p"><see cref="IProgress{T}"/></param>
9897
/// <param name="token">Cancellation token passed to <see cref="BaseSearchEngine.GetResultAsync"/></param>
9998
public async Task<SearchResult[]> RunSearchAsync(SearchQuery query, bool reload = true,
100-
[CBN] IProgress<int> p = null,
10199
CancellationToken token = default)
102100
{
103101
IsRunning = true;
@@ -116,7 +114,7 @@ public async Task<SearchResult[]> RunSearchAsync(SearchQuery query, bool reload
116114
var results = new SearchResult[tasks.Count];
117115
int i = 0;
118116

119-
while (tasks.Any()) {
117+
while (tasks.Count > 0) {
120118
if (token.IsCancellationRequested) {
121119

122120
Logger.LogWarning("Cancellation requested");
@@ -126,21 +124,15 @@ public async Task<SearchResult[]> RunSearchAsync(SearchQuery query, bool reload
126124
}
127125

128126
var task = await Task.WhenAny(tasks);
127+
tasks.Remove(task);
129128

130129
var result = await task;
131130

132-
OnResult?.Invoke(this, result);
133-
p?.Report(i);
134-
135-
if (Config.PriorityEngines.HasFlag(result.Engine.EngineOption)) {
136-
137-
OpenResult(result);
138-
}
131+
ProcessResult(result);
139132

140133
results[i] = result;
141134
i++;
142135
// results.Add(result);
143-
tasks.Remove(task);
144136
}
145137

146138
OnComplete?.Invoke(this, results);
@@ -160,8 +152,8 @@ public async Task<SearchResult[]> RunSearchAsync(SearchQuery query, bool reload
160152
OpenResult(results.MaxBy(x => x.AllResults.Sum(xy => xy.Score)));
161153
}
162154
else {
163-
OpenResult(rr.OrderByDescending(x=>x.Similarity)
164-
.FirstOrDefault(x=>Url.IsValid(x.Url))?.Url);
155+
OpenResult(rr.OrderByDescending(x => x.Similarity)
156+
.FirstOrDefault(x => Url.IsValid(x.Url))?.Url);
165157
}
166158
}
167159
catch (Exception e) {
@@ -177,6 +169,16 @@ public async Task<SearchResult[]> RunSearchAsync(SearchQuery query, bool reload
177169
return results;
178170
}
179171

172+
private void ProcessResult(SearchResult result)
173+
{
174+
OnResult?.Invoke(this, result);
175+
176+
if (Config.PriorityEngines.HasFlag(result.Engine.EngineOption)) {
177+
178+
OpenResult(result);
179+
}
180+
}
181+
180182
private void OpenResult(Url url1)
181183
{
182184
#if DEBUG && !TEST
@@ -187,7 +189,6 @@ private void OpenResult(Url url1)
187189

188190
#pragma warning restore CA1822
189191
#else
190-
191192
Logger.LogInformation("Opening {Url}", url1);
192193
FileSystem.Open(url1);
193194
// HttpUtilities.TryOpenUrl(url1);

‎SmartImage.UI/MainWindow.Handlers.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,7 @@ private void Btn_Remove_Click(object sender, RoutedEventArgs e)
250250
else
251251
n = Queue[i2];
252252
CurrentQueueItem = n;
253+
253254
// Lb_Queue.ItemsSource. = n;
254255
// AdvanceQueue(i-1);
255256

‎SmartImage.UI/MainWindow.State.cs‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,4 +79,16 @@ public bool ShowMedia
7979
OnPropertyChanged();
8080
}
8181
}
82+
83+
private bool m_isChecked;
84+
85+
public bool IsChecked
86+
{
87+
get { return m_isChecked; }
88+
set
89+
{
90+
m_isChecked = value;
91+
OnPropertyChanged();
92+
}
93+
}
8294
}

‎SmartImage.UI/MainWindow.xaml‎

Lines changed: 16 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,20 @@
7070
<Setter Property="HorizontalAlignment" Value="Center" />
7171
</Style>
7272
<Style x:Key="CustomListViewItemStyle" TargetType="{x:Type ListViewItem}">
73-
<Setter Property="Background" Value="LightGray" />
74-
<Setter Property="Foreground" Value="Black" />
73+
74+
<!-- <Setter Property="Background" Value="LightGray" /> -->
75+
<!-- <Setter Property="Foreground" Value="Black" /> -->
76+
<!--<Setter Property="Template">
77+
<Setter.Value>
78+
<ControlTemplate TargetType="ListViewItem">
79+
<ControlTemplate.Triggers>
80+
<Trigger Property="IsSelected" Value="True">
81+
<Setter Property="FontStyle" Value="Italic"></Setter>
82+
</Trigger>
83+
</ControlTemplate.Triggers>
84+
</ControlTemplate>
85+
</Setter.Value>
86+
</Setter>-->
7587
<Setter Property="ContextMenu" Value="{StaticResource ItemContextMenu}" />
7688

7789
<Style.Resources>
@@ -440,10 +452,11 @@
440452
<ListView x:Name="Lv_Results" Margin="0,85,0,0"
441453
MouseDoubleClick="Lv_Results_MouseDoubleClick"
442454
Foreground="White"
455+
IsSelected="{Binding IsChecked, UpdateSourceTrigger=PropertyChanged}"
443456
IsSynchronizedWithCurrentItem="True"
444457
Background="{DynamicResource Black2}"
445458
SelectedItem="{Binding CurrentResultItem, Mode=TwoWay}"
446-
ItemContainerStyle="{StaticResource CustomListViewItemStyle}"
459+
ItemContainerStyle="{DynamicResource CustomListViewItemStyle}"
447460
MouseRightButtonDown="Lv_Results_MouseRightButtonDown"
448461
SelectionChanged="Lv_Results_SelectionChanged" KeyDown="Lv_Results_KeyDown"
449462
ScrollViewer.CanContentScroll="True" Grid.Row="1" Grid.ColumnSpan="2">
@@ -465,43 +478,6 @@
465478
Width="20"
466479
Height="20" Stretch="None" ToolTip="{Binding Status}">
467480

468-
<!--<Image.RenderTransformOrigin>
469-
<Point X="0" Y="1"></Point>
470-
</Image.RenderTransformOrigin>
471-
472-
<Image.RenderTransform>
473-
<TransformGroup>
474-
<ScaleTransform ScaleX="1" ScaleY="1" CenterX="0" CenterY="1" />
475-
<TranslateTransform X="0" Y="0" />
476-
</TransformGroup>
477-
</Image.RenderTransform>
478-
479-
<Image.Triggers>
480-
<EventTrigger RoutedEvent="Image.MouseEnter">
481-
<BeginStoryboard>
482-
<Storyboard>
483-
<DoubleAnimation Storyboard.TargetName="Img_Status"
484-
Storyboard.TargetProperty="(Image.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleX)"
485-
To="2.5" Duration="0:0:0.2" />
486-
<DoubleAnimation Storyboard.TargetName="Img_Status"
487-
Storyboard.TargetProperty="(Image.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleY)"
488-
To="2.5" Duration="0:0:0.2" />
489-
</Storyboard>
490-
</BeginStoryboard>
491-
</EventTrigger>
492-
<EventTrigger RoutedEvent="Image.MouseLeave">
493-
<BeginStoryboard>
494-
<Storyboard>
495-
<DoubleAnimation Storyboard.TargetName="Img_Status"
496-
Storyboard.TargetProperty="(Image.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleX)"
497-
To="1" Duration="0:0:0.2" />
498-
<DoubleAnimation Storyboard.TargetName="Img_Status"
499-
Storyboard.TargetProperty="(Image.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleY)"
500-
To="1" Duration="0:0:0.2" />
501-
</Storyboard>
502-
</BeginStoryboard>
503-
</EventTrigger>
504-
</Image.Triggers>-->
505481
</Image>
506482

507483
</DataTemplate>

‎SmartImage.UI/MainWindow.xaml.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ public MainWindow()
151151

152152
// m_hydrus = new HydrusClient()
153153
ParseArgs(Args);
154-
154+
155155
}
156156

157157
#region
@@ -231,6 +231,7 @@ public string CurrentQueueItem
231231
if (Equals(value, m_currentQueueItem) /*|| Query?.ValueString == value*/ /* || (String.IsNullOrWhiteSpace(value))*/) return;
232232
m_currentQueueItem = value;
233233
OnPropertyChanged();
234+
234235
}
235236
}
236237

0 commit comments

Comments
 (0)