Iqdb previews

Decimation · Decimation · commit 070b0efe331e · 2023-09-06T15:28:35.000-05:00
diff --git a/SmartImage.Lib 3/Engines/Impl/Search/IqdbEngine.cs b/SmartImage.Lib 3/Engines/Impl/Search/IqdbEngine.cs
@@ -43,12 +43,12 @@ private SearchResultItem ParseResult(IHtmlCollection<IElement> tr, SearchResult
 		var img     = tr[1];
 		var src     = tr[2];
 
-		var img2      = img.Children[0].Children[0].Attributes["src"];
-		var thumbnail = img2 != null ? Url.Combine(BaseUrl.Root, img2.Value) : null;
-		var thumbnail1 = img.Children[0].Children[0].Attributes["alt"];
+		var img2         = img.Children[0].Children[0].Children[0].Attributes["src"];
+		var thumbnail    = img2 != null ? Url.Combine(BaseUrl.Root, img2.Value) : null;
+		var thumbnail1   = img.Children[0].Children[0].Attributes["alt"];
 		var thumbnailAlt = thumbnail1?.Value;
 
-		string url  = null;
+		string url = null;
 
 		//img.ChildNodes[0].ChildNodes[0].TryGetAttribute("href")
 
@@ -107,18 +107,20 @@ private SearchResultItem ParseResult(IHtmlCollection<IElement> tr, SearchResult
 
 		var result = new SearchResultItem(r)
 		{
-			Url         = uri,
-			Similarity  = sim,
-			Width       = w,
-			Height      = h,
-			Source      = src.TextContent,
-			Description = caption.TextContent,
-			Thumbnail = thumbnail,
+			Url            = uri,
+			Similarity     = sim,
+			Width          = w,
+			Height         = h,
+			Source         = src.TextContent,
+			Description    = caption.TextContent,
+			Thumbnail      = thumbnail,
 			ThumbnailTitle = thumbnailAlt
 
 		};
 		result.Site ??= uri?.Host;
 
+		// r.Results.Add(result);
+
 		return result;
 	}
 
@@ -205,21 +207,27 @@ public override async Task<SearchResult> GetResultAsync(SearchQuery query, Cance
 		}
 
 		var select = tables.Select(table => ((IHtmlElement) table)
-			                           .QuerySelectorAll(Serialization.S_Iqdb_Table));
+			                           .QuerySelectorAll(Serialization.S_Iqdb_Table))
+			.ToArray();
+
+		for (int i = 1; i < select.Length; i++) {
+			var sri = ParseResult(select[i], sr);
+			sr.Results.Add(sri);
+		}
 
-		var images = select.Select(x => ParseResult(x, sr)).ToList();
+		// XPATH //body/div/div/table
 
 		// First is original image
-		images.RemoveAt(0);
+		// images.RemoveAt(0);
 
 		// var best = images[0];
 		// sr.PrimaryResult.UpdateFrom(best);
-		sr.Results.AddRange(images);
+		// sr.Results.AddRange(images);
 
 		/*sr.Results.Quality = sr.PrimaryResult.Similarity switch
 		{
-		    >= 75 => ResultQuality.High,
-		    _ or null => ResultQuality.NA,
+			>= 75 => ResultQuality.High,
+			_ or null => ResultQuality.NA,
 		};*/
 
 		ret:
diff --git a/SmartImage.Lib 3/SearchConfig.cs b/SmartImage.Lib 3/SearchConfig.cs
@@ -103,6 +103,8 @@ public string EhPassword
 			OnPropertyChanged();
 		}
 	}
