Added download of multiple audios from any audio buffer

src/controller/buffers.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 """ A buffer is a (virtual) list of items. All items belong to a category (wall posts, messages, persons...)"""
+import os
 import time
 import random
 import logging
@@ -880,12 +881,12 @@ class audioBuffer(feedBuffer):
 			multiple = True
 			filename = "" # No default filename for multiple files.
 		path = self.tab.get_download_path(filename=filename, multiple=multiple)
-		call_threaded(self.download_threaded, path, multiple, audios)
+		self.download_threaded(path, multiple, audios)
 
 	def download_threaded(self, path, multiple, audios):
 		if multiple == False:
 			url = audios[0]["url"]
-			pub.sendMessage("download-file", url=url, filename=filename)
+			pub.sendMessage("download-file", url=url, filename=path)
 			return
 		else:
 			downloads = []
@@ -893,7 +894,7 @@ class audioBuffer(feedBuffer):
 				filename = utils.safe_filename("{0} - {1}.mp3".format(i["title"], i["artist"]))
 				filepath = os.path.join(path, filename)
 				downloads.append((utils.transform_audio_url(i["url"]), filepath))
-				pub.sendMessage("download-files", downloads)
+				pub.sendMessage("download-files", downloads=downloads)
 
 class audioAlbum(audioBuffer):
 	""" this buffer was supposed to be used with audio albums

src/controller/mainController.py

@@ -402,10 +402,10 @@ class Controller(object):
 		"""
 		url = utils.transform_audio_url(url)
 		log.debug("downloading %s URL to %s filename" % (url, filename,))
-		call_threaded(utils.download_file, url, filename, self.window)
+		call_threaded(utils.download_file, url, filename)
 
 	def download_files(self, downloads):
-		call_threaded(utils.download_files, downloads, self.window)
+		call_threaded(utils.download_files, downloads)
 
 	def view_post(self, post_object, controller_, vars=dict()):
 		""" Display the passed post in the passed post presenter.

src/sessionmanager/utils.py

@@ -5,6 +5,7 @@ import re
 import html
 import logging
 import requests
+from pubsub import pub
 
 log = logging.getLogger("utils")
 url_re = re.compile("(?:\w+://|www\.)[^ ,.?!#%=+][^ ]*")
@@ -41,26 +42,27 @@ def seconds_to_string(seconds, precision=0):
 def find_urls_in_text(text):
 	return [s.strip(bad_chars) for s in url_re.findall(text)]
 
-def download_file(url, local_filename, window):
+def download_file(url, local_filename):
 	r = requests.get(url, stream=True)
-	window.change_status(_("Downloading {0}").format(local_filename,))
+	pub.sendMessage("change_status", status=_("Downloading {0}").format(local_filename,))
 	total_length = r.headers.get("content-length")
 	dl = 0
 	total_length = int(total_length)
 	with open(local_filename, 'wb') as f:
-		for chunk in r.iter_content(chunk_size=64): 
+		for chunk in r.iter_content(chunk_size=512*1024): 
 			if chunk: # filter out keep-alive new chunks
 				dl += len(chunk)
 				f.write(chunk)
 				done = int(100 * dl/total_length)
 				msg = _("Downloading {0} ({1}%)").format(os.path.basename(local_filename), done)
-				window.change_status(msg)
-	window.change_status(_("Ready"))
+#				print(msg)
+				pub.sendMessage("change_status", status=msg)
+	pub.sendMessage("change_status", status=_("Ready"))
 	return local_filename
 
-def download_files(downloads, window):
+def download_files(downloads):
 		for download in downloads:
-			download_file(download[0], download[1], window)
+			download_file(download[0], download[1])
 
 def detect_users(text):
 	""" Detect all users and communities mentionned in any text posted in VK."""

src/wxUI/mainWindow.py

@@ -2,6 +2,7 @@
 import wx
 import wx.adv
 import application
+from pubsub import pub
 
 class mainWindow(wx.Frame):
 	def makeMenu(self):
@@ -83,6 +84,7 @@ class mainWindow(wx.Frame):
 		self.sb = self.CreateStatusBar()
 		self.tb = wx.Treebook(self.panel, -1)
 		self.sizer.Add(self.tb, 1, wx.ALL|wx.EXPAND, 5)
+		pub.subscribe(self.change_status, "change_status")
 
 	def realize(self):
 		self.panel.SetSizer(self.sizer)
@@ -91,7 +93,7 @@ class mainWindow(wx.Frame):
 		self.SetSize(self.GetBestSize())
 
 	def change_status(self, status):
-		self.sb.SetStatusText(status)
+		wx.CallAfter(self.sb.SetStatusText, status)
 
 	def connection_error(self):
 		wx.MessageDialog(self, _("There is a connection error. Check your internet connection and try again later."), _("Connection error"), wx.ICON_ERROR).ShowModal()