Ticket #5742: mythweb-music-lastplay-v2.patch

File mythweb-music-lastplay-v2.patch, 16.3 KB (added by otto at kolsi dot fi, 15 years ago)

  • modules/music/mp3act_js.js.php

     
    305305                    }
    306306                    items = items.substring(1);
    307307                }
    308                 if(data.rating.value == 'all'){
    309                     x_randAdd(type,num,items,randadd_cb);
     308
     309                var lastplay = "";
     310                if(data.lastplay.value == 'never'){
     311                    lastplay = " IS NULL ";
    310312                }
    311                 else{
    312                     var filter = data.rating.value + ' ' + data.rating_value.value;
    313                     x_randAdd(type,num,items,filter,randadd_cb);
     313                else if(data.lastplay.value != 'all'){
     314                    lastplay = data.lastplay.value + " DATE_SUB(NOW(), INTERVAL " +
     315                        data.lastplay_value.value + " DAY) ";
     316
     317                    //take into account songs never played
     318                    if(data.lastplay.value == '<'){
     319                        lastplay = lastplay + " OR lastplay IS NULL ";
     320                    }
    314321                }
    315322
     323                var rating = "";
     324                if(data.rating.value != 'all'){
     325                    rating = data.rating.value + ' ' + data.rating_value.value;
     326                }
     327
     328                x_randAdd(type,num,items,rating,lastplay,randadd_cb);
     329
    316330                return false;
    317331
    318332            }

  • modules/music/mp3act_functions.php

     
    534534
    535535        <strong>'.t('Rating').'</strong><br />
    536536        <select name="rating">
    537         <option value="all">All</option>
     537        <option value="all">'.t('All').'</option>
    538538        <option value=">">></option>
    539539        <option value="=">=</option>
    540540        <option value="<"><</option>
    … …  
    552552        <option value="1">1</option>
    553553        </select><br />
    554554
     555         <strong>'.t('Last Play').'</strong><br />
     556         <select name="lastplay">
     557         <option value="all">'.t('All').'</option>
     558         <option value="never">'.t('Never').'</option>
     559         <option value="<">'.t('Earlier than').'</option>
     560         <option value=">">'.t('Later than').'</option>
     561         </select>
     562
     563         <select name="lastplay_value">
     564         <option value="30">30 '.t('days ago').'</option>
     565         <option value="60">60 '.t('days ago').'</option>
     566         <option value="90">90 '.t('days ago').'</option>
     567         <option value="120">120 '.t('days ago').'</option>
     568         </select><br />
     569
    555570        <strong>'.t('Random Type').'</strong><br />
    556571
    557572        <select name="random_type" onchange="getRandItems(this.options[selectedIndex].value); return false;">
    … …  
    14061421  return $output;
    14071422}
    14081423
    1409 function randAdd($type,$num=0,$items='',$rating='')
     1424function randAdd($type,$num=0,$items='',$rating='',$lastplay='')
    14101425{
    14111426  $output = array(0 => 1);
    14121427  // Check to see if $items matches our REGEXP.
    … …  
    14291444    case 'albums':
    14301445      $query .= 'WHERE album_id IN ('.$sql_items.') ';
    14311446      break;
     1447    case 'all':
     1448      $query .= 'WHERE true ';
     1449      break;
     1450
    14321451  }
     1452
    14331453  if($rating != '') {
    1434     if($type == 'all')
    1435       $query .= 'WHERE rating '.$rating.' ';
    1436     else
    14371454      $query .= 'AND rating '.$rating.' ';
    14381455  }
     1456 
     1457  if($lastplay != '') {
     1458      $query .= 'AND (lastplay '.$lastplay.') ';
     1459  }
    14391460
     1461
    14401462  $query .= 'GROUP BY name ORDER BY RAND()+0 '.
    14411463    'LIMIT '.mysql_real_escape_string(intval($num));
    14421464  $result = mysql_query($query);

  • modules/_shared/lang/English_GB.lang

     
    111111"Browse the Music Database"
    112112"By Artist Beginning With"
    113113"By Genre"
    114 "Cache Engine"
    115114"callsign"
    116115"Cancel"
    117116"Cancel this schedule."
    … …  
    168167"Database Health"
    169168"Date"
    170169"Date Formats"
     170"days ago"
    171171"Deactivated"
    172172"Deaf Signed"
    173173    Deaf Signed
    … …  
    204204"Duplicates"
    205205"Earlier"
    206206"Earlier Showing"
     207"Earlier than"
    207208"Edit"
    208209"Edit existing group"
    209210"Edit MythWeb and some MythTV settings."
    … …  
    336337"Keyword Search"
    337338"Keywords"
    338339"Language"
     340"Last Play"
    339341"Last Recorded"
    340342"Last recording"
    341343"Later"
     344"Later than"
    342345"left"
    343346"Left"
    344347"leftl"
    … …  
    404407"Name"
    405408"name"
    406409"Narrow Your Search"
     410"Never"
    407411"Never Record"
    408412"New"
    409413"New Episodes Only"

  • modules/_shared/lang/Catalan.lang

     
    153153"Browse the Music Database"
    154154"By Artist Beginning With"
    155155"By Genre"
    156 "Cache Engine"
    157156"callsign"
    158157"Cancel"
    159158"Cancel this schedule."
    … …  
    240239    Data
    241240"Date Formats"
    242241    Formats de data
     242"days ago"
    243243"Deactivated"
    244244    Desactivat
    245245"Deaf Signed"
    … …  
    291291    Duplicats
    292292"Earlier"
    293293"Earlier Showing"
     294"Earlier than"
    294295"Edit"
    295296    Editar
    296297"Edit existing group"
    … …  
    459460"Keywords"
    460461"Language"
    461462    Llengua
     463"Last Play"
    462464"Last Recorded"
    463465    Darrer cop enregistrat
    464466"Last recording"
    465467    Darrer enregistrament
    466468"Later"
     469"Later than"
    467470"left"
    468471"Left"
    469472"leftl"
    … …  
    554557"name"
    555558    nom
    556559"Narrow Your Search"
     560"Never"
    557561"Never Record"
    558562    Mai enregistrar
    559563"New"

  • modules/_shared/lang/French.lang

     
    136136"Browse the Music Database"
    137137"By Artist Beginning With"
    138138"By Genre"
    139 "Cache Engine"
    140139"callsign"
    141140"Cancel"
    142141"Cancel this schedule."
    … …  
    209208    Date
    210209"Date Formats"
    211210    Formats de date
     211"days ago"
    212212"Deactivated"
    213213    D&eacute;sactiver
    214214"Deaf Signed"
    … …  
    255255    Doublonner
    256256"Earlier"
    257257"Earlier Showing"
     258"Earlier than"
    258259"Edit"
    259260"Edit existing group"
    260261"Edit MythWeb and some MythTV settings."
    … …  
    404405"Keywords"
    405406"Language"
    406407    Langue
     408"Last Play"
    407409"Last Recorded"
    408410"Last recording"
    409411"Later"
     412"Later than"
    410413"left"
    411414"Left"
    412415"leftl"
    … …  
    479482"Name"
    480483"name"
    481484"Narrow Your Search"
     485"Never"
    482486"Never Record"
    483487    Ne jamais enregistrer
    484488"New"

  • modules/_shared/lang/Spanish.lang

     
    203203    Por Artista Que Comience En
    204204"By Genre"
    205205    Por Género
    206 "Cache Engine"
    207206"callsign"
    208207"Cancel"
    209208    Cancelar
    … …  
    304303    Fecha
    305304"Date Formats"
    306305    Formatos Fecha
     306"days ago"
    307307"Deactivated"
    308308    Desactivado
    309309"Deaf Signed"
    … …  
    362362"Earlier"
    363363    Más Temprano
    364364"Earlier Showing"
     365"Earlier than"
    365366"Edit"
    366367    Editar
    367368"Edit existing group"
    … …  
    531532"Keywords"
    532533"Language"
    533534    Lengua
     535"Last Play"
    534536"Last Recorded"
    535537    Última vez Grabado
    536538"Last recording"
    537539    Última Grabación
    538540"Later"
     541"Later than"
    539542"left"
    540543"Left"
    541544"leftl"
    … …  
    625628"name"
    626629    nombre
    627630"Narrow Your Search"
     631"Never"
    628632"Never Record"
    629633    Nunca grabar
    630634"New"

  • modules/_shared/lang/Danish.lang

     
    150150"Browse the Music Database"
    151151"By Artist Beginning With"
    152152"By Genre"
    153 "Cache Engine"
    154153"callsign"
    155154    kortnavn
    156155"Cancel"
    … …  
    236235    Dato
    237236"Date Formats"
    238237    Datoformater
     238"days ago"
    239239"Deactivated"
    240240    Deaktiveret
    241241"Deaf Signed"
    … …  
    286286    Dubletter
    287287"Earlier"
    288288"Earlier Showing"
     289"Earlier than"
    289290"Edit"
    290291    Ændre
    291292"Edit existing group"
    … …  
    446447"Keywords"
    447448"Language"
    448449    Sprog
     450"Last Play"
    449451"Last Recorded"
    450452    Sidst optaget
    451453"Last recording"
    452454    Sidste optagelse
    453455"Later"
     456"Later than"
    454457"left"
    455458"Left"
    456459"leftl"
    … …  
    534537"name"
    535538    navn
    536539"Narrow Your Search"
     540"Never"
    537541"Never Record"
    538542    Optag aldrig
    539543"New"

  • modules/_shared/lang/Swedish.lang

     
    199199    Efter artist som börjar pÃ¥
    200200"By Genre"
    201201    Efter genre
    202 "Cache Engine"
    203202"callsign"
    204203    kortnamn
    205204"Cancel"
    … …  
    302301    Datum
    303302"Date Formats"
    304303    Datumformat
     304"days ago"
    305305"Deactivated"
    306306    Avaktiverad
    307307"Deaf Signed"
    … …  
    359359"Earlier"
    360360    Tidigare
    361361"Earlier Showing"
     362"Earlier than"
    362363"Edit"
    363364    Redigera
    364365"Edit existing group"
    … …  
    553554    Nyckelord
    554555"Language"
    555556    SprÃ¥k
     557"Last Play"
    556558"Last Recorded"
    557559    Senast inspelad
    558560"Last recording"
    559561    Senaste inspelning
    560562"Later"
    561563    Senare
     564"Later than"
    562565"left"
    563566"Left"
    564567"leftl"
    … …  
    666669    namn
    667670"Narrow Your Search"
    668671    BegrÀnsa din sökning
     672"Never"
    669673"Never Record"
    670674    Spela aldrig in
    671675"New"

  • modules/_shared/lang/Dutch.lang

     
    146146"Browse the Music Database"
    147147"By Artist Beginning With"
    148148"By Genre"
    149 "Cache Engine"
    150149"callsign"
    151150    zender
    152151"Cancel"
    … …  
    229228    Datum
    230229"Date Formats"
    231230    Weergave Datum
     231"days ago"
    232232"Deactivated"
    233233    Gedeactiveerd
    234234"Deaf Signed"
    … …  
    280280    Dubbels
    281281"Earlier"
    282282"Earlier Showing"
     283"Earlier than"
    283284"Edit"
    284285    Bewerken
    285286"Edit existing group"
    … …  
    445446"Keywords"
    446447"Language"
    447448    Taal
     449"Last Play"
    448450"Last Recorded"
    449451"Last recording"
    450452"Later"
     453"Later than"
    451454"left"
    452455"Left"
    453456"leftl"
    … …  
    529532"name"
    530533    naam
    531534"Narrow Your Search"
     535"Never"
    532536"Never Record"
    533537    Nooit Opnemen
    534538"New"

  • modules/_shared/lang/German.lang

     
    195195    Nach KÃŒnstler beginnend mit
    196196"By Genre"
    197197    Nach Genre
    198 "Cache Engine"
    199198"callsign"
    200199    Kurzname
    201200"Cancel"
    … …  
    303302    Datum
    304303"Date Formats"
    305304    Datumsformate
     305"days ago"
    306306"Deactivated"
    307307    Deaktiviert
    308308"Deaf Signed"
    … …  
    364364    frÃŒher
    365365"Earlier Showing"
    366366    frÃŒhere Austrahlung
     367"Earlier than"
    367368"Edit"
    368369    Bearbeiten
    369370"Edit existing group"
    … …  
    566567    SchlÃŒsselwörter
    567568"Language"
    568569    Sprache
     570"Last Play"
    569571"Last Recorded"
    570572    zuletzt aufgenommen
    571573"Last recording"
    572574    letzte Aufnahme
    573575"Later"
    574576    spÀter
     577"Later than"
    575578"left"
    576579"Left"
    577580"leftl"
    … …  
    675678    Name
    676679"Narrow Your Search"
    677680    Suche verfeinern
     681"Never"
    678682"Never Record"
    679683    Niemals aufnehmen
    680684"New"

  • modules/_shared/lang/Japanese.lang

     
    146146"Browse the Music Database"
    147147"By Artist Beginning With"
    148148"By Genre"
    149 "Cache Engine"
    150149"callsign"
    151150    コヌルサむン
    152151"Cancel"
    … …  
    229228    日付
    230229"Date Formats"
    231230    日付曞匏
     231"days ago"
    232232"Deactivated"
    233233    無効
    234234"Deaf Signed"
    … …  
    280280    重耇
    281281"Earlier"
    282282"Earlier Showing"
     283"Earlier than"
    283284"Edit"
    284285    線集
    285286"Edit existing group"
    … …  
    443444"Keywords"
    444445"Language"
    445446    蚀語
     447"Last Play"
    446448"Last Recorded"
    447449    最埌の録画
    448450"Last recording"
    449451    最埌の録画
    450452"Later"
     453"Later than"
    451454"left"
    452455"Left"
    453456"leftl"
    … …  
    535538"name"
    536539    名前
    537540"Narrow Your Search"
     541"Never"
    538542"Never Record"
    539543    もう録画しない
    540544"New"

  • modules/_shared/lang/English.lang

     
    108108"Browse the Music Database"
    109109"By Artist Beginning With"
    110110"By Genre"
    111 "Cache Engine"
    112111"callsign"
    113112"Cancel"
    114113"Cancel this schedule."
    … …  
    165164"Database Health"
    166165"Date"
    167166"Date Formats"
     167"days ago"
    168168"Deactivated"
    169169"Deaf Signed"
    170170    Deaf Signed
    … …  
    200200"Duplicates"
    201201"Earlier"
    202202"Earlier Showing"
     203"Earlier than"
    203204"Edit"
    204205"Edit existing group"
    205206"Edit MythWeb and some MythTV settings."
    … …  
    332333"Keyword Search"
    333334"Keywords"
    334335"Language"
     336"Last Play"
    335337"Last Recorded"
    336338"Last recording"
    337339"Later"
     340"Later than"
    338341"left"
    339342"Left"
    340343"leftl"
    … …  
    399402"Name"
    400403"name"
    401404"Narrow Your Search"
     405"Never"
    402406"Never Record"
    403407"New"
    404408"New Episodes Only"

  • modules/_shared/lang/Czech.lang

     
    124124"Browse the Music Database"
    125125"By Artist Beginning With"
    126126"By Genre"
    127 "Cache Engine"
    128127"callsign"
    129128"Cancel"
    130129"Cancel this schedule."
    … …  
    190189"Date"
    191190    Datum
    192191"Date Formats"
     192"days ago"
    193193"Deactivated"
    194194"Deaf Signed"
    195195"Default"
    … …  
    229229"Duplicates"
    230230"Earlier"
    231231"Earlier Showing"
     232"Earlier than"
    232233"Edit"
    233234"Edit existing group"
    234235"Edit MythWeb and some MythTV settings."
    … …  
    364365"Keywords"
    365366"Language"
    366367    Jazyk
     368"Last Play"
    367369"Last Recorded"
    368370"Last recording"
    369371"Later"
     372"Later than"
    370373"left"
    371374"Left"
    372375"leftl"
    … …  
    436439"Name"
    437440"name"
    438441"Narrow Your Search"
     442"Never"
    439443"Never Record"
    440444    Nikdy nenahrávat
    441445"New"

  • modules/_shared/lang/Finnish.lang

     
    210210    Selaa artisteja, jotka alkavat"
    211211"By Genre"
    212212    Lajityypin mukaan
    213 "Cache Engine"
    214213"callsign"
    215214    Kutsumanimi
    216215"Cancel"
    … …  
    320319    Aika
    321320"Date Formats"
    322321    PÀivÀmÀÀrÀn muoto
     322"days ago"
    323323"Deactivated"
    324324    Pois pÀÀltÀ
    325325"Deaf Signed"
    … …  
    385385    Aiemmat
    386386"Earlier Showing"
    387387    aiemmat nÀytÀnnöt
     388"Earlier than"
    388389"Edit"
    389390    Muokkaa
    390391"Edit existing group"
    … …  
    606607    Avainsanat
    607608"Language"
    608609    Kieli
     610"Last Play"
    609611"Last Recorded"
    610612    Viimeksi tallennettu
    611613"Last recording"
    612614    Viimeisin tallennus
    613615"Later"
    614616    Myöhemmin
     617"Later than"
    615618"left"
    616619    jÀljellÀ
    617620"Left"
    … …  
    727730    Nimi
    728731"Narrow Your Search"
    729732    Kavenna hakuasi
     733"Never"
    730734"Never Record"
    731735    ÄlÀ nauhoita koskaan
    732736"New"

  • modules/_shared/lang/Polish.lang

     
    139139"Browse the Music Database"
    140140"By Artist Beginning With"
    141141"By Genre"
    142 "Cache Engine"
    143142"callsign"
    144143    ??callsign??
    145144"Cancel"
    … …  
    221220    Data
    222221"Date Formats"
    223222    Format Daty
     223"days ago"
    224224"Deactivated"
    225225    Zdezaktywowany
    226226"Deaf Signed"
    … …  
    268268    Duplikaty
    269269"Earlier"
    270270"Earlier Showing"
     271"Earlier than"
    271272"Edit"
    272273    Edycja
    273274"Edit existing group"
    … …  
    395396"Keywords"
    396397"Language"
    397398    Język
     399"Last Play"
    398400"Last Recorded"
    399401    Ostatnio Nagrane
    400402"Last recording"
    401403"Later"
     404"Later than"
    402405"left"
    403406"Left"
    404407"leftl"
    … …  
    475478"name"
    476479    nazwa
    477480"Narrow Your Search"
     481"Never"
    478482"Never Record"
    479483    Nigdy Nie Nagrywaj
    480484"New"

  • modules/_shared/lang/Slovenian.lang

     
    201201    Po izvajalcu, ki se začne z
    202202"By Genre"
    203203    Po zvrsti
    204 "Cache Engine"
    205204"callsign"
    206205    oznaka
    207206"Cancel"
    … …  
    308307    Datum
    309308"Date Formats"
    310309    Format datuma
     310"days ago"
    311311"Deactivated"
    312312    Neaktivni
    313313"Deaf Signed"
    … …  
    372372    PrejÅ¡nje
    373373"Earlier Showing"
    374374    PrejÅ¡nje oddaje
     375"Earlier than"
    375376"Edit"
    376377    Uredi
    377378"Edit existing group"
    … …  
    580581    Ključne besede
    581582"Language"
    582583    Jezik
     584"Last Play"
    583585"Last Recorded"
    584586    Nazadnje posneto
    585587"Last recording"
    586588    Zadnje snemanje
    587589"Later"
    588590    Kasneje
     591"Later than"
    589592"left"
    590593"Left"
    591594    Levo
    … …  
    698701    ime
    699702"Narrow Your Search"
    700703    ZoÅŸite vaÅ¡e iskanje
     704"Never"
    701705"Never Record"
    702706    Nikoli ne snemaj
    703707"New"