Merge branch 'master' into release

.gitignore

@@ -18,3 +18,4 @@ users.dat
 output
 received.txt
 *.po~
+spaces_metadata_dumps

DefaultSettings.py

@@ -36,6 +36,9 @@ def get():
 			"enable": False,
 			"saveComments": False,
 		}
+		config["spaces"] = {
+			"enable": False,
+		}
 		config["record"] = {
 			"dir": "output\\%source%",
 			"createSubDir": True,

app.py

@@ -51,6 +51,10 @@ def initialize(self):
 		# 「ツイキャスの監視を有効化」の設定値を確認
 		if self.config.getboolean("twitcasting", "enable", True) and self.tc.initialize():
 			self.tc.start()
+		from sources import spaces
+		self.spaces = spaces.Spaces()
+		if self.config.getboolean("spaces", "enable", False) and self.spaces.initialize():
+			self.spaces.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.2.1"
-APP_LAST_RELEASE_DATE="2022-02-02"
+APP_VERSION="1.3.0"
+APP_LAST_RELEASE_DATE="2022-02-11"
 APP_COPYRIGHT_YEAR="2021"
 APP_LICENSE="Apache License 2.0"
 APP_DEVELOPERS="Kazto Kitabatake, ACT Laboratory"
@@ -26,9 +26,11 @@
 SETTING_FILE_NAME="data\\settings.ini"
 KEYMAP_FILE_NAME="data\\keymap.ini"
 TC_USER_DATA = os.path.abspath("data\\twitcasting\\users.dat")
+SPACES_USER_DATA = os.path.abspath("data\\spaces\\users.dat")
 FFMPEG_PATH = os.path.abspath("bin\\ffmpeg.exe")
 # 各サービスのアカウントデータの格納場所
 AC_TWITCASTING = os.path.abspath("data\\twitcasting\\account.bin")
+AC_SPACES = os.path.abspath("data\\spaces\\account.bin")
 #フォントの設定可能サイズ範囲
 FONT_MIN_SIZE=5
 FONT_MAX_SIZE=35
@@ -55,9 +57,18 @@
 TC_URL = "https://apiv2.twitcasting.tv/oauth2/authorize"
 TC_PORT = 9339
 # Twitter関係
-TWITTER_V1_KEY = "zAphCyhNj7ElkI5J1aXqH4Gcw"
-TWITTER_V1_SECRET = "Ioq2aSTDMThRopTD7LH7uA0eYzKYJgtwNe9j4vkDOOTNQoOWh4"
+TWITTER_CLIENT_ID = "bDVKekZERkMtNXNVMlFoWnNONWY6MTpjaQ"
+TWITTER_CONSUMER_KEY = "zAphCyhNj7ElkI5J1aXqH4Gcw"
+TWITTER_CONSUMER_SECRET = "Ioq2aSTDMThRopTD7LH7uA0eYzKYJgtwNe9j4vkDOOTNQoOWh4"
 TWITTER_PORT = 9339
+TWITTER_BEARER = "Bearer AAAAAAAAAAAAAAAAAAAAANRILgAAAAAAnNwIzUejRCOuH5E6I8xnZz4puTs%3D1Zv7ttfk8LF81IUq16cHjhLTvJu4FA33AGWWjCpTnA"
+TWITTER_SCOPE = [
+    "tweet.read",
+    "users.read",
+    "follows.read",
+    "offline.access",
+    "space.read",
+]
 
 
 # その他

defaultKeymap.py

@@ -10,6 +10,11 @@
 	"TC_RECORD_ARCHIVE": "",
 	"TC_RECORD_USER": "",
 	"TC_MANAGE_USER": "",
+	"SPACES_ENABLE": "",
+	"SPACES_UPDATE_USER": "",
+	"SPACES_URL_REC": "",
+	"SPACES_TOKEN_MANAGER": "",
+	"SPACES_MANAGE_USER": "",
 	"OP_SETTINGS": "",
 	"HELP_UPDATE":"",
 	"HELP_VERSIONINFO":"",
@@ -19,5 +24,5 @@
 	"SHOW":"",
 	"EXIT": "",
 	"TC_ENABLE": "",
-
+	"SPACES_ENABLE": "",
 }

errorCodes.py

@@ -1,16 +1,22 @@
 # -*- coding: utf-8 -*-
-#error codes
+# error codes
 
-OK=0				#成功(エラーなし)
-NOT_SUPPORTED=1		#サポートされていない呼び出し
-FILE_NOT_FOUND=2
-PARSING_FAILED=3
-ACCESS_DENIED=4
+OK = 0  # 成功(エラーなし)
+NOT_SUPPORTED = 1  # サポートされていない呼び出し
+FILE_NOT_FOUND = 2
+PARSING_FAILED = 3
+ACCESS_DENIED = 4
 CONNECT_TIMEOUT = 12
-UPDATER_NEED_UPDATE = 200# アップデートが必要
-UPDATER_LATEST = 204# アップデートが無い
+UPDATER_NEED_UPDATE = 200  # アップデートが必要
+UPDATER_LATEST = 204  # アップデートが無い
 UPDATER_VISIT_SITE = 205
-UPDATER_BAD_PARAM = 400# パラメーターが不正
-UPDATER_NOT_FOUND = 404# アプリケーションが存在しない
+UPDATER_BAD_PARAM = 400  # パラメーターが不正
+UPDATER_NOT_FOUND = 404  # アプリケーションが存在しない
 RECORD_SKIPPED = 1000
-UNKNOWN=99999
+SPACE_ENDED = 2000
+CONNECTION_ERROR = 2001
+INVALID_RECEIVED = 2002
+SPACE_NOT_STARTED = 2003
+INVALID_URL = 2004
+SHOULD_EXIT = 2005
+UNKNOWN = 99999