Syping/ragephoto-cli
1
0
Fork 0
mirror of https://github.com/Syping/ragephoto-cli.git synced 2025-11-09 13:15:17 +01:00
Code Issues Projects Releases Packages Wiki Activity

impl. set output stdout and improve get file safety

Browse source
This commit is contained in:
Syping 2025-10-25 02:09:53 +02:00
parent 32c4f48cad
commit 21b62d1b79
1 changed files with 26 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

34
Program.cs
View file

@ -47,8 +47,19 @@ internal static class Program {
break; break;
} }
using Stream output = outputFile == "-" ? Console.OpenStandardOutput() : File.Create(outputFile); if (outputFile == "-" || outputFile == String.Empty) {
output.Write(content); using MemoryStream contentStream = new(content);
using Stream output = Console.OpenStandardOutput();
contentStream.CopyTo(output);
}
else {
String tempFile = Path.GetTempFileName();
using (MemoryStream contentStream = new(content)) {
using FileStream output = File.Create(tempFile);
contentStream.CopyTo(output);
}
File.Move(tempFile, outputFile, true);
}
} }
catch (RagePhotoException exception) { catch (RagePhotoException exception) {
Console.Error.WriteLine(exception.Message); Console.Error.WriteLine(exception.Message);
@ -60,7 +71,7 @@ internal static class Program {
} }
} }
private static void Set(FileInfo photoFile, String? format, String? jpegFile, String? description, String? json, String? title, FileInfo? outputFile) { private static void Set(FileInfo photoFile, String? format, String? jpegFile, String? description, String? json, String? title, String? outputFile) {
if (format == null && jpegFile == null && if (format == null && jpegFile == null &&
description == null && json == null && title == null) { description == null && json == null && title == null) {
Console.Error.WriteLine("No value has being set"); Console.Error.WriteLine("No value has being set");
@ -88,7 +99,7 @@ internal static class Program {
if (title != null) if (title != null)
photo.Title = title; photo.Title = title;
if (jpegFile == string.Empty) { if (jpegFile == String.Empty) {
photo.Jpeg = Properties.Resources.EmptyJpeg; photo.Jpeg = Properties.Resources.EmptyJpeg;
} }
else if (jpegFile != null) { else if (jpegFile != null) {
@ -98,9 +109,16 @@ internal static class Program {
photo.Jpeg = jpegStream.ToArray(); photo.Jpeg = jpegStream.ToArray();
} }
String tempFile = Path.GetTempFileName(); if (outputFile == "-") {
photo.SaveFile(tempFile); using MemoryStream photoStream = new(photo.Save());
File.Move(tempFile, outputFile != null ? outputFile.FullName : photoFile.FullName, true); using Stream output = Console.OpenStandardOutput();
photoStream.CopyTo(output);
}
else {
String tempFile = Path.GetTempFileName();
photo.SaveFile(tempFile);
File.Move(tempFile, !String.IsNullOrEmpty(outputFile) ? outputFile : photoFile.FullName, true);
}
} }
catch (RagePhotoException exception) { catch (RagePhotoException exception) {
Console.Error.WriteLine(exception.Message); Console.Error.WriteLine(exception.Message);
@ -160,7 +178,7 @@ internal static class Program {
Option<String?> titleOption = new("--title", "-t") { Option<String?> titleOption = new("--title", "-t") {
Description = "Photo Title" Description = "Photo Title"
}; };
Option<FileInfo?> outputOption = new("--output", "-o") { Option<String?> outputOption = new("--output", "-o") {
Description = "Output File" Description = "Output File"
}; };
Command setCommand = new("set", "Set Photo Data") { Command setCommand = new("set", "Set Photo Data") {