Skip to content

Commit 4d3e41e

Browse files
Help: adapt Zip export for LimitedFileSystem
1 parent db4b3f1 commit 4d3e41e

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

Extensions/Signum.Help/HelpXml.cs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -586,7 +586,7 @@ private static void ImportImages(Entity entity, string filePath, List<HelpImageE
586586
{
587587

588588
var imageDir = FS.Path.Combine(FS.Path.GetDirectoryName(filePath)!, FS.Path.GetFileNameWithoutExtension(filePath));
589-
var newImages = FS.Directory.Exists(imageDir) ? FS.Directory.GetFiles(imageDir) : null;
589+
var newImages = FS.Directory.Exists(imageDir) ? FS.Directory.GetFiles(imageDir, "*") : null;
590590

591591
Synchronizer.Synchronize(
592592
newDictionary: newImages.EmptyIfNull().ToDictionaryEx(n => FS.Path.GetFileName(n)),
@@ -662,7 +662,7 @@ private static HashSet<CultureInfo> GetAllCultures(string directoryName)
662662
cultures.AddRange(Database.Query<TypeHelpEntity>().Select(a => a.Culture).Distinct().ToList().Select(c => c.ToCultureInfo()));
663663
cultures.AddRange(Database.Query<QueryHelpEntity>().Select(a => a.Culture).Distinct().ToList().Select(c => c.ToCultureInfo()));
664664
if (FS.Directory.Exists(directoryName))
665-
cultures.AddRange(FS.DirectoryInfo.New(directoryName).GetDirectories().Select(c => CultureInfo.GetCultureInfo(c.Name)));
665+
cultures.AddRange(FS.Directory.GetDirectories(directoryName).Select(c => CultureInfo.GetCultureInfo(c.Name)));
666666
return cultures;
667667
}
668668

@@ -899,15 +899,16 @@ public static void Export(List<IHelpEntity> entities, string directoryName)
899899

900900
public static byte[] ExportToZipBytes(List<IHelpEntity> entities)
901901
{
902-
using var zip = new ZipBuilderScope("Help");
902+
using var zip = new ZipBuilder("Help");
903+
using (new FS(zip))
903904
Export(entities, "");
904905
var bytes = zip.GetAllBytes();
905906
return bytes;
906907
}
907908

908909
public static byte[] ExportAllToZipBytes()
909910
{
910-
using var zip = new ZipBuilderScope("Help");
911+
using var zip = new ZipBuilder("Help");
911912
ExportAll("");
912913
var bytes = zip.GetAllBytes();
913914
return bytes;
@@ -928,7 +929,7 @@ public static void ImportExportHelp()
928929
public static void ImportExportHelp(string directoryName)
929930
{
930931
retry:
931-
Console.WriteLine("You want to export (e) or import (i) Help? (nothing to exit)");
932+
Console.WriteLine("You want to export (e) export as Zip (ez) or import (i) Help? (nothing to exit)");
932933

933934
switch (Console.ReadLine()!.ToLower())
934935
{

0 commit comments

Comments
 (0)