Changeset 18937 for lang/php

Timestamp:

09/07/08 14:11:26 (3 months ago)

Author:

sasezaki

Message:

lang/php/Diggin_CDDB: modify

Location:

lang/php/Diggin_CDDB/library/Diggin/CDDB

Files:

• CDex.php (modified) (5 diffs)
• Exception.php (modified) (1 diff)

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

@@ -66 +66 @@
     public function getLastFile()
     {       
-        $rii = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($this->getLocalCDDBDirPath()));
+        $rii = new RecursiveIteratorIterator(
+                    new RecursiveDirectoryIterator($this->getLocalCDDBDirPath()));
         
         $ai = new ArrayIterator(array());
@@ -90 +91 @@
         //if not found
         require_once 'Diggin/CDDB/Exception.php';
-        throw new Diggin_CDDB_Exception('LocalCDDB Foramt text not found, etc. c:\cdex_151\LocalCDDB');
+        $errorMsg = sprintf('LocalCDDB Foramt text not found at %s',
+                             $this->getLocalCDDBDirPath());
+        throw new Diggin_CDDB_Exception($errorMsg);
     }
     
@@ -99 +102 @@
      * @return array
      */
-    public function getLastDiscInfo()
+    public function getLastDisc($style = 'Net_CDDB_Disc')
     {                
-        $splFileObject = $this->getLastFile()->openFile();
-        
-        $points = $this->getSeekPointsLatestOfFile($splFileObject);
-        $splFileObject->seek($points['start']);
-        
-        $disc = array();
-        $disc['discid'] = trim(preg_replace('/^DISCID=(.*)(\s)$/i', '$1', $splFileObject->current()));
-        list($disc['dartist'], $disc['dtitle']) = explode(' / ', $splFileObject->fgets(), 2);
-        $disc['dtitle'] = trim($disc['dtitle']);
-        $disc['dartist'] = ltrim($disc['dartist'], 'DTITLE=');
-        $disc['dyear'] = rtrim(ltrim($splFileObject->fgets(), 'DYEAR='));
-        $disc['dgenre'] = rtrim(ltrim($splFileObject->fgets(), 'DGENRE='));
-        
-        do {
-            $title = preg_replace('/^TTITLE(\d*)=(.*)(\s)$/', '$2', $splFileObject->fgets());
-
-            //if (preg_match('/^EXTD=/s', $title)) break;
-            if ($splFileObject->key() > $points['end']) break;
-            $disc['tracks'][] = trim($title);
-        } while ($splFileObject->valid());
+        $lastFile = $this->getLastFile()->openFile();
+        
+        if ($style == 'Net_CDDB_Disc') {
+            $points = $this->getSeekPointsLatestOfFile($lastFile, '#FILENAME', 'PLAYORDER');
+            //oops! FILENAME not defined Net_CDDB_Utilities, so I plus 1 for start point.
+            $discStr = implode('', array_slice(file($lastFile), $points['start'] +1, $points['end']));
+            
+            require_once 'Net/CDDB/Utilities.php';
+            $ncu = new Net_CDDB_Utilities();
+            $parse = $ncu->parseRecord($discStr);
+            require_once 'Net/CDDB/Disc.php';
+            $disc = new Net_CDDB_Disc($parse);
+        } else {
+            $points = $this->getSeekPointsLatestOfFile($lastFile, 'DISCID');
+            $lastFile->seek($points['start']);
+            
+            $disc = array();
+            $disc['discid'] = trim(preg_replace('/^DISCID=(.*)(\s)$/i', '$1', $lastFile->current()));
+            list($disc['dartist'], $disc['dtitle']) = explode(' / ', $lastFile->fgets(), 2);
+            $disc['dtitle'] = trim($disc['dtitle']);
+            $disc['dartist'] = ltrim($disc['dartist'], 'DTITLE=');
+            $disc['dyear'] = rtrim(ltrim($lastFile->fgets(), 'DYEAR='));
+            $disc['dgenre'] = rtrim(ltrim($lastFile->fgets(), 'DGENRE='));
+            
+            do {
+                $title = preg_replace('/^TTITLE(\d*)=(.*)(\s)$/', '$2', $lastFile->fgets());
+    
+                //if (preg_match('/^EXTD=/s', $title)) break;
+                if ($lastFile->key() > $points['end']) break;
+                $disc['tracks'][] = trim($title);
+            } while ($lastFile->valid());
+        }
+        
+        //$disc = mb_convert_variables()
         
         return $disc;
     }