+
+	/*
 	/// <summary>
 	/// <see cref="HydrusClient.EndpointUrl"/>
 	/// </summary>
@@ -128,6 +130,8 @@ public string HydrusKey
 			OnPropertyChanged();
 		}
 	}
+	*/
+
 	public bool OpenRaw
 	{
 		get { return Configuration.ReadSetting(nameof(OpenRaw), false); }
@@ -221,8 +225,8 @@ public DataTable ToTable()
 		table.Rows.Add(Resources.S_Clipboard, Clipboard);
 		table.Rows.Add(Resources.S_AutoSearch, AutoSearch);
 		table.Rows.Add(Resources.S_SauceNaoKey, SauceNaoKey);
-		table.Rows.Add(Resources.S_HydrusEndpoint, HydrusEndpoint);
-		table.Rows.Add(Resources.S_HydrusKey, HydrusKey);
+		/*table.Rows.Add(Resources.S_HydrusEndpoint, HydrusEndpoint);
+		table.Rows.Add(Resources.S_HydrusKey, HydrusKey);*/
 
 		// table.Rows.Add("Path", new FileInfo(Configuration.FilePath).Name);
 
diff --git a/SmartImage.UI/ControlsHelper.cs b/SmartImage.UI/ControlsHelper.cs
@@ -84,24 +84,26 @@ public static void HandleEnum<T>(this ListBox lb, T src) where T : struct, Enum
 	public static SearchEngineOptions HandleEnum(this ListBox lb, SelectionChangedEventArgs e,
 	                                             SearchEngineOptions orig)
 	{
-		var rg = lb.ItemsSource.OfType<SearchEngineOptions>().ToArray();
+		// var rg = lb.ItemsSource.OfType<SearchEngineOptions>().ToArray();
 
 		var ai = e.AddedItems.OfType<SearchEngineOptions>()
-			.Aggregate(default(SearchEngineOptions), (n, l) => n | l);
+			.Aggregate(default(SearchEngineOptions), Func);
 
 		var ri = e.RemovedItems.OfType<SearchEngineOptions>()
-			.Aggregate(default(SearchEngineOptions), (n, l) => n | l);
+			.Aggregate(default(SearchEngineOptions), Func);
 
 		var si = lb.SelectedItems.OfType<SearchEngineOptions>().ToArray();
 
-		var siv = si.Aggregate(default(SearchEngineOptions), (n, l) => n | l);
+		var siv = si.Aggregate(default(SearchEngineOptions), Func);
 
 		orig &= siv;
 		orig &= (~ri);
 		orig |= ai;
 
 		return orig;
 
+		static SearchEngineOptions Func(SearchEngineOptions n, SearchEngineOptions l)
+			=> n | l;
 	}
 
 	public static string[] GetFilesFromDrop(this DragEventArgs e)
diff --git a/SmartImage.UI/HydrusWindow.xaml.cs b/SmartImage.UI/HydrusWindow.xaml.cs
@@ -34,7 +34,7 @@ public HydrusWindow(SharedInfo s)
 
 	private void Btn_1_OnClick(object sender, RoutedEventArgs e)
 	{
-		Tb_Info.Dispatcher.InvokeAsync(async () =>
+		/*Tb_Info.Dispatcher.InvokeAsync(async () =>
 		{
 			Shared.Query.Uni.Stream.TrySeek();
 			var    data        = SHA256.HashData(Shared.Query.Uni.Stream);
@@ -47,7 +47,7 @@ private void Btn_1_OnClick(object sender, RoutedEventArgs e)
 			imageSource.EndInit();
 			imageSource.Freeze();
 			Img_Preview.Source       = imageSource;
-		});
+		});*/
 		e.Handled = true;
 	}
 }
diff --git a/SmartImage.UI/MainWindow.Handlers.cs b/SmartImage.UI/MainWindow.Handlers.cs
@@ -308,15 +308,15 @@ private void Lv_Results_SelectionChanged(object sender, SelectionChangedEventArg
 				CheckMedia();
 			}
 			else {
-				UpdatePreview(m_image);
+				UpdatePreview();
 				if (ri.Result.Metadata is TraceMoeEngine.TraceMoeDoc doc) {
 					
 					Me_Preview.ScrubbingEnabled = false;
 					Me_Preview.UnloadedBehavior = MediaState.Close;
 					Me_Preview.LoadedBehavior   = MediaState.Manual;
 					Me_Preview.Source           = new Uri(doc.video, UriKind.Absolute);
 					Me_Preview.Play();
-					ShowMedia = true;
+					ShowMedia       = true;
 				}
 				else {
 					CheckMedia();
@@ -339,6 +339,9 @@ void CheckMedia()
 				Me_Preview.Source = null;
 				ShowMedia         = false;
 			}
+			else {
+
+			}
 		}
 	}
 
