diff --git a/Wabbajack/Compiler.cs b/Wabbajack/Compiler.cs index c7646601..0fef8eb0 100644 --- a/Wabbajack/Compiler.cs +++ b/Wabbajack/Compiler.cs @@ -33,7 +33,7 @@ namespace Wabbajack public string MO2Profile; - public string ModListName, ModListAuthor, ModListDescription, ModListWebsite, ModListImage; + public string ModListName, ModListAuthor, ModListDescription, ModListWebsite, ModListImage, ModListReadme; public Compiler(string mo2_folder) { @@ -280,6 +280,7 @@ namespace Wabbajack Name = ModListName ?? MO2Profile, Author = ModListAuthor ?? "", Description = ModListDescription ?? "", + Readme = ModListReadme ?? "", Image = ModListImage ?? "", Website = ModListWebsite ?? "" }; @@ -675,12 +676,26 @@ namespace Wabbajack { return source => { - if (source.AbsolutePath != ModListImage) return null; - if (!File.Exists(ModListImage)) return null; + var files = new HashSet + { + ModListImage, ModListReadme + }; + if (!files.Any(f => source.AbsolutePath.Equals(f))) return null; + if (!File.Exists(source.AbsolutePath)) return null; + var isBanner = source.AbsolutePath == ModListImage; + //var isReadme = source.AbsolutePath == ModListReadme; var result = source.EvolveTo(); - result.Type = PropertyType.Banner; - result.SourceDataID = IncludeFile(File.ReadAllBytes(ModListImage)); - ModListImage = result.SourceDataID; + result.SourceDataID = IncludeFile(File.ReadAllBytes(source.AbsolutePath)); + if (isBanner) + { + result.Type = PropertyType.Banner; + ModListImage = result.SourceDataID; + } + else + { + result.Type = PropertyType.Readme; + ModListReadme = result.SourceDataID; + } return result; }; } diff --git a/Wabbajack/Data.cs b/Wabbajack/Data.cs index 3ee359a7..467a3c67 100644 --- a/Wabbajack/Data.cs +++ b/Wabbajack/Data.cs @@ -65,7 +65,7 @@ namespace Wabbajack public string Description; /// - /// Image of the ModList + /// Hash of the banner-image /// public string Image; @@ -74,6 +74,11 @@ namespace Wabbajack /// public string Website; + /// + /// Hash of the readme + /// + public string Readme; + /// /// Content Report in HTML form /// @@ -111,7 +116,7 @@ namespace Wabbajack public string SourceDataID; } - public enum PropertyType { Banner } + public enum PropertyType { Banner, Readme } /// /// File meant to be extracted before the installation