diff options
| author | Robin Appelman <icewind1991@gmail.com> | 2012-01-08 01:53:40 +0100 |
|---|---|---|
| committer | Robin Appelman <icewind1991@gmail.com> | 2012-01-08 01:53:40 +0100 |
| commit | d1edc360d9bd7d97c35d25b54dadec61004cd869 (patch) | |
| tree | 7344744268280ccbdc194746a7b40dfc90a33260 /apps/media/lib_scanner.php | |
| parent | 3844fb0e4ce093bb3c2e67d20f85f61b7723efdc (diff) | |
| parent | 8f8985c3e53862e2ca6446f296d4835a9577faac (diff) | |
| download | nextcloud-server-d1edc360d9bd7d97c35d25b54dadec61004cd869.tar.gz nextcloud-server-d1edc360d9bd7d97c35d25b54dadec61004cd869.zip | |
merge master into filesystem
Diffstat (limited to 'apps/media/lib_scanner.php')
| -rw-r--r-- | apps/media/lib_scanner.php | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/apps/media/lib_scanner.php b/apps/media/lib_scanner.php index c2bea2d836d..320b1f79199 100644 --- a/apps/media/lib_scanner.php +++ b/apps/media/lib_scanner.php @@ -120,7 +120,20 @@ class OC_MEDIA_SCANNER{ $title=stripslashes($data['comments']['title'][0]); } $size=$data['filesize']; - $track=(isset($data['comments']['track']))?$data['comments']['track'][0]:0; + if (isset($data['comments']['track'])) + { + $track = $data['comments']['track'][0]; + } + else if (isset($data['comments']['track_number'])) + { + $track = $data['comments']['track_number'][0]; + $track = explode('/',$track); + $track = $track[0]; + } + else + { + $track = 0; + } $length=isset($data['playtime_seconds'])?round($data['playtime_seconds']):0; } if(!isset(self::$artists[$artist])){ |