From 79138f4198da5b4c92edb63be70f9fb15361f7d3 Mon Sep 17 00:00:00 2001
From: Xuan Sang LE <xsang.le@gmail.com>
Date: Tue, 27 Feb 2018 16:40:36 +0100
Subject: [PATCH] working on VFS binding of Google drive

---
 Makefile                               |  1 +
 src/core/api.coffee                    | 41 ++++++++++-------
 src/core/gui.coffee                    | 26 +----------
 src/core/handlers/RemoteHandler.coffee |  2 +-
 src/core/settings.coffee               | 33 ++++++++++++++
 src/core/vfs/GoogleDriveHandler.coffee | 62 ++++++++++++++++++++++++++
 src/packages/Files/main.coffee         | 40 +++++++++++------
 src/packages/MarkOn/main.coffee        | 13 +++---
 src/packages/NotePad/main.coffee       |  4 +-
 9 files changed, 161 insertions(+), 61 deletions(-)
 create mode 100644 src/core/settings.coffee

diff --git a/Makefile b/Makefile
index 38760e5..54532cc 100644
--- a/Makefile
+++ b/Makefile
@@ -6,6 +6,7 @@ NC=\033[0m
 
 coffees= 	src/core/core.coffee\
         	src/core/api.coffee\
+			src/core/settings.coffee\
         	src/core/handlers/RemoteHandler.coffee\
         	src/core/vfs.coffee\
 			src/core/vfs/GoogleDriveHandler.coffee\
diff --git a/src/core/api.coffee b/src/core/api.coffee
index 3df26ae..0bebe21 100644
--- a/src/core/api.coffee
+++ b/src/core/api.coffee
@@ -156,23 +156,34 @@ self.OS.API =
         path = "resources/#{r}"
         _API.get path, c, f
     
+    libready: (l) ->
+        return _API.shared[l] || false
+
     require: (l,f) ->
-        path = "os:///scripts/"
         if not _API.shared[l]
-            js = "#{path}#{l}.js"
-            js.asFileHandler().onready (d) ->
-                _API.shared[l] = true
-                el = $ '<script>', { src: "#{_API.handler.get}/#{js}" }
-                        .appendTo 'head'
-                #load css file
-                css =  "#{path}#{l}.css"
-                css.asFileHandler().onready (d) ->
-                    el = $ '<link>', { rel: 'stylesheet', type: 'text/css', 'href': "#{_API.handler.get}/#{css}" }
-                        .appendTo 'head'
-                , () ->
-                console.log "loaded", l
-                _courrier.trigger "sharedlibraryloaded", l
-                f() if f
+            if l.match /^(https?:\/\/[^\s]+)/g
+                _API.script l, () ->
+                    _API.shared[l] = true
+                    _courrier.trigger "sharedlibraryloaded", l
+                    f() if f
+                , (e, s) ->
+                    _courrier.oserror "Cannot load 3rd library at: #{l}", e, r
+            else
+                path = "os:///scripts/"
+                js = "#{path}#{l}.js"
+                js.asFileHandler().onready (d) ->
+                    _API.shared[l] = true
+                    el = $ '<script>', { src: "#{_API.handler.get}/#{js}" }
+                            .appendTo 'head'
+                    #load css file
+                    css =  "#{path}#{l}.css"
+                    css.asFileHandler().onready (d) ->
+                        el = $ '<link>', { rel: 'stylesheet', type: 'text/css', 'href': "#{_API.handler.get}/#{css}" }
+                            .appendTo 'head'
+                    , () ->
+                    console.log "loaded", l
+                    _courrier.trigger "sharedlibraryloaded", l
+                    f() if f
         else
             console.log l, "Library exist, no need to load" 
             _courrier.trigger "sharedlibraryloaded", l
diff --git a/src/core/gui.coffee b/src/core/gui.coffee
index 4ed865f..e2f7697 100644
--- a/src/core/gui.coffee
+++ b/src/core/gui.coffee
@@ -352,30 +352,8 @@ self.OS.GUI =
         # clean up things
         _OS.cleanup()
         # get setting from conf
-        _OS.setting.desktop = conf.desktop if conf.desktop
-        _OS.setting.applications = conf.applications if conf.applications
-        _OS.setting.appearance = conf.appearance if conf.appearance
-        _OS.setting.user = conf.user
-        _OS.setting.VFS = conf.VFS if conf.VFS
-        _OS.setting.desktop.path = "home:///.desktop" unless _OS.setting.desktop.path
-        _OS.setting.desktop.menu = {} unless _OS.setting.desktop.menu
-        _OS.setting.VFS.mountpoints = [
-            #TODO: multi app try to write to this object, it neet to be cloned
-            { text: "Applications", path: 'app:///', iconclass: "fa  fa-adn", type: "app" },
-            { text: "Home", path: 'home:///', iconclass: "fa fa-home", type: "fs" },
-            { text: "OS", path: 'os:///', iconclass: "fa fa-inbox", type: "fs" },
-            { text: "Desktop", path: _OS.setting.desktop.path , iconclass: "fa fa-desktop", type: "fs" },
-            { text: "Shared", path: 'shared:///' , iconclass: "fa fa-share-square", type: "fs" }
-        ] if not _OS.setting.VFS.mountpoints
-
-        _OS.setting.system = conf.system if conf.system
-        _OS.setting.system.pkgpaths = [
-            "home:///.packages",
-            "os:///packages"
-        ] unless _OS.setting.system.pkgpaths
-        _OS.setting.system.menu = {} unless _OS.setting.system.menu
-        _OS.setting.system.repositories = [] unless _OS.setting.system.repositories
-        _OS.setting.appearance.theme = "antos" unless _OS.setting.appearance.theme
+        _OS.systemSetting(conf)
+        console.log _OS.setting
         # load theme
         _GUI.loadTheme _OS.setting.appearance.theme
         # initDM
diff --git a/src/core/handlers/RemoteHandler.coffee b/src/core/handlers/RemoteHandler.coffee
index bca1db1..9481505 100644
--- a/src/core/handlers/RemoteHandler.coffee
+++ b/src/core/handlers/RemoteHandler.coffee
@@ -84,7 +84,7 @@ self.OS.API.handler =
         , (e, s) ->
             _courrier.osfail "Fail to make request: #{p}", e, s
     
-    dbquery: (cmd,d, c) ->
+    dbquery: (cmd, d, c) ->
         path = "#{_REST}/db/#{cmd}"
         _API.post path, d, c, (e, s) ->
             _courrier.osfail "Fail to query data from database: #{path}", e, s
\ No newline at end of file
diff --git a/src/core/settings.coffee b/src/core/settings.coffee
new file mode 100644
index 0000000..8291fab
--- /dev/null
+++ b/src/core/settings.coffee
@@ -0,0 +1,33 @@
+ self.OS.systemSetting = (conf) ->
+    _OS.setting.desktop = conf.desktop if conf.desktop
+    _OS.setting.applications = conf.applications if conf.applications
+    _OS.setting.appearance = conf.appearance if conf.appearance
+    _OS.setting.user = conf.user
+    _OS.setting.VFS = conf.VFS if conf.VFS
+    _OS.setting.desktop.path = "home:///.desktop" unless _OS.setting.desktop.path
+    _OS.setting.desktop.menu = {} unless _OS.setting.desktop.menu
+    _OS.setting.VFS.mountpoints = [
+        #TODO: multi app try to write to this object, it neet to be cloned
+        { text: "Applications", path: 'app:///', iconclass: "fa  fa-adn", type: "app" },
+        { text: "Home", path: 'home:///', iconclass: "fa fa-home", type: "fs" },
+        { text: "OS", path: 'os:///', iconclass: "fa fa-inbox", type: "fs" },
+        { text: "Desktop", path: _OS.setting.desktop.path , iconclass: "fa fa-desktop", type: "fs" },
+        { text: "Shared", path: 'shared:///' , iconclass: "fa fa-share-square", type: "fs" }
+    ] if not _OS.setting.VFS.mountpoints
+
+    _OS.setting.system = conf.system if conf.system
+    _OS.setting.system.pkgpaths = [
+        "home:///.packages",
+        "os:///packages"
+    ] unless _OS.setting.system.pkgpaths
+    _OS.setting.system.menu = {} unless _OS.setting.system.menu
+    _OS.setting.system.repositories = [] unless _OS.setting.system.repositories
+    _OS.setting.appearance.theme = "antos" unless _OS.setting.appearance.theme
+
+    _OS.setting.VFS.gdrive = {
+        CLIENT_ID: "1006507170703-l322pfkrhf9cgta4l4jh2p8ughtc14id.apps.googleusercontent.com"
+        API_KEY: "AIzaSyBZhM5KbARvT10acWC8JQKlRn2WbSsmfLc"
+        apilink: "https://apis.google.com/js/api.js"
+        DISCOVERY_DOCS: ["https://www.googleapis.com/discovery/v1/apis/drive/v3/rest"]
+        SCOPES: 'https://www.googleapis.com/auth/drive.metadata.readonly'
+    } unless _OS.setting.VFS.gdrive
\ No newline at end of file
diff --git a/src/core/vfs/GoogleDriveHandler.coffee b/src/core/vfs/GoogleDriveHandler.coffee
index 0d16ab5..8a27c68 100644
--- a/src/core/vfs/GoogleDriveHandler.coffee
+++ b/src/core/vfs/GoogleDriveHandler.coffee
@@ -1,6 +1,68 @@
+
 # GoogleDrive File Handler
 class GoogleDriveHandler extends this.OS.API.VFS.BaseFileHandler
     constructor: (path) ->
         super path
+        me = @
+        @setting = _OS.setting.VFS.gdrive
+        return  _courrier.oserror "Unknown API setting for google drive VFS",   (_API.throwe "OS.VFS"), null unless @setting
+        @gid = 'root' if @isRoot()
+
+    oninit: (f) ->
+        me = @
+        return unless @setting
+        if _API.libready @setting.apilink
+            f()
+        else
+            _API.require @setting.apilink, () ->
+                gapi.load "client:auth2", () ->
+                    gapi.client.init {
+                        apiKey: me.setting.API_KEY,
+                        clientId: me.setting.CLIENT_ID,
+                        discoveryDocs: me.setting.DISCOVERY_DOCS,
+                        scope: me.setting.SCOPES
+                    }
+                    .then () ->
+                        fn = (r) ->
+                            return f() if r
+                            # perform the login
+                            gapi.auth2.getAuthInstance().signIn()
+
+                        gapi.auth2.getAuthInstance().isSignedIn.listen (r) ->
+                            fn(r)
+                        fn(gapi.auth2.getAuthInstance().isSignedIn.get())
+
+    meta: (f) ->
+        @oninit () ->
+            gapi.client.drive.files.list {
+                q: 'parents = "root" and trashed = false ',
+                fields: "nextPageToken, files(id, name)"
+            }
+            .then (r) ->
+                console.log(r)
+                f()
+    
+    action: (n, p, f) ->
+        me = @
+        switch n
+            when "read"
+                return
+            when "mk"
+                return
+            when "write"
+                return
+            when "upload"
+                return
+            when "remove"
+                return
+            when "publish"
+                return
+            when "download"
+                return
+            when "move"
+                return
+            else
+                return _courrier.osfail "VFS unknown action: #{n}", (_API.throwe "OS.VFS"), n
+
 
 self.OS.API.VFS.register "^gdv$", GoogleDriveHandler
\ No newline at end of file
diff --git a/src/packages/Files/main.coffee b/src/packages/Files/main.coffee
index b109054..0cd6ef5 100644
--- a/src/packages/Files/main.coffee
+++ b/src/packages/Files/main.coffee
@@ -65,6 +65,18 @@ class Files extends this.OS.GUI.BaseApplication
         @applySetting()
         @subscribe "VFS", (d) ->
             me.chdir null if d.data.file.hash() is me.currdir.hash() or d.data.file.parent().hash() is me.currdir.hash()
+        @bindKey "CTRL-F", () -> me.actionFile "#{me.name}-mkf"
+        @bindKey "CTRL-D", () -> me.actionFile "#{me.name}-mkdir"
+        @bindKey "CTRL-U", () -> me.actionFile "#{me.name}-upload"
+        @bindKey "CTRL-S", () -> me.actionFile "#{me.name}-share"
+        @bindKey "CTRL-I", () -> me.actionFile "#{me.name}-info"
+
+        @bindKey "CTRL-R", () -> me.actionEdit "#{me.name}-mv"
+        @bindKey "CTRL-M", () -> me.actionEdit "#{me.name}-rm"
+        @bindKey "CTRL-X", () -> me.actionEdit "#{me.name}-cut"
+        @bindKey "CTRL-C", () -> me.actionEdit "#{me.name}-copy"
+        @bindKey "CTRL-P", () -> me.actionEdit "#{me.name}-paste"
+
         @chdir null
 
     applySetting: (k) ->
@@ -98,14 +110,14 @@ class Files extends this.OS.GUI.BaseApplication
         arr = {
             text: "File",
             child: [
-                { text: "New file", dataid: "#{@name}-mkf" },
-                { text: "New folder", dataid: "#{@name}-mkdir" },
+                { text: "New file", dataid: "#{@name}-mkf", shortcut: 'C-F' },
+                { text: "New folder", dataid: "#{@name}-mkdir", shortcut: 'C-D' },
                 { text: "Open with", dataid: "#{@name}-open", child:@apps },
-                { text: "Upload", dataid: "#{@name}-upload" },
+                { text: "Upload", dataid: "#{@name}-upload", shortcut: 'C-U' },
                 { text: "Download", dataid: "#{@name}-download" },
-                { text: "Share file", dataid: "#{@name}-share" },
-                { text: "Properties", dataid: "#{@name}-info" }
-            ], onmenuselect: (e) -> me.actionFile e
+                { text: "Share file", dataid: "#{@name}-share", shortcut: 'C-S' },
+                { text: "Properties", dataid: "#{@name}-info", shortcut: 'C-I' }
+            ], onmenuselect: (e) -> me.actionFile e.item.data.dataid
         }
         return arr
     mnEdit: () ->
