CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-07-02 21:20:28 +12:00
Code Issues Packages Projects Releases Wiki Activity

Added Import function

Browse source
This commit is contained in:
Jaex 2016-02-10 21:55:57 +02:00
parent ec0da15666
commit 6b6f3fdb7c
3 changed files with 40 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ShareX.HelpersLib/Helpers/ImageHelpers.cs
View file

@ -1207,7 +1207,7 @@ public static string SaveImageFileDialog(Image img, string filePath = "")
sfd.FileName = Path.GetFileNameWithoutExtension(filePath);
}
sfd.DefaultExt = ".png";
sfd.DefaultExt = "png";
sfd.Filter = "PNG (*.png)|*.png|JPEG (*.jpg, *.jpeg, *.jpe, *.jfif)|*.jpg;*.jpeg;*.jpe;*.jfif|GIF (*.gif)|*.gif|BMP (*.bmp)|*.bmp|TIFF (*.tif, *.tiff)|*.tif;*.tiff";
if (sfd.ShowDialog() == DialogResult.OK)

56
ShareX/ExportImportManager.cs
View file

@ -40,13 +40,17 @@ public static bool Export()
{
try
{
string exportFolder;
string exportPath;
using (FolderSelectDialog dlg = new FolderSelectDialog())
using (SaveFileDialog sfd = new SaveFileDialog())
{
if (dlg.ShowDialog())
sfd.DefaultExt = "sxb";
sfd.FileName = "ShareX_backup.sxb";
sfd.Filter = "ShareX backup (*.sxb)|*.sxb|All files (*.*)|*.*";
if (sfd.ShowDialog() == DialogResult.OK)
{
exportFolder = dlg.FileName;
exportPath = sfd.FileName;
}
else
{
@ -58,7 +62,7 @@ public static bool Export()
SevenZipCompressor zip = new SevenZipCompressor();
zip.ArchiveFormat = OutArchiveFormat.SevenZip;
zip.CompressionLevel = CompressionLevel.Ultra;
zip.CompressionLevel = CompressionLevel.Normal;
zip.CompressionMethod = CompressionMethod.Lzma2;
Dictionary<string, string> files = new Dictionary<string, string>();
@ -83,8 +87,6 @@ public static bool Export()
}
}
string exportPath = Path.Combine(exportFolder, "ShareX_backup.sxb");
zip.CompressFileDictionary(files, exportPath);
return true;
@ -100,27 +102,45 @@ public static bool Export()
private static void AddFileToDictionary(Dictionary<string, string> files, string filePath, string subFolder = null)
{
string destinationPath = Path.GetFileName(filePath);
if (!string.IsNullOrEmpty(subFolder))
if (File.Exists(filePath))
{
destinationPath = Path.Combine(subFolder, destinationPath);
}
string destinationPath = Path.GetFileName(filePath);
files.Add(destinationPath, filePath);
if (!string.IsNullOrEmpty(subFolder))
{
destinationPath = Path.Combine(subFolder, destinationPath);
}
files.Add(destinationPath, filePath);
}
}
public static bool Import(string filePath)
public static bool Import()
{
try
{
string importPath;
using (OpenFileDialog ofd = new OpenFileDialog())
{
ofd.Filter = "ShareX backup (*.sxb)|*.sxb|All files (*.*)|*.*";
if (ofd.ShowDialog() == DialogResult.OK)
{
importPath = ofd.FileName;
}
else
{
return false;
}
}
Set7ZipLibraryPath();
Helpers.CreateDirectoryIfNotExist(filePath);
using (SevenZipExtractor zip = new SevenZipExtractor(filePath))
using (SevenZipExtractor zip = new SevenZipExtractor(importPath))
{
// TODO
zip.ExtractArchive(Program.PersonalFolder);
return true;
}
}

1
ShareX/Forms/ApplicationSettingsForm.cs
View file

@ -428,6 +428,7 @@ private void btnExport_Click(object sender, EventArgs e)
private void btnImport_Click(object sender, EventArgs e)
{
ExportImportManager.Import();
}
#endregion Export / Import