From 96ef0ac0dee1204b1b3d25f193e1519c561c3452 Mon Sep 17 00:00:00 2001 From: lxsang Date: Wed, 24 Aug 2022 13:34:57 +0200 Subject: [PATCH] Libreoffice: improvement + add features --- LibreOffice/README.md | 5 + LibreOffice/api/api.lua | 25 +++- LibreOffice/build/debug/README.md | 5 + LibreOffice/build/debug/api/api.lua | 25 +++- LibreOffice/build/debug/main.js | 2 +- LibreOffice/build/debug/package.json | 2 +- LibreOffice/build/release/LibreOffice.zip | Bin 43422 -> 45103 bytes LibreOffice/main.ts | 139 ++++++++++++++++++---- LibreOffice/package.json | 2 +- packages.json | 2 +- 10 files changed, 177 insertions(+), 30 deletions(-) diff --git a/LibreOffice/README.md b/LibreOffice/README.md index 483f205..2109173 100644 --- a/LibreOffice/README.md +++ b/LibreOffice/README.md @@ -9,4 +9,9 @@ It support a wide range of documents. ![https://github.com/lxsang/antosdk-apps/blob/master/LibreOffice/libreoffice.png?raw=true](https://github.com/lxsang/antosdk-apps/blob/master/LibreOffice/libreoffice.png?raw=true) ## Change log +- v 0.1.1-a: + * improve UI handling + * add Save as option + * add traditional AntOS application File menu + * fetch supported mimes from discovery URL - v 0.1.0-a: Initial version diff --git a/LibreOffice/api/api.lua b/LibreOffice/api/api.lua index fb88bb0..b84d990 100644 --- a/LibreOffice/api/api.lua +++ b/LibreOffice/api/api.lua @@ -1,11 +1,14 @@ local args=... + +--LOG_ROOT = ulib.getenv("HOME") + if not args then args = REQUEST end local vfs = require("vfs") local DLCMD="wget --no-check-certificate -O" local handle = {} - +--local logger = Logger:new{ levels = {INFO = true, ERROR = true, DEBUG = false}} local result = function(data) return { error = false, result = data } end @@ -24,6 +27,21 @@ handle.token = function(data) return result(ret) end +handle.duplicate = function(data) + if not data.src or not data.dest then + return error("Unknow source or destination file") + end + local real_src = vfs.ospath(data.src) + local real_dest = vfs.ospath(data.dest) + if not ulib.exists(real_src) then + return error("Source file doesnt exist") + end + if not ulib.send_file(real_src, real_dest) then + return error("Unable to duplicate file") + end + return result(true) +end + handle.discover = function(data) local tmpfile = "/tmp/libreoffice_discover.xml" local cmd = DLCMD.." "..tmpfile..' '..data.uri @@ -67,7 +85,8 @@ handle.file = function(data) Size = math.floor(stat.size), UserCanWrite = vfs.checkperm(data.file,"write"), mime = stat.mime, - PostMessageOrigin = "*" + PostMessageOrigin = "*", + UserCanNotWriteRelative = false } else return error("Unknown request") @@ -75,6 +94,8 @@ handle.file = function(data) end +--logger:info(JSON.encode(REQUEST)) + if args.action and handle[args.action] then return handle[args.action](args.args) else diff --git a/LibreOffice/build/debug/README.md b/LibreOffice/build/debug/README.md index 483f205..2109173 100644 --- a/LibreOffice/build/debug/README.md +++ b/LibreOffice/build/debug/README.md @@ -9,4 +9,9 @@ It support a wide range of documents. ![https://github.com/lxsang/antosdk-apps/blob/master/LibreOffice/libreoffice.png?raw=true](https://github.com/lxsang/antosdk-apps/blob/master/LibreOffice/libreoffice.png?raw=true) ## Change log +- v 0.1.1-a: + * improve UI handling + * add Save as option + * add traditional AntOS application File menu + * fetch supported mimes from discovery URL - v 0.1.0-a: Initial version diff --git a/LibreOffice/build/debug/api/api.lua b/LibreOffice/build/debug/api/api.lua index fb88bb0..b84d990 100644 --- a/LibreOffice/build/debug/api/api.lua +++ b/LibreOffice/build/debug/api/api.lua @@ -1,11 +1,14 @@ local args=... + +--LOG_ROOT = ulib.getenv("HOME") + if not args then args = REQUEST end local vfs = require("vfs") local DLCMD="wget --no-check-certificate -O" local handle = {} - +--local logger = Logger:new{ levels = {INFO = true, ERROR = true, DEBUG = false}} local result = function(data) return { error = false, result = data } end @@ -24,6 +27,21 @@ handle.token = function(data) return result(ret) end +handle.duplicate = function(data) + if not data.src or not data.dest then + return error("Unknow source or destination file") + end + local real_src = vfs.ospath(data.src) + local real_dest = vfs.ospath(data.dest) + if not ulib.exists(real_src) then + return error("Source file doesnt exist") + end + if not ulib.send_file(real_src, real_dest) then + return error("Unable to duplicate file") + end + return result(true) +end + handle.discover = function(data) local tmpfile = "/tmp/libreoffice_discover.xml" local cmd = DLCMD.." "..tmpfile..' '..data.uri @@ -67,7 +85,8 @@ handle.file = function(data) Size = math.floor(stat.size), UserCanWrite = vfs.checkperm(data.file,"write"), mime = stat.mime, - PostMessageOrigin = "*" + PostMessageOrigin = "*", + UserCanNotWriteRelative = false } else return error("Unknown request") @@ -75,6 +94,8 @@ handle.file = function(data) end +--logger:info(JSON.encode(REQUEST)) + if args.action and handle[args.action] then return handle[args.action](args.args) else diff --git a/LibreOffice/build/debug/main.js b/LibreOffice/build/debug/main.js index 5b1abbe..795d625 100644 --- a/LibreOffice/build/debug/main.js +++ b/LibreOffice/build/debug/main.js @@ -1 +1 @@ -var OS;!function(e){let t;!function(e){class t extends e.BaseApplication{constructor(e){super("LibreOffice",e),this.access_token=void 0,this.curr_file=void 0,this.eid="id"+Math.random().toString(36).replace(".",""),this.iframe=void 0,this.post_msg_handle=e=>{this.process_iframe_msg(e)}}main(){this.args&&this.args.length>0&&(this.curr_file=this.args[0].path.asFileHandle()),this.placeholder=this.find("editor-area"),this.placeholder.id=this.eid,this.find("btn-open-file").onbtclick=e=>{this.openFile()},this.find("btn-new-doc").onbtclick=e=>{this.create("word")},this.find("btn-new-cell").onbtclick=e=>{this.create("sheet")},this.find("btn-new-slide").onbtclick=e=>{this.create("slide")},$(window).on("message",this.post_msg_handle),this.discover().then(e=>{this.editor_meta=e,this.curr_file&&this.open()}).catch(e=>{this.error(__("Unable to discover LibreOffice service: {0}",e.toString()),e),this.quit(!0)})}update_title(){let e=this.curr_file.path;this.curr_file.dirty&&(e+=" "+__("(modified)")),this.scheme.apptitle=e}post_message(e,t){console.log("sending",e);let i={MessageId:e,SendTime:Date.now()};t&&(i.Values=t),this.iframe.contentWindow.postMessage(JSON.stringify(i),"*")}process_iframe_msg(e){if(e.originalEvent.source!=this.iframe.contentWindow)return;let t=e.originalEvent,i=JSON.parse(t.data);switch(i.MessageId){case"Action_Load_Resp":i.Values.success||this.error(i.Values.errorMsg);break;case"App_LoadingStatus":"Document_Loaded"==i.Values.Status&&(this.post_message("Host_PostmessageReady"),this.trigger("document_file_loaded"),this.post_message("Insert_Button",{id:"lool_new_file",imgurl:"data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABmJLR0QA/wD/AP+gvaeTAAABmklEQVRIie2Vv0tbURTHP+fmJTGpIYM/KEoUHItOEtIu6uTk2r9BcNMWuro62X9D6OTWIhp00baLCI2giKKYVoMtJtTE93JPhyLSpyavLxE69Due+73nwzn3nnvhkSX+wNut2pugm9XapdkXicO/A3ysaZDk3UnD9yt77KETs9mOg4d8Jkiy+9TTCc8HIpmoSH7xU3Wo7QCA3k5DLtMY0hIgCKRlwB8QI6v+NSds0sKZpXBm/eFBf6AtFTTSf0BThT5kvxRw620G1FUREQxwUraUa3c9LbXoa0XZLbkUSpYBd4Pp+Bz6eTQJoPo7d0sVVD14FZ8mbc5JU8IRF6/CnpsfSXlr5iVsvw9VQa0Ox5eWRP0b/ZF9uqSII+7Nch+QwthJVSTUc31aUXqvN5npeE2Uexp/q5VQFfQkhCN9hquxZtb1f3PQzq+UQflCVK6bWcdCAboSQtHJMf/zHVV98pBt0Rnfmbx7TYWFZoC4A5m0oVh+mr2gP5viIpbUH7GIeAKcAilUPogQ6H9vqJuB8taGp9z88LJ/0H4BR3aNW1eB/4cAAAAASUVORK5CYII=",label:__("New file").__(),hint:__("Create new document").__(),insertBefore:"save"}),this.post_message("Insert_Button",{id:"lool_open_file",imgurl:"data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAD8UlEQVR42q1Va2gcVRQ+587s7mRItNskfaY1trRi2sZHNYoQHzGmQkAMlNZK1R+l0R+K/REhRAmzIEElaqX2R/tDhZamov4QbV0a6V9Nm9DiI8QEEtpI8zDbPPfh7sw93juzOzv7Ugge2L3nztz7fed859w7CHmGiKocYHVGwswcvLwFWnNzc3tLS8sjaTIvcX4kBZvD4fBAf3//aeEmShGUd3Z2nu7q6noBHZPABOjA2/9ijs4+wiwrydehUKivp6fnqPCjOQSHPhrTmKI2XP/uA33/k9s6Ot58rSkNnvPzZlKQkTDDMM4XJXjp08m3aiqV9xUex3sqZqCtqZ6QMSeDdKQeEoISGQiCvo9PfnY0tjBVQNC9d7vf0Fkcq2AK9jXeR8wrEQB6Ii8gkJWV/skz4ZlLI8posKbOQmQfnnl9y/f2gsMnbnbvuctnaCwOm9QZaH3ifmAlpCklj7RvLw/Bn8lqSPAy+PVGKnT2ja0hN4MdmxTDDzGs1Wbh+aYHXVm8kebNM5m4En3TfxXGY1WUBB3HblmGyCBLsLUaDZViuLN8DvY/s9cL+p8SZQi+DF+BkaW1ZKKON/+iLIGUaEMQDMZjsHtNBA7ue6hAnlISCfldv++HK/DL7SBwpsP0PGQlOnh8onttBRpgruDD6xbgcGtDTgb5EkmXc27XVozus7MXr8Lg7BoCtRznlyF0/litgfUdAxcCqnovAK/l3IRKnWBz9Z155ZMZQEHUcnRcZz41twyROAJj8rZhN5KmOYxtvcMLLz5egxanCimrIiT2qUpBAT1sztzGppw1psXBIlkj0aQIsYHRSAqffnd4fOeWDRoRXy8iYgGBXab5PKDu1SAxwQXOji5BPGlCirNMB94em5xdxGffGx3as23zRotbLoGu+XMzQEgDOagZAqE/SplknUzLwtjfFqDiJ9kTDNn8bxO3JvC53vEfG+o21okF68VWTBN4znnaIUpzkJ2JBBZ1BlVVIJlMwUrCBKb43E2MscXBkekhPHBi8qvHdlc3Eqd1Ygtqoj56ma94Dci5FmT3ZEZRO4jGUwTMZzebXCIlFXkt/Tw8dwlfPjV9qrE+2MYYVckMHAK/q3uGwBN9uj3JliUaN4UsPoK8QyeT+un3hXPY/nmk59FdFa8GfBSUb/2MQ1lALXrXULYOIMDB0bz4BzCaoMTgSPQ4Hju31LHrbu0dXaM7ZDmJmxmof29T+wCq6QNCdmtmw0BcXOHJPyaTb2PvxciRYGX5J5wsvQRocYLSa5yTbiGPLifasfXAkada2g59kTKpuC6rNJ+C1uULX78iPlxKgHPrAfGssqiYqzOZRURRlGv/F2BJ+wdsRP1yLA0KOQAAAABJRU5ErkJggg==",label:__("Open file").__(),hint:__("Open document").__(),insertBefore:"lool_new_file"})),"Frame_Ready"==i.Values.Status&&$(this.iframe).css("visibility","visible");break;case"Doc_ModifiedStatus":this.curr_file.dirty=i.Values.Modified,this.update_title();break;case"Clicked_Button":switch(i.Values.Id){case"lool_open_file":this.check_dirty().then(e=>this.openFile());break;case"lool_new_file":this.check_dirty().then(e=>this.new_document())}break;default:console.log(i)}}new_document(){this.openDialog("SelectionDialog",{title:__("Create new"),data:[{text:__("Document"),iconclass:"fa fa-file-word-o",type:"word"},{text:__("Spreadsheet"),iconclass:"fa fa-file-excel-o",type:"sheet"},{text:__("Presentation"),iconclass:"fa fa-file-powerpoint-o",type:"slide"}]}).then(e=>{this.create(e.type)})}discover(){return new Promise(async(e,i)=>{try{let i=await t.discovery_uri.asFileHandle().read(),s=(new DOMParser).parseFromString(i,"text/xml").getElementsByTagName("app"),a={};if(s)for(let e of s){let t=e.getElementsByTagName("action");if(t)for(let e of t){let t=e.getAttribute("ext"),i=e.getAttribute("urlsrc");t&&""!=t&&i&&(a[t]=i)}}e(a)}catch(e){i(__e(e))}})}openFile(){this.openDialog("FileDialog",{title:__("Open file"),type:"file",mimes:this.meta().mimes}).then(e=>{this.curr_file=e.file.path.asFileHandle(),this.open()})}create(e){let t=void 0;switch(e){case"word":t="docx";break;case"sheet":t="xlsx";break;case"slide":t="pptx";break;default:this.error(__("Unknown doc type {0}",e))}this.openDialog("FileDialog",{title:__("Save file as"),type:"dir",file:("home://Untitled."+t).asFileHandle()}).then(async e=>{try{let i=`${e.file.path}/${e.name}`.asFileHandle(),s=`${this.path()}/templates/model.${t}`.asFileHandle(),a=await s.read("binary"),r=new Blob([a],{type:s.info.mime});i.cache=r,await i.write(s.info.mime),i.cache=void 0,this.curr_file=i,this.open()}catch(e){this.error(__("Unable to create document {0}",e.toString()),e)}})}open(){this.scheme.apptitle=__("Libre Office Online"),this.curr_file&&this.exec({action:"token",args:{file:this.curr_file.path}}).then(e=>{if(e.error)return void this.error(e.error);this.access_token=e.result.sid;let t=this.editor_meta[this.curr_file.ext];if(!t)return this.error(__("Unknown editor for extension {0}",this.curr_file.ext));$(this.placeholder).empty();let i=$("