Touch up user experience

nirgoren · Dec 12, 2021 · 2402df1 · 2402df1
1 parent b68d190
commit 2402df1
Show file tree

Hide file tree

Showing 38 changed files with 14 additions and 12 deletions.
diff --git a/build.bat b/build.bat
@@ -7,9 +7,9 @@ copy vcontroller\x64\Release\vcontroller.dll dist\Eddienput\vcontroller.dll
 copy src\icon.ico dist\Eddienput\icon.ico
 copy src\config.json dist\Eddienput\config.json
 copy src\eddienput_controller.png dist\Eddienput\eddienput_controller.png
-Xcopy /E /I configs dist\Eddienput\configs
-Xcopy /E /I playbacks dist\Eddienput\playbacks
-Xcopy /E /I rec_configs dist\Eddienput\rec_configs
+Xcopy /E /I src\configs dist\Eddienput\configs
+Xcopy /E /I src\playbacks dist\Eddienput\playbacks
+Xcopy /E /I src\rec_configs dist\Eddienput\rec_configs
 Xcopy /E /I src\sounds dist\Eddienput\sounds
 copy LICENSE dist\Eddienput\LICENSE
 copy README.md dist\Eddienput\README.md

diff --git a/src/config.json b/src/config.json
@@ -1,5 +1,5 @@
 {
-  "playback": "playbacks\\gg_test.txt",
+  "playback": "playbacks\\recording.txt",
   "playback_start_end_sound": "true",
   "side": "P2",
   "hot_reload": "true",

diff --git a/configs/bb.json → src/configs/bb.json b/configs/bb.json → src/configs/bb.json
diff --git a/configs/dbfz.json → src/configs/dbfz.json b/configs/dbfz.json → src/configs/dbfz.json
diff --git a/configs/gg.json → src/configs/gg.json b/configs/gg.json → src/configs/gg.json
diff --git a/configs/gg_keyboard.json → src/configs/gg_keyboard.json b/configs/gg_keyboard.json → src/configs/gg_keyboard.json
diff --git a/configs/ggst.json → src/configs/ggst.json b/configs/ggst.json → src/configs/ggst.json
diff --git a/configs/iamp_keyboard.json → src/configs/iamp_keyboard.json b/configs/iamp_keyboard.json → src/configs/iamp_keyboard.json
diff --git a/configs/kof.json → src/configs/kof.json b/configs/kof.json → src/configs/kof.json
diff --git a/configs/kof_keyboard.json → src/configs/kof_keyboard.json b/configs/kof_keyboard.json → src/configs/kof_keyboard.json
diff --git a/configs/mbtl.json → src/configs/mbtl.json b/configs/mbtl.json → src/configs/mbtl.json
diff --git a/configs/neogeo.json → src/configs/neogeo.json b/configs/neogeo.json → src/configs/neogeo.json
diff --git a/configs/sf.json → src/configs/sf.json b/configs/sf.json → src/configs/sf.json
diff --git a/configs/sg.json → src/configs/sg.json b/configs/sg.json → src/configs/sg.json
diff --git a/configs/tekken.json → src/configs/tekken.json b/configs/tekken.json → src/configs/tekken.json
diff --git a/configs/tekken_alt.json → src/configs/tekken_alt.json b/configs/tekken_alt.json → src/configs/tekken_alt.json
diff --git a/configs/unist.json → src/configs/unist.json b/configs/unist.json → src/configs/unist.json
diff --git a/configs/universal.json → src/configs/universal.json b/configs/universal.json → src/configs/universal.json
diff --git a/src/gui.py b/src/gui.py
@@ -1,4 +1,5 @@
 import json
+import os
 
 from PyQt5 import QtGui
 from PyQt5.QtWidgets import QApplication, QLineEdit, QWidget, QVBoxLayout, QLabel, QTextEdit, QHBoxLayout, \
@@ -273,19 +274,20 @@ def set_rec_config_file(file_path):
 
 
 def choose_playbacks_file():
-    file_path = choose_file()
+    file_path = choose_file(filter='*.txt', directory=os.getcwd() + '\\playbacks')
     set_playback_file(file_path)
 
 
 def choose_rec_config_file():
-    file_path = choose_file()
+    file_path = choose_file(filter='*.json', directory=os.getcwd() + '\\rec_configs')
     set_rec_config_file(file_path)
 
 
-def choose_file():
+def choose_file(filter, directory):
     dlg = QFileDialog()
-    dlg.setFileMode(QFileDialog.AnyFile)
-    dlg.setDirectory('')
+    dlg.setFileMode(QFileDialog.ExistingFile)
+    dlg.setNameFilter(filter)
+    dlg.setDirectory(directory)
     if dlg.exec_():
         filenames = dlg.selectedFiles()
         return filenames[0]

diff --git a/playbacks/bb_test.txt → src/playbacks/bb_test.txt b/playbacks/bb_test.txt → src/playbacks/bb_test.txt
diff --git a/playbacks/dbfz_test.txt → src/playbacks/dbfz_test.txt b/playbacks/dbfz_test.txt → src/playbacks/dbfz_test.txt
diff --git a/playbacks/different_beeps.txt → src/playbacks/different_beeps.txt b/playbacks/different_beeps.txt → src/playbacks/different_beeps.txt
diff --git a/playbacks/eddie_mix.txt → src/playbacks/eddie_mix.txt b/playbacks/eddie_mix.txt → src/playbacks/eddie_mix.txt
diff --git a/playbacks/eddie_super_sb_beep.txt → src/playbacks/eddie_super_sb_beep.txt b/playbacks/eddie_super_sb_beep.txt → src/playbacks/eddie_super_sb_beep.txt
diff --git a/playbacks/gf_frc_practice_beep.txt → src/playbacks/gf_frc_practice_beep.txt b/playbacks/gf_frc_practice_beep.txt → src/playbacks/gf_frc_practice_beep.txt
diff --git a/playbacks/gg_test.txt → src/playbacks/gg_test.txt b/playbacks/gg_test.txt → src/playbacks/gg_test.txt
diff --git a/playbacks/iamp_test.txt → src/playbacks/iamp_test.txt b/playbacks/iamp_test.txt → src/playbacks/iamp_test.txt
diff --git a/playbacks/kof_test.txt → src/playbacks/kof_test.txt b/playbacks/kof_test.txt → src/playbacks/kof_test.txt
diff --git a/src/playbacks/recording.txt b/src/playbacks/recording.txt
@@ -0,0 +1 @@
+configs/universal.json
diff --git a/playbacks/sf_test.txt → src/playbacks/sf_test.txt b/playbacks/sf_test.txt → src/playbacks/sf_test.txt
diff --git a/playbacks/sg_test.txt → src/playbacks/sg_test.txt b/playbacks/sg_test.txt → src/playbacks/sg_test.txt
diff --git a/playbacks/sol_dustloop.txt → src/playbacks/sol_dustloop.txt b/playbacks/sol_dustloop.txt → src/playbacks/sol_dustloop.txt
diff --git a/playbacks/tekken_test.txt → src/playbacks/tekken_test.txt b/playbacks/tekken_test.txt → src/playbacks/tekken_test.txt
diff --git a/playbacks/wakeup_dp_sol.txt → src/playbacks/wakeup_dp_sol.txt b/playbacks/wakeup_dp_sol.txt → src/playbacks/wakeup_dp_sol.txt
diff --git a/rec_configs/rec_bb.json → src/rec_configs/rec_bb.json b/rec_configs/rec_bb.json → src/rec_configs/rec_bb.json
diff --git a/rec_configs/rec_universal.json → src/rec_configs/rec_universal.json b/rec_configs/rec_universal.json → src/rec_configs/rec_universal.json
diff --git a/src/recording.py b/src/recording.py
@@ -107,7 +107,8 @@ def record(symbol_map: dict, direction_index: int):
         parsed_frames.append(parsed_frame)
 
     # Compress empty frames
-    parsed_frames = parsed_frames[1:]
+    while not parsed_frames[0]:
+        parsed_frames = parsed_frames[1:]
     compressed_frames = []
     empty_frames_count = 0
     for frame in parsed_frames:

diff --git a/src/recording.txt b/src/recording.txt