From 98d0ce19e5e6dd08bda2163639039daf2762818b Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Fri, 3 Dec 2021 17:36:24 +0000 Subject: [PATCH] wip #4937 @3 --- inc/ws/Controlleur/class.ws.url.php | 3 +- inc/ws/Util/packager/_common.php | 2 + .../packager/class.ws.packager.chromeos.php | 46 +++++++++++++++++++ .../class.ws.packager.mac.exe.html.php | 2 +- inc/ws/Util/packager/class.ws.packager.php | 2 + 5 files changed, 53 insertions(+), 2 deletions(-) create mode 100644 inc/ws/Util/packager/class.ws.packager.chromeos.php diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php index cb7d64b9c..262b9d289 100644 --- a/inc/ws/Controlleur/class.ws.url.php +++ b/inc/ws/Controlleur/class.ws.url.php @@ -461,7 +461,6 @@ class wsUrl public static function getSelectVersions($versions) { - fb($versions); $res = array('-----' => ''); $e = explode(',', $versions); @@ -561,7 +560,9 @@ class wsUrl $versions['win_exe_html'] = array('title' => __('Version offline') . ' - ' . __('ZIP Windows'), 'icon' => cubeMedia::silk('application_view_tile.png')); $versions['mac_exe_html'] = array('title' => __('Version offline') . ' - ' . __('Exécutable Mac OS X'), 'icon' => cubeMedia::image(IMG . '/macos.png')); $versions['win_cd_html'] = array('title' => __('Version offline') . ' - ' . __('CD-ROM') . ' / ' . __('Clé USB'), 'icon' => cubeMedia::silk('cd.png')); + //$versions['chromeos'] = array('title' => __('Version offline') . ' - ' . __('ChromeOS'), 'icon' => cubeMedia::silk('cd.png')); $versions['win_html'] = array('title' => __('Version offline') . ' - ' . __('HTML') . ' (' . __('Non adaptée à l\'installation sur un serveur web') . ')', 'icon' => cubeMedia::silk('cd.png')); + if ($droits->admin) { $versions['phonegap'] = array('title' => __('Version offline') . ' - ' . __('Application mobile'), 'icon' => cubeMedia::image(IMG . '/phonegap.png')); $versions['precompiled'] = array('title' => __('Version precompilée'), 'icon' => cubeMedia::image(IMG . '/phonegap.png')); diff --git a/inc/ws/Util/packager/_common.php b/inc/ws/Util/packager/_common.php index 85c702090..ece243151 100644 --- a/inc/ws/Util/packager/_common.php +++ b/inc/ws/Util/packager/_common.php @@ -17,6 +17,8 @@ $__autoload['wsPackagerWinCDHTML'] = dirname(__FILE__) . '/class.ws.packager.win $__autoload['wsPackagerMacEXEHTML'] = dirname(__FILE__) . '/class.ws.packager.mac.exe.html.php'; $__autoload['wsPackagerPrecompiled'] = dirname(__FILE__) . '/class.ws.packager.precompiled.php'; +$__autoload['wsPackagerChromeOS'] = dirname(__FILE__) . '/class.ws.packager.chromeos.php'; + $__autoload['wsPackagerWinHTML'] = dirname(__FILE__) . '/class.ws.packager.win.html.php'; diff --git a/inc/ws/Util/packager/class.ws.packager.chromeos.php b/inc/ws/Util/packager/class.ws.packager.chromeos.php new file mode 100644 index 000000000..2c3b16d3a --- /dev/null +++ b/inc/ws/Util/packager/class.ws.packager.chromeos.php @@ -0,0 +1,46 @@ +version = 'chromeos'; + $this->cleanOnDestruct = false; + } + + protected function preparePackage() + { + $res = parent::preparePackage(); + $manifest = ['name' => $this->book->parametres->offlineTitle == '' ? $this->book->parametres->title : $this->book->parametres->offlineTitle, + 'version' => '1.0.' . time(), + 'manifest_version' => 3, + //'default_locale' => $this->book->lang, + //'icons' => [], + 'permissions' => [ + 'webview', + ] + ]; +// $sizes=[128,64,32,16]; +// $pngFile = WS_THEMES . '/' . $this->theme->theme_id . '/' . $this->theme->parametres->favicon; +// foreach ($sizes as $size) { +// +// } + + file_put_contents($this->vdir . '/m/manifest.json', json_encode($manifest)); + return $res; + } + +// public function makePackage($zip) +// { +// $this->preparePackage(); +// +// $chrome = new CubeIT_CommandLine('crx3'); +// $chrome->setArg('o', WS_PACKAGER . '/download/' . $this->getBaseFile() . '.crx'); +// $chrome->setArg(null, $this->vdir.'/m/'); +// $chrome->execute(); +// $chrome->debug(); +// +// return $this->getURLBase('crx'); +// } +} \ No newline at end of file diff --git a/inc/ws/Util/packager/class.ws.packager.mac.exe.html.php b/inc/ws/Util/packager/class.ws.packager.mac.exe.html.php index 7ce274c8d..1b868d2c9 100644 --- a/inc/ws/Util/packager/class.ws.packager.mac.exe.html.php +++ b/inc/ws/Util/packager/class.ws.packager.mac.exe.html.php @@ -3,7 +3,7 @@ class wsPackagerMacEXEHTML extends wsPackagerWinEXEHTML { protected $nwplatform = 'osx64'; - //protected $nwversion = '0.49.2'; + protected $nwversion = '0.49.2'; protected $node_platform = 'mac'; protected $exenameMaxlength = 28; diff --git a/inc/ws/Util/packager/class.ws.packager.php b/inc/ws/Util/packager/class.ws.packager.php index 140e4f7e6..fba50a74b 100644 --- a/inc/ws/Util/packager/class.ws.packager.php +++ b/inc/ws/Util/packager/class.ws.packager.php @@ -46,6 +46,8 @@ class wsPackager $packager = new wsPackagerWinCDHTML($book_id); } else if ($version === 'precompiled') { $packager = new wsPackagerPrecompiled($book_id); + } else if ($version === 'chromeos') { + $packager = new wsPackagerChromeOS($book_id); } $packager->cleanOnDestruct = $packager->cleanOnDestruct && $cleanOnDestruct; -- 2.39.5