Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

请求合入：忽略输出功能&代码改进&bug修复 #20

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

请求合入：忽略输出功能&代码改进&bug修复 #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9908750
添加当epub文件存在时忽略输出的功能
jywhy6 Jul 3, 2022
ce3abdc
使用Path.Combine代替硬编码的路径，使代码跨平台可用
jywhy6 Jul 3, 2022
b07f723
使用Path.Combine代替硬编码的路径，使代码跨平台可用
jywhy6 Jul 3, 2022
b76fe72
自动转义xhtml中的无效字符，避免epub转换失败
jywhy6 Jul 4, 2022
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
16 changes: 9 additions & 7 deletions src/EpubBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ public void Save(string path)
{
string p = "OEBPS/Text/" + xhtml_names[i];
string ss;
var xmlSettings = new XmlWriterSettings { Indent = true, NewLineChars = "\n" };
var xmlSettings = new XmlWriterSettings { Indent = true, NewLineChars = "\n", CheckCharacters = false };
using (var stringWriter = new StringWriter())
using (var xmlTextWriter = XmlWriter.Create(stringWriter, xmlSettings))
{
Expand Down Expand Up @@ -338,7 +338,7 @@ string ProcEmbed(string uri)
string name = "embed" + Util.Number(resid) + font_Section.ext;
if (font_Section.ext == null)
{
Log.log("[Warn] The referred font file is unrecognized: "+name);
Log.log("[Warn] The referred font file is unrecognized: " + name);
}
link = "../Fonts/" + name;
font_Section.comment = name;
Expand Down Expand Up @@ -451,7 +451,7 @@ void CreateIndexDoc()
CreateIndexDoc_Helper(root, temp_epub3, temp_epub2);
//Create NAV
{
string t = File.ReadAllText("template\\template_nav.txt");
string t = File.ReadAllText(Path.Combine(Environment.CurrentDirectory, "template", "template_nav.txt"));
t = t.Replace("{❕toc}", temp_epub3.ToString());
string guide = "";
if (azw3.guide_table != null)
Expand All @@ -475,7 +475,7 @@ void CreateIndexDoc()
nav = t;
}
{
string t = File.ReadAllText("template\\template_ncx.txt");
string t = File.ReadAllText(Path.Combine(Environment.CurrentDirectory, "template", "template_ncx.txt"));

t = t.Replace("{❕navMap}", temp_epub2.ToString());
t = t.Replace("{❕Title}", azw3.title);
Expand All @@ -501,7 +501,7 @@ void SetCover()//等KindlePosToUri不再使用后 关系到xhtml相关变量
{
Log.log("[Info]Adding a cover document.");

string t = File.ReadAllText("template\\template_cover.txt");
string t = File.ReadAllText(Path.Combine(Environment.CurrentDirectory, "template", "template_cover.txt"));
var (w, h) = Util.GetImageSize(imgs[img_names.IndexOf(cover_name)]);
cover = t.Replace("{❕image}", cover_name).Replace("{❕w}", w.ToString()).Replace("{❕h}", h.ToString());

Expand Down Expand Up @@ -535,7 +535,7 @@ void CreateOPF()
{
if (azw3.resc != null)
{
string t = File.ReadAllText("template\\template_opf.txt");
string t = File.ReadAllText(Path.Combine(Environment.CurrentDirectory, "template", "template_opf.txt"));
XmlDocument manifest = new XmlDocument();
XmlElement mani_root = manifest.CreateElement("manifest");
manifest.AppendChild(mani_root);
Expand Down Expand Up @@ -854,8 +854,10 @@ XmlDocument LoadXhtml(string xhtml)
{
int htmlstart = xhtml.IndexOf("<html", 0, StringComparison.OrdinalIgnoreCase);
xhtml = xhtml11doctype + xhtml.Substring(htmlstart);
string filt_xhtml = Util.EscapeInvalidXmlCharacters(xhtml);
if (filt_xhtml != xhtml) Log.log("[Warn] Invalid character found in xhtml, escaped.");
XmlDocument d = new XmlDocument();
using (var rdr = new XmlTextReader(new StringReader(xhtml)))
using (var rdr = new XmlTextReader(new StringReader(filt_xhtml)))
{
d.PreserveWhitespace = true;
rdr.DtdProcessing = DtdProcessing.Parse;
Expand Down
16 changes: 13 additions & 3 deletions src/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ class Program
static bool append_log = false;
static bool overwrite = false;
static bool rename_when_exist = false;
static bool ignore_when_exist = false;
static bool rename_xhtml_with_id = false;
static void Main(string[] args)
{
Expand Down Expand Up @@ -54,6 +55,10 @@ static void Main(string[] args)
{
rename_when_exist = true;
}
if (a.ToLower() == "--ignore-when-exist")
{
ignore_when_exist = true;
}
if (a.ToLower() == "--rename-xhtml-with-id")
{
rename_xhtml_with_id = true;
Expand All @@ -70,10 +75,10 @@ static void Main(string[] args)
if (!end_of_proc) ProcPath(args);
if (append_log)
{
Log.Append("..\\lastrun.log");
Log.Append(Path.Combine(Environment.CurrentDirectory, "..", "lastrun.log"));
}
else
Log.Save("..\\lastrun.log");
Log.Save(Path.Combine(Environment.CurrentDirectory, "..", "lastrun.log"));

Environment.CurrentDirectory = temp_environment_dir;
}
Expand Down Expand Up @@ -228,6 +233,11 @@ static void ProcPath(string[] args)
}
Log.log("[Warn]Save as...");
}
else if (ignore_when_exist)
{
Log.log("[Warn]Output ignored.");
output_path = "";
}
else if (!overwrite)
{
Console.WriteLine("Output file already exist. N(Abort,Defualt)/y(Overwrite)/r(Rename)?");
Expand Down Expand Up @@ -256,7 +266,7 @@ static void ProcPath(string[] args)
}
else
{
Log.log("[Error]Operation aborted. You can use --overwrite or --rename-when-exist to avoid pause.");
Log.log("[Error]Operation aborted. You can use --overwrite or --rename-when-exist or --ignore-when-exist to avoid pause.");
output_path = "";
}

Expand Down
29 changes: 29 additions & 0 deletions src/utils.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,35 @@ public static string FilenameCheck(string s)
;
}

public static string EscapeInvalidXmlCharacters(string in_string)
{
// from https://stackoverflow.com/a/641632
if (in_string == null) return null;

StringBuilder str_buf = new StringBuilder();
char ch;

for (int i = 0; i < in_string.Length; i++)
{
ch = in_string[i];
if ((ch >= 0x0020 && ch <= 0xD7FF) ||
(ch >= 0xE000 && ch <= 0xFFFD) ||
ch == 0x0009 ||
ch == 0x000A ||
ch == 0x000D)
{
str_buf.Append(ch);
}
else
{
byte[] bytes = Encoding.UTF8.GetBytes(Char.ToString(ch));

str_buf.Append("&#x" + Convert.ToHexString(bytes) + ";");
}
}
return str_buf.ToString();
}

public static (int, int) GetImageSize(byte[] data)
{
using (var img = Image.FromStream(new MemoryStream(data)))
Expand Down