Changeset 115258 in spip-zone

Timestamp:

May 6, 2019, 10:22:51 AM (2 weeks ago)

Author:

cedric@…

Message:

Mise a jour de scssphp, qui inclue une petite optimisation du cache: sur var_mode=css on ne refresh un cache qu'une seule fois et on peut ensuite l'utiliser, ce qui permet de ne parser les fichiers modifies qu'une seule fois
Accelere sensiblement la mise a jour si on a plusieurs scss independante mais qui inclue des morceaux en commun (variables, mixins…)

A noter que le var_mode=css reste utile dans un seul scenario : si on duplique une feuille existante pour la surcharger dans le path, il faudra passer par là pour que le compilateur voit le nouveau fichier et le prenne en compte.
Autrement toute modification d'un fichier utilise dans la compilation provoquera la mise a jour de la css compilee avec un simple var_mode=calcul

Location:

_plugins_/scssphp/trunk

Files:

• lib/scssphp/src/Cache.php (modified) (7 diffs)
• scssphp_fonctions.php (modified) (1 diff)

_plugins_/scssphp/trunk/lib/scssphp/src/Cache.php

@@ -15 +15 @@
 
 /**
- * The scss cacher.
- *
- * In summary:
- *
- * TODO
+ * The scss cache manager.
+ *
+ * In short:
+ *
+ * allow to put in cache/get from fache a generic result from a known operation on a generic dataset,
+ * taking in account options that affects the result
+ *
+ * The cache manager is agnostic about data format and only the operation is expected to be descripted by string
+ *
  */
 
@@ -39 +43 @@
     public static $prefix = 'scssphp_';
 
+    // force a refresh : 'once' for refreshing the first hit on a cache only, true to never use the cache in this hit
     public static $force_refresh = false;
 
     // specifies the number of seconds after which data cached will be seen as 'garbage' and potentially cleaned up
     public static $gc_lifetime = 604800;
+
+
+    // array of already refreshed cache if $force_refresh==='once'
+    protected static $refreshed = [];
 
 
@@ -76 +85 @@
 
     /**
-     * Generic get
-     *    Get the previous computed result of $what, affected by $options
+     * Get the cached result of $operation on $what, which is known as dependant from the content of $options
      *
      * @param string $operation
-     *   parse, compile?
+     *   parse, compile...
      * @param $what
-     *  content key (filename to be treated?)
+     *  content key (filename to be treated for instance)
      * @param array $options
      *  any option that affect the operation result on the content
@@ -94 +102 @@
         $fileCache = self::$cache_dir . self::cacheName($operation, $what, $options);
 
-        if (! self::$force_refresh
+        if ((! self::$force_refresh || (self::$force_refresh === 'once' && isset(self::$refreshed[$fileCache])))
           and file_exists($fileCache)) {
             $cache_time = filemtime($fileCache);
@@ -110 +118 @@
     }
 
+    /**
+     * Put in cache the result of $operation on $what, which is known as dependant from the content of $options
+     *
+     * @param string $operation
+     * @param $what
+     * @param $value
+     * @param array $options
+     */
     public function setCache($operation, $what, $value, $options = array())
     {
@@ -117 +133 @@
         $c = serialize($c);
         file_put_contents($fileCache, $c);
-    }
-
-
+
+        if (self::$force_refresh === 'once') {
+            self::$refreshed[$fileCache] = true;
+        }
+    }
+
+
+    /**
+     * get the cachename for the caching of $opetation on $what, which is known as dependant from the content of $options
+     * @param string $operation
+     * @param $what
+     * @param array $options
+     * @return string
+     */
     private static function cacheName($operation, $what, $options = array())
     {
@@ -139 +166 @@
 
 
+    /**
+     * Check that the cache dir is existing and writeable
+     * @throws Exception
+     */
     public static function checkCacheDir()
     {

_plugins_/scssphp/trunk/scssphp_fonctions.php

@@ -46 +46 @@
         if (defined('_VAR_MODE') and
                 (_request('var_mode') == 'css' or in_array(_VAR_MODE, array('css', 'recalcul'))) ) {
-                $cache_options['force_refresh'] = true;
+                $cache_options['force_refresh'] = 'once';
         }