Change regular expression for res matching and jbbs subject.

diff --git a/src/FukuiNoNamari/BbsType/bbs_type_base.py b/src/FukuiNoNamari/BbsType/bbs_type_base.py
index 2bd1dd3..00834ba 100644 (file)
--- a/src/FukuiNoNamari/BbsType/bbs_type_base.py
+++ b/src/FukuiNoNamari/BbsType/bbs_type_base.py
@@ -22,8 +22,8 @@ import codecs
 
 from bbs_type_exception import BbsTypeError
 
-subject_reg_expr = re.compile("(?P<id>.*).dat<>(?P<title>.*)\((?P<res>\d*)\)")
-dat_reg_expr = re.compile("(?P<name>.*)<>(?P<mail>.*)<>(?P<date>.*)<>(?P<msg>.*)<>(?P<title>.*)")
+subject_reg_expr = re.compile("(?P<id>(?:(?!<>).)*).dat<>(?P<title>(?:(?!<>).)*)\((?P<res>\d*)\)")
+dat_reg_expr = re.compile("(?P<name>(?:(?!<>).)*)<>(?P<mail>(?:(?!<>).)*)<>(?P<date>(?:(?!<>).)*)<>(?P<msg>(?:(?!<>).)*)<>(?P<title>(?:(?!<>).)*)")
 
 
 class BaseType:

diff --git a/src/FukuiNoNamari/BbsType/bbs_type_jbbs.py b/src/FukuiNoNamari/BbsType/bbs_type_jbbs.py
index 53841ec..6b747ee 100644 (file)
--- a/src/FukuiNoNamari/BbsType/bbs_type_jbbs.py
+++ b/src/FukuiNoNamari/BbsType/bbs_type_jbbs.py
@@ -24,8 +24,8 @@ from bbs_type_base import BaseType
 
 _base_reg_expr = re.compile("http://(?P<host>jbbs\.livedoor\.jp)/(?P<board>(?P<brd_dir>[^/]+)/(?P<brd_bbs>[^/]+))(?:/[^/]*){0,1}$")
 _cgi_reg_expr = re.compile("http://(?P<host>jbbs\.livedoor\.jp)/bbs/read\.cgi/(?P<board>(?P<brd_dir>[^/]+)/(?P<brd_bbs>[^/]+))/(?P<thread>[^/]+)/.*")
-subject_reg_expr = re.compile("(?P<id>.*)\.cgi,(?P<title>.*)\((?P<res>\d*)\)")
-dat_reg_expr = re.compile("(?P<num>\d+)<>(?P<name>.*)<>(?P<mail>.*)<>(?P<date>.*)<>(?P<msg>.*)<>(?P<title>.*)<>(?P<id>.*)")
+subject_reg_expr = re.compile("(?P<id>[^,]*)\.cgi,(?P<title>.*)\((?P<res>\d*)\)")
+dat_reg_expr = re.compile("(?P<num>\d+)<>(?P<name>(?:(?!<>).)*)<>(?P<mail>(?:(?!<>).)*)<>(?P<date>(?:(?!<>).)*)<>(?P<msg>(?:(?!<>).)*)<>(?P<title>(?:(?!<>).)*)<>(?P<id>(?:(?!<>).)*)")
 
 
 class TypeJbbs(BaseType):