add file sync mechanism between apps

This commit is contained in:
Xuan Sang LE
2018-01-30 14:47:27 +01:00
parent 1311ea2a88
commit 02422319ca
8 changed files with 161 additions and 46 deletions

View File

@ -88,7 +88,15 @@ self.OS or=
($ "#wrapper").empty()
_GUI.clearTheme()
_courrier.observable = riot.observable()
_courrier.quota = 0
_OS.APP = {}
_OS.setting =
user: {}
applications: {}
desktop: {}
appearance: {}
VFS: {}
system: {}
_PM.processes = {}
_PM.pidalloc = 0

View File

@ -61,7 +61,7 @@ self.OS.GUI =
_courrier.osfail "Cannot read service script: #{srv} ", e, s
appsByMime: (mime) ->
metas = ( a.meta for k, a of _OS.APP when a and a.type is 1)
metas = ( v for k, v of _OS.setting.system.packages when v.app )
mimes = ( m.mimes for m in metas when m)
apps = []
# search app by mimes
@ -80,9 +80,9 @@ self.OS.GUI =
openWith: (it) ->
return unless it
console.log "open #{it.path}"
return _GUI.launch it.app if it.type is "app" and it.app
apps = _GUI.appsByMime ( if it.type is "dir" then "dir" else it.mime )
return OS.info "No application available to open #{it.filename}" if apps.length is 0
return _courrier.osinfo "No application available to open #{it.filename}" if apps.length is 0
return _GUI.launch apps[0].app, [it.path] if apps.length is 1
list = ( { text: e.app, icon: e.icon, iconclass: e.iconclass } for e in apps )
_GUI.openDialog "SelectionDialog", ( d ) ->
@ -186,8 +186,8 @@ self.OS.GUI =
# desktop default file manager
desktop = $ "#desktop"
fp = _OS.setting.desktop.path.asFileHandler()
desktop[0].fetch = () ->
fp = _OS.setting.desktop.path.asFileHandler()
fn = () ->
fp.read (d) ->
return _courrier.osfail d.error, (_API.throwe "OS.VFS"), d.error if d.error
@ -239,7 +239,9 @@ self.OS.GUI =
console.log "context menu handler for desktop"
desktop[0].fetch()
_courrier.trigger "desktoploaded"
_courrier.observable.on "VFS", (d) ->
desktop[0].fetch() if d.data.file.hash() is fp.hash() or d.data.file.parent().hash() is fp.hash()
_courrier.ostrigger "desktoploaded"
# mount it
riot.mount desktop
, (e, s) ->
@ -256,7 +258,7 @@ self.OS.GUI =
child: [
{
text: "Application",
child: [],
child: ( v for k, v of _OS.setting.system.packages when v.app ),
dataid: "sys-apps"
iconclass: "fa fa-adn",
onmenuselect: (d) ->
@ -273,13 +275,7 @@ self.OS.GUI =
return _API.handler.logout() if d.item.data.dataid is "sys-logout"
_GUI.launch d.item.data.app unless d.item.data.dataid
#now get app list
_API.packages.fetch (r) ->
if r.result
r.result = ( it for it in r.result when it.app )
v.text = v.name for k, v of r.result
menu.child[0].child = r.result if r.result
($ "[data-id = 'os_menu']", "#syspanel")[0].set "items", [menu]
($ "[data-id = 'os_menu']", "#syspanel")[0].set "items", [menu]
#console.log menu
@ -329,14 +325,23 @@ self.OS.GUI =
_GUI.initDM()
_courrier.observable.one "syspanelloaded", () ->
# TODO load packages list then build system menu
# push startup services
# TODO: get services list from user setting
_GUI.buildSystemMenu()
_GUI.pushServices [
"CoreServices/PushNotification",
"CoreServices/Spotlight",
"CoreServices/Calendar"
]
_API.packages.fetch (r) ->
if r.result
for k, v of r.result
v.text = v.name
v.filename = k
v.type = "app"
v.mime = "antos/app"
v.iconclass = "fa fa-adn" unless v.iconclass or v.icon
_OS.setting.system.packages = if r.result then r.result else
_GUI.buildSystemMenu()
# push startup services
# TODO: get services list from user setting
_GUI.pushServices [
"CoreServices/PushNotification",
"CoreServices/Spotlight",
"CoreServices/Calendar"
]
# startup application here
_courrier.observable.one "desktoploaded", () ->

View File

@ -62,7 +62,8 @@
v.text = v.filename
if(v.text.length > 10)
v.text = v.text.substring(0,9) + "..."
v.iconclass = v.type
v.iconclass = v.iconclass?v.iconclass:v.type
v.icon = v.icon
items.push(v)
})
self.refs.listview.root.set("items", items)
@ -71,7 +72,7 @@
var rows = []
$.each(self.data, function(i,v){
if(v.filename[0] == '.' && !self.showhidden) return
var row = [{value:v.filename, iconclass: v.type},{value:v.mime},{value:v.size},{idx:i}]
var row = [{value:v.filename, iconclass: v.iconclass?v.iconclass:v.type, icon:v.icon},{value:v.mime},{value:v.size},{idx:i}]
rows.push(row)
})
self.refs.gridview.root.set("rows",rows)
@ -94,7 +95,8 @@
v.nodes = []
v.open = false
}
v.iconclass = v.type
v.iconclass = v.iconclass?v.iconclass:v.type
v.icon = v.icon
nodes.push(v)
})
return nodes
@ -186,7 +188,7 @@
})
self.root.observable.on("filedbclick", function(e){
if(e.id != self.rid ) return
if(e.data.type == "file" && self.onfileopen)
if(e.data.type != "dir" && self.onfileopen)
self.onfileopen(e.data)
else if(self.chdir && e.data.type == "dir")
self.chdir(e.data.path)

View File

@ -64,7 +64,7 @@ class BasicFileHandler
me.meta (d) ->
if d.error
return if err then err d else _courrier.osfail d.error, (_API.throwe "OS.VFS"), d.error
me.meta = d.result
me.info = d.result
me.ready = true
f()
@ -73,19 +73,28 @@ class BasicFileHandler
@onready (() -> me.action "read", null, f)
write: (d, f) ->
@action "write", d, f
me = @
@action "write", d, (r) ->
_courrier.ostrigger "VFS", { m: "write", file: me } if r.result
f r
mk: (d, f) ->
me = @
@onready (() -> me.action "mk", d, f)
@onready (() -> me.action "mk", d, (r) ->
_courrier.ostrigger "VFS", { m: "mk", file: me } if r.result
f r)
remove: (f) ->
me = @
@onready (() -> me.action "remove", null, f)
@onready (() -> me.action "remove", null, (r) ->
_courrier.ostrigger "VFS", { m: "remove", file: me } if r.result
f r)
upload: (f) ->
me = @
@onready (() -> me.action "upload", null, f)
@onready (() -> me.action "upload", null, (r) ->
_courrier.ostrigger "VFS", { m: "upload", file: me } if r.result
f r)
download: (f) ->
me = @
@ -93,7 +102,9 @@ class BasicFileHandler
move: (d, f) ->
me = @
@onready (() -> me.action "move", d, f)
@onready (() -> me.action "move", d, (r) ->
_courrier.ostrigger "VFS", { m: "move", file: d.asFileHandler() } if r.result
f r)
execute: (f) ->
me = @
@ -123,21 +134,21 @@ class RemoteFileHandler extends self.OS.API.VFS.BasicFileHandler
me = @
switch n
when "read"
return _API.handler.scandir @path, f if @meta.type is "dir"
return _API.handler.scandir @path, f if @info.type is "dir"
#read the file
_API.handler.readfile @path, f
when "mk"
return f { error: "#{@path} is not a directory" } if @meta.type is "file"
return f { error: "#{@path} is not a directory" } if @info.type is "file"
_API.handler.mkdir "#{@path}/#{p}", f
when "write"
_API.handler.write @path, p, f
when "upload"
return if @meta.type is "file"
return if @info.type is "file"
_API.handler.upload @path, f
when "remove"
_API.handler.delete @path, f
when "download"
return if @meta.type is "dir"
return if @info.type is "dir"
_API.handler.fileblob @path, (d) ->
blob = new Blob [d], { type: "octet/stream" }
_API.saveblob me.basename, blob
@ -152,6 +163,41 @@ self.OS.API.VFS.RemoteFileHandler = RemoteFileHandler
class ApplicationHandler extends self.OS.API.VFS.BasicFileHandler
constructor: (path) ->
super path
@info = _OS.setting.system.packages[@basename] if @basename
@ready = true
meta: (f) ->
f()
action: (n, p, f) ->
me = @
switch n
when "read"
return f { result: @info } if @info
return unless @isRoot()
f { result: ( v for k, v of _OS.setting.system.packages ) }
when "mk"
return
when "write"
return
when "upload"
# install
return
when "remove"
#uninstall
return
when "download"
return
when "move"
return
else
return _courrier.osfail "VFS unknown action: #{n}", (_API.throwe "OS.VFS"), n
self.OS.API.VFS.ApplicationHandler = ApplicationHandler