Downloads; fixes; etc

Author: Decimation

SmartImage.Lib/Images/Uni/UniImage.cs

@@ -14,11 +14,11 @@
 using SixLabors.ImageSharp.Formats;
 using SixLabors.ImageSharp.Formats.Png;
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing;
 using System.Diagnostics;
 using System.Runtime.InteropServices;
 using CoenM.ImageHash;
 using CommunityToolkit.HighPerformance;
+using Kantan.Net.Utilities;
 using Microsoft.IO;
 using SmartImage.Lib.Model;
 using SmartImage.Lib.Utilities;
@@ -45,7 +45,6 @@ public enum UniImageType
 
 }
 
-
 /// <summary>
 /// <seealso cref="UniSource"/>
 /// </summary>	
@@ -67,6 +66,8 @@ static UniImage()
 
 	public virtual long? Length => Bytes.Length;
 
+	// public virtual string Name {get; protected set;}
+
 	[JI]
 	public string Value { get; }
 
@@ -286,24 +287,26 @@ public bool TryDeleteFile()
 	}
 
 	[MURV]
-	public virtual string WriteImageToFile([CBN] string fn = null, [CBN] Action<IImageProcessingContext> operation = null)
+	public virtual string WriteImageToFile([CBN] string fn = null)
 	{
 		if (!HasImage) {
 			throw new InvalidOperationException();
 		}
 
-		fn ??= Path.GetTempFileName();
+		fn ??= this switch
+		{
+			UniImageUri uri   => uri.Url.GetFileName(),
+			UniImageFile file => file.LocalFileInfo.Name,
+			_                 => Path.GetRandomFileName()
+		};
 
-		var encoder = new PngEncoder();
-		operation ??= static _ => { };
+		fn = Path.ChangeExtension(fn, ImageFormat.FileExtensions.First());
 
-		using var image = Image.Clone(operation);
+		var path = Path.Combine(Path.GetTempPath(), fn);
 
-		// Image.Save(fn);
-		image.Mutate(operation);
-		image.Save(fn, encoder);
+		Image.Save(path);
 
-		return fn;
+		return path;
 	}
 
 

SmartImage.Lib/Images/Uni/UniImageFile.cs

@@ -3,7 +3,6 @@
 
 using Microsoft;
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing;
 using System.IO.MemoryMappedFiles;
 using JetBrains.Annotations;
 using Microsoft.Extensions.Logging;
@@ -21,7 +20,7 @@ internal UniImageFile(FileInfo fi) : base(fi.FullName, UniImageType.File)
 
 	public FileInfo LocalFileInfo { get; }
 
