Ticket #3699: mythweb-music-rating.patch

File mythweb-music-rating.patch, 5.4 KB (added by otto at kolsi dot fi, 17 years ago)

  • modules/music/mp3act_functions.php

     
    378378        <strong>'.t('Album Tracks').'</strong>
    379379        <ul class="music">';
    380380
    381       $query = 'SELECT ms.song_id, ms.track, ms.name, ms.length, ms.numplays, '.
     381      $query = 'SELECT ms.song_id, ms.track, ms.name, ms.length, ms.numplays, ms.rating, '.
    382382               'SEC_TO_TIME(ms.length/1000) AS length, artist_name, genre '.
    383383               'FROM music_songs AS ms '.
    384384               'LEFT JOIN music_artists ON ms.artist_id=music_artists.artist_id '.
    … …  
    393393      {
    394394        $output .= getHtmlSong($row['song_id'], $row['artist_name'],
    395395          '', $row['track'], $row['name'],
    396           $row['length'], $row['numplays'], $row['genre']);
     396          $row['length'], $row['numplays'], $row['genre'], $row['rating']);
    397397      }
    398398      mysql_free_result($result);
    399399      $output .= '</ul>';
    … …  
    408408        <p><strong>".t('Songs').'</strong></p>
    409409        <ul class="music">';
    410410
    411       $query = 'SELECT ms.song_id, ms.name, ms.length, ms.numplays, ma.artist_name, mg.genre '.
     411      $query = 'SELECT ms.song_id, ms.name, SEC_TO_TIME(ms.length/1000) AS length, ms.numplays, ms.rating, ma.artist_name, mg.genre '.
    412412               'FROM music_songs AS ms '.
    413413               'LEFT JOIN music_artists AS ma ON ms.artist_id=ma.artist_id '.
    414414               'LEFT JOIN music_genres AS mg ON ms.genre_id=mg.genre_id '.
    … …  
    422422      {
    423423        $output .= getHtmlSong($row['song_id'], $row['artist_name'],
    424424          '', '', $row['name'],
    425           $row['length'], $row['numplays'], '');
     425          $row['length'], $row['numplays'], '', $row['rating']);
    426426      }
    427427      mysql_free_result($result);
    428428      $output .= '</ul>';
    … …  
    475475      $output .='</ul><p><strong>'.t('Songs').'</strong></p>
    476476        <ul class="music">';
    477477
    478       $query = 'SELECT ms.song_id, ms.track, ms.name, ms.length, ms.numplays, '.
     478      $query = 'SELECT ms.song_id, ms.track, ms.name, ms.length, ms.numplays, ms.rating, '.
    479479        'SEC_TO_TIME(ms.length/1000) AS length, music_artists.artist_name, track, '.
    480480        'music_albums.album_name, genre '.
    481481        'FROM music_songs AS ms '.
    … …  
    491491      {
    492492        $output .= getHtmlSong($row['song_id'], '',
    493493          $row['album_name'], $row['track'], $row['name'],
    494           $row['length'], $row['numplays'], $row['genre']);
     494          $row['length'], $row['numplays'], $row['genre'], $row['rating']);
    495495      }
    496496      mysql_free_result($result);
    497497      $output .= '</ul>';
    … …  
    653653            $row = $song_info[$song_id];
    654654            $output .= getHtmlSong($row['song_id'], $row['artist_name'],
    655655              '', '', $row['name'],
    656               $row['length'], $row['numplays'], '');
     656              $row['length'], $row['numplays'], '', '');
    657657          }
    658658          else if ($song_id < 0)
    659659          {
    … …  
    760760      while ($row = mysql_fetch_array($result))
    761761      {
    762762        $output .= getHtmlSong($row['song_id'], $row['artist_name'],
    763           '', '', $row['name'], '', '', '');
     763          '', '', $row['name'], '', '', '', '');
    764764      }
    765765      mysql_free_result($result);
    766766      $output .= '</ul>';
    … …  
    786786      while ($row = mysql_fetch_array($result))
    787787      {
    788788        $output .= getHtmlSong($row['song_id'], $row['artist_name'],
    789           '', '', $row['name'], '', '', '');
     789          '', '', $row['name'], '', '', '', '');
    790790      }
    791791      $output .= '</ul>';
    792792      break;
    … …  
    833833function searchMusic($terms, $option)
    834834{
    835835  $sql_terms = "'%".mysql_real_escape_string($terms)."%'";
    836   $query = 'SELECT ms.song_id, ma.album_name, ms.track, mt.artist_name, ms.name, SEC_TO_TIME(ms.length/1000) AS length, genre '.
     836  $query = 'SELECT ms.song_id, ma.album_name, ms.track, mt.artist_name, ms.name, ms.rating, '.
     837    'SEC_TO_TIME(ms.length/1000) AS length, genre '.
    837838    'FROM music_songs AS ms '.
    838839    'LEFT JOIN music_artists AS mt ON ms.artist_id=mt.artist_id '.
    839840    'LEFT JOIN music_albums AS ma ON ms.album_id=ma.album_id '.
    … …  
    880881    {
    881882      $output .= getHtmlSong($row['song_id'], $row['artist_name'],
    882883        $row['album_name'], $row['track'], $row['name'],
    883         $row['length'], '', $row['genre']);
     884        $row['length'], '', $row['genre'], $row['rating']);
    884885    }
    885886    $output .= '</ul>';
    886887  }

  • modules/music/mp3act_html_functions.php

     
    11<?php
    22
    3 function getHtmlSong($id, $artistName, $albumName, $trackNum, $trackName, $trackLength, $numPlays, $genre)
     3function getHtmlSong($id, $artistName, $albumName, $trackNum, $trackName, $trackLength, $numPlays, $genre, $rating)
    44{
    55  static $alt = true;
    66  $alt = !$alt;
    … …  
    3434  }
    3535
    3636  if (!empty($trackLength))
    37     '<em>'.$trackLength.'</em>';
     37    $sub_output .= $trackLength.'<br />';
    3838
    3939  if(!empty($genre))
    4040    $sub_output .= t('Genre').': '.$genre.'<br />';
    4141
     42  if(!empty($rating))
     43    $sub_output .= t('Rating').': '.$rating.'<br />';
     44
    4245  if (!empty($sub_output))
    4346  {
    4447    $output .= '<p>'.$sub_output.'</p>';
    … …  
    160163    '<br />'.sprintf(t('Total Time:  %s'), $playlistTotalTime).'</p>');
    161164}
    162165
    163 ?>
    164  No newline at end of file
     166?>