Changeset 1730

Timestamp:

08/31/08 08:57:33 (3 months ago)

Author:

vollmerk

Message:

remove lib/album.lib.php and move its two functions into album class, corrected some old php4 ish code in localplay controllers, removed redundent link from sidebar (modules)

Location:

trunk

Files:

• image.php (modified) (1 diff)
• lib/album.lib.php (deleted)
• lib/class/album.class.php (modified) (1 diff)
• lib/class/catalog.class.php (modified) (1 diff)
• lib/init.php (modified) (1 diff)
• logout.php (modified) (1 diff)
• modules/localplay/httpq.controller.php (modified) (11 diffs)
• modules/localplay/mpd.controller.php (modified) (14 diffs)
• server/index.ajax.php (modified) (1 diff)
• templates/show_album_art.inc.php (modified) (1 diff)
• templates/sidebar_modules.inc.php (modified) (1 diff)

trunk/image.php

@@ -68 +68 @@
                 vauth::check_session(); 
                 $key = scrub_in($_REQUEST['image_index']); 
-                $image = get_image_from_source($_SESSION['form']['images'][$key]);
+                $image = Album::get_image_from_source($_SESSION['form']['images'][$key]);
                 $mime = $_SESSION['form']['images'][$key]['mime'];
                 $data = explode("/",$mime); 

trunk/lib/class/album.class.php

@@ -823 +823 @@
         } // save_resized_art
 
+        /**
+         * get_random_albums
+         * This returns a random number of albums from the catalogs
+         * this is used by the index to return some 'potential' albums to play
+         */
+        public static function get_random_albums($count=6) {
+
+                $sql = 'SELECT `id` FROM `album` ORDER BY RAND() LIMIT ' . ($count*2);
+                $db_results = Dba::query($sql);
+
+                $in_sql = '`album_id` IN (';
+
+                while ($row = Dba::fetch_assoc($db_results)) {
+                        $in_sql .= "'" . $row['id'] . "',";
+                        $total++;
+                }
+
+                if ($total < $count) { return false; }
+
+                $in_sql = rtrim($in_sql,',') . ')';
+
+                $sql = "SELECT `album_id`,ISNULL(`art`) AS `no_art` FROM `album_data` WHERE $in_sql";
+                $db_results = Dba::query($sql);
+                $results = array();
+
+                while ($row = Dba::fetch_assoc($db_results)) {
+                        $results[$row['album_id']] = $row['no_art'];
+                } // end for
+        
+                asort($results);
+                $albums = array_keys($results);
+                $results = array_slice($albums,0,$count);
+        
+                return $results;
+
+        } // get_random_albums
+
+        /**
+         * get_image_from_source
+         * This gets an image for the album art from a source as 
+         * defined in the passed array. Because we don't know where
+         * its comming from we are a passed an array that can look like
+         * ['url']      = URL *** OPTIONAL ***
+         * ['file']     = FILENAME *** OPTIONAL ***
+         * ['raw']      = Actual Image data, already captured
+         */
+        public static function get_image_from_source($data) {
+
+                // Already have the data, this often comes from id3tags
+                if (isset($data['raw'])) {
+                        return $data['raw'];
+                }
+
+                // If it came from the database
+                if (isset($data['db'])) {
+                        // Repull it 
+                        $album_id = Dba::escape($data['db']);
+                        $sql = "SELECT * FROM `album_data` WHERE `album_id`='$album_id'";
+                        $db_results = Dba::query($sql);
+                        $row = Dba::fetch_assoc($db_results);
+                        return $row['art'];
+                } // came from the db
+
+                // Check to see if it's a URL
+                if (isset($data['url'])) {
+                        $snoopy = new Snoopy();
+                        $snoopy->fetch($data['url']);
+                        return $snoopy->results;
+                }
+
+                // Check to see if it's a FILE
+                if (isset($data['file'])) {
+                        $handle = fopen($data['file'],'rb');
+                        $image_data = fread($handle,filesize($data['file']));
+                        fclose($handle);
+                        return $image_data;
+                }
+        
+                // Check to see if it is embedded in id3 of a song
+                if (isset($data['song'])) {
+                        // If we find a good one, stop looking
+                        $getID3 = new getID3();
+                        $id3 = $getID3->analyze($data['song']);
+        
+                        if ($id3['format_name'] == "WMA") {
+                                return $id3['asf']['extended_content_description_object']['content_descriptors']['13']['data'];
+                        }
+                        elseif (isset($id3['id3v2']['APIC'])) {
+                                // Foreach incase they have more then one 
+                                foreach ($id3['id3v2']['APIC'] as $image) {
+                                        return $image['data'];
+                                }
+                        }
+                } // if data song
+
+                return false;
+
+        } // get_image_from_source
+
 } //end of album class
 