-    
+
     /**
      * get Seek point From => DISCID, TO => TTITLE{X}
@@ -131 +148 @@
      * @return array $points 
      */
-    public function getSeekPointsLatestOfFile(SplFileObject $splFileObject)
+    public function getSeekPointsLatestOfFile(SplFileObject $splFileObject, $start = 'DTITLE', $end = 'EXTD')
     {
         $line = count(file($splFileObject->getPathName()));
-        for ($i = 1; $i < $line; $i++) {
+        for ($i = 1; $i <= $line; $i++) {
             $splFileObject->seek($line - $i);
             //cdex comment is /^#FILE/
-            if (preg_match('/^EXTD.*/i', $splFileObject->current())) {
+            if (preg_match("/^$end.*/i", $splFileObject->current())) {
                 $end = $splFileObject->key() -1;
             }
-            
-            if (preg_match('/^DTITLE.*$/s', $splFileObject->current())) {
+            if (preg_match("/^$start.*/i", $splFileObject->current())) {
                 return array('start' => ($line - $i), 'end' => $end);
             }
-            
-            $splFileObject->next();
         }
     }  
@@ -179 +193 @@
     }
     
-    public function getRewriteStr($rewritefile, $points, $discArray)
-    {
-        $fileArray = file($rewritefile);
-
-        $rewriteStr = implode('', array_slice($fileArray, 0, $points['start']));
-        $rewriteStr .=  'DTITLE='.$discArray['dartist'].' / '.$discArray['dtitle'].PHP_EOL.
-                        'DYEAR='.$discArray['dyear'].PHP_EOL.
-                        'DGENRE='.$discArray['dgenre'].PHP_EOL;
+    /**
+     * 
+     * @param string | SPLFileInfo
+     * @param array 
+     * @param array $disc
+     * 
+     * 
+     * NOTES:
+     * 0
+     * 1
+     * 2 <<if'start' ==3  'length' of array_slice is here
+     * 3 DTITLE <=rewrite_points['start'])
+     * 4 DYEAR
+     * 5 DGENRE
+     * 6 TTITLE0
+     * 7 TTITLE1 <=$rewrite_points['end'] (last track )
+     * 8 EXTD= 
+     */
+    public function getRewriteStr($file, $rewrite_points, $disc)
+    {
+        $fileArray = file($file);
+
+        $rewriteStr = implode('', array_slice($fileArray, 0, $rewrite_points['start']));
+        $rewriteStr .=  'DTITLE='.$disc['dartist'].' / '.$disc['dtitle'].PHP_EOL.
+                        'DYEAR='.$disc['dyear'].PHP_EOL.
+                        'DGENRE='.$disc['dgenre'].PHP_EOL;
         $trackStr = '';
-        foreach ($discArray['tracks'] as $count => $track) {
-            $trackStr .= "TTITLE$count=".$track.PHP_EOL;
+        $trackCount = $rewrite_points['end'] - $rewrite_points['start'] - 3;
+        for ($i = 0; $i <= $trackCount; $i++) {
+            $track = isset($disc['tracks'][$i]) ? $disc['tracks'][$i] : false;
+            if (!$track) {
+                //@todo various fomart by sprintf
+                $trackStr .= "TTITLE$i=".$disc['dtitle'].'_'.($i+1).PHP_EOL;
+            } else {
+                $trackStr .= "TTITLE$i=".$track.PHP_EOL;
+            }
         }
         $rewriteStr .= $trackStr;
-        $rewriteStr .= implode('', array_slice($fileArray, $points['end'] +1));
+        $rewriteStr .= implode('', array_slice($fileArray, $rewrite_points['end'] +1));
 
         //@todo

lang/php/Diggin_CDDB/library/Diggin/CDDB/Exception.php

@@ -9 +9 @@
  * 
  * @category   Diggin
- * @package    Diggin_Service
+ * @package    Diggin_CDDB
  * @copyright  2006-2008 sasezaki (http://diggin.musicrider.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License