@@ -113,12 +125,12 @@ class Files extends this.OS.GUI.BaseApplication
         {
             text: "Edit",
             child: [
-                { text: "Rename", dataid: "#{@name}-mv" },
-                { text: "Delete", dataid: "#{@name}-rm" },
-                { text: "Cut", dataid: "#{@name}-cut" },
-                { text: "Copy", dataid: "#{@name}-copy" },
-                { text: "Paste", dataid: "#{@name}-paste" }
-            ], onmenuselect: (e) -> me.actionEdit e
+                { text: "Rename", dataid: "#{@name}-mv", shortcut: 'C-R' },
+                { text: "Delete", dataid: "#{@name}-rm", shortcut: 'C-M' },
+                { text: "Cut", dataid: "#{@name}-cut", shortcut: 'C-X' },
+                { text: "Copy", dataid: "#{@name}-copy", shortcut: 'C-C' },
+                { text: "Paste", dataid: "#{@name}-paste", shortcut: 'C-P' }
+            ], onmenuselect: (e) -> me.actionEdit e.item.data.dataid
         }
     menu: () ->
         me = @
@@ -173,7 +185,7 @@ class Files extends this.OS.GUI.BaseApplication
     actionEdit: (e) ->
         me = @
         file = @view.get "selectedFile"
