diff options
| author | Robin Appelman <icewind1991@gmail.com> | 2011-08-01 00:32:44 +0200 |
|---|---|---|
| committer | Robin Appelman <icewind1991@gmail.com> | 2011-08-01 00:32:44 +0200 |
| commit | cbf8f822de35748e079df695dd322ada32d02f69 (patch) | |
| tree | 5b29d072cc692e340f300dbd17d2aa81bd700193 /apps/media/lib_scanner.php | |
| parent | f88b47745911f06a844fbc3f35a347c679f0339c (diff) | |
| download | nextcloud-server-cbf8f822de35748e079df695dd322ada32d02f69.tar.gz nextcloud-server-cbf8f822de35748e079df695dd322ada32d02f69.zip | |
automatically scan songs that are played from the filebrowser
Diffstat (limited to 'apps/media/lib_scanner.php')
| -rw-r--r-- | apps/media/lib_scanner.php | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/apps/media/lib_scanner.php b/apps/media/lib_scanner.php index 4d0b38f820a..ab38d76294b 100644 --- a/apps/media/lib_scanner.php +++ b/apps/media/lib_scanner.php @@ -38,7 +38,6 @@ class OC_MEDIA_SCANNER{ * @return int the number of songs found */ public static function scanFolder($path){ -// OC_DB::beginTransaction(); if (OC_Filesystem::is_dir($path)) { $songs=0; if ($dh = OC_Filesystem::opendir($path)) { @@ -62,7 +61,6 @@ class OC_MEDIA_SCANNER{ }else{ $songs=0; } -// OC_DB::commit(); return $songs; } @@ -141,6 +139,6 @@ class OC_MEDIA_SCANNER{ $albumId=self::$albums[$artist.'/'.$album]; } $songId=OC_MEDIA_COLLECTION::addSong($title,$path,$artistId,$albumId,$length,$track,$size); - return !($title=='unkown' && $artist=='unkown' && $album=='unkown'); + return (!($title=='unkown' && $artist=='unkown' && $album=='unkown'))?$songId:0; } }
\ No newline at end of file |