From: Robin Appelman <icewind1991@gmail.com>
Date: Tue, 2 Aug 2011 02:43:08 +0000 (+0200)
Subject: make the progres bar for scanning always go to the full 100%
X-Git-Tag: v3.0~267^2~305^2~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=900adb35d8a712809c6ed36f2a9b9b26285bdb7f;p=nextcloud-server.git

make the progres bar for scanning always go to the full 100%
---

diff --git a/apps/media/js/scanner.js b/apps/media/js/scanner.js
index e3867580bdb..de67c7c9931 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;