@@ -402,10 +405,12 @@ private void Lv_Results_KeyDown(object sender, KeyEventArgs e)
 			case Key.R when ctrl && alt:
 				Dispatcher.InvokeAsync(() => RetryEngineAsync(CurrentResultItem));
 				break;
+			/*
 			case Key.H when ctrl:
 				var w = new HydrusWindow(Shared);
 				w.Show();
 				break;
+				*/
 
 		}
 
diff --git a/SmartImage.UI/MainWindow.xaml b/SmartImage.UI/MainWindow.xaml
@@ -61,7 +61,7 @@
             <MenuItem Header="Retry" Click="RetryItem_Click" />
             <MenuItem Header="Enqueue" Click="EnqueueItem_Click" IsEnabled="{Binding CanDownload}" />
         </ContextMenu>
-        
+
         <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
         <controls:InvertableBooleanToVisibilityConverter x:Key="BooleanVisConverter"/>
 
@@ -435,7 +435,7 @@
                     <ProgressBar x:Name="Pb_Status" HorizontalAlignment="Left" Height="10" Margin="4,54,0,0"
                                  VerticalAlignment="Top" Width="100" Minimum="0" Maximum="100" Grid.Row="1" />
 
-                    <ListView x:Name="Lv_Results" Margin="0,70,0,0"
+                    <ListView x:Name="Lv_Results" Margin="0,85,0,0"
                               MouseDoubleClick="Lv_Results_MouseDoubleClick"
                               Foreground="White"
                               IsSynchronizedWithCurrentItem="True"
@@ -582,6 +582,7 @@
                              TextChanged="Tb_Search_TextChanged" Grid.ColumnSpan="2" />
                     <ComboBox x:Name="Cb_SearchFields" HorizontalAlignment="Right" Margin="0,17,499,0" Grid.Row="1"
                               VerticalAlignment="Top" Width="148" Grid.ColumnSpan="2" />
+                    <TextBlock x:Name="Tb_Preview" Grid.Column="1" HorizontalAlignment="Left" Margin="460,65,0,0" Grid.Row="1" TextWrapping="Wrap" VerticalAlignment="Top" TextDecorations="Underline" Foreground="White"/>
                 </Grid>
             </TabItem>
             <TabItem x:Name="Ti_Config" HorizontalAlignment="Center" Height="20" Header="Config"
@@ -641,17 +642,18 @@
                            VerticalAlignment="Top" Foreground="White" />
                     <Label x:Name="Lbl_UploadEngines" Content="Upload Engine" HorizontalAlignment="Left"
                            Margin="600,3,0,0" VerticalAlignment="Top" Foreground="White" FontWeight="Bold" />
-                    <TextBox x:Name="Tb_HyEndpoint" HorizontalAlignment="Left" Margin="527,297,0,0" TextWrapping="Wrap"
+
+                    <!--<TextBox x:Name="Tb_HyEndpoint" HorizontalAlignment="Left" Margin="527,297,0,0" TextWrapping="Wrap"
                              VerticalAlignment="Top" Width="120"
