cidoku/AO2XP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improve music thread

Browse Source
This commit is contained in:
cidoku 2025-02-27 23:53:47 -03:00
parent 5b07e9a3ad
commit 6e9d6d486b
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gameview.py
View File

@ -3076,7 +3076,8 @@ class gui(QtGui.QWidget):
self.stream = None self.stream = None
if self.download_thread: if self.download_thread:
self.download_thread.terminate() # Live dangerously self.download_thread.stop()
self.download_thread.wait()
self.download_thread = None self.download_thread = None
def playDownloadedMusic(self, file_length): def playDownloadedMusic(self, file_length):
@ -3751,11 +3752,16 @@ class music_download_thread(QtCore.QThread):
super(music_download_thread, self).__init__() super(music_download_thread, self).__init__()
self.caller = caller self.caller = caller
self.url = url self.url = url
self.exiting = False
def run(self): def run(self):
self.exiting = False
self.download(self.url) self.download(self.url)
def download(self, url): def download(self, url):
if self.exiting:
return
headers = { headers = {
'User-Agent': "AO2XP %s" % (GAME_VERSION), 'User-Agent': "AO2XP %s" % (GAME_VERSION),
'Accept': '*/*', 'Accept': '*/*',
@ -3779,11 +3785,19 @@ class music_download_thread(QtCore.QThread):
buffer_size = 8192 buffer_size = 8192
while bytes_downloaded < file_length: while bytes_downloaded < file_length:
if self.exiting:
self.quit()
break
chunk = response.read(buffer_size) chunk = response.read(buffer_size)
if not chunk: if not chunk:
break break
stream += chunk stream += chunk
bytes_downloaded += len(chunk) bytes_downloaded += len(chunk)
self.caller.stream = create_string_buffer(stream) self.caller.stream = create_string_buffer(stream)
self.finished_signal.emit(file_length) self.finished_signal.emit(file_length)
def stop(self):
self.exiting = True