Skip to content

Commit

Permalink
0.7.1
Browse files Browse the repository at this point in the history
  • Loading branch information
SuperZombi committed Jan 15, 2025
1 parent c88ffe4 commit 0d00e6d
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 15 deletions.
14 changes: 6 additions & 8 deletions GICutscenesUI/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import win32api

CONSOLE_DEBUG_MODE = False
__version__ = '0.7.0'
__version__ = '0.7.1'

# ---- Required Functions ----

Expand Down Expand Up @@ -329,19 +329,17 @@ def start_work(files, args):
send_message_to_ui_output("event", "copy_files")
send_message_to_ui_output("work_file", file)
send_message_to_ui_output("console", f"----- {os.path.basename(file)} -----")
# MAIN CALL
shutil.copyfile(file, os.path.join(temp_folder, os.path.basename(file)))
send_message_to_ui_output("event", "run_demux")
# MAIN CALL
p_status = 0
if CONSOLE_DEBUG_MODE:
subprocess.call([SCRIPT_FILE, 'batchDemux', temp_folder, '--output', OUTPUT_F])
subprocess.call([SCRIPT_FILE, 'demuxUsm', file, '--output', OUTPUT_F])
else:
process = subprocess.Popen([SCRIPT_FILE, 'batchDemux', temp_folder, '--output', OUTPUT_F], encoding=os.device_encoding(0), universal_newlines=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, creationflags=subprocess.CREATE_NO_WINDOW)
process = subprocess.Popen([SCRIPT_FILE, 'demuxUsm', file, '--output', OUTPUT_F], encoding=os.device_encoding(0), universal_newlines=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, creationflags=subprocess.CREATE_NO_WINDOW)
with process.stdout:
log_subprocess_output(process.stdout)
p_status = process.wait()

os.remove(os.path.join(temp_folder, os.path.basename(file)))
if p_status != 0:
send_message_to_ui_output("event", "error")
else:
Expand All @@ -353,9 +351,9 @@ def start_work(files, args):
new_file_name = str(old_file_name) + ".m2v"
file_name = os.path.join(OUTPUT_F, file_name)
new_file_name = os.path.join(OUTPUT_F, new_file_name)
try:
if os.path.exists(file_name):
os.rename(file_name, new_file_name)
except:
else:
send_message_to_ui_output("console", "\n")
send_message_to_ui_output("event", "error")
continue
Expand Down
2 changes: 1 addition & 1 deletion GICutscenesUI/web/main.html
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ <h2 translation="__select_files_dots__" align="center">Select Files:</h2>
</fieldset>

<fieldset>
<legend><code>GICutscenes.exe:</code></legend>
<legend style="margin-bottom: 0.5em;"><code>GICutscenes.exe:</code></legend>
<input type="text" readonly class="input_element path" id="script_path">
<button onclick="change_script_folder()" class="input_element path_button" translation="__change__">Change</button>
</fieldset>
Expand Down
3 changes: 3 additions & 0 deletions GICutscenesUI/web/styles/dark.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
background: #2d2d2d;
color: white;
}
.dark hr {
border-color: grey;
}
.dark code{
background: grey;
}
Expand Down
1 change: 0 additions & 1 deletion GICutscenesUI/web/styles/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,6 @@ input[type="range" i]{
fieldset{
border-radius: 12px;
margin: 1em 0;
padding: 1em 0.75em;
}
fieldset legend{
font-size: 1.15rem;
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<strong> User Interface for <a href="https://github.com/ToaHartor/GI-cutscenes">Genshin Cutscenes Demuxer</a></strong>
</p>
<p align="center">
<img src="https://shields.io/badge/version-v0.7.0-blue"></br>
<img src="https://shields.io/badge/version-v0.7.1-blue"></br>
<a href="#donate"><img src="https://shields.io/badge/💲-Support_the_Project-2ea043"></a>
</p>

Expand Down
8 changes: 4 additions & 4 deletions github/ver
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
VSVersionInfo(
ffi=FixedFileInfo(
filevers=(0, 7, 0, 0),
prodvers=(0, 7, 0, 0),
filevers=(0, 7, 1, 0),
prodvers=(0, 7, 1, 0),
mask=0x3f,
flags=0x0,
OS=0x40004,
Expand All @@ -16,11 +16,11 @@ VSVersionInfo(
u'040904B0',
[
StringStruct(u'FileDescription', u'Genshin Impact Cutscenes'),
StringStruct(u'FileVersion', u'0.7.0'),
StringStruct(u'FileVersion', u'0.7.1'),
StringStruct(u'InternalName', u'GICutscenesUI'),
StringStruct(u'OriginalFilename', u'GICutscenesUI.exe'),
StringStruct(u'ProductName', u'GI-Cutscenes UI'),
StringStruct(u'ProductVersion', u'0.7.0')])
StringStruct(u'ProductVersion', u'0.7.1')])
]),
VarFileInfo([VarStruct(u'Translation', [1033, 1200])])
]
Expand Down

0 comments on commit 0d00e6d

Please sign in to comment.