Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
19 changes: 13 additions & 6 deletions src/lib/openFile.js
Original file line number Diff line number Diff line change
Expand Up @@ -386,14 +386,21 @@ export default async function openFile(file, options = {}) {

const binData = await fs.readFile();

// Detect encoding if not explicitly provided
// Determine encoding: if explicit provided use it, otherwise
// if settings.defaultFileEncoding === 'auto' then detect; else use the default as-is
let detectedEncoding = file.encoding || encoding;
if (!detectedEncoding) {
try {
detectedEncoding = await detectEncoding(binData);
} catch (error) {
console.warn("Encoding detection failed, using default:", error);
detectedEncoding = appSettings.value.defaultFileEncoding;
const defaultSetting = appSettings.value.defaultFileEncoding;
if (defaultSetting === "auto") {
try {
detectedEncoding = await detectEncoding(binData);
if (detectedEncoding === "auto") detectedEncoding = "UTF-8";
} catch (error) {
console.warn("Encoding detection failed, using UTF-8:", error);
detectedEncoding = "UTF-8";
}
} else {
detectedEncoding = defaultSetting || "UTF-8";
}
}

Expand Down
14 changes: 9 additions & 5 deletions src/settings/appSettings.js
Original file line number Diff line number Diff line change
Expand Up @@ -178,11 +178,15 @@ export default function otherSettings() {
key: "defaultFileEncoding",
text: strings["default file encoding"],
value: values.defaultFileEncoding,
valueText: (value) => getEncoding(value).label,
select: Object.keys(encodings).map((id) => {
const encoding = encodings[id];
return [id, encoding.label];
}),
valueText: (value) =>
value === "auto" ? strings.auto || "Auto" : getEncoding(value).label,
select: [
["auto", strings.auto || "Auto"],
...Object.keys(encodings).map((id) => {
const encoding = encodings[id];
return [id, encoding.label];
}),
],
},
];

Expand Down
14 changes: 11 additions & 3 deletions src/utils/encodings.js
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,8 @@ function isValidUTF8(bytes) {

export async function detectEncoding(buffer) {
if (!buffer || buffer.byteLength === 0) {
return settings.value.defaultFileEncoding || "UTF-8";
const def = settings.value.defaultFileEncoding;
return def === "auto" ? "UTF-8" : def || "UTF-8";
}

const bytes = new Uint8Array(buffer);
Expand All @@ -115,7 +116,9 @@ export async function detectEncoding(buffer) {
const encodings = [
...new Set([
"UTF-8",
settings.value.defaultFileEncoding || "UTF-8",
settings.value.defaultFileEncoding === "auto"
? "UTF-8"
: settings.value.defaultFileEncoding || "UTF-8",
"windows-1252",
"ISO-8859-1",
]),
Expand Down Expand Up @@ -144,7 +147,8 @@ export async function detectEncoding(buffer) {
}
}

return settings.value.defaultFileEncoding || "UTF-8";
const def = settings.value.defaultFileEncoding;
return def === "auto" ? "UTF-8" : def || "UTF-8";
}

/**
Expand All @@ -165,6 +169,8 @@ export async function decode(buffer, charset) {
charset = settings.value.defaultFileEncoding;
}

if (charset === "auto") charset = "UTF-8";

charset = getEncoding(charset).name;
const text = await execDecode(buffer, charset);

Expand All @@ -186,6 +192,8 @@ export function encode(text, charset) {
charset = settings.value.defaultFileEncoding;
}

if (charset === "auto") charset = "UTF-8";

charset = getEncoding(charset).name;
return execEncode(text, charset);
}
Expand Down