From 2e6a3913fca02859060f3e3fe874abd5ae8a8099 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Thu, 14 Jan 2016 17:58:09 +0800 Subject: [PATCH] AssetTrait.php Asset.php --- Asset.php | 268 ------------------------------------------------- AssetTrait.php | 2 +- 2 files changed, 1 insertion(+), 269 deletions(-) diff --git a/Asset.php b/Asset.php index dfd511ac..9226b1fb 100644 --- a/Asset.php +++ b/Asset.php @@ -102,271 +102,3 @@ class Pman_Core_Asset extends Pman { } - -// a little experimental... we are going to use the same name as the class. for these.. - -trait Pman_Core_Asset_Trait { - - - - /** - * usage in template - * {outputJavascriptDir(#Hydra#,#Hydra.js",#.......#)} - * - * call_user - * - */ - - function outputJavascriptDir($path) - { - - $relpath = $this->rootURL . '/' . $path .'/'; - $ff = HTML_FlexyFramework::get(); - $dir = $this->rootDir.'/' . $path; - - $args = func_get_args(); - $ar = array(); - if (count($args) < 2) { - $ar = glob($dir . '/*.js'); - } else { - array_shift($args); - foreach($args as $f) { - if (strpos($f,'*') > -1) { - - $ar = array_merge($ar , glob($dir . '/'. $f)); - continue; - } - - $ar[] = $dir .'/'. $f; - } - - } - // cached version?? - how do we decide if it's expired? - // while scanning the directory is slow... - it's faster than serving every file... - - - //$path = $this->rootURL ."/Pman/$mod/"; - - - - $files = array(); - $arfiles = array(); - $maxtime = 0; - $mtime = 0; - foreach($ar as $fn) { - $f = basename($fn); - // got the 'module file..' - $mtime = filemtime($dir . '/'. $f); - $maxtime = max($mtime, $maxtime); - $arfiles[$fn] = $mtime; - $files[] = $relpath . $f . '?ts='.$mtime; - } - - ksort($arfiles); // just sort by name so it's consistant for serialize.. - - $ui = posix_getpwuid(posix_geteuid()); - - - $compiledir = session_save_path() . '/' . - $ui['name'] . '-' . $ff->project . '-' . $ff->version . '-jscompile'; - - if (!file_exists($compiledir)) { - mkdir($compiledir,0700,true); - } - - - - $lsort = create_function('$a,$b','return strlen($a) > strlen($b) ? 1 : -1;'); - usort($files, $lsort); - - - if (!empty($this->bootLoader->isDev) && !empty($_REQUEST['isDev'])) { - echo "\n"; - $this->assetArrayToHtml($files,'js'); - return; - } - - - $smod = str_replace('/','.',$path); - - $output = date('Y-m-d-H-i-s-', $maxtime). $smod .'-'.md5(serialize($arfiles)) .'.js'; - - - - // where are we going to write all of this.. - // This has to be done via a - if (!file_exists($compiledir.'/'.$output) || !filesize($compiledir.'/'.$output)) { - require_once 'Pman/Core/JsCompile.php'; - $x = new Pman_Core_JsCompile(); - - $x->pack($arfiles,$compiledir.'/'.$output, false); - clearstatcache(); - if (!file_exists($compiledir.'/'.$output) || - !filesize($compiledir.'/'.$output)) { - echo "\n"; - $this->assetArrayToHtml($files,'js'); - return; - } - - } else { - // echo "\n"; - } - //$this->arrayToJsInclude( $files); - $this->assetArrayToHtml( array( - $this->baseURL.'/Asset/js/'. $output, - - ), 'js'); - - } - - function assetArrayToHtml($ar, $type) - { - foreach($ar as $f) { - switch( $type) { - case 'js': - echo ''."\n"; - break; - case 'css': - echo ''."\n"; - break; - - } - - } - } - - - /** - * usage in template - * {outputCssDir(#{Hydra/templates/images/css/#,#Hydra.js",#.......#)} - */ - - function outputCssDir($path) - { - - $relpath = $this->rootURL . '/' . $path .'/'; - $ff = HTML_FlexyFramework::get(); - $dir = $this->rootDir.'/' . $path; - - $args = func_get_args(); - $ar = array(); - if (count($args) < 2) { - $ar = glob($dir . '/*.css'); - } else { - array_shift($args); - foreach($args as $f) { - if (strpos($f,'*') > -1) { - - $ar = array_merge($ar , glob($dir . '/'. $f)); - continue; - } - // what if the fiel does not exist??? - $ar[] = $dir .'/'. $f; - } - - } - - - // cached version?? - how do we decide if it's expired? - // while scanning the directory is slow... - it's faster than serving every file... - - - //$path = $this->rootURL ."/Pman/$mod/"; - - //print_R($ar);exit; - $missing_files = false; - $files = array(); - $arfiles = array(); - $relfiles = array(); // array of files without the path part... - $maxtime = 0; - $mtime = 0; - foreach($ar as $fn) { - $relfiles[] = substr($fn, strlen($dir)+1); - $f = basename($fn); - // got the 'module file..' - - if (!file_exists($dir . '/'. $f)) { - echo "\n"; - $files[] = $relpath . $f . '?ts=0'; - $missing_files = true; - continue; - } - - $mtime = filemtime($dir . '/'. $f); - $maxtime = max($mtime, $maxtime); - $arfiles[$fn] = $mtime; - $files[] = $relpath . $f . '?ts='.$mtime; - - - - } - if ($missing_files) { - $this->assetArrayToHtml($files, 'css'); - return; - - } - - - //print_r($relfiles); - - $ui = posix_getpwuid(posix_geteuid()); - - - $compiledir = session_save_path() . '/' . - $ui['name'] . '-' . $ff->project . '-'. $ff->version . '-csscompile'; - - if (!file_exists($compiledir)) { - mkdir($compiledir,0700,true); - } - - - // no sorting??? - //$lsort = create_function('$a,$b','return strlen($a) > strlen($b) ? 1 : -1;'); - //usort($files, $lsort); - - - if (!empty($this->bootLoader->isDev) && !empty($_REQUEST['isDev'])) { - echo "\n"; - $this->assetArrayToHtml($files,'css'); - return; - } - - - $smod = str_replace('/','.',$path); - - $output = date('Y-m-d-H-i-s-', $maxtime). $smod .'-'.md5(serialize($arfiles)) .'.css'; - - - - // where are we going to write all of this.. - // This has to be done via a - if (true || !file_exists($compiledir.'/'.$output) || !filesize($compiledir.'/'.$output)) { - - - - require_once 'HTML/CSS/Minify.php'; - $x = new HTML_CSS_Minify(substr($relpath,0,-1), $dir, $relfiles); - - file_put_contents($compiledir.'/'.$output , $x->minify( $this->baseURL.'/Asset/css')); - clearstatcache(); - if (!file_exists($compiledir.'/'.$output) || - !filesize($compiledir.'/'.$routput)) { - echo "\n"; - $this->assetArrayToHtml($files,'css'); - return; - } - - } else { - // echo "\n"; - } - //$this->arrayToJsInclude( $files); - $this->assetArrayToHtml( array( - $this->baseURL.'/Asset/css/'. $output, - - ),'css'); - - } - - - -} \ No newline at end of file diff --git a/AssetTrait.php b/AssetTrait.php index 4075ee77..3e5f994b 100644 --- a/AssetTrait.php +++ b/AssetTrait.php @@ -1,4 +1,4 @@ - +