trunk/lib/class/catalog.class.php

@@ -641 +641 @@
                         if (count($results)) { 
                                 // Pull the string representation from the source
-                                $image = get_image_from_source($results['0']);  
+                                $image = Album::get_image_from_source($results['0']);  
                                 if (strlen($image) > '5') { 
                                         $album->insert_art($image,$results['0']['mime']); 

trunk/lib/init.php

@@ -122 +122 @@
 
 // Library and module includes we can't do with the autoloader
-require_once $prefix . '/lib/album.lib.php';
 require_once $prefix . '/lib/search.php';
 require_once $prefix . '/lib/preferences.php';

trunk/logout.php

@@ -2 +2 @@
 /*
 
- Copyright (c) 2001 - 2007 Ampache.org
+ Copyright (c) Ampache.org
  All rights reserved.
 

trunk/modules/localplay/httpq.controller.php

@@ -313 +313 @@
          * This deletes the entire Httpq playlist... nuff said
          */
-        function clear_playlist() { 
+        public function clear_playlist() { 
 
                 if (is_null($this->_httpq->clear())) { return false; }
@@ -359 +359 @@
          * This tells HttpQ to skip to the specified song
          */
-        function skip($song) { 
+        public function skip($song) { 
 
                 if (is_null($this->_httpq->skip($song))) { return false; }
@@ -369 +369 @@
          * This tells Httpq to increase the volume by WinAmps default amount
          */
-        function volume_up() { 
+        public function volume_up() { 
 
                 if (is_null($this->_httpq->volume_up())) { return false; } 
@@ -379 +379 @@
          * This tells HttpQ to decrease the volume by Winamps default amount
          */
-        function volume_down() { 
+        public function volume_down() { 
 
                 if (is_null($this->_httpq->volume_down())) { return false; }
@@ -388 +388 @@
         /**
          * next
-         * This just tells MPD to skip to the next song 
-         */
-        function next() { 
+         * This just tells HttpQ to skip to the next song 
+         */
+        public function next() { 
 
                 if (is_null($this->_httpq->next())) { return false; } 
@@ -400 +400 @@
         /**
          * prev
-         * This just tells MPD to skip to the prev song
-         */
-        function prev() { 
+         * This just tells HttpQ to skip to the prev song
+         */
+        public function prev() { 
 
                 if (is_null($this->_httpq->prev())) { return false; } 
@@ -412 +412 @@
         /**
          * pause
-         * This tells MPD to pause the current song 
-         */
-        function pause() { 
+         * This tells HttpQ to pause the current song 
+         */
+        public function pause() { 
                 
                 if (is_null($this->_httpq->pause())) { return false; } 
@@ -426 +426 @@
         * is 0-100
         */
-       function volume($volume) {
+       public function volume($volume) {
 
                if (is_null($this->_httpq->set_volume($volume))) { return false; }
@@ -478 +478 @@
 
                         $url_data = $this->parse_url($entry); 
+
                         switch ($url_data['primary_key']) {
                                 case 'song':
@@ -490 +491 @@
                                         $data['link']   = '';
                                 break;
+                                case 'random': 
+                                        $data['name'] = _('Random') . ' - ' . scrub_out(ucfirst($url_data['type'])); 
+                                        $data['link'] = ''; 
+                                break; 
                                 default:
 
@@ -510 +515 @@
                         } // end switch on primary key type
 
-
                         $data['track']  = $key+1;
 

trunk/modules/localplay/mpd.controller.php

@@ -314 +314 @@
          * This deletes the entire MPD playlist... nuff said
          */
-        function clear_playlist() { 
+        public function clear_playlist() { 
 
                 if (is_null($this->_mpd->PLClear())) { return false; }
@@ -327 +327 @@
          * take any arguments
          */
-        function play() { 
+        public function play() { 
 
                 if (is_null($this->_mpd->Play())) { return false; } 
@@ -339 +339 @@
          * any arguments
          */
-        function stop() { 
+        public function stop() { 
 
                 if (is_null($this->_mpd->Stop())) { return false; } 
@@ -350 +350 @@
          * This tells MPD to skip to the specified song
          */
-        function skip($song) { 
+        public function skip($song) { 
 
                 if (is_null($this->_mpd->SkipTo($song))) { return false; }
@@ -360 +360 @@
          * This tells MPD to increase the volume by 5
          */
-        function volume_up() { 
+        public function volume_up() { 
 
                 if (is_null($this->_mpd->AdjustVolume('5'))) { return false; } 
@@ -370 +370 @@
          * This tells MPD to decrese the volume by 5
          */
-        function volume_down() { 
+        public function volume_down() { 
 
                 if (is_null($this->_mpd->AdjustVolume('-5'))) { return false; }
@@ -381 +381 @@
          * This just tells MPD to skip to the next song 
          */
-        function next() { 
+        public function next() { 
 
                 if (is_null($this->_mpd->Next())) { return false; } 
@@ -392 +392 @@
          * This just tells MPD to skip to the prev song
          */
-        function prev() { 
+        public function prev() { 
 
                 if (is_null($this->_mpd->Previous())) { return false; } 
@@ -403 +403 @@
          * This tells MPD to pause the current song 
          */
-        function pause() { 
+        public function pause() { 
                 
                 if (is_null($this->_mpd->Pause())) { return false; } 
@@ -415 +415 @@
         * This tells MPD to set the volume to the parameter
         */
-       function volume($volume) {
+        public function volume($volume) {
 
                if (is_null($this->_mpd->SetVolume($volume))) { return false; }
@@ -426 +426 @@
         * This tells MPD to set the repeating the playlist (i.e. loop) to either on or off
         */
-       function repeat($state) {
+        public function repeat($state) {
         
                 if (is_null($this->_mpd->SetRepeat($state))) { return false; }
@@ -432 +432 @@
 
        } // repeat
-
 
        /**
@@ -438 +437 @@
         * This tells MPD to turn on or off the playing of songs from the playlist in random order
         */
-       function random($onoff) {
+       public function random($onoff) {
 
                if (is_null($this->_mpd->SetRandom($onoff))) { return false; }
@@ -449 +448 @@
         * This tells MPD to move song from SrcPos to DestPos
         */
-       function move($SrcPos, $DestPos) {
+       public function move($SrcPos, $DestPos) {
 
                 if (is_null($this->_mpd->PLMoveTrack($SrcPos, $DestPos))) { return false; }

trunk/server/index.ajax.php

@@ -27 +27 @@
 switch ($_REQUEST['action']) { 
         case 'random_albums': 
-                $albums = get_random_albums('6'); 
+                $albums = Album::get_random_albums('6'); 
                 if (count($albums)) { 
                         ob_start(); 

trunk/templates/show_album_art.inc.php

@@ -34 +34 @@
                 $key = $i*4+$j;
                 $image_url = Config::get('web_path') . '/image.php?type=session&image_index=' . $key; 
-                $dimensions = Core::image_dimensions(get_image_from_source($_SESSION['form']['images'][$key])); 
+                $dimensions = Core::image_dimensions(Album::get_image_from_source($_SESSION['form']['images'][$key])); 
                 if (!isset($images[$key])) { echo "<td>&nbsp;</td>\n"; } 
                 else { 

trunk/templates/sidebar_modules.inc.php

@@ -39 +39 @@
   <li><h4><?php echo _('Information'); ?></h4>
     <ul class="sb3" id="sb_home_info">
-      <li id="sb_home_info_CurrentlyPlaying"><a href="<?php echo $web_path; ?>/index.php"><?php echo _('Currently Playing'); ?></a></li>
       <li id="sb_home_info_Statistics"><a href="<?php echo $web_path; ?>/stats.php"><?php echo _('Statistics'); ?></a></li>
       <li id="sb_home_info_AddStationRadio"><a href="<?php echo $web_path; ?>/radio.php?action=show_create"><?php echo _('Add Radio Station'); ?></a></li>