Changeset 19073 for lang/php

Timestamp:

09/10/08 00:12:15 (2 months ago)

Author:

sasezaki

Message:

lang/php/Diggin_CDDB: registerAutoloadでライブラリコーディングしたまたとかださーい

Location:

lang/php/Diggin_CDDB/library/Diggin/CDDB

Files:

• Application/CDex.php (modified) (8 diffs)
• Disc/Decoder.php (modified) (1 diff)
• Disc/Encoder.php (modified) (1 diff)
• Disc/Interface.php (deleted)

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

@@ -14 +14 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
+/**
+ * @see Diggin_CDDB_Disc_Encoder
+ */
+require_once 'Diggin/CDDB/Disc/Encoder.php';
+/**
+ * @see Diggin_CDDB_Disc_Decoder
+ */
+require_once 'Diggin/CDDB/Disc/Decoder.php';
 
 class Diggin_CDDB_Application_CDex
@@ -96 +104 @@
      * @return array $points 
      */
-    public function getSeekPointsLatestOfFile(SplFileObject $splFileObject, $start = 'DTITLE', $end = 'EXTD', $endBacklineNum = 1)
+    public function getSeekPointsLatestOfFile(SplFileObject $splFileObject, $start = '#FILENAME', $end = 'PLAYORDER')
     {
         $line = count(file($splFileObject->getPathName()));
@@ -103 +111 @@
             //cdex comment is /^#FILE/
             if (preg_match("/^$end.*/i", $splFileObject->current())) {
-                $end = $splFileObject->key() - $endBacklineNum;
+                $end = $splFileObject->key();
             }
             if (preg_match("/^$start.*/i", $splFileObject->current())) {
@@ -127 +135 @@
         $discStr = implode('', array_slice(file($lastFile), $points['start'] +1, $points['end']));
 
-        require_once 'Diggin/CDDB/Disc/Decoder.php';
         return Diggin_CDDB_Disc_Decoder::decode($discStr, $decodeType);
     }
@@ -150 +157 @@
         $lastFile = $this->getLastFile();
         
-        $points = $this->getSeekPointsLatestOfFile($lastFile->openFile(), '# xmcd CD', 'PLAYORDER');
-        
-        
-        return $this->getRewriteStr($lastFile, $points, $discArray);
+        $points = $this->getSeekPointsLatestOfFile($lastFile->openFile(), '#FILENAME', 'PLAYORDER');
+
         if (!file_put_contents($lastFile, 
                                $this->getRewriteStr($lastFile, $points, $discArray))) {
@@ -186 +191 @@
     {
         //extract rewritepart string
-        $rewriteStr = implode('', array_slice(file($file), $rewrite_points['start'], $rewrite_points['end'] + 1));
-
-        require_once 'Diggin/CDDB/Disc/Decoder.php';
+        $rewriteStr = implode('', array_slice(file($file), $rewrite_points['start'] +1 , $rewrite_points['end']));
+
         $decode = Diggin_CDDB_Disc_Decoder::decode($rewriteStr, Diggin_CDDB_Disc_Decoder::TYPE_ARRAY, 'SJIS');
 
@@ -196 +200 @@
                 foreach ($v as $c => $track) {
                     $decode['tracks'][$c]['ttitle'] = $track;
-                    $decode['tracks'][$c]['tartist'] = $disc['dartist'];
                 }
             } else {
@@ -204 +207 @@
         
         //__toString
-        require_once 'Diggin/CDDB/Disc/Encoder.php';
         $rewriteStr = Diggin_CDDB_Disc_Encoder::encode($decode);
         
         //#filename line add
-        $file->openFile()->seek($rewrite_points['start'] -1);
-        $rewriteStr = $file->openFile()->current().$rewriteStr;
+        $file->openFile()->seek($rewrite_points['start'] );
+        $rewriteStr = $file->openFile()->current().$rewriteStr.PHP_EOL;
         
         return $rewriteStr;

lang/php/Diggin_CDDB/library/Diggin/CDDB/Disc/Decoder.php

@@ -14 +14 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Diggin_CDDB_Disc_Decoder implements Diggin_CDDB_Disc_Interface
-{    
+class Diggin_CDDB_Disc_Decoder
+{
+    const TYPE_ARRAY  = 1;
+    const TYPE_OBJECT = 0;
+    
     /**
      * decoding CDDB format

lang/php/Diggin_CDDB/library/Diggin/CDDB/Disc/Encoder.php

@@ -14 +14 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Diggin_CDDB_Disc_Encoder implements Diggin_CDDB_Disc_Interface
-{    
+class Diggin_CDDB_Disc_Encoder
+{
+    const TYPE_ARRAY  = 1;
+    const TYPE_OBJECT = 0;
+    
     /**
      * Enter description here...