mirror of
https://github.com/Dvorinka/swingmusic-extended.git
synced 2026-06-03 20:13:02 +00:00
process silence with processes instead of threads
- might help memory issues? + fix double slash problem on windows?
This commit is contained in:
+3
-4
@@ -99,11 +99,12 @@ def get_folder_tree(body: FolderTree):
|
||||
if is_windows():
|
||||
# Trailing slash needed when drive letters are passed,
|
||||
# Remember, the trailing slash is removed in the client.
|
||||
req_dir += "/"
|
||||
# req_dir += "/"
|
||||
pass
|
||||
else:
|
||||
req_dir = "/" + req_dir if not req_dir.startswith("/") else req_dir
|
||||
|
||||
res = get_files_and_dirs(
|
||||
return get_files_and_dirs(
|
||||
req_dir,
|
||||
start=body.start,
|
||||
limit=body.limit,
|
||||
@@ -114,8 +115,6 @@ def get_folder_tree(body: FolderTree):
|
||||
foldersort_reverse=body.foldersort_reverse,
|
||||
)
|
||||
|
||||
return res
|
||||
|
||||
|
||||
def get_all_drives(is_win: bool = False):
|
||||
"""
|
||||
|
||||
@@ -6,7 +6,7 @@ import os
|
||||
|
||||
from app.lib.pydub.pydub import AudioSegment
|
||||
from app.lib.pydub.pydub.silence import detect_leading_silence, detect_silence
|
||||
from app.utils.threading import ThreadWithReturnValue
|
||||
from app.utils.threading import ProcessWithReturnValue
|
||||
|
||||
|
||||
def get_leading_silence_end(filepath: str):
|
||||
@@ -58,13 +58,13 @@ def get_silence_paddings(ending_file: str, starting_file: str):
|
||||
starting_thread = None
|
||||
|
||||
if os.path.exists(ending_file):
|
||||
ending_thread = ThreadWithReturnValue(
|
||||
ending_thread = ProcessWithReturnValue(
|
||||
target=get_trailing_silence_start, args=(ending_file,)
|
||||
)
|
||||
ending_thread.start()
|
||||
|
||||
if os.path.exists(starting_file):
|
||||
starting_thread = ThreadWithReturnValue(
|
||||
starting_thread = ProcessWithReturnValue(
|
||||
target=get_leading_silence_end, args=(starting_file,)
|
||||
)
|
||||
starting_thread.start()
|
||||
|
||||
+17
-9
@@ -1,4 +1,5 @@
|
||||
import threading
|
||||
from multiprocessing import Process, Pipe
|
||||
|
||||
|
||||
def background(func):
|
||||
@@ -12,23 +13,30 @@ def background(func):
|
||||
return background_func
|
||||
|
||||
|
||||
class ThreadWithReturnValue(threading.Thread):
|
||||
"""
|
||||
A thread class that returns a value on join.
|
||||
|
||||
Credit: https://stackoverflow.com/a/6894023
|
||||
class ProcessWithReturnValue(Process):
|
||||
"""
|
||||
A process class that returns a value on join.
|
||||
Uses a pipe to communicate the return value back to the parent process.
|
||||
"""
|
||||
|
||||
def __init__(
|
||||
self, group=None, target=None, name=None, args=(), kwargs={}, Verbose=None
|
||||
):
|
||||
threading.Thread.__init__(self, group, target, name, args, kwargs)
|
||||
self._return = None
|
||||
Process.__init__(self, group=group, target=target, name=name, args=args, kwargs=kwargs)
|
||||
self._parent_conn, self._child_conn = Pipe()
|
||||
self._target = target
|
||||
self._args = args
|
||||
self._kwargs = kwargs
|
||||
|
||||
def run(self):
|
||||
if self._target is not None:
|
||||
self._return = self._target(*self._args, **self._kwargs)
|
||||
result = self._target(*self._args, **self._kwargs)
|
||||
self._child_conn.send(result)
|
||||
self._child_conn.close()
|
||||
|
||||
def join(self, *args):
|
||||
threading.Thread.join(self, *args)
|
||||
return self._return
|
||||
Process.join(self, *args)
|
||||
if self._parent_conn.poll():
|
||||
return self._parent_conn.recv()
|
||||
return None
|
||||
Reference in New Issue
Block a user