fix #81 修复弹幕内容为空的问题

nICEnnnnnnnLee · Nov 21, 2021 · cdcc941 · cdcc941
1 parent ad572e2
commit cdcc941
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/nicelee/bilibili/util/danmuku/Xml2Ass.java b/src/nicelee/bilibili/util/danmuku/Xml2Ass.java
@@ -14,6 +14,8 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import nicelee.bilibili.util.Logger;
+
 public class Xml2Ass {
 
 	int width = 1920;
@@ -49,11 +51,12 @@ public List<Danmuku> readXml(File xmlFile) throws IOException{
 
 		BufferedReader reader = new BufferedReader(new FileReader(xmlFile));
 		List<Danmuku> danmuList = new ArrayList<Danmuku>();
-		Pattern danmukuPattern = Pattern.compile("<d p=\"([^,]*),([^,]*),([^,]*),([^,]*),([^,]*),([^,]*),([^,]*),([0-9]*)\">(.*?)</d>");
+		Pattern danmukuPattern = Pattern.compile("<d p=\"([^,]*),([^,]*),([^,]*),([^,]*),([^,]*),([^,]*),([^,]*),([^,]*)(?:,[0-9]*)?\">(.*?)</d>");
 		String line = reader.readLine();
 		while(line != null) {
 			Matcher m = danmukuPattern.matcher(line);
 			while(m.find()) {
+//				Logger.println(m.group());
 				double time = Double.parseDouble(m.group(1));
 				int type = Integer.parseInt(m.group(2));
 				if(type >= 1 & type <=3)