Changeset 16420 for branches/feature-module-update/data/class/batch

Timestamp:

2007/10/14 22:55:13 (19 years ago)

Author:

adachi

Message:

ｵｰﾅｰｽﾞｽﾄｱ連携暫定コミット

File:

• branches/feature-module-update/data/class/batch/SC_Batch_Update.php (modified) (6 diffs)

branches/feature-module-update/data/class/batch/SC_Batch_Update.php

@@ -37 +37 @@
      */
     function execute($target = ".") {
+        $arrLog = array();
         $includeArray = explode(',', $this->includes);
         $excludeArray = explode(',', $this->excludes);
@@ -55 +56 @@
                 // distinfo.php を読み込む
                 if ($fileName == "distinfo.php") {
-                    include_once($fileName);
+                    include_once($path);
                 }
 
                 // 除外ファイルをスキップ
                 if (in_array($fileName, $excludeArray)) {
-                    echo "excludes by " . $path . "\n";
+                    $arrLog[] = "excludes by " . $path . "\n";
                     continue;
                 }
@@ -67 +68 @@
                 $sha1 = sha1_file($path);
 
-                echo $sha1 . " => " . $path . "\n";
+                $arrLog[] = $sha1 . " => " . $path . "\n";
 
 
@@ -81 +82 @@
                             $out = $distinfo[$sha1];
                         } else {
-                            die("ハッシュ値が一致しないため, コピー先が取得できません.");
+                            $arrLog[] = "ハッシュ値が一致しないため, コピー先が取得できません.";
+                            die();
                         }
 
                         // ファイルを書き出しモードで開く
-                        $handle = fopen($out, "w");
+                        $handle = @fopen($out, "w");
                         if (!$handle) {
-                            echo "Cannot open file (". $out . ")";
-                            continue;
+                            // ディレクトリ作成を行ってリトライ
+                            $this->mkdir_p($out);
+                            $handle = @fopen($out, "w");
+                            if (!$handle) {
+                                $arrLog[] = "Cannot open file (". $out . ")\n";
+                                continue;
+                            }
                         }
 
                         // 取得した内容を書き込む
                         if (fwrite($handle, $contents) === false) {
-                            echo "Cannot write to file (" . $out . ")";
+                            $arrLog[] = "Cannot write to file (" . $out . ")\n";
                             continue;
                         }
 
-                        echo "copyed " . $out . "\n";
+                        $arrLog[] =  "copyed " . $out . "\n";
                         // ファイルを閉じる
                         fclose($handle);
@@ -104 +111 @@
             }
         }
-        echo "Finished Successful!\n";
+        $arrLog[] = "Finished Successful!\n";
+        return $arrLog;
     }
 
@@ -123 +131 @@
         return $alldirs;
     }
+
+    /**
+     * mkdir -p
+     *
+     * @param string $path 絶対パス
+     */
+    function mkdir_p($path){
+        $path = dirname($path);
+        $path = str_replace ('\\', '/', $path);
+
+        $arrDirs = explode("/", $path);
+        $dir = '';
+
+        foreach($arrDirs as $n){
+            $dir .= $n . '/';
+            if(!file_exists($dir)) {
+                if (!@mkdir($dir)) return;
+            }
+        }
+}
 }
 ?>