Changeset 1103:f22f7ac9160c

Timestamp:

02/24/13 10:07:55 (12 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Optimize way to get media folders tree, from db rather than filesystem. Bruno's patch for not so well tuned hosts.

Files:

• admin/media_item.php (modified) (1 diff)
• inc/core/class.dc.media.php (modified) (1 diff)

admin/media_item.php

@@ -60 +60 @@
      # Prepare directories combo box
      $dirs_combo = array();
-     foreach ($core->media->getRootDirs() as $v) {
-          if ($v->w) {
-               $dirs_combo['/'.$v->relname] = $v->relname;
-          }
+     foreach ($core->media->getDBDirs() as $v) {
+          $dirs_combo['/'.$v] = $v;
      }
      ksort($dirs_combo);

inc/core/class.dc.media.php

@@ -821 +821 @@
           $this->callFileHandler(files::getMimeType($media_file),'remove',$f);
      }
+
+     /**
+     * Root directories
+     *
+     * Returns an array of directory under {@link $root} directory.
+     *
+     * @uses fileItem
+     * @return array
+     */
+     public function getDBDirs()
+     {
+          $media_dir = $this->relpwd ? $this->relpwd : '.';
+          
+          $strReq =
+          'SELECT distinct media_dir '.
+          'FROM '.$this->table.' '.
+          "WHERE media_path = '".$this->path."'";
+          $rs = $this->con->select($strReq);
+          while ($rs->fetch()) {
+               if (is_dir($this->root.'/'.$rs->media_dir))
+                    $dir[] = $rs->media_dir;
+          }
+          
+          return $dir;
+     }
      
      /**