Indefero Commit Details

Date:

2009-06-19 14:37:39 (16 years 4 months ago)

Author:

Loic d'Anterroches

Branch:

develop, feature-issue_links, feature.better-home, feature.content-md5, feature.diff-whitespace, feature.download-md5, feature.issue-links, feature.issue-of-others, feature.issue-summary, feature.search-filter, feature.webrepos, feature.wiki-default-page, master, release-1.1, release-1.2, release-1.3

Commit:

6cf4f00f92205e0749e5c007b8a039e8f75c767b

Parents:

d6c0b7a6802c9e5d5ae6fd9cccc51a1b1ce8f1cd

Message:

Fixed to make the command portable on BSD/Solaris.

Changes:

File differences

-43
44 44
45 45
46 
46
47 47
48 48
49 
49
50 50
51 51
52 52
+␊
    public function getRepositorySize()␊
    {␊
        $cmd = Pluf::f('idf_exec_cmd_prefix', '').'du -bs '␊
        $cmd = Pluf::f('idf_exec_cmd_prefix', '').'du -sk '␊
            .escapeshellarg($this->repo);␊
        $out = split(' ', shell_exec($cmd), 2);␊
        return (int) $out[0];␊
        return (int) $out[0]*1024;␊
    }␊
␊
    public function isAvailable()␊
 ␊
     public function getRepositorySize()␊
     {␊
-        $cmd = Pluf::f('idf_exec_cmd_prefix', '').'du -bs '␊
+        $cmd = Pluf::f('idf_exec_cmd_prefix', '').'du -sk '␊
             .escapeshellarg($this->repo);␊
         $out = split(' ', shell_exec($cmd), 2);␊
-        return (int) $out[0];␊
+        return (int) $out[0]*1024;␊
     }␊
 ␊
     public function isAvailable()␊

-35
36 36
37 37
38 
38
39 39
40 40
41 
41
42 42
43 43
44 44
+␊
    public function getRepositorySize()␊
    {␊
        $cmd = Pluf::f('idf_exec_cmd_prefix', '').'du -bs '␊
        $cmd = Pluf::f('idf_exec_cmd_prefix', '').'du -sk '␊
            .escapeshellarg($this->repo);␊
        $out = split(' ', shell_exec($cmd), 2);␊
        return (int) $out[0];␊
        return (int) $out[0]*1024;␊
    }␊
␊
    public static function factory($project)␊
 ␊
     public function getRepositorySize()␊
     {␊
-        $cmd = Pluf::f('idf_exec_cmd_prefix', '').'du -bs '␊
+        $cmd = Pluf::f('idf_exec_cmd_prefix', '').'du -sk '␊
             .escapeshellarg($this->repo);␊
         $out = split(' ', shell_exec($cmd), 2);␊
-        return (int) $out[0];␊
+        return (int) $out[0]*1024;␊
     }␊
 ␊
     public static function factory($project)␊

-56
57 57
58 58
59 
59
60 60
61 61
62 
62
63 63
64 64
65 65
+        if (strpos($this->repo, 'file://') !== 0) {␊
            return -1;␊
        }␊
        $cmd = Pluf::f('idf_exec_cmd_prefix', '').'du -bs '␊
        $cmd = Pluf::f('idf_exec_cmd_prefix', '').'du -sk '␊
            .escapeshellarg(substr($this->repo, 7));␊
        $out = split(' ', shell_exec($cmd), 2);␊
        return (int) $out[0];␊
        return (int) $out[0]*1024;␊
    }␊
␊
    /**␊
         if (strpos($this->repo, 'file://') !== 0) {␊
             return -1;␊
         }␊
-        $cmd = Pluf::f('idf_exec_cmd_prefix', '').'du -bs '␊
+        $cmd = Pluf::f('idf_exec_cmd_prefix', '').'du -sk '␊
             .escapeshellarg(substr($this->repo, 7));␊
         $out = split(' ', shell_exec($cmd), 2);␊
-        return (int) $out[0];␊
+        return (int) $out[0]*1024;␊
     }␊
 ␊
     /**␊

-319
320 320
321 321
322 
322
323 323
324 324
325 
326 
325
326
327 327
328 328
329 
329
330 330
331 331
332 332
+            $res['repositories'] += $size;␊
        }␊
    }␊
    $cmd = Pluf::f('idf_exec_cmd_prefix', '').'du -bs '␊
    $cmd = Pluf::f('idf_exec_cmd_prefix', '').'du -sk '␊
        .escapeshellarg(Pluf::f('upload_path'));␊
    $out = split(' ', shell_exec($cmd), 2);␊
    $res['downloads'] = $out[0];␊
    $cmd = Pluf::f('idf_exec_cmd_prefix', '').'du -bs '␊
    $res['downloads'] = $out[0]*1024;␊
    $cmd = Pluf::f('idf_exec_cmd_prefix', '').'du -sk '␊
        .escapeshellarg(Pluf::f('upload_issue_path'));␊
    $out = split(' ', shell_exec($cmd), 2);␊
    $res['attachments'] = $out[0];␊
    $res['attachments'] = $out[0]*1024;␊
    $res['total'] = $res['repositories'] + $res['downloads'] + $res['attachments'];␊
    // TODO: now we need the db␊
    return $res;␊
             $res['repositories'] += $size;␊
         }␊
     }␊
-    $cmd = Pluf::f('idf_exec_cmd_prefix', '').'du -bs '␊
+    $cmd = Pluf::f('idf_exec_cmd_prefix', '').'du -sk '␊
         .escapeshellarg(Pluf::f('upload_path'));␊
     $out = split(' ', shell_exec($cmd), 2);␊
-    $res['downloads'] = $out[0];␊
-    $cmd = Pluf::f('idf_exec_cmd_prefix', '').'du -bs '␊
+    $res['downloads'] = $out[0]*1024;␊
+    $cmd = Pluf::f('idf_exec_cmd_prefix', '').'du -sk '␊
         .escapeshellarg(Pluf::f('upload_issue_path'));␊
     $out = split(' ', shell_exec($cmd), 2);␊
-    $res['attachments'] = $out[0];␊
+    $res['attachments'] = $out[0]*1024;␊
     $res['total'] = $res['repositories'] + $res['downloads'] + $res['attachments'];␊
     // TODO: now we need the db␊
     return $res;␊

Download the corresponding diff file

Indefero

File differences

Branches

Tags