Updated to 3.12

Author: Maxe

addon/doc/zh_TW/changelog.md

@@ -1,5 +1,24 @@
 # 更新日誌
 
+## V3.12, 2025.3.21
+
+版本代號：Diamond City Lights
+
+Video source:
+https://youtu.be/BZzP_k3cLao
+
+### 修正項目
+
+1. 修正 Prime Video 無法閱讀字幕的錯誤（感謝 Franco Hong 提供測試帳號）。
+2. 修正 Youtube 聊天室改版，導致取得意見調查出現錯誤，連帶導致無法自動閱讀聊天室。
+3. 修正 Youtube 聊天室改版，導致閱讀聊天橫幅內容為空的錯誤。
+聊天橫幅改為移動焦點時自動朗讀一次，之後出現的橫幅不會被自動朗讀，除非再次移動焦點。
+4. 聯絡開發者：刪除 Skype 並新增 WhatsApp 聯絡方式。
+
+---
+
+
+
 ## V3.11, 2025.1.5
 
 版本代號：煦日 Apricity

addon/globalPlugins/subtitle_reader/__init__.py

@@ -58,7 +58,7 @@ def __init__(self, *args, **kwargs):
 			'.+ - YouTube': Youtube(self),
 			'^Disney\+ \| ': DisneyPlus(self),
 			'.*?Netflix': Netflix(self),
-			'^Prime Video: .+': PrimeVideo(self),
+			'^Prime Video.+': PrimeVideo(self),
 			'.+ Apple TV\+': AppleTVPlus(self),
 			'.+ - Wikimedia Commons': WKMediaCommons(self),
 			'.+ \| KKTV': Kktv(self),
@@ -102,7 +102,7 @@ def initMenu(self):
 		gui.tray.Bind(gui.wx.EVT_MENU, self.update.openChangeLog, menu.openChangeLog)
 		gui.tray.Bind(gui.wx.EVT_MENU, self.update.toggleCheckAutomatic, menu.checkUpdateAutomatic)
 		# 聯絡開發者
-		gui.tray.Bind(gui.wx.EVT_MENU, self.contactUseSkype, menu.contactUseSkype)
+		gui.tray.Bind(gui.wx.EVT_MENU, self.contactUseWhatsApp, menu.contactUseWhatsApp)
 		gui.tray.Bind(gui.wx.EVT_MENU, self.contactUseFacebook, menu.contactUseFacebook)
 		gui.tray.Bind(gui.wx.EVT_MENU, self.contactUseQq, menu.contactUseQq)
 		gui.tray.Bind(gui.wx.EVT_MENU, self.contactUseLine, menu.contactUseLine)
@@ -381,8 +381,8 @@ def toggleInfoCardPrompt(self, evt):
 		self.menu.infoCardPrompt.Check(conf['infoCardPrompt'])
 
 	# 聯絡開發者
-	def contactUseSkype(self, evt):
-		webbrowser.open('https://join.skype.com/invite/VnIdifjym1OR')
+	def contactUseWhatsApp(self, evt):
+		webbrowser.open('https://wa.me/+886925285060')
 
 	def contactUseLine(self, evt):
 		api.copyToClip('Maxe0310', notify=True)

addon/globalPlugins/subtitle_reader/gui.py

@@ -64,7 +64,7 @@ def __init__(self, main):
 		self.contactDeveloper = wx.Menu()
 		self.contactDeveloperMenuItem = self.AppendSubMenu(self.contactDeveloper, _('聯絡開發者 (&C)'))
 
-		self.contactUseSkype = self.contactDeveloper.Append(wx.ID_ANY, 'Skype, id:p15937a')
+		self.contactUseWhatsApp = self.contactDeveloper.Append(wx.ID_ANY, 'WhatsApp, id:+886925285060')
 		self.contactUseFacebook = self.contactDeveloper.Append(wx.ID_ANY, _('Facebook 個人檔案'))
 		self.contactUseQq = self.contactDeveloper.Append(wx.ID_ANY, _('QQ, id:2231691423'))
 		self.contactUseLine = self.contactDeveloper.Append(wx.ID_ANY, 'Line, id:Maxe0310 ' + _('點此複製到剪貼簿'))

addon/globalPlugins/subtitle_reader/primeVideo.py

@@ -8,18 +8,20 @@ class PrimeVideo(SubtitleAlg):
 	def getVideoPlayer(self):
 		obj = self.main.focusObject
 		appName = obj.appModule.appName
-		videoPlayer = find(obj, 'parent', 'class', 'atvwebplayersdk-overlays-container fpqiyer')
-		if videoPlayer:
-			videoPlayer = obj.parent.parent.parent.parent
+		videoPlayer = find(obj, 'parent', 'role', role('document'))
+		videoPlayer = videoPlayer.firstChild
+		if videoPlayer.IA2Attributes.get('class') != 'webPlayerSDKContainer':
+			videoPlayer = videoPlayer.lastChild.firstChild
 