-                             Text="{Binding Config.HydrusEndpoint, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                             Text="{Binding Config.HydrusEndpoint, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" d:IsHidden="True" />
                     <TextBox x:Name="Tb_HyKey" HorizontalAlignment="Left" Margin="527,326,0,0" TextWrapping="Wrap"
                              VerticalAlignment="Top" Width="120"
-                             Text="{Binding Config.HydrusKey, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                             Text="{Binding Config.HydrusKey, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" d:IsHidden="True" />
                     <Label x:Name="Lb_HyEndpoint" Content="Hydrus Endpoint" HorizontalAlignment="Left"
                            Margin="424,293,0,0"
-                           VerticalAlignment="Top" Foreground="White" />
+                           VerticalAlignment="Top" Foreground="White" d:IsHidden="True" />
                     <Label x:Name="Lb_HyKey" Content="Hydrus Key" HorizontalAlignment="Left" Margin="424,322,0,0"
-                           VerticalAlignment="Top" Foreground="White" />
+                           VerticalAlignment="Top" Foreground="White" d:IsHidden="True" />-->
 
                 </Grid>
             </TabItem>
diff --git a/SmartImage.UI/MainWindow.xaml.cs b/SmartImage.UI/MainWindow.xaml.cs
@@ -71,7 +71,7 @@ static MainWindow() { }
 
 	public MainWindow()
 	{
-		// Client    = new SearchClient(new SearchConfig());
+		Client    = new SearchClient(new SearchConfig());
 		Shared    = new SharedInfo();
 		m_queries = new ConcurrentDictionary<string, SearchQuery>();
 
@@ -170,9 +170,11 @@ public MainWindow()
 
 	#region
 
-	public SearchClient Client => Shared.Client;
+	public SearchClient Client { get; }
 
-	public SearchConfig Config => Shared.Config;
+	public SearchConfig Config => Client.Config;
+
+	public SearchQuery Query { get; internal set; }
 
 	public ObservableCollection<ResultItem> Results { get; private set; }
 
@@ -213,12 +215,6 @@ public bool InPath
 
 	#region Queue/Query
 
-	public SearchQuery Query
-	{
-		get => Shared.Query;
-		internal set => Shared.Query = value;
-	}
-
 	private string m_currentQueueItem;
 
 	public string CurrentQueueItem
@@ -419,7 +415,7 @@ void UpdateImage()
 
 			// Img_Preview.Source = m_image;
 
-			UpdatePreview(m_image);
+			UpdatePreview();
 		}
 	}
 
@@ -1036,6 +1032,7 @@ private void ChangeStatus2(ResultItem ri)
 		}
 		else {
 			Tb_Status2.Text = $"{ri.Name}";
+			
 		}
 	}
 
@@ -1101,13 +1098,21 @@ private void UpdatePreview(ResultItem ri)
 				Img_Preview.Source = ri.Image;
 				// Debug.WriteLine($"updated image {ri.Image}");
 				// PreviewChanged?.Invoke(ri);
+				Tb_Preview.Text = $"Preview: {ri.Name}";
+				
 			}
 			else {
-				Img_Preview.Source = m_image;
+				UpdatePreview();
 			}
 		});
 	}
 
+	private void UpdatePreview()
+	{
+		UpdatePreview(m_image);
+		
+	}
+
 	private void UpdatePreview(ImageSource x)
 	{
 		Application.Current.Dispatcher.Invoke(() =>
diff --git a/SmartImage.UI/Model/SharedInfo.cs b/SmartImage.UI/Model/SharedInfo.cs
@@ -14,16 +14,12 @@ public class SharedInfo : INotifyPropertyChanged
 	{
 		public SharedInfo()
 		{
-			Client = new SearchClient(new SearchConfig());
+			// Client = new SearchClient(new SearchConfig());
 
-			m_hydrus = new HydrusClient(Config.HydrusEndpoint, Config.HydrusKey);
+			m_hydrus = new HydrusClient();
 		}
 
 		public readonly HydrusClient m_hydrus;
-		
-		public          SearchClient Client { get; }
-
-		public  SearchConfig Config => Client.Config;
 
 		private string       _hash;
 
@@ -38,11 +34,7 @@ public string Hash
 				}
 			}
 		}
-		public SearchQuery Query
-		{
-			get;
-			internal set;
-		}
+
 		public event PropertyChangedEventHandler? PropertyChanged;
 
 		protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)

