blackteay/ffmpeg-python
1
0
Fork 0
mirror of https://github.com/kkroening/ffmpeg-python.git synced 2025-04-06 04:15:44 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #16 from kkroening/cleanup-hashing

Browse Source 
Cleanup hashing
This commit is contained in:
Karl Kroening 2017-06-17 01:19:04 -06:00 committed by GitHub
commit d4b8900646
3 changed files with 15 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.python-version
View File

@ -1,5 +0,0 @@
3.3.6
3.4.6
3.5.3
3.6.1
jython-2.7.0

19
ffmpeg/nodes.py
View File

@ -8,13 +8,13 @@ import json
class Node(object): class Node(object):
"""Node base""" """Node base"""
def __init__(self, parents, name, *args, **kwargs): def __init__(self, parents, name, *args, **kwargs):
parent_hashes = [parent._hash for parent in parents] parent_hashes = [hash(parent) for parent in parents]
assert len(parent_hashes) == len(set(parent_hashes)), 'Same node cannot be included as parent multiple times' assert len(parent_hashes) == len(set(parent_hashes)), 'Same node cannot be included as parent multiple times'
self._parents = parents self._parents = parents
self._hash = None
self._name = name self._name = name
self._args = args self._args = args
self._kwargs = kwargs self._kwargs = kwargs
self._update_hash()
def __repr__(self): def __repr__(self):
formatted_props = ['{}'.format(arg) for arg in self._args] formatted_props = ['{}'.format(arg) for arg in self._args]
@ -22,17 +22,22 @@ class Node(object):
return '{}({})'.format(self._name, ','.join(formatted_props)) return '{}({})'.format(self._name, ','.join(formatted_props))
def __hash__(self): def __hash__(self):
return int(self._hash, base=16) if self._hash is None:
self._update_hash()
return self._hash
def __eq__(self, other): def __eq__(self, other):
return self._hash == other._hash return hash(self) == hash(other)
def _update_hash(self): def _update_hash(self):
props = {'args': self._args, 'kwargs': self._kwargs} props = {'args': self._args, 'kwargs': self._kwargs}
my_hash = hashlib.md5(json.dumps(props, sort_keys=True).encode('utf-8')).hexdigest() props_str = json.dumps(props, sort_keys=True).encode('utf-8')
parent_hashes = [parent._hash for parent in self._parents] my_hash = hashlib.md5(props_str).hexdigest()
parent_hashes = [str(hash(parent)) for parent in self._parents]
hashes = parent_hashes + [my_hash] hashes = parent_hashes + [my_hash]
self._hash = hashlib.md5(','.join(hashes).encode('utf-8')).hexdigest() hashes_str = ','.join(hashes).encode('utf-8')
hash_str = hashlib.md5(hashes_str).hexdigest()
self._hash = int(hash_str, base=16)
class InputNode(Node): class InputNode(Node):

14
setup.py
View File

@ -2,12 +2,8 @@ from setuptools import setup
from textwrap import dedent from textwrap import dedent
import subprocess import subprocess
version = '0.1.6'
def get_current_commit_hash(): download_url = 'https://github.com/kkroening/ffmpeg-python/archive/v{}.zip'.format(version)
p = subprocess.Popen(['git', 'rev-parse', 'HEAD'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
commit_hash = p.communicate()[0].strip()
return commit_hash
long_description = dedent("""\ long_description = dedent("""\
ffmpeg-python: Python bindings for FFmpeg ffmpeg-python: Python bindings for FFmpeg
@ -18,10 +14,6 @@ long_description = dedent("""\
""") """)
commit_hash = get_current_commit_hash()
download_url = 'https://github.com/kkroening/ffmpeg-python/archive/{}.zip'.format(commit_hash)
file_formats = [ file_formats = [
'aac', 'aac',
'ac3', 'ac3',
@ -67,7 +59,7 @@ setup(
packages=['ffmpeg'], packages=['ffmpeg'],
setup_requires=['pytest-runner'], setup_requires=['pytest-runner'],
tests_require=['pytest'], tests_require=['pytest'],
version='0.1.5', version=version,
description='Python bindings for FFmpeg - with support for complex filtering', description='Python bindings for FFmpeg - with support for complex filtering',
author='Karl Kroening', author='Karl Kroening',
author_email='karlk@kralnet.us', author_email='karlk@kralnet.us',