Skip to content

Commit

Permalink
Moving checks for #114 into the correct position
Browse files Browse the repository at this point in the history
  • Loading branch information
JasonMillward committed Jul 11, 2016
1 parent b52ea2f commit 0b0e233
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 6 deletions.
19 changes: 19 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
- repo: git://github.com/pre-commit/pre-commit-hooks
sha: master
hooks:
- id: trailing-whitespace
- id: autopep8-wrapper
- id: check-yaml
files: \.(yaml|yml)$
- id: fix-encoding-pragma
- id: flake8
args:
- --ignore=E501

- repo: git://github.com/FalconSocial/pre-commit-python-sorter
sha: master
hooks:
- id: python-import-sorter
args:
- --silent-overwrite

15 changes: 9 additions & 6 deletions classes/makemkv.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# -*- coding: utf-8 -*-
"""
MakeMKV CLI Wrapper
Expand All @@ -11,14 +12,14 @@
@license http://opensource.org/licenses/MIT
"""

import subprocess
import os
import re
import csv
import logger
import datetime
import re
import subprocess
import time

import logger


class MakeMKV(object):

Expand Down Expand Up @@ -182,12 +183,14 @@ def rip_disc(self, path, titleIndex):

badstrings = [
"failed",
"Fail",
"fail",
"error"
]

if any(x in line.lower() for x in badstrings):
if self.ignore_region and "RPC protection" in line and "Failed to add angle" in line:
if self.ignore_region and "RPC protection" in line:
self.log.warn(line)
elif "Failed to add angle" in line:
self.log.warn(line)
else:
self.log.error(line)
Expand Down

0 comments on commit 0b0e233

Please sign in to comment.