add message priority and better file info display

Recorder.py

@@ -1,5 +1,6 @@
 # coding: utf8
 import copy
+import heapq
 import os
 import shutil
 import socket
@@ -204,7 +205,8 @@ def disconnect(self):
 			return
 		if len(self.file_urls) > 0:
 			self.print_urls()
-		self.chat(self.translation('OnDisconnect'))
+		self.chat(self.translation('OnDisconnect'), priority=ChatThread.Priority.High)
+		self.chat_thread.flush_pending_chat(ChatThread.Priority.High)
 		self.connection.disconnect()
 		self.online = False
 
@@ -486,6 +488,8 @@ def __createReplayFile(self, logger, restart):
 		logger.log('Size of replay file "{}": {}MB'.format(file_name, utils.convert_file_size(os.path.getsize(file_name))))
 		file_path = f'{utils.RecordingStorageFolder}{file_name}'
 		shutil.move(file_name, file_path)
+		if self.isOnline():
+			self.chat(self.translation('OnCreatedMCPRFile').format(file_name), priority=ChatThread.Priority.High)
 
 		if self.config.get('upload_file'):
 			if self.isOnline():
@@ -497,7 +501,7 @@ def __createReplayFile(self, logger, restart):
 				url = out.splitlines()[-1]
 				self.file_urls.append(url)
 				if self.isOnline():
-					self.chat(self.translation('OnUploadedMCPRFile').format(file_name, url))
+					self.chat(self.translation('OnUploadedMCPRFile').format(file_name, url), priority=ChatThread.Priority.High)
 			except Exception as e:
 				logger.error('Fail to upload "{}" to transfer.sh'.format(utils.RecordingFileName))
 				logger.error(traceback.format_exc())
@@ -566,21 +570,24 @@ def stop(self, restart=False):
 	def restart(self):
 		self.stop(True)
 
-	def _chat(self, text, prefix=''):
+	def _chat(self, text, prefix='', priority=None):
 		for line in text.splitlines():
-			self.chat_thread.add_chat(prefix + line)
+			if priority is None:
+				self.chat_thread.add_chat(prefix + line)
+			else:
+				self.chat_thread.add_chat(prefix + line, priority)
 
-	def chat(self, text):
+	def chat(self, text, priority=None):
 		if self.isOnline():
-			self._chat(text)
+			self._chat(text, priority=priority)
 		else:
 			self.logger.warn('Cannot chat when disconnected')
 
 	def tell(self, name, text):
 		if name is None:
 			return self.chat(text)
 		if self.isOnline():
-			self._chat(text, '/tell {} '.format(name))
+			self._chat(text, prefix='/tell {} '.format(name))
 		else:
 			self.logger.warn('Cannot /tell when disconnected')
 
@@ -612,7 +619,8 @@ def format_status(self, text):
 		return text.format(
 			self.isWorking(), self.isWorking() and not self.isAFKing(),
 			utils.convert_millis(self.timeRecorded()), utils.convert_millis(self.timePassed()),
-			self.packet_counter, utils.convert_file_size(len(self.file_buffer)), utils.convert_file_size(self.file_size)
+			self.packet_counter, utils.convert_file_size(len(self.file_buffer)), utils.convert_file_size(self.file_size),
+			self.file_name
 		)
 
 	def print_urls(self):
@@ -732,33 +740,56 @@ def processCommand(self, command, sender, uuid):
 
 
 class ChatThread(threading.Thread):
+	class Priority:
+		Low = 1
+		Normal = 0
+		High = -1
+
+	class QueueData:
+		id_counter = 0
+
+		def __init__(self, priority, data):
+			self.priority = priority
+			self.data = data
+			self.id = ChatThread.QueueData.id_counter + 1
+			ChatThread.QueueData.id_counter += 1
+
+		def __lt__(self, other):
+			return self.priority < other.priority or (self.priority == other.priority and self.id < other.id)
+
 	def __init__(self, recorder):
 		super().__init__()
 		self.setDaemon(True)
 		self.recorder = recorder
