Solve the problem of garbled characters

[lhDream]

Solve the problem that CJK characters cannot be packaged and installed packages and garbled characters. #202

[lhDream]

https://stackoverflow.com/questions/51066207/utf-8-characters-not-displaying-correctly-in-inno-setup
The UTF-8 string output by java will not carry BOM

[fvarrui]

What is GBK for?

[fvarrui]

Are you sure this won't present other problems with other language encodings?

[lhDream]

I'm not sure.
maybe so:

BufferedReader output = new BufferedReader(new InputStreamReader(process.getInputStream(), CharSetUtil.getCommandLineChartSet()));

public class CharSetUtil {

    public static Charset getCommandLineChartSet(){
        try{
            Process p = Runtime.getRuntime().exec("cmd /k chcp");
            BufferedReader br = new BufferedReader(new InputStreamReader(p.getInputStream()));
            String res = br.readLine();
            String code = find("\\d+",res);
            switch (code){
                case "936": return Charset.forName("GBK");
                case "65001": return Charset.forName("UTF-8");
            }
        }catch (Exception e){
        }
        return return Charset.defaultCharset();
    }

    private static String find(String pattern,String data){
        Pattern r = Pattern.compile(pattern);
        Matcher matcher = r.matcher(data);
        matcher.find();
        return matcher.group();
    }

}

https://learn.microsoft.com/en-us/windows/win32/intl/code-page-bitfields

[lhDream]

Hi @fvarrui
Do you have any questions?

[fvarrui]

Hi @lhDream!
Thanks for your PR ... I'll give it a try asap.

[fvarrui]

Please, take a look at this:

JavaPackager/src/main/java/io/github/fvarrui/javapackager/utils/VelocityUtils.java

Lines 65 to 76 in 49528dc

	public static void render(String templatePath, File output, Object info) throws Exception {
	render(templatePath, output, info, false);
	}
	public static void render(String templatePath, File output, Object info, boolean includeBom) throws Exception {
	String data = render(templatePath, info);
	if (!includeBom) {
	writeStringToFile(output, StringUtils.dosToUnix(data), "UTF-8");
	} else {
	FileUtils.writeStringToFileWithBOM(output, data);
	}
	}

I reverted your changes in this part of the code, but keeping the possibility to render files with Velocity including the BOM ... We should only include the BOM in those files where it is essential, not in all files by default. Do you know which files really need it?

[lhDream]

Hi @fvarrui

It is currently known that the iss.vtl file requires

[fvarrui]

Ok, done!

JavaPackager/src/main/java/io/github/fvarrui/javapackager/packagers/GenerateSetup.java

Lines 57 to 59 in 60bd8cb

	// generates iss file from velocity template
	File issFile = new File(assetsFolder, name + ".iss");
	VelocityUtils.render("windows/iss.vtl", issFile, packager, true);

JavaPackager/src/main/java/io/github/fvarrui/javapackager/utils/VelocityUtils.java

Lines 69 to 77 in 60bd8cb

	public static void render(String templatePath, File output, Object info, boolean includeBom) throws Exception {
	String data = render(templatePath, info);
	data = StringUtils.dosToUnix(data);
	if (!includeBom) {
	writeStringToFile(output, data, "UTF-8");
	} else {
	FileUtils.writeStringToFileWithBOM(output, data);
	}
	}

Could you test branch pr-272?
Thanks!

[lhDream]

Hi @fvarrui
Of course, but there is no such branch as pr-272，or what you want to say is pr-271

I tested with pr-271 branch no problem.

[fvarrui]

Yes, sorry, I mean 271 🙄

[lhDream]

@fvarrui
I tested with pr-271 branch no problem.

[fvarrui]

Merged into devel, ready to be released in the next version

[commi]

FYI: This change breaks with the non-unicode InnoSetup 5.x version... it cant read the iss file.

This IS version is old, but this could be added to the documentation. (use 6.x or 5.x Unicode)