Skip to content

Beirdo #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
timmy61109 wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Beirdo #1

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8d7ffc5
Handle filenames with spaces in them
Beirdo Jul 7, 2019
419d987
Give access to the raw JSON from ffprobe
Beirdo Jul 8, 2019
38e1700
Add for Codec ID/Hint, Codec ID in Audio
Beirdo Aug 2, 2019
9ac47bb
Counting frames is too damned slow right now.
Beirdo Aug 2, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 20 additions & 20 deletions MediaInfo.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ def __init__(self, **kwargs) :
self.filename = kwargs.get('filename')
self.cmd = kwargs.get('cmd')
self.info = dict()
self.infoDict = dict()

if self.filename == None :
self.filename = ''
Expand Down Expand Up @@ -41,12 +42,15 @@ def getInfo(self) :


def _ffmpegGetInfo(self) :
cmd = self.cmd + ' -loglevel quiet -print_format json -show_format -show_streams -show_error -count_frames -i ' + self.filename
cmd = [self.cmd, "-loglevel", "quiet", "-print_format", "json",
"-show_format", "-show_streams", "-show_error",
#"-count_frames",
"-i", self.filename]
outputBytes = ''

try :
outputBytes = subprocess.check_output(cmd, shell = True)
except subprocess.CalledProcessError as e :
outputBytes = subprocess.check_output(cmd, shell=False)
except subprocess.CalledProcessError as e:
return ''

outputText = outputBytes.decode('utf-8')
Expand All @@ -58,6 +62,7 @@ def _ffmpegGetInfoJson(self, sourceString) :

try :
infoDict = json.loads(sourceString)
self.infoDict = infoDict
except json.JSONDecodeError as err :
return mediaInfo

Expand Down Expand Up @@ -102,26 +107,14 @@ def _ffmpegGetInfoJson(self, sourceString) :
return mediaInfo

def _mediainfoGetInfo(self) :
prevPath = os.getcwd()
newPath = os.path.abspath(os.path.dirname(self.filename))
file = os.path.basename(self.filename)

cmd = self.cmd + ' -f ' + file
outputBytes = ''
file_ = os.path.abspath(self.filename)
cmd = [self.cmd, "-f", file_]

try :
os.chdir(newPath)
try :
outputBytes = subprocess.check_output(cmd, shell = True)
except subprocess.CalledProcessError as e :
return ''

outputBytes = subprocess.check_output(cmd, shell=False)
outputText = outputBytes.decode('utf-8')
except IOError :
os.chdir(prevPath)
except Exception:
return ''
finally:
os.chdir(prevPath)

self.info = self._mediainfoGetInfoRegex(outputText)

Expand Down Expand Up @@ -181,7 +174,14 @@ def _mediainfoGetInfoRegex(self, sourceString) :
mediaInfo['haveAudio'] = 1
audioInfo = audio.group(0)

tmpAudioCodec = re.search("Codec\s*:\s*([\w\_\-\\\/ ]+)\n", audioInfo, re.S)
tmpAudioCodec = re.search("Codec ID/Hint\s*:\s*([\w\_\-\\\/ ]+)\n", audioInfo, re.S)

if not tmpAudioCodec:
tmpAudioCodec = re.search("Codec ID\s*:\s*([\w\_\-\\\/ ]+)\n", audioInfo, re.S)

if not tmpAudioCodec:
tmpAudioCodec = re.search("Codec\s*:\s*([\w\_\-\\\/ ]+)\n", audioInfo, re.S)

audioCodec = re.search("\w+", tmpAudioCodec.group(1), re.S)
audioCodecProfile = re.search("Codec profile\s*:\s*([\w\_\-\\\/\@\. ]+)\n", audioInfo, re.S)
if audioCodecProfile is None :
Expand Down