-
-
-
- |
- {{ header || `Column ${index + 1}` }}
- |
-
-
-
-
- |
- {{ cell }}
- |
-
-
-
-
@@ -213,10 +247,6 @@ const displayError = computed(() => {
padding: 0.5rem;
}
-.csv-footer > :only-child {
- margin-left: auto;
-}
-
.csv-info {
display: flex;
align-items: center;
@@ -230,18 +260,25 @@ const displayError = computed(() => {
font-size: 0.875rem;
}
-.column-separator {
+.csv-header {
+ display: flex;
+ justify-content: space-between;
+ padding: 0.25rem;
+}
+
+.header-select {
display: flex;
align-items: center;
gap: 0.5rem;
+ margin-bottom: 0.5rem;
}
-.column-separator > label {
+.header-select > label {
font-size: small;
- text-align: end;
+ max-width: 80px;
}
-.column-separator > select {
+.header-select > select {
margin-bottom: 0;
}
diff --git a/frontend/src/i18n/en.json b/frontend/src/i18n/en.json
index 3fcdf635..8938cb06 100644
--- a/frontend/src/i18n/en.json
+++ b/frontend/src/i18n/en.json
@@ -88,7 +88,8 @@
"comma": "Comma (,)",
"semicolon": "Semicolon (;)",
"both": "Both (,) and (;)"
- }
+ },
+ "fileEncoding": "File Encoding"
},
"help": {
"click": "select file or directory",
diff --git a/frontend/src/types/file.d.ts b/frontend/src/types/file.d.ts
index 5664c16b..6b9b6372 100644
--- a/frontend/src/types/file.d.ts
+++ b/frontend/src/types/file.d.ts
@@ -21,6 +21,7 @@ interface Resource extends ResourceBase {
index: number;
subtitles?: string[];
content?: string;
+ rawContent?: ArrayBuffer;
}
interface ResourceItem extends ResourceBase {
@@ -57,3 +58,8 @@ interface BreadCrumb {
name: string;
url: string;
}
+
+interface CsvData {
+ headers: string[];
+ rows: string[][];
+}
diff --git a/frontend/src/utils/csv.ts b/frontend/src/utils/csv.ts
deleted file mode 100644
index c03731e7..00000000
--- a/frontend/src/utils/csv.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-export interface CsvData {
- headers: string[];
- rows: string[][];
-}
-
-/**
- * Parse CSV content into headers and rows
- * Supports quoted fields and handles commas within quotes
- */
-export function parseCSV(
- content: string,
- columnSeparator: Array
-): CsvData {
- if (!content || content.trim().length === 0) {
- return { headers: [], rows: [] };
- }
-
- const lines = content.split(/\r?\n/);
- const result: string[][] = [];
-
- for (const line of lines) {
- if (line.trim().length === 0) continue;
-
- const row: string[] = [];
- let currentField = "";
- let inQuotes = false;
-
- for (let i = 0; i < line.length; i++) {
- const char = line[i];
- const nextChar = line[i + 1];
-
- if (char === '"') {
- if (inQuotes && nextChar === '"') {
- // Escaped quote
- currentField += '"';
- i++; // Skip next quote
- } else {
- // Toggle quote state
- inQuotes = !inQuotes;
- }
- } else if (columnSeparator.includes(char) && !inQuotes) {
- // Field separator
- row.push(currentField);
- currentField = "";
- } else {
- currentField += char;
- }
- }
-
- // Add the last field
- row.push(currentField);
- result.push(row);
- }
-
- if (result.length === 0) {
- return { headers: [], rows: [] };
- }
-
- // First row is headers
- const headers = result[0];
- const rows = result.slice(1);
-
- return { headers, rows };
-}
diff --git a/frontend/src/utils/encodings.ts b/frontend/src/utils/encodings.ts
new file mode 100644
index 00000000..80f1e219
--- /dev/null
+++ b/frontend/src/utils/encodings.ts
@@ -0,0 +1,95 @@
+export const availableEncodings = [
+ "utf-8",
+ "ibm866",
+ "iso-8859-2",
+ "iso-8859-3",
+ "iso-8859-4",
+ "iso-8859-5",
+ "iso-8859-6",
+ "iso-8859-7",
+ "iso-8859-8",
+ "iso-8859-8-i",
+ "iso-8859-10",
+ "iso-8859-13",
+ "iso-8859-14",
+ "iso-8859-15",
+ "iso-8859-16",
+ "koi8-r",
+ "koi8-u",
+ "macintosh",
+ "windows-874",
+ "windows-1250",
+ "windows-1251",
+ "windows-1252",
+ "windows-1253",
+ "windows-1254",
+ "windows-1255",
+ "windows-1256",
+ "windows-1257",
+ "windows-1258",
+ "x-mac-cyrillic",
+ "gbk",
+ "gb18030",
+ "big5",
+ "euc-jp",
+ "iso-2022-jp",
+ "shift_jis",
+ "euc-kr",
+ "utf-16be",
+ "utf-16le",
+];
+
+export function decode(content: ArrayBuffer, encoding: string): string {
+ const decoder = new TextDecoder(encoding);
+ return decoder.decode(content);
+}
+
+export function isEncodableResponse(url: string): boolean {
+ const extensions = [".csv"];
+
+ if (typeof TextDecoder === "undefined") {
+ return false;
+ }
+
+ for (const extension of extensions) {
+ if (url.endsWith(extension)) {
+ return true;
+ }
+ }
+
+ return false;
+}
+
+export async function makeRawResource(
+ res: Response,
+ url: string
+): Promise {
+ const buffer = await res.arrayBuffer();
+ return {
+ items: [],
+ numDirs: 0,
+ numFiles: 0,
+ sorting: {} as Sorting,
+ index: 0,
+ extension: getExtension(url),
+ isDir: false,
+ isSymlink: false,
+ path: url,
+ size: buffer.byteLength,
+ modified: new Date().toISOString(),
+ name: url.split("/").pop() || "",
+ type: "text",
+ mode: 0,
+ url: `/files${url}`,
+ rawContent: buffer,
+ content: decode(buffer, "utf-8"),
+ };
+}
+
+function getExtension(url: string): string {
+ const lastDotIndex = url.lastIndexOf(".");
+ if (lastDotIndex === -1) {
+ return "";
+ }
+ return url.substring(lastDotIndex);
+}
diff --git a/frontend/src/views/files/Editor.vue b/frontend/src/views/files/Editor.vue
index 7d3a8dfc..4ce7b427 100644
--- a/frontend/src/views/files/Editor.vue
+++ b/frontend/src/views/files/Editor.vue
@@ -171,25 +171,19 @@ onMounted(() => {
`https://cdn.jsdelivr.net/npm/ace-builds@${ace_version}/src-min-noconflict/`
);
- editor.value = ace.edit("editor", {
- value: fileContent,
- showPrintMargin: false,
- readOnly: fileStore.req?.type === "textImmutable",
- theme: getEditorTheme(authStore.user?.aceEditorTheme ?? ""),
- mode: modelist.getModeForPath(fileStore.req!.name).mode,
- wrap: true,
- enableBasicAutocompletion: true,
- enableLiveAutocompletion: true,
- enableSnippets: true,
- });
-
- editor.value.setFontSize(fontSize.value);
- editor.value.focus();
-
- editor.value.getSelection().on("changeSelection", () => {
- isSelectionEmpty.value =
- editor.value == null || editor.value.getSelectedText().length == 0;
- });
+ if (!layoutStore.loading) {
+ initEditor(fileContent);
+ } else {
+ const unwatch = watchEffect(() => {
+ // Initialize editor when layout is loaded
+ if (!layoutStore.loading) {
+ setTimeout(() => {
+ initEditor(fileContent);
+ unwatch();
+ }, 50);
+ }
+ });
+ }
});
onBeforeUnmount(() => {
@@ -218,6 +212,23 @@ onBeforeRouteUpdate((to, from, next) => {
});
});
+const initEditor = (fileContent: string) => {
+ editor.value = ace.edit("editor", {
+ value: fileContent,
+ showPrintMargin: false,
+ readOnly: fileStore.req?.type === "textImmutable",
+ theme: getEditorTheme(authStore.user?.aceEditorTheme ?? ""),
+ mode: modelist.getModeForPath(fileStore.req!.name).mode,
+ wrap: true,
+ enableBasicAutocompletion: true,
+ enableLiveAutocompletion: true,
+ enableSnippets: true,
+ });
+
+ editor.value.setFontSize(fontSize.value);
+ editor.value.focus();
+};
+
const keyEvent = (event: KeyboardEvent) => {
if (event.code === "Escape") {
close();
diff --git a/frontend/src/views/files/Preview.vue b/frontend/src/views/files/Preview.vue
index 09562856..46670a35 100644
--- a/frontend/src/views/files/Preview.vue
+++ b/frontend/src/views/files/Preview.vue
@@ -253,7 +253,7 @@ const hoverNav = ref(false);
const autoPlay = ref(false);
const previousRaw = ref("");
const nextRaw = ref("");
-const csvContent = ref("");
+const csvContent = ref("");
const csvError = ref("");
const player = ref(null);
@@ -393,7 +393,11 @@ const updatePreview = async () => {
if (fileStore.req.size > CSV_MAX_SIZE) {
csvError.value = t("files.csvTooLarge");
} else {
- csvContent.value = fileStore.req.content ?? "";
+ if (fileStore.req.rawContent != null) {
+ csvContent.value = fileStore.req.rawContent;
+ } else {
+ csvContent.value = fileStore.req.content ?? "";
+ }
}
}
diff --git a/http/resource.go b/http/resource.go
index 59ce7f5b..7066f35a 100644
--- a/http/resource.go
+++ b/http/resource.go
@@ -36,10 +36,31 @@ var resourceGetHandler = withUser(func(w http.ResponseWriter, r *http.Request, d
return errToStatus(err), err
}
+ encoding := r.Header.Get("X-Encoding")
if file.IsDir {
file.Sorting = d.user.Sorting
file.ApplySort()
return renderJSON(w, r, file)
+ } else if encoding == "true" {
+ if file.Type != "text" {
+ return http.StatusUnsupportedMediaType, fmt.Errorf("file is not a text file")
+ }
+
+ f, err := d.user.Fs.Open(r.URL.Path)
+ if err != nil {
+ return errToStatus(err), err
+ }
+ defer f.Close()
+
+ data, err := io.ReadAll(f)
+ if err != nil {
+ return http.StatusInternalServerError, err
+ }
+
+ w.Header().Set("Content-Type", "application/octet-stream")
+ w.WriteHeader(http.StatusOK)
+ _, err = w.Write(data)
+ return 0, err
}
if checksum := r.URL.Query().Get("checksum"); checksum != "" {