-		self.message_queue = Queue()
+		self.clear_queue()
 		self.logger = copy.deepcopy(recorder.logger)
 		self.logger.thread = 'Chat'
 		self.interrupt = False
 		self.chatSpamThresholdCount = 0
 
-	def add_chat(self, msg):
-		self.message_queue.put(msg)
+	def add_chat(self, msg, prio=Priority.Normal):
+		heapq.heappush(self.message_queue, ChatThread.QueueData(prio, msg))
 
-	def send_chat(self, msg):
+	def send_chat(self, queue_data):
+		msg = queue_data.data
 		packet = serverbound.play.ChatPacket()
 		packet.message = msg
 		self.recorder.connection.write_packet(packet)
 		self.logger.log('Sent chat message "{}" to the server'.format(msg))
 		self.chatSpamThresholdCount += 20
 
 	def clear_queue(self):
-		self.message_queue = Queue()
+		self.message_queue = []
 
 	def kill(self):
 		self.interrupt = True
 		self.clear_queue()
 
+	# instant send all chat with priority <= p
+	def flush_pending_chat(self, p=Priority.Low):
+		while len(self.message_queue) > 0 and self.message_queue[0].priority <= p:
+			self.send_chat(heapq.heappop(self.message_queue))
+
 	def on_recieved_TimeUpdatePacket(self):
 		self.chatSpamThresholdCount -= 20  # 20 gt passed
 		if self.chatSpamThresholdCount < 0:
@@ -772,7 +803,7 @@ def run(self):
 		self.logger.log('Chat thread started')
 		while not self.interrupt:
 			if self.can_chat():
-				if self.message_queue.qsize() > 0:
-					self.send_chat(self.message_queue.get())
+				if len(self.message_queue) > 0:
+					self.send_chat(heapq.heappop(self.message_queue))
 			time.sleep(0.001)
 		self.logger.log('Chat thread stopped')

lang/en_us.yml

@@ -7,9 +7,11 @@ RecordingContinue: |
 RecordingPause: |
     Everyone left, pause recording now, go afk
 OnCreatingMCPRFile: |
-    Creating .mcpr file
+    Creating recording file
+OnCreatedMCPRFile: |
+    Recording file "{0}" created
 OnUploadingMCPRFile: |
-    Uploading .mcpr file
+    Uploading recording file
 OnUploadedMCPRFile: |
     "{0}" url = {1}
 OnPCRCStopping: |
@@ -31,8 +33,8 @@ CommandStatusResult: |
     Running: {0}; Recording: {1}
     Time recorded/passed: {2}/{3}
     Packet Recorded: {4}
-    Buffer size: {5}MB
-    File size: {6}MB
+    Buffer/File size: {5}MB/{6}MB
+    File name: {7}
 CommandSpectateResult: |
     Spectating to {0}(uuid = {1})
 CommandPositionResult: |

lang/zh_cn.yml

@@ -7,9 +7,11 @@ RecordingContinue: |
 RecordingPause: |
     附近玩家均已离开，暂停录制
 OnCreatingMCPRFile: |
-    正在生成.mcpr文件
+    正在生成录像文件
+OnCreatedMCPRFile: |
+    录像文件 "{0}" 已生成
 OnUploadingMCPRFile: |
-    正在上传.mcpr文件
+    正在上传录像文件
 OnUploadedMCPRFile: |
     "{0}" 的链接: {1}
 OnPCRCStopping: |
@@ -31,8 +33,8 @@ CommandStatusResult: |
     工作中: {0}; 录制中: {1}
     录制时长/工作时长: {2}/{3}
     录制数据包数: {4}
-    缓存大小: {5}MB
-    文件大小: {6}MB
+    缓存大小/文件大小: {5}MB/{6}MB
+    文件名: {7}
 CommandSpectateResult: |
     正在观察者模式附身至{0} (uuid = {1})
 CommandPositionResult: |