-        switch e.item.data.dataid
+        switch e
             when "#{@name}-mv"
                 return unless file
                 @openDialog "PromptDialog",
@@ -226,7 +238,7 @@ class Files extends this.OS.GUI.BaseApplication
     actionFile: (e) ->
         me = @
         file = @view.get "selectedFile"
-        switch e.item.data.dataid
+        switch e
 
             when "#{@name}-mkdir"
                 @openDialog "PromptDialog",
diff --git a/src/packages/MarkOn/main.coffee b/src/packages/MarkOn/main.coffee
index ee5679d..177998e 100644
--- a/src/packages/MarkOn/main.coffee
+++ b/src/packages/MarkOn/main.coffee
@@ -44,6 +44,9 @@ class MarkOn extends this.OS.GUI.BaseApplication
                 me.currfile.dirty = true
                 me.scheme.set "apptitle", "#{me.currfile.basename}*"
         @on "hboxchange", (e) -> me.resizeContent()
+        @bindKey "ALT-O", () -> me.actionFile "#{me.name}-Open"
+        @bindKey "CTRL-S", () -> me.actionFile "#{me.name}-Save"
+        @bindKey "ALT-W", () -> me.actionFile "#{me.name}-Saveas"
         @resizeContent()
         @open @currfile
 
@@ -80,11 +83,11 @@ class MarkOn extends this.OS.GUI.BaseApplication
         menu = [{
                 text: "File",
                 child: [
-                    { text: "Open", dataid: "#{@name}-Open" },
-                    { text: "Save", dataid: "#{@name}-Save" },
-                    { text: "Save as", dataid: "#{@name}-Saveas" }
+                    { text: "Open", dataid: "#{@name}-Open", shortcut: "A-O" },
+                    { text: "Save", dataid: "#{@name}-Save", shortcut: "C-S" },
+                    { text: "Save as", dataid: "#{@name}-Saveas", shortcut: "A-W" }
                 ],
-                onmenuselect: (e) -> me.actionFile e
+                onmenuselect: (e) -> me.actionFile e.item.data.dataid
             }]
         menu
     
