Support view zip via gbk encoding

cweijan · Mar 29, 2024 · c5bc139 · c5bc139
1 parent f233eb1
commit c5bc139
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 16 deletions.
diff --git a/src/bundle/adm-zip/index.d.ts b/src/bundle/adm-zip/index.d.ts
@@ -353,6 +353,7 @@ declare namespace AdmZip {
     }
 
     interface InitOptions {
+        encoding: string;
         /* If true it disables files sorting */
         noSort: boolean;
         /* Read entries during load (initial loading may be slower) */

diff --git a/src/bundle/adm-zip/zipEntry.js b/src/bundle/adm-zip/zipEntry.js
@@ -4,7 +4,7 @@ var Utils = require("./util"),
     Methods = require("./methods");
 import iconv from 'iconv-lite';
 
-module.exports = function (/*Buffer*/ input) {
+module.exports = function (/*Buffer*/ input, /** object */ options) {
     var _entryHeader = new Headers.EntryHeader(),
         _entryName = Buffer.alloc(0),
         _comment = Buffer.alloc(0),
@@ -199,7 +199,10 @@ module.exports = function (/*Buffer*/ input) {
     return {
         get entryName() {
             const buffer = _entryName;
-            return buffer.toString('utf-8')
+            if (options?.encoding == 'gbk') {
+                return iconv.decode(buffer, 'gbk');
+            }
+            return buffer.toString(options?.encoding || 'utf-8')
         },
         get rawEntryName() {
             return _entryName;

diff --git a/src/bundle/adm-zip/zipFile.js b/src/bundle/adm-zip/zipFile.js
@@ -28,7 +28,7 @@ module.exports = function (/*Buffer|null*/ inBuffer, /** object */ options) {
 
         for (let i = 0; i < totalEntries; i++) {
             let tmp = index;
-            const entry = new ZipEntry(inBuffer);
+            const entry = new ZipEntry(inBuffer, options);
 
             entry.header = inBuffer.slice(tmp, (tmp += Utils.Constants.CENHDR));
             entry.entryName = inBuffer.slice(tmp, (tmp += entry.header.fileNameLength));
@@ -46,7 +46,7 @@ module.exports = function (/*Buffer|null*/ inBuffer, /** object */ options) {
         var index = mainHeader.offset; // offset of first CEN header
         for (var i = 0; i < entryList.length; i++) {
             var tmp = index,
-                entry = new ZipEntry(inBuffer);
+                entry = new ZipEntry(inBuffer, options);
             entry.header = inBuffer.slice(tmp, (tmp += Utils.Constants.CENHDR));
 
             entry.entryName = inBuffer.slice(tmp, (tmp += entry.header.fileNameLength));

diff --git a/src/provider/handlers/zipHandler.ts b/src/provider/handlers/zipHandler.ts
@@ -12,10 +12,22 @@ export async function handleZip(uri: Uri, handler: Handler) {
     handler.on('init', async () => {
         const data = (await workspace.fs.readFile(uri)) as Buffer
         const basePath = `${tmpdir()}/officeZip.${new Date().getTime()}`;
-        const { zip, files, folderMap, fileMap } = parseZipAsTree(data)
+        let { zip, files, folderMap, fileMap } = parseZipAsTree(data)
         handler.emit('data', {
             files, folderMap,
             fileName: basename(uri.fsPath)
+        })
+
+        handler.on('changeEncoding', async (encoding) => {
+            const info = parseZipAsTree(data, { encoding });
+            zip = info.zip;
+            files = info.files;
+            folderMap = info.folderMap;
+            fileMap = info.fileMap;
+            handler.emit('data', {
+                files, folderMap,
+                fileName: basename(uri.fsPath)
+            })
         }).on('openPath', async info => {
             const { entryName, isDirectory } = info
             if (isDirectory) {

diff --git a/src/react/view/compress/components/Toolbar.tsx b/src/react/view/compress/components/Toolbar.tsx
@@ -1,16 +1,31 @@
 import { FileAddOutlined, FileDoneOutlined } from '@ant-design/icons';
-import { Button } from "antd";
+import { Button, Flex, Select } from "antd";
 import { handler } from "../../../util/vscode";
 
 export default function Toolbar({ currentDir }) {
     return (
-        <div style={{ padding: '5px', backgroundColor: 'white' }}>
-            <Button type="primary" size='middle' style={{ marginRight: '10px' }} icon={<FileDoneOutlined />} onClick={() => handler.emit('autoExtract')}>
-                Extract
-            </Button>
-            <Button size='middle' icon={<FileAddOutlined />} onClick={() => { handler.emit('addFile', currentDir) }} >
-                Add
-            </Button>
-        </div>
+        <Flex justify='space-between' style={{ padding: '5px', backgroundColor: 'white' }}>
+            <div>
+                <Button type="primary" size='middle' style={{ marginRight: '10px' }} icon={<FileDoneOutlined />} onClick={() => handler.emit('autoExtract')}>
+                    Extract
+                </Button>
+                <Button size='middle' icon={<FileAddOutlined />} onClick={() => { handler.emit('addFile', currentDir) }} >
+                    Add
+                </Button>
+            </div>
+            <div>
+                Encoding:
+                <Select
+                    defaultValue="utf8"
+                    size='middle'
+                    style={{ width: 120, marginLeft: '15px', marginRight: '20px' }}
+                    onChange={(value) => handler.emit('changeEncoding', value)}
+                    options={[
+                        { value: 'gbk', label: 'GBK' },
+                        { value: 'utf8', label: 'UTF-8' },
+                    ]}
+                />
+            </div>
+        </Flex>
     )
 }
diff --git a/src/service/zip/zipUtils.ts b/src/service/zip/zipUtils.ts
@@ -11,8 +11,8 @@ interface ZipParseResult {
     folderMap: { [fullPath: string]: ZipEntry }
 }
 
-export function parseZipAsTree(zipData: Buffer): ZipParseResult {
-    const zip = new AdmZip(zipData);
+export function parseZipAsTree(zipData: Buffer, option?: Partial<AdmZip.InitOptions>): ZipParseResult {
+    const zip = new AdmZip(zipData, option);
     const zipEntries = zip.getEntries().filter(e => e.name);
 
     let files: ZipEntry[] = []