mirror/AnimeWwise
1
0
Fork 0
mirror of https://github.com/Escartem/AnimeWwise.git synced 2026-06-17 00:10:25 +08:00
Code Activity

fix both progress bars

Browse Source
This commit is contained in:
Escartem
2024-07-24 09:55:01 +02:00
parent 1f0c7d90db
commit dd78319589
2 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app.py
View File

@@ -2,6 +2,7 @@ import os
import sys import sys
import json import json
import time import time
import math
import mapper import mapper
import extract import extract
from PyQt5 import uic from PyQt5 import uic
@@ -118,9 +119,9 @@ class AnimeWwise(QMainWindow):
@pyqtSlot(list) @pyqtSlot(list)
def progressBarSlot(self, progress): def progressBarSlot(self, progress):
if progress[0] == "total": if progress[0] == "total":
self.totalProgress.setValue(progress[1]) self.totalProgress.setValue(math.ceil(progress[1]))
elif progress[0] == "file": elif progress[0] == "file":
self.fileProgress.setValue(progress[1]) self.fileProgress.setValue(math.ceil(progress[1]))
@pyqtSlot(dict) @pyqtSlot(dict)
def handleFinished(self, data): def handleFinished(self, data):

28
extract.py
View File

@@ -2,14 +2,14 @@ import os
import io import io
import sys import sys
import time import time
from mapper import Mapper
import shutil import shutil
import filecmp import filecmp
import tempfile import tempfile
import wavescan import wavescan
import subprocess import subprocess
from filereader import FileReader from mapper import Mapper
from allocator import Allocator from allocator import Allocator
from filereader import FileReader
cwd = os.getcwd() cwd = os.getcwd()
path = lambda path: os.path.join(cwd, path) path = lambda path: os.path.join(cwd, path)
@@ -370,6 +370,13 @@ class WwiseExtract:
def extract_files(self, _input, files, output, _format, progress): def extract_files(self, _input, files, output, _format, progress):
temp_dir = tempfile.TemporaryDirectory() temp_dir = tempfile.TemporaryDirectory()
self.progress = progress
self.steps = {
"wem": 1,
"wav": 2,
"mp3": 3,
"ogg": 3
}[_format]
# wem # wem
if _format == "wem": if _format == "wem":
@@ -377,7 +384,7 @@ class WwiseExtract:
else: else:
output_folder = os.path.join(temp_dir.name, "wem") output_folder = os.path.join(temp_dir.name, "wem")
self.extract_wem(_input, files, output_folder, progress) self.extract_wem(_input, files, output_folder)
if _format == "wem": if _format == "wem":
temp_dir.cleanup() temp_dir.cleanup()
@@ -392,7 +399,7 @@ class WwiseExtract:
else: else:
output_folder = os.path.join(temp_dir.name, "wav") output_folder = os.path.join(temp_dir.name, "wav")
self.extract_wav(new_input, files, output_folder, progress) self.extract_wav(new_input, files, output_folder)
if _format == "wav": if _format == "wav":
temp_dir.cleanup() temp_dir.cleanup()
@@ -408,7 +415,7 @@ class WwiseExtract:
temp_dir.cleanup() temp_dir.cleanup()
return return
def extract_wem(self, _input, files, output, progress): def extract_wem(self, _input, files, output):
print(": Extracting audio as wem") print(": Extracting audio as wem")
all_sources = list(set([e["source"] for e in files])) all_sources = list(set([e["source"] for e in files]))
@@ -418,7 +425,7 @@ class WwiseExtract:
pos = 0 pos = 0
for file in files: for file in files:
pos += 1 pos += 1
progress(["file", pos * 100 // len(files)]) self.update_progress(pos, len(files), 1)
data = self.allocator.read_at(file["source"], file["offset"], file["size"]) data = self.allocator.read_at(file["source"], file["offset"], file["size"])
@@ -432,12 +439,12 @@ class WwiseExtract:
self.allocator.free_mem() self.allocator.free_mem()
def extract_wav(self, _input, files, output, progress): def extract_wav(self, _input, files, output):
print(": Converting audio to wav") print(": Converting audio to wav")
pos = 0 pos = 0
for file in files: for file in files:
pos += 1 pos += 1
progress(["file", pos * 100 // len(files)]) self.update_progress(pos, len(files), 2)
filename = f'{os.path.basename(file).split(".")[0]}.wav' filename = f'{os.path.basename(file).split(".")[0]}.wav'
filepath = os.path.join(output, os.path.dirname(file), filename) filepath = os.path.join(output, os.path.dirname(file), filename)
@@ -486,6 +493,11 @@ class WwiseExtract:
### other ### ### other ###
def update_progress(self, current, total, step):
base = 100 / self.steps
self.progress(["total", current * base // total + base * (step - 1)])
self.progress(["file", current * 100 // total])
def reset(self): def reset(self):
if self.mapper is not None: if self.mapper is not None:
self.mapper.reset() self.mapper.reset()