Original file line number	Diff line number	Diff line change
`@@ -103,6 +103,8 @@ public string EhPassword`
`103`	`103`	`OnPropertyChanged();`
`104`	`104`	`}`
`105`	`105`	`}`
	`106`	`+`
	`107`	`+ /*`
`106`	`108`	`/// <summary>`
`107`	`109`	`/// <see cref="HydrusClient.EndpointUrl"/>`
`108`	`110`	`/// </summary>`
`@@ -128,6 +130,8 @@ public string HydrusKey`
`128`	`130`	`OnPropertyChanged();`
`129`	`131`	`}`
`130`	`132`	`}`
	`133`	`+ */`
	`134`	`+`
`131`	`135`	`public bool OpenRaw`
`132`	`136`	`{`
`133`	`137`	`get { return Configuration.ReadSetting(nameof(OpenRaw), false); }`
`@@ -221,8 +225,8 @@ public DataTable ToTable()`
`221`	`225`	`table.Rows.Add(Resources.S_Clipboard, Clipboard);`
`222`	`226`	`table.Rows.Add(Resources.S_AutoSearch, AutoSearch);`
`223`	`227`	`table.Rows.Add(Resources.S_SauceNaoKey, SauceNaoKey);`
`224`		`- table.Rows.Add(Resources.S_HydrusEndpoint, HydrusEndpoint);`
`225`		`- table.Rows.Add(Resources.S_HydrusKey, HydrusKey);`
	`228`	`+ /*table.Rows.Add(Resources.S_HydrusEndpoint, HydrusEndpoint);`
	`229`	`+ table.Rows.Add(Resources.S_HydrusKey, HydrusKey);*/`
`226`	`230`
`227`	`231`	`// table.Rows.Add("Path", new FileInfo(Configuration.FilePath).Name);`
`228`	`232`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public HydrusWindow(SharedInfo s)`
`34`	`34`
`35`	`35`	`private void Btn_1_OnClick(object sender, RoutedEventArgs e)`
`36`	`36`	`{`
`37`		`- Tb_Info.Dispatcher.InvokeAsync(async () =>`
	`37`	`+ /*Tb_Info.Dispatcher.InvokeAsync(async () =>`
`38`	`38`	`{`
`39`	`39`	`Shared.Query.Uni.Stream.TrySeek();`
`40`	`40`	`var data = SHA256.HashData(Shared.Query.Uni.Stream);`
`@@ -47,7 +47,7 @@ private void Btn_1_OnClick(object sender, RoutedEventArgs e)`
`47`	`47`	`imageSource.EndInit();`
`48`	`48`	`imageSource.Freeze();`
`49`	`49`	`Img_Preview.Source = imageSource;`
`50`		`- });`
	`50`	`+ });*/`
`51`	`51`	`e.Handled = true;`
`52`	`52`	`}`
`53`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,16 +14,12 @@ public class SharedInfo : INotifyPropertyChanged`
`14`	`14`	`{`
`15`	`15`	`public SharedInfo()`
`16`	`16`	`{`
`17`		`- Client = new SearchClient(new SearchConfig());`
	`17`	`+ // Client = new SearchClient(new SearchConfig());`
`18`	`18`
`19`		`- m_hydrus = new HydrusClient(Config.HydrusEndpoint, Config.HydrusKey);`
	`19`	`+ m_hydrus = new HydrusClient();`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`public readonly HydrusClient m_hydrus;`
`23`		`-`
`24`		`- public SearchClient Client { get; }`
`25`		`-`
`26`		`- public SearchConfig Config => Client.Config;`
`27`	`23`
`28`	`24`	`private string _hash;`
`29`	`25`
`@@ -38,11 +34,7 @@ public string Hash`
`38`	`34`	`}`
`39`	`35`	`}`
`40`	`36`	`}`
`41`		`- public SearchQuery Query`
`42`		`- {`
`43`		`- get;`
`44`		`- internal set;`
`45`		`- }`
	`37`	`+`
`46`	`38`	`public event PropertyChangedEventHandler? PropertyChanged;`
`47`	`39`
`48`	`40`	`protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)`