-	public override string WriteImageToFile(string fn = null, Action<IImageProcessingContext> operation = null)
+	public override string WriteImageToFile(string fn = null)
 	{
 		if (!HasFilePath) {
 			throw new FileNotFoundException(Value);

SmartImage.Lib/Images/Uni/UniImageUri.cs

@@ -22,8 +22,11 @@ public class UniImageUri : UniImage
 	internal UniImageUri(Url url) : base(url?.ToString(), UniImageType.Uri)
 	{
 		Url = url;
+		
 	}
 
+	// public override string Name => Url?.GetFileName();
+
 
 	protected override async Task<bool> AllocAsync(CancellationToken ct = default)
 	{

SmartImage.Rdx/Commands/SearchCommand.UI.cs

@@ -63,7 +63,7 @@ public sealed partial class SearchCommand
 
 	private static readonly ConcurrentDictionary<SearchResultItem, int> tbl = new();
 
-	private static Selection GetResultItemIndexes(SearchResult res)
+	private static Selection GetSelectionChoice(SearchResult res)
 	{
 		Selection ret;
 

SmartImage.Rdx/Commands/SearchCommand.cs

@@ -49,6 +49,7 @@
 using System.Collections.Concurrent;
 using System.Collections.Specialized;
 using System.Diagnostics;
+using System.IO.MemoryMappedFiles;
 using System.Linq;
 using System.Reflection;
 using System.Runtime.Caching;
@@ -299,14 +300,17 @@ private async Task RunInteractiveAsync(CancellationToken ct = default)
 
 				cmd = AnsiConsole.Prompt(ConsoleElements.Prm_Command);
 
+				if (cmd == R2.Chc_Exit) {
+					return;
+				}
 				if (cmd == R2.Chc_Back) {
 					break;
 				}
 
-				var sel = GetResultItemIndexes(sr);
+				var sel = GetSelectionChoice(sr);
 				var sri = sel.Item;
 
-				s_logger.LogInformation("Selected {Item} {Scn} | {Idx1}, {Idx2}", sel.Item, sel.IsScannedItem, sel.ItemIdx, sel.ScanIdx);
+				s_logger.LogDebug("Selected {Item} {Scn} | {Idx1}, {Idx2}", sel.Item, sel.IsScannedItem, sel.ItemIdx, sel.ScanIdx);
 
 				// s_logger.LogTrace("Interactive: {ResItem}", sri);
 
@@ -322,12 +326,12 @@ await AnsiConsole.Live(srTable).StartAsync(async (f) =>
 						s_logger.LogTrace("Scanning {Item}", sri);
 						bool scannedOk = false;
 						scannedOk = await sri.ScanAsync2(m_ctsRun.Token);
-						
+
 
 						if (!scannedOk) {
 							return;
 						}
-						
+
 						/*if (!tbl.TryGetValue(sel.Item, out var idx)) {
 							for (int j = 0; j < sel.Item.ScannedItems.Count; j++) {
 								tbl[sel.Item.ScannedItems[j]] = j;
@@ -337,11 +341,10 @@ await AnsiConsole.Live(srTable).StartAsync(async (f) =>
 						var idx = tbl[sel.Item.Parent];
 
 						int row;
-						
+
 						row = sr.Results.IndexOf(sri);
 
 						// row = idx;
-
 						// row = GetRowForItem(sri);
 						// row = sr.Index(sel.Item, sel.Scanned);
 
@@ -371,7 +374,6 @@ await AnsiConsole.Live(srTable).StartAsync(async (f) =>
 						}
 
 
-						
 						/*if (sr.ScannedResults.TryGetValue(sri, out SearchResultItem[] scanned)) {
 							int i = 0;
 
@@ -403,20 +405,8 @@ await AnsiConsole.Live(srTable).StartAsync(async (f) =>
 
 						AnsiConsole.Live(srTable).Start(f =>
 						{
-							// var row  = GetRowForItem(sri);
-							// var row = SearchResultItem.FindSumIndex(sri);
-							// var row = sr.Index(sri);
-
-							// var row = sr.Index(sel.Item, sel.Scanned);
-
-							// var row = sel.Index();
-
-							var row = tbl[sel.Item];
-
-							// var row = (sel.ScanIdx == -1 ? 0 : sel.ScanIdx) + sel.ItemIdx;
-
-							// var row2 = sriPak;
-							// var row  = row2.RootIdx + (row2.ScnIdx == -1 ? 0 : (row2.ScnIdx + 1));
+							//todo
+							var row = sel.ItemIdx;
 
 							sri.CalculateSimilarity(Query.Source);
 
@@ -441,7 +431,33 @@ await AnsiConsole.Live(srTable).StartAsync(async (f) =>
 				}
 
 				if (cmd == R2.Chc_Download) {
-					//todo
+
+					var ok = sri.TryWriteToFile();
+
+					if (ok) {
+						AC.AlternateScreen(() =>
+						{
+							var gr = new Grid();
+							gr.AddColumns(new GridColumn[] { new(), new() });
+							gr.AddRow(new IRenderable[] { new Text("File", ConsoleElements.Sty_Name), new Text(sri.LocalFilePath) });
+							AnsiConsole.Write(gr);
+							var prompt = new ConfirmationPrompt("Open?") { };
+							var choice = AnsiConsole.Prompt(prompt);
+
+							if (choice) {
+								var proc = Process.Start(new ProcessStartInfo()
+								{
+									FileName = sri.LocalFilePath,
+									WorkingDirectory = "",
+									UseShellExecute = true
+								});
+
+								proc?.WaitForExit();
+								proc.Dispose();	
+							}
+						});
+					}
+
 				}
 
 			cont:
@@ -496,7 +512,7 @@ private CanvasImage GetPreview(SearchResultItem sri)
 		var key = sri.Url;
 		var val = m_prevCache.Get(key);
 
-		CanvasImage ci = val as CanvasImage;
+		var ci = val as CanvasImage;
 
 		if (ci is null) {
 			str = sri.GetStream();
@@ -536,7 +552,6 @@ private void ShowPreview(CanvasImage ci, SearchResultItem ui)
 				ldc.Refresh();
 				var cki = AnsiConsole.Console.Input.ReadKey(true);
 
-
 				if (cki.HasValue) {
 
 					switch (cki.Value.Key) {

SmartImage.Rdx/Shell/ConsoleElements.cs

@@ -262,7 +262,7 @@ public static IEnumerable<TableColumn> GetColumns(params string[] names)
 		AllowEmpty       = false,
 		Choices =
 		{
-			R2.Chc_Open, R2.Chc_Scan, R2.Chc_Preview, R2.Chc_Calc, R2.Chc_Exit, R2.Chc_Back
+			R2.Chc_Open, R2.Chc_Scan, R2.Chc_Preview, R2.Chc_Calc, R2.Chc_Download, R2.Chc_Back, R2.Chc_Exit
 		}
 	};