Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'cc-4759-add-aac-stream-in-support' into devel

Browse source 
Conflicts:
	python_apps/media-monitor2/media/monitor/pure.py
This commit is contained in:
Martin Konecny 2012-12-27 17:29:25 -05:00
commit 0596d1c391
4 changed files with 77 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
python_apps/media-monitor2/media/monitor/pure.py
View file

@ -154,6 +154,9 @@ def walk_supported(directory, clean_empties=False):
that support the extensions we are considering. When clean_empties
is True we recursively delete empty directories left over in
directory after the walk. """
if directory is None:
return
for root, dirs, files in os.walk(directory):
full_paths = ( os.path.join(root, name) for name in files
if is_file_supported(name) )
@ -162,8 +165,7 @@ def walk_supported(directory, clean_empties=False):
def file_locked(path):
cmd = "lsof %s" % (pipes.quote(path))
f = Popen(cmd, shell=True, stdout=PIPE).stdout
f = Popen(["lsof", path], stdout=PIPE).stdout
return bool(f.readlines())
def magic_move(old, new, after_dir_make=lambda : None):