diff --git a/sickbeard/db.py b/sickbeard/db.py index cb2ecada..1f51c42a 100644 --- a/sickbeard/db.py +++ b/sickbeard/db.py @@ -130,12 +130,8 @@ class DBConnection(object): sqlResult = [] attempt = 0 - # Transaction - #self.execute('BEGIN') - while attempt < 5: try: - for qu in querylist: if len(qu) == 1: if logTransaction: diff --git a/sickbeard/name_parser/regexes.py b/sickbeard/name_parser/regexes.py index 62b16bc4..b0b18c8d 100644 --- a/sickbeard/name_parser/regexes.py +++ b/sickbeard/name_parser/regexes.py @@ -76,7 +76,7 @@ normal_regexes = {'normal':[ (?P\d+) # 02 and separator (([. _-]*x|-) # linking x/- char (?P - (?!(1080|720|480)[pi])(?!(?<=x)264) # ignore obviously wrong multi-eps + (?!(1080|720|480)[pi])(?!(?<=[hx])264) # ignore obviously wrong multi-eps \d+))* # additional x03/etc [\]. _-]*((?P.+?) # Source_Quality_Etc- ((?