Changeset 19198

Timestamp:

09/11/08 23:14:24 (4 months ago)

Author:

sasezaki

Message:

lang/php/Diggin_CDDB: ひどい！前後のレコード捨ててたなんて！私のこともそうやって捨てるのね！

Files:

• lang/php/Diggin_CDDB/library/Diggin/CDDB/Application/CDex.php (modified) (3 diffs)

lang/php/Diggin_CDDB/library/Diggin/CDDB/Application/CDex.php

@@ -115 +115 @@
             //cdex comment is /^#FILE/
             if (preg_match("/^$end.*/i", $splFileObject->current())) {
-                $end = $splFileObject->key();
+                $endkey = $splFileObject->key();
             }
             if (preg_match("/^$start.*/i", $splFileObject->current())) {
-                return array('start' => ($line - $i), 'end' => $end);
+                if (isset($endkey)) {
+                    return array('start' => ($line - $i), 'end' => $endkey);
+                }
             }
         }
         
         //if none
-        
+        require_once 'Diggin/CDDB/Application/Exception.php';
+        throw new Diggin_CDDB_Application_Exception("there is no seek points, $splFileObject,(start:$start, end:$end)");
     } 
         
@@ -194 +197 @@
     public function getRewriteStr(SplFileInfo $file, $rewrite_points, $disc)
     {
+        $fileArray = file($file);
+    
         //extract rewritepart string
-        $rewriteStr = implode('', array_slice(file($file), $rewrite_points['start'] +1 , $rewrite_points['end']));
+        $rewriteStr = implode('', array_slice($fileArray, $rewrite_points['start'] +1 , $rewrite_points['end']));
 
         $decode = Diggin_CDDB_Disc_Decoder::decode($rewriteStr, Diggin_CDDB_Disc_Decoder::TYPE_ARRAY, 'SJIS');
@@ -213 +218 @@
         $rewriteStr = Diggin_CDDB_Disc_Encoder::encode($decode);
         
+        
         //#filename line add
         $splFileObject = $file->openFile();
         $splFileObject->seek($rewrite_points['start'] );
-        $rewriteStr = $splFileObject->current().$rewriteStr.PHP_EOL;
-        
-        return $rewriteStr;
+        $rewriteStr = $splFileObject->current().$rewriteStr;
+        
+        //if rewriting is not first(head of file),   add before of rewrite
+        if ($rewrite_points['start'] !== 0) {
+            $before = implode('', array_slice($fileArray, 0, $rewrite_points['start']));
+            $rewriteStr = $before.$rewriteStr;
+        }
+        
+        if ($rewrite_points['end']  !== count($fileArray)-1 ) {
+            $after = implode('', array_slice($fileArray, $rewrite_points['end']+1));
+            $rewriteStr = $rewriteStr.PHP_EOL.$after;
+            $end = ''; //afterをつける場合、EOFの行まで含まれるので調整。
+        } else {            
+            $end = PHP_EOL;
+        }
+        
+        return $rewriteStr.$end;
     }