CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-07-01 04:30:49 +12:00
Code Issues Packages Projects Releases Wiki Activity

Extract not relies on package name now

Browse source
This commit is contained in:
Jaex 2020-06-17 10:14:31 +03:00
parent b3bcffbde0
commit a4ce674153
3 changed files with 33 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
ShareX.ImageEffectsLib/ImageEffectPackager.cs
View file

@ -46,22 +46,23 @@ public static string Package(string outputFilePath, string configJson, string as
string configFilePath = Path.Combine(outputFolder, ConfigFileName);
File.WriteAllText(configFilePath, configJson, Encoding.UTF8);
Dictionary<string, string> files = new Dictionary<string, string>();
files.Add(configFilePath, ConfigFileName);
if (!string.IsNullOrEmpty(assetsFolderPath) && Directory.Exists(assetsFolderPath))
{
string parentFolderPath = Directory.GetParent(assetsFolderPath).FullName;
int entryNamePosition = parentFolderPath.Length + 1;
foreach (string assetPath in Directory.EnumerateFiles(assetsFolderPath, "*.*", SearchOption.AllDirectories).Where(x => Helpers.IsImageFile(x)))
{
string entryName = assetPath.Substring(entryNamePosition);
files.Add(assetPath, entryName);
}
}
try
{
Dictionary<string, string> files = new Dictionary<string, string>();
files.Add(configFilePath, ConfigFileName);
if (!string.IsNullOrEmpty(assetsFolderPath) && Directory.Exists(assetsFolderPath))
{
int entryNamePosition = assetsFolderPath.Length + 1;
foreach (string assetPath in Directory.EnumerateFiles(assetsFolderPath, "*.*", SearchOption.AllDirectories).Where(x => Helpers.IsImageFile(x)))
{
string entryName = assetPath.Substring(entryNamePosition);
files.Add(assetPath, entryName);
}
}
ZipManager.Compress(outputFilePath, files);
}
finally
@ -75,34 +76,20 @@ public static string Package(string outputFilePath, string configJson, string as
return null;
}
public static string ExtractPackage(string packageFilePath, string imageEffectsFolderPath)
public static string ExtractPackage(string packageFilePath, string destination)
{
if (!string.IsNullOrEmpty(packageFilePath) && File.Exists(packageFilePath) && !string.IsNullOrEmpty(imageEffectsFolderPath))
if (!string.IsNullOrEmpty(packageFilePath) && File.Exists(packageFilePath) && !string.IsNullOrEmpty(destination))
{
string packageName = Path.GetFileNameWithoutExtension(packageFilePath);
string configFilePath = Path.Combine(destination, ConfigFileName);
if (!string.IsNullOrEmpty(packageName) && !packageName.StartsWith("."))
if (File.Exists(configFilePath))
{
string destination = Path.Combine(imageEffectsFolderPath, packageName);
if (Directory.Exists(destination))
{
// TODO: Translate
if (MessageBox.Show($"Destination folder already exists:\r\n\"{destination}\"\r\n\r\nWould you like to overwrite it?", "ShareX - " +
"Image effect packager", MessageBoxButtons.YesNo, MessageBoxIcon.Warning) == DialogResult.Yes)
{
Directory.Delete(destination, true);
}
else
{
return null;
}
}
ZipManager.Extract(packageFilePath, destination);
return Path.Combine(destination, ConfigFileName);
File.Delete(configFilePath);
}
ZipManager.Extract(packageFilePath, destination);
return configFilePath;
}
return null;

2
ShareX.ImageEffectsLib/ImageEffectPackagerForm.Designer.cs generated
View file

@ -41,7 +41,7 @@ private void InitializeComponent()
//
this.btnPackage.Location = new System.Drawing.Point(16, 112);
this.btnPackage.Name = "btnPackage";
this.btnPackage.Size = new System.Drawing.Size(128, 23);
this.btnPackage.Size = new System.Drawing.Size(384, 24);
this.btnPackage.TabIndex = 0;
this.btnPackage.Text = "Package";
this.btnPackage.UseVisualStyleBackColor = true;

9
ShareX/TaskHelpers.cs
View file

@ -1707,7 +1707,14 @@ public static void ImportImageEffect(string filePath)
if (imageEffectsForm != null)
{
imageEffectsForm.ImportImageEffectFromFile(configFilePath);
try
{
imageEffectsForm.ImportImageEffectFromFile(configFilePath);
}
finally
{
File.Delete(configFilePath);
}
}
}
}