-		return videoPlayer
+		return videoPlayer if videoPlayer.IA2Attributes.get('class') == 'webPlayerSDKContainer' else None
 
 	def getSubtitleContainer(self):
 		videoPlayer = self.main.videoPlayer
-		container = videoPlayer.next.firstChild.firstChild
+		container = videoPlayer.lastChild.firstChild.firstChild.lastChild.previous.previous.firstChild.firstChild.firstChild
 		return container
 
 	def getSubtitle(self):
 		obj = self.main.subtitleContainer
+		obj = obj.next
 		return super(PrimeVideo, self).getSubtitle(obj)
 

addon/globalPlugins/subtitle_reader/youtube.py

@@ -28,8 +28,8 @@ def __init__(self, *args, **kwargs):
 		self.chatSenderIsVerified = ''
 		self.chat = ''
 		self.voting = False
-		self.chatBanner = ''
 		self.chatContainerSearchObject = None
+		self.chatBannerSearchObject = None
 		self.chatSearchObject = None
 
 	def getVideoPlayer(self):
@@ -64,35 +64,37 @@ def getChatContainer(self):
 		self.chatContainer = None
 		self.chatObject = None
 		self.voting = None
-		self.chatBanner = ''
 		if self.chatContainerSearchObject:
 			self.chatContainerSearchObject.cancel()
 
 		self.chatContainerSearchObject = search(obj, lambda obj: ('yt-live-chat-item-list-renderer' in obj.IA2Attributes.get('class') and obj.IA2Attributes.get('id') == 'items') or obj.IA2Attributes.get('id') == 'chat', self.onFoundChatContainer, continueOnFound=True)
 
+		if self.chatBannerSearchObject:
+			self.chatBannerSearchObject.cancel()
+		
 		if self.chatSearchObject:
 			self.chatSearchObject.cancel()
 
 
 	def onFoundChatContainer(self, obj):
-		if obj.IA2Attributes.get('id') == 'chat':
+		id = obj.IA2Attributes.get('id')
+		if id == 'chat':
 			self.chatRoom = obj
-		else:
+		elif id == 'items':
 			self.chatContainer = obj
 			self.chatContainerSearchObject.cancel()
+			self.readChatBanner()
 
 
 	def getSubtitle(self):
 		'''
 		取得字幕
 		'''
-		
 		self.promptInfoCard()
 
 		self.get_subtitle_object()
 
 		self.readVoting()
-		self.readChatBanner()
 		self.readChat()
 
 	def get_subtitle_object(self):
@@ -300,29 +302,26 @@ def readChatBanner(self):
 		if not self.chatContainer:
 			return
 
-		banner = self.chatContainer.parent.previous
-		text = ''
-		while banner:
-			obj = banner.firstChild
-			while obj:
-				if obj.name:
-					text += obj.name
-					break
-				
-				obj = obj.firstChild
+		obj = self.chatContainer.parent.previous
+		banner = None
+		while obj:
+			banner = find(obj, 'firstChild', 'id', 'banner-container')
+			if banner:
+				break
 
-			banner = banner.previous
+			obj = obj.previous
 
-		if text and not self.chatBanner:
-			ui.message(text)
+		if not banner:
+			return
 
-		self.chatBanner = text
+		self.chatBannerSearchObject = search(banner, lambda obj: bool(obj.name) and obj.role != role('LINK'), lambda banner: ui.message(banner.name if banner.role != role('BUTTON') else '聊天室橫幅'), continueOnFound=True)
 
 	def readVoting(self):
 		if not self.chatRoom:
 			return
 
-		votingObj = self.chatRoom.firstChild.next.next
+		votingObj = self.chatRoom.lastChild
+		votingObj = find(votingObj, 'firstChild', 'class', 'style-scope yt-live-chat-poll-renderer')
 		if bool(votingObj) != self.voting:
 			self.voting = bool(votingObj)
 			if self.voting:

addon/manifest.ini

@@ -3,7 +3,7 @@ summary = "字幕閱讀器"
 description = """當焦點位於網頁上的影片播放器時，讓 NVDA 讀出字幕。"""
 author = "福恩 <maxe@mail.batol.net>"
 url = https://github.com/maxe-hsieh/subtitle_reader
-version = 3.11
+version = 3.12
 docFileName = readme.html
 minimumNVDAVersion = 2019.2.1
 lastTestedNVDAVersion = 2024.1

buildVars.py

@@ -25,7 +25,7 @@ def _(arg):
 	# Translators: Long description to be shown for this add-on on add-on information from add-ons manager
 	"addon_description": _("當焦點位於網頁上的影片播放器時，讓 NVDA 讀出字幕。"),
 	# version
-	"addon_version": "3.11",
+	"addon_version": "3.12",
 	# Author(s)
 	"addon_author": "福恩 <maxe@mail.batol.net>",
 	# URL for the add-on documentation support