@@ -95,7 +98,7 @@ class MarkOn extends this.OS.GUI.BaseApplication
                 me.currfile.setPath "#{d}/#{n}"
                 me.save me.currfile
             , "Save as", { file: me.currfile }
-        switch e.item.data.dataid
+        switch e
             when "#{@name}-Open"
                 @openDialog "FileDiaLog", ( d, f ) ->
                     me.open "#{d}/#{f}".asFileHandler()
diff --git a/src/packages/NotePad/main.coffee b/src/packages/NotePad/main.coffee
index a2c9285..fae8a36 100644
--- a/src/packages/NotePad/main.coffee
+++ b/src/packages/NotePad/main.coffee
@@ -106,7 +106,7 @@ class NotePad extends this.OS.GUI.BaseApplication
         #@tabarea.set "closable", true
         @bindKey "ALT-O", () -> me.actionFile "#{me.name}-Open"
         @bindKey "CTRL-S", () -> me.actionFile "#{me.name}-Save"
-        @bindKey "META-S", () -> me.actionFile "#{me.name}-Saveas"
+        @bindKey "ALT-W", () -> me.actionFile "#{me.name}-Saveas"
         @open @currfile
     
     open: (file) ->
@@ -245,7 +245,7 @@ class NotePad extends this.OS.GUI.BaseApplication
                 child: [
                     { text: "Open", dataid: "#{@name}-Open", shortcut: "A-O"  },
                     { text: "Save", dataid: "#{@name}-Save", shortcut: "C-S" },
-                    { text: "Save as", dataid: "#{@name}-Saveas", shortcut: "M-S" }
+                    { text: "Save as", dataid: "#{@name}-Saveas", shortcut: "A-W" }
                 ],
                 onmenuselect: (e) -> me.actionFile e.item.data.dataid
             }]