From 900adb35d8a712809c6ed36f2a9b9b26285bdb7f Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Tue, 2 Aug 2011 04:43:08 +0200 Subject: [PATCH] make the progres bar for scanning always go to the full 100% --- apps/media/js/scanner.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/apps/media/js/scanner.js b/apps/media/js/scanner.js index e3867580bd..de67c7c993 100644 --- a/apps/media/js/scanner.js +++ b/apps/media/js/scanner.js @@ -1,6 +1,7 @@ Scanner={ songsFound:0, songsScanned:0, + songsChecked:0, startTime:null, endTime:null, stopScanning:false, @@ -18,6 +19,7 @@ Scanner={ scanFile:function(path,ready){ path=encodeURIComponent(path); $.getJSON(OC.linkTo('media','ajax/api.php')+'?action=get_path_info&path='+path,function(song){ + Scanner.songsChecked++; if(ready){ ready(song); } @@ -25,7 +27,7 @@ Scanner={ var artistId=song.song_artist; Scanner.songsScanned++; $('#scan span.songCount').text(Scanner.songsScanned); - var progress=(Scanner.songsScanned/Scanner.songsFound)*100; + var progress=(Scanner.songsChecked/Scanner.songsFound)*100; $('#scanprogressbar').progressbar('value',progress) Collection.addSong(song); } @@ -35,6 +37,8 @@ Scanner={ $('#scanprogressbar').progressbar({ value:0, }); + Scanner.songsChecked=0; + Scanner.songsScanned=0; Scanner.startTime=new Date().getTime()/1000; Scanner.findSongs(function(songs){ Scanner.songs=songs;