[Bf-extensions-cvs] SVN commit: /data/svn/bf-extensions [4340] contrib/py/scripts/addons/ sequencer_extra_actions: recursive loader is fixed and now manages uppercased extensions (like .MXF )
carlos padial
palidoestudio2 at gmail.com
Mon Mar 4 18:40:29 CET 2013
Revision: 4340
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-extensions&revision=4340
Author: carlospadial
Date: 2013-03-04 17:40:29 +0000 (Mon, 04 Mar 2013)
Log Message:
-----------
recursive loader is fixed and now manages uppercased extensions (like .MXF)
this operator is no longer a panel, it has been added as operator in the sequencer add menu
working in 2.66 r54697
TODO
ripple delete, ripple cut,
filename to strip name,
open with image editor
and distribute operators are not working
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-extensions&revision=54697
Modified Paths:
--------------
contrib/py/scripts/addons/sequencer_extra_actions/__init__.py
contrib/py/scripts/addons/sequencer_extra_actions/functions.py
contrib/py/scripts/addons/sequencer_extra_actions/operators_extra_actions.py
Modified: contrib/py/scripts/addons/sequencer_extra_actions/__init__.py
===================================================================
--- contrib/py/scripts/addons/sequencer_extra_actions/__init__.py 2013-03-04 13:09:15 UTC (rev 4339)
+++ contrib/py/scripts/addons/sequencer_extra_actions/__init__.py 2013-03-04 17:40:29 UTC (rev 4340)
@@ -19,9 +19,9 @@
bl_info = {
"name": "Extra Sequencer Actions",
"author": "Turi Scandurra, Carlos Padial",
- "version": (3, 6),
- "blender": (2, 65, 0),
- "api": 53177,
+ "version": (3, 7),
+ "blender": (2, 66, 0),
+ "api": 54697,
"category": "Sequencer",
"location": "Sequencer",
"description": "Collection of extra operators to manipulate VSE strips",
@@ -91,4 +91,4 @@
if __name__ == '__main__':
- register()
\ No newline at end of file
+ register()
Modified: contrib/py/scripts/addons/sequencer_extra_actions/functions.py
===================================================================
--- contrib/py/scripts/addons/sequencer_extra_actions/functions.py 2013-03-04 13:09:15 UTC (rev 4339)
+++ contrib/py/scripts/addons/sequencer_extra_actions/functions.py 2013-03-04 17:40:29 UTC (rev 4340)
@@ -191,43 +191,58 @@
# recursive load functions
-def onefolder(context, default_recursive_ext):
+def onefolder(context, recursive_select_by_extension, ext):
'''
returns a list of MOVIE type files from folder selected in file browser
'''
filelist = []
path, filename = getfilepathfrombrowser()
- extension = filename.rpartition(".")[2]
+
+ for i in movieextdict:
+ if i[0] == ext:
+ extension = i[1].rpartition(".")[2]
+ break
+
scn = context.scene
if detect_strip_type(path + filename) == 'MOVIE':
- if default_recursive_ext == True:
+ if recursive_select_by_extension == True:
+ #filtering by extension...
for file in os.listdir(path):
- if file.rpartition(".")[2] == extension:
+ if file.rpartition(".")[2].lower() == extension:
filelist.append((path, file))
else:
+ #looking for all known extensions
for file in os.listdir(path):
- filelist.append((path, file))
+ for i in movieextdict:
+ if file.rpartition(".")[2].lower() == i[1].rpartition(".")[2]:
+ filelist.append((path, file))
return (filelist)
-def recursive(context, default_recursive_ext):
+def recursive(context, recursive_select_by_extension, ext):
'''
returns a list of MOVIE type files recursively from file browser
'''
filelist = []
path = getpathfrombrowser()
- scn = context.scene
- for i in movieextlist:
- if i[0] == scn.default_ext:
+
+ for i in movieextdict:
+ if i[0] == ext:
extension = i[1].rpartition(".")[2]
- #pythonic way to magic:
+ break
+
+ scn = context.scene
for root, dirs, files in os.walk(path):
- for f in files:
- if default_recursive_ext == True:
- if f.rpartition(".")[2] == extension:
- filelist.append((root, f))
+ for file in files:
+ if recursive_select_by_extension == True:
+ #filtering by extension...
+ if file.rpartition(".")[2].lower() == extension:
+ filelist.append((root, file))
else:
- filelist.append((root, f))
+ #looking for all known extensions
+ for i in movieextdict:
+ if file.rpartition(".")[2].lower() == i[1].rpartition(".")[2]:
+ filelist.append((root, file))
return filelist
@@ -271,4 +286,4 @@
print(lst[count : int(lista[i]-1)+count])
newlist.append([lst[count : int(lista[i]-1)+count]])
count += int(lista[i])
- return newlist
\ No newline at end of file
+ return newlist
Modified: contrib/py/scripts/addons/sequencer_extra_actions/operators_extra_actions.py
===================================================================
--- contrib/py/scripts/addons/sequencer_extra_actions/operators_extra_actions.py 2013-03-04 13:09:15 UTC (rev 4339)
+++ contrib/py/scripts/addons/sequencer_extra_actions/operators_extra_actions.py 2013-03-04 17:40:29 UTC (rev 4340)
@@ -131,19 +131,19 @@
description='Load in recursive folders',
default=False)
scn.default_recursive = False
-
- bpy.types.Scene.default_recursive_ext = BoolProperty(
- name='Recursive ext',
- description='Load only clips with selected extension',
- default=False)
- scn.default_recursive_ext = False
-
+
bpy.types.Scene.default_recursive_proxies = BoolProperty(
name='Recursive proxies',
description='Load in recursive folders + proxies',
default=False)
scn.default_recursive_proxies = False
+ bpy.types.Scene.default_recursive_select_by_extension = BoolProperty(
+ name='Recursive ext',
+ description='Load only clips with selected extension',
+ default=False)
+ scn.default_recursive_select_by_extension = False
+
bpy.types.Scene.default_ext = EnumProperty(
items=functions.movieextdict,
name="ext enum",
@@ -1734,48 +1734,48 @@
bl_label = "recursive load"
bl_options = {'REGISTER', 'UNDO'}
- default_recursive = BoolProperty(
+ recursive = BoolProperty(
name='recursive',
description='Load in recursive folders',
default=False)
- default_recursive_ext = BoolProperty(
+ recursive_select_by_extension = BoolProperty(
name='select by extension',
- description='Load by extension',
+ description='Load only clips with selected extension',
default=False)
- default_ext = EnumProperty(
+ ext = EnumProperty(
items=functions.movieextdict,
name="extension",
default="3")
- default_recursive_proxies = BoolProperty(
+ recursive_proxies = BoolProperty(
name='use proxies',
description='Load in recursive folders',
default=False)
build_25 = BoolProperty(name='default_build_25',
- description='default build_25',
+ description='build_25',
default=True)
build_50 = BoolProperty(name='default_build_50',
- description='default build_50',
- default=True)
+ description='build_50',
+ default=False)
build_75 = BoolProperty(name='default_build_75',
- description='default build_75',
- default=True)
+ description='build_75',
+ default=False)
build_100 = BoolProperty(name='default_build_100',
- description='default build_100',
- default=True)
+ description='build_100',
+ default=False)
proxy_suffix = StringProperty(
- name='default proxy suffix',
- description='default proxy filename suffix',
+ name='proxy suffix',
+ description='proxy filename suffix',
default="-25")
proxy_extension = StringProperty(
- name='default proxy extension',
- description='default proxy extension',
+ name='proxy extension',
+ description='proxy extension',
default=".mkv")
proxy_path = StringProperty(
- name='default proxy path',
- description='default proxy path',
+ name='proxy path',
+ description='proxy path',
default="")
@@ -1790,19 +1790,32 @@
def invoke(self, context, event):
scn = context.scene
- initSceneProperties(context, scn)
- self.build_25 = scn.default_build_25
- self.build_50 = scn.default_build_50
- self.build_75 = scn.default_build_75
- self.build_100 = scn.default_build_100
- self.proxy_suffix = scn.default_proxy_suffix
- self.proxy_extension = scn.default_proxy_extension
- self.proxy_path = scn.default_proxy_path
- self.recursive = scn.default_recursive
- self.recursive_ext = scn.default_recursive_ext
- self.recursive_proxies = scn.default_recursive_proxies
- self.ext = scn.default_ext
-
+ try:
+ self.build_25 = scn.default_build_25
+ self.build_50 = scn.default_build_50
+ self.build_75 = scn.default_build_75
+ self.build_100 = scn.default_build_100
+ self.proxy_suffix = scn.default_proxy_suffix
+ self.proxy_extension = scn.default_proxy_extension
+ self.proxy_path = scn.default_proxy_path
+ self.recursive = scn.default_recursive
+ self.recursive_select_by_extension = scn.default_recursive_select_by_extension
+ self.recursive_proxies = scn.default_recursive_proxies
+ self.ext = scn.default_ext
+ except AttributeError:
+ initSceneProperties(context, scn)
+ self.build_25 = scn.default_build_25
+ self.build_50 = scn.default_build_50
+ self.build_75 = scn.default_build_75
+ self.build_100 = scn.default_build_100
+ self.proxy_suffix = scn.default_proxy_suffix
+ self.proxy_extension = scn.default_proxy_extension
+ self.proxy_path = scn.default_proxy_path
+ self.recursive = scn.default_recursive
+ self.recursive_select_by_extension = scn.default_recursive_select_by_extension
+ self.recursive_proxies = scn.default_recursive_proxies
+ self.ext = scn.default_ext
+
return context.window_manager.invoke_props_dialog(self)
def loader(self, context, filelist):
@@ -1811,7 +1824,7 @@
for i in filelist:
functions.setpathinbrowser(i[0], i[1])
try:
- if self.default_recursive_proxies:
+ if self.recursive_proxies:
bpy.ops.sequencerextra.placefromfilebrowserproxy(
proxy_suffix=self.proxy_suffix,
proxy_extension=self.proxy_extension,
@@ -1825,19 +1838,52 @@
except:
print("Error loading file (recursive loader error): ", i[1])
functions.add_marker(context, i[1])
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-extensions-cvs
mailing list