Merge branch 'master' into release

.gitignore

@@ -20,3 +20,4 @@ received.txt
 *.po~
 spaces_metadata_dumps
 session.dat
+list.dat

app.py

@@ -73,6 +73,8 @@ def initialize(self):
 			self.tc.start()
 		from sources import ydl
 		self.ydl = ydl.YDL()
+		if self.config.getboolean("ydl", "enable", True) and self.ydl.initialize():
+			self.ydl.start()
 		self.hMainView.Show()
 		if self.config.getboolean("general", "autoHide", False):
 			self.hMainView.events.hide()

constants.py

@@ -9,8 +9,8 @@
 APP_FULL_NAME = "Universal Live Tracking and Recording App"#アプリケーションの完全な名前
 APP_NAME="ULTRA"#アプリケーションの名前
 APP_ICON = "ultra.ico"
-APP_VERSION="1.7.0"
-APP_LAST_RELEASE_DATE="2023-07-17"
+APP_VERSION="1.8.0"
+APP_LAST_RELEASE_DATE="2023-08-11"
 APP_COPYRIGHT_YEAR="2021-2023"
 APP_LICENSE="Apache License 2.0"
 APP_DEVELOPERS="Kazto Kitabatake, ACT Laboratory"
@@ -27,6 +27,7 @@
 KEYMAP_FILE_NAME="data\\keymap.ini"
 TC_USER_DATA = os.path.abspath("data\\twitcasting\\users.dat")
 TC_SESSION_DATA = os.path.abspath("data\\twitcasting\\session.dat")
+YDL_LIST_DATA = os.path.abspath("data\\ydl\\list.dat")
 FFMPEG_PATH = os.path.abspath("bin\\ffmpeg.exe")
 # 各サービスのアカウントデータの格納場所
 AC_TWITCASTING = os.path.abspath("data\\twitcasting\\account.bin")

defaultKeymap.py

@@ -10,6 +10,9 @@
 	"TC_RECORD_ARCHIVE": "",
 	"TC_RECORD_USER": "",
 	"TC_MANAGE_USER": "",
+	"YDL_ENABLE": "",
+	"YDL_DOWNLOAD": "",
+	"YDL_MANAGE_LISTS": "",
 	"OP_SETTINGS": "",
 	"HELP_UPDATE":"",
 	"HELP_VERSIONINFO":"",
@@ -19,4 +22,5 @@
 	"SHOW":"",
 	"EXIT": "",
 	"TC_ENABLE": "",
+	"YDL_ENABLE": "",
 }