From 7911f259b10ab708d51948e7a9309c46abc6f580 Mon Sep 17 00:00:00 2001 From: Xuan Sang LE Date: Thu, 1 Mar 2018 19:33:36 +0100 Subject: [PATCH] fix file reader --- src/core/vfs.coffee | 7 ++++--- src/core/vfs/GoogleDriveHandler.coffee | 2 +- src/packages/Preview/main.coffee | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/core/vfs.coffee b/src/core/vfs.coffee index 5538205..f4d9c68 100644 --- a/src/core/vfs.coffee +++ b/src/core/vfs.coffee @@ -151,7 +151,7 @@ class RemoteFileHandler extends self.OS.API.VFS.BaseFileHandler when "read" return _API.handler.scandir @path, f if @info.type is "dir" #read the file - return _API.handler.fileblob @path, f if p is "blob" + return _API.handler.fileblob @path, f if p is "binary" _API.handler.readfile @path, f, if p then p else "text" when "mk" return f { error: "#{@path} is not a directory" } if @info.type is "file" @@ -221,7 +221,7 @@ class ApplicationHandler extends self.OS.API.VFS.BaseFileHandler self.OS.API.VFS.register "^app$", ApplicationHandler -class BlobFileHandler extends self.OS.API.VFS.BaseFileHandler +class BufferFileHandler extends self.OS.API.VFS.BaseFileHandler constructor: (path, mime, data) -> super path @cache = data if data @@ -269,7 +269,7 @@ class BlobFileHandler extends self.OS.API.VFS.BaseFileHandler else return _courrier.osfail "VFS unknown action: #{n}", (_API.throwe "OS.VFS"), n -self.OS.API.VFS.register "^blob$", BlobFileHandler +self.OS.API.VFS.register "^mem$", BufferFileHandler class SharedFileHandler extends self.OS.API.VFS.BaseFileHandler constructor: (path) -> @@ -284,6 +284,7 @@ class SharedFileHandler extends self.OS.API.VFS.BaseFileHandler when "read" return _API.get "#{_API.handler.shared}/all", f, ((e, s)->) if @isRoot() #read the file + return _API.handler.fileblob @path, f if p is "binary" _API.handler.readfile @path, f, if p then p else "text" when "mk" return diff --git a/src/core/vfs/GoogleDriveHandler.coffee b/src/core/vfs/GoogleDriveHandler.coffee index 2265dcb..60fd220 100644 --- a/src/core/vfs/GoogleDriveHandler.coffee +++ b/src/core/vfs/GoogleDriveHandler.coffee @@ -161,7 +161,7 @@ class GoogleDriveHandler extends this.OS.API.VFS.BaseFileHandler } .then (r) -> _API.loaded q, "OK" - return f r.body unless p is "blob" + return f r.body unless p is "binary" bytes = [] for i in [0..(r.body.length - 1)] bytes.push r.body.charCodeAt i diff --git a/src/packages/Preview/main.coffee b/src/packages/Preview/main.coffee index c378643..ebb0ee5 100644 --- a/src/packages/Preview/main.coffee +++ b/src/packages/Preview/main.coffee @@ -67,7 +67,7 @@ class Preview extends this.OS.GUI.BaseApplication .catch (err) -> me.error "Cannot render the PDF file" me._api.loaded q, "FAIL" - , "blob" + , "binary" renderImage: (file) -> me = @ @@ -88,7 +88,7 @@ class Preview extends this.OS.GUI.BaseApplication console.log canvas.width, canvas.height context.drawImage img, 0, 0 me.setStatus "#{file.info.name} (#{file.info.size} Kb) - #{img.width}x#{img.height}" - , "blob" + , "binary" menu: () -> me = @