From 26ac3d2458fa672fd850cec87621e5de7fd376ff Mon Sep 17 00:00:00 2001 From: Michael <15317421+ActualMandM@users.noreply.github.com> Date: Wed, 26 Jun 2024 16:03:41 -0700 Subject: [PATCH] Trim based off Sparrow xml --- .gitignore | 398 ++++++++++++++++++++++++ App.config | 6 +- LICENSE.md | 2 +- Program.cs | 97 +++++- Properties/AssemblyInfo.cs | 6 +- README.md | 19 +- SimpleTrim.csproj => SparrowTrim.csproj | 36 ++- SimpleTrim.sln => SparrowTrim.sln | 2 +- 8 files changed, 519 insertions(+), 47 deletions(-) create mode 100644 .gitignore rename SimpleTrim.csproj => SparrowTrim.csproj (62%) rename SimpleTrim.sln => SparrowTrim.sln (86%) diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..8a30d25 --- /dev/null +++ b/.gitignore @@ -0,0 +1,398 @@ +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. +## +## Get latest from https://github.com/github/gitignore/blob/main/VisualStudio.gitignore + +# User-specific files +*.rsuser +*.suo +*.user +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Mono auto generated files +mono_crash.* + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +[Ww][Ii][Nn]32/ +[Aa][Rr][Mm]/ +[Aa][Rr][Mm]64/ +bld/ +[Bb]in/ +[Oo]bj/ +[Ll]og/ +[Ll]ogs/ + +# Visual Studio 2015/2017 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# Visual Studio 2017 auto generated files +Generated\ Files/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUnit +*.VisualState.xml +TestResult.xml +nunit-*.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# Benchmark Results +BenchmarkDotNet.Artifacts/ + +# .NET Core +project.lock.json +project.fragment.lock.json +artifacts/ + +# ASP.NET Scaffolding +ScaffoldingReadMe.txt + +# StyleCop +StyleCopReport.xml + +# Files built by Visual Studio +*_i.c +*_p.c +*_h.h +*.ilk +*.meta +*.obj +*.iobj +*.pch +*.pdb +*.ipdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*_wpftmp.csproj +*.log +*.tlog +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# Visual Studio Trace Files +*.e2e + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# AxoCover is a Code Coverage Tool +.axoCover/* +!.axoCover/settings.json + +# Coverlet is a free, cross platform Code Coverage Tool +coverage*.json +coverage*.xml +coverage*.info + +# Visual Studio code coverage results +*.coverage +*.coveragexml + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# Note: Comment the next line if you want to checkin your web deploy settings, +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml +*.publishproj + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + +# NuGet Packages +*.nupkg +# NuGet Symbol Packages +*.snupkg +# The packages folder can be ignored because of Package Restore +**/[Pp]ackages/* +# except build/, which is used as an MSBuild target. +!**/[Pp]ackages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/[Pp]ackages/repositories.config +# NuGet v3's project.json files produces more ignorable files +*.nuget.props +*.nuget.targets + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files +AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt +*.appx +*.appxbundle +*.appxupload + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!?*.[Cc]ache/ + +# Others +ClientBin/ +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.jfm +*.pfx +*.publishsettings +orleans.codegen.cs + +# Including strong name files can present a security risk +# (https://github.com/github/gitignore/pull/2483#issue-259490424) +#*.snk + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm +ServiceFabricBackup/ +*.rptproj.bak + +# SQL Server files +*.mdf +*.ldf +*.ndf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings +*.rptproj.rsuser +*- [Bb]ackup.rdl +*- [Bb]ackup ([0-9]).rdl +*- [Bb]ackup ([0-9][0-9]).rdl + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat +node_modules/ + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) +*.vbw + +# Visual Studio 6 auto-generated project file (contains which files were open etc.) +*.vbp + +# Visual Studio 6 workspace and project file (working project files containing files to include in project) +*.dsw +*.dsp + +# Visual Studio 6 technical files +*.ncb +*.aps + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# CodeRush personal settings +.cr/personal + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc + +# Cake - Uncomment if you are using it +# tools/** +# !tools/packages.config + +# Tabs Studio +*.tss + +# Telerik's JustMock configuration file +*.jmconfig + +# BizTalk build output +*.btp.cs +*.btm.cs +*.odx.cs +*.xsd.cs + +# OpenCover UI analysis results +OpenCover/ + +# Azure Stream Analytics local run output +ASALocalRun/ + +# MSBuild Binary and Structured Log +*.binlog + +# NVidia Nsight GPU debugger configuration file +*.nvuser + +# MFractors (Xamarin productivity tool) working folder +.mfractor/ + +# Local History for Visual Studio +.localhistory/ + +# Visual Studio History (VSHistory) files +.vshistory/ + +# BeatPulse healthcheck temp database +healthchecksdb + +# Backup folder for Package Reference Convert tool in Visual Studio 2017 +MigrationBackup/ + +# Ionide (cross platform F# VS Code tools) working folder +.ionide/ + +# Fody - auto-generated XML schema +FodyWeavers.xsd + +# VS Code files for those working on multiple tools +.vscode/* +!.vscode/settings.json +!.vscode/tasks.json +!.vscode/launch.json +!.vscode/extensions.json +*.code-workspace + +# Local History for Visual Studio Code +.history/ + +# Windows Installer files from build outputs +*.cab +*.msi +*.msix +*.msm +*.msp + +# JetBrains Rider +*.sln.iml diff --git a/App.config b/App.config index 88fa402..4bfa005 100644 --- a/App.config +++ b/App.config @@ -1,6 +1,6 @@ - + - + - \ No newline at end of file + diff --git a/LICENSE.md b/LICENSE.md index 54bf20c..0ab4ed3 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2017 Siketyan +Copyright (c) 2017 Siketyan, 2024 M&M Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/Program.cs b/Program.cs index 84c9bfc..67a9963 100644 --- a/Program.cs +++ b/Program.cs @@ -1,27 +1,90 @@ -using System.Drawing; +using System.Drawing.Imaging; +using System.Drawing; +using System.IO; +using System.Xml; +using System; -namespace SimpleTrim +namespace SparrowTrim { - public class Program + internal class Program { - // SimpleTrim.exe public static void Main(string[] args) { - Bitmap original = new Bitmap(args[0]); - Bitmap clone = original.Clone( - new Rectangle( - int.Parse(args[2]), // Left - int.Parse(args[3]), // Top - int.Parse(args[4]), // Width - int.Parse(args[5]) // Height - ), - original.PixelFormat - ); - - clone.Save(args[1]); + DirSearch(args[0]); + } - clone.Dispose(); + public static void DirSearch(string dir) + { + foreach (string d in Directory.GetDirectories(dir)) + { + DirSearch(d); + } + + foreach (string f in Directory.GetFiles(dir)) + { + if (Path.GetExtension(f) != ".png") + { + continue; + } + + var filePath = Path.Combine(Path.GetDirectoryName(f), Path.GetFileNameWithoutExtension(f)); + + if (File.Exists(filePath + ".xml")) + { + try + { + ProcessImage(filePath); + } + catch (Exception e) + { + Console.WriteLine($"{filePath}: {e.Message}"); + } + } + } + } + + public static void ProcessImage(string file) + { + XmlDocument doc = new XmlDocument(); + doc.Load(file + ".xml"); + + int padding = Int32.MaxValue; + int maxX = Int32.MinValue; + int maxY = Int32.MinValue; + + foreach (XmlNode node in doc.DocumentElement.SelectNodes("SubTexture")) + { + padding = Math.Min(padding, Int32.Parse(node.Attributes["x"].Value)); + maxX = Math.Max(maxX, Int32.Parse(node.Attributes["x"].Value) + Int32.Parse(node.Attributes["width"].Value)); + maxY = Math.Max(maxY, Int32.Parse(node.Attributes["y"].Value) + Int32.Parse(node.Attributes["height"].Value)); + } + + maxX += padding; + maxY += padding; + + string fileName = file + ".png"; + + Bitmap original = new Bitmap(fileName); + + if (maxX >= original.Width && maxY >= original.Height) + { + original.Dispose(); + return; + } + + maxX = Math.Min(maxX, original.Width); + maxY = Math.Min(maxY, original.Height); + + Bitmap clone = original.Clone(new Rectangle(0, 0, maxX, maxY), original.PixelFormat); original.Dispose(); + + if (File.Exists(fileName)) + { + File.Delete(fileName); + } + + clone.Save(fileName, ImageFormat.Png); + clone.Dispose(); } } } \ No newline at end of file diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs index 27ed96e..a604adb 100644 --- a/Properties/AssemblyInfo.cs +++ b/Properties/AssemblyInfo.cs @@ -5,12 +5,12 @@ // アセンブリに関する一般情報は以下の属性セットをとおして制御されます。 // アセンブリに関連付けられている情報を変更するには、 // これらの属性値を変更してください。 -[assembly: AssemblyTitle("SimpleTrim")] +[assembly: AssemblyTitle("SparrowTrim")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("SimpleTrim")] -[assembly: AssemblyCopyright("Copyright © 2017 Siketyan.")] +[assembly: AssemblyProduct("SparrowTrim")] +[assembly: AssemblyCopyright("Copyright © 2017 Siketyan, 2024 M&M")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/README.md b/README.md index 6cc79a4..26d2098 100644 --- a/README.md +++ b/README.md @@ -1,18 +1 @@ -# SimpleTrim -画像を指定された通りにトリミングするだけのコマンドラインツール。ただそれだけ。自分用 - -[![Build status](https://ci.appveyor.com/api/projects/status/2u66xkx94vvrg18p?retina=true)](https://ci.appveyor.com/project/Siketyan/simpletrim) - -## Requirements -- Microsoft Windows Vista 以上 -- .NET Framework 4.5.2 - -（System.Drawing使えればいいのでビルドし直せばおそらくXP+.NET 2.0でも可能？） - -## Usage -``` -SimpleTrim.exe -``` - -## License -ご自由にどうぞ +# SparrowTrim diff --git a/SimpleTrim.csproj b/SparrowTrim.csproj similarity index 62% rename from SimpleTrim.csproj rename to SparrowTrim.csproj index c80a9b8..793f312 100644 --- a/SimpleTrim.csproj +++ b/SparrowTrim.csproj @@ -6,11 +6,27 @@ AnyCPU {2A1BE0C8-8E84-4AF8-BAB8-0B50F410075B} Exe - SimpleTrim - SimpleTrim - v4.5.2 + SparrowTrim + SparrowTrim + v4.8 512 true + + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.%2a + false + false + true AnyCPU @@ -32,7 +48,7 @@ 4 - SimpleTrim.Program + SparrowTrim.Program @@ -55,5 +71,17 @@ + + + False + Microsoft .NET Framework 4.8 %28x86 and x64%29 + true + + + False + .NET Framework 3.5 SP1 + false + + \ No newline at end of file diff --git a/SimpleTrim.sln b/SparrowTrim.sln similarity index 86% rename from SimpleTrim.sln rename to SparrowTrim.sln index 1257715..2302ad7 100644 --- a/SimpleTrim.sln +++ b/SparrowTrim.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 VisualStudioVersion = 15.0.26020.0 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleTrim", "SimpleTrim.csproj", "{2A1BE0C8-8E84-4AF8-BAB8-0B50F410075B}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SparrowTrim", "SparrowTrim.csproj", "{2A1BE0C8-8E84-4AF8-BAB8-0B50F410075B}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution