Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

add Encoding to Archive activities #777

Merged
merged 1 commit into from
Sep 12, 2023
Merged

add Encoding to Archive activities #777

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions OpenRPA.Utilities/Activities/CompressArchive.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
using Newtonsoft.Json;
using ExcelDataReader;
using System.Data;
using System.IO.Compression;
using System.IO;

namespace OpenRPA.Utilities
{
Expand All @@ -28,12 +30,13 @@ public class CompressArchive : CodeActivity
public InArgument<int> CompressionLevel { get; set; }
public InArgument<bool> IncludeBaseDirectory { get; set; }
public InArgument<bool> Overwrite { get; set; }

public InArgument<string> Encoding { get; set; }
protected override void Execute(CodeActivityContext context)
{
var includeBaseDirectory = IncludeBaseDirectory.Get(context);
var compressionLevel = CompressionLevel.Get(context);
var filename = Filename.Get(context);
var encoding = Encoding.Get(context);
filename = Environment.ExpandEnvironmentVariables(filename);
var path = Path.Get(context);
path = Environment.ExpandEnvironmentVariables(path);
Expand All @@ -48,7 +51,15 @@ protected override void Execute(CodeActivityContext context)
throw new System.IO.IOException("The file '" + filename + "' already exists.");
}
}
System.IO.Compression.ZipFile.CreateFromDirectory(path, filename, (System.IO.Compression.CompressionLevel)compressionLevel, includeBaseDirectory);
if (string.IsNullOrEmpty(encoding))
{
ZipFile.CreateFromDirectory(path, filename, (CompressionLevel)compressionLevel, includeBaseDirectory);
} else
{
ZipFile.CreateFromDirectory(path, filename, (CompressionLevel)compressionLevel, includeBaseDirectory,
System.Text.Encoding.GetEncoding(encoding));

}
}
}
}
Expand Down
17 changes: 15 additions & 2 deletions OpenRPA.Utilities/Activities/ExpandArchive.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
using ExcelDataReader;
using System.Data;
using System.IO.Compression;
using System.IO;

namespace OpenRPA.Utilities
{
Expand All @@ -26,17 +27,29 @@ public class ExpandArchive : CodeActivity
[RequiredArgument]
public InArgument<string> Filename { get; set; }
public InArgument<bool> Overwrite { get; set; }
public InArgument<string> Encoding { get; set; }
protected override void Execute(CodeActivityContext context)
{
var overwrite = Overwrite.Get(context);
var filename = Filename.Get(context);
var encoding = Encoding.Get(context);
filename = Environment.ExpandEnvironmentVariables(filename);
var path = Path.Get(context);
path = Environment.ExpandEnvironmentVariables(path);
if(!string.IsNullOrEmpty(path) && !string.IsNullOrEmpty(filename))
{
var archive = ZipFile.OpenRead(filename);
archive.ExtractToDirectory(path, overwrite);
if(string.IsNullOrEmpty(encoding))
{
var archive = ZipFile.OpenRead(filename);
archive.ExtractToDirectory(path, overwrite);
}
else
{
using (FileStream zipToOpen = new FileStream(filename, FileMode.Open)) {
ZipArchive archive = new ZipArchive(zipToOpen, ZipArchiveMode.Read, false, System.Text.Encoding.GetEncoding(encoding));
archive.ExtractToDirectory(path, overwrite);
}
}
}
}

Expand Down