[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31169] trunk/blender/release/scripts/ui/ space_userpref.py: display addons sorted by category then name ( remove old commented code which loaded the modules for real)
Campbell Barton
ideasman42 at gmail.com
Sun Aug 8 15:45:16 CEST 2010
Revision: 31169
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31169
Author: campbellbarton
Date: 2010-08-08 15:45:16 +0200 (Sun, 08 Aug 2010)
Log Message:
-----------
display addons sorted by category then name (remove old commented code which loaded the modules for real)
Modified Paths:
--------------
trunk/blender/release/scripts/ui/space_userpref.py
Modified: trunk/blender/release/scripts/ui/space_userpref.py
===================================================================
--- trunk/blender/release/scripts/ui/space_userpref.py 2010-08-08 13:11:13 UTC (rev 31168)
+++ trunk/blender/release/scripts/ui/space_userpref.py 2010-08-08 13:45:16 UTC (rev 31169)
@@ -841,110 +841,86 @@
if bpy.app.debug:
t_main = time.time()
- if 1:
- # fake module importing
- def fake_module(mod_name, mod_path, speedy=True):
- if bpy.app.debug:
- print("fake_module", mod_name, mod_path)
- import ast
- ModuleType = type(ast)
- if speedy:
- lines = []
- line_iter = iter(open(mod_path, "r"))
- l = ""
- while not l.startswith("bl_addon_info"):
- l = line_iter.readline()
- if len(l) == 0:
+ # fake module importing
+ def fake_module(mod_name, mod_path, speedy=True):
+ if bpy.app.debug:
+ print("fake_module", mod_name, mod_path)
+ import ast
+ ModuleType = type(ast)
+ if speedy:
+ lines = []
+ line_iter = iter(open(mod_path, "r"))
+ l = ""
+ while not l.startswith("bl_addon_info"):
+ l = line_iter.readline()
+ if len(l) == 0:
+ break
+ while l.rstrip():
+ lines.append(l)
+ l = line_iter.readline()
+ del line_iter
+ data = "".join(lines)
+
+ else:
+ data = open(mod_path, "r").read()
+
+ ast_data = ast.parse(data, filename=mod_path)
+ body_info = None
+ for body in ast_data.body:
+ if body.__class__ == ast.Assign:
+ if len(body.targets) == 1:
+ if getattr(body.targets[0], "id", "") == "bl_addon_info":
+ body_info = body
break
- while l.rstrip():
- lines.append(l)
- l = line_iter.readline()
- del line_iter
- data = "".join(lines)
- else:
- data = open(mod_path, "r").read()
+ if body_info:
+ mod = ModuleType(mod_name)
+ mod.bl_addon_info = ast.literal_eval(body.value)
+ mod.__file__ = mod_path
+ mod.__time__ = os.path.getmtime(mod_path)
+ return mod
+ else:
+ return None
- ast_data = ast.parse(data, filename=mod_path)
- body_info = None
- for body in ast_data.body:
- if body.__class__ == ast.Assign:
- if len(body.targets) == 1:
- if getattr(body.targets[0], "id", "") == "bl_addon_info":
- body_info = body
- break
+ modules_stale = set(USERPREF_PT_addons._addons_fake_modules.keys())
- if body_info:
- mod = ModuleType(mod_name)
- mod.bl_addon_info = ast.literal_eval(body.value)
- mod.__file__ = mod_path
- mod.__time__ = os.path.getmtime(mod_path)
- return mod
+ for path in paths:
+ for f in sorted(os.listdir(path)):
+ if f.endswith(".py"):
+ mod_name = f[0:-3]
+ mod_path = os.path.join(path, f)
+ elif ("." not in f) and (os.path.isfile(os.path.join(path, f, "__init__.py"))):
+ mod_name = f
+ mod_path = os.path.join(path, f, "__init__.py")
else:
- return None
+ mod_name = ""
+ mod_path = ""
+ if mod_name:
+ if mod_name in modules_stale:
+ modules_stale.remove(mod_name)
+ mod = USERPREF_PT_addons._addons_fake_modules.get(mod_name)
+ if mod:
+ if mod.__time__ != os.path.getmtime(mod_path):
+ print("Reloading", mod_name)
+ del USERPREF_PT_addons._addons_fake_modules[mod_name]
+ mod = None
- modules_stale = set(USERPREF_PT_addons._addons_fake_modules.keys())
-
- for path in paths:
- for f in sorted(os.listdir(path)):
- if f.endswith(".py"):
- mod_name = f[0:-3]
- mod_path = os.path.join(path, f)
- elif ("." not in f) and (os.path.isfile(os.path.join(path, f, "__init__.py"))):
- mod_name = f
- mod_path = os.path.join(path, f, "__init__.py")
- else:
- mod_name = ""
- mod_path = ""
-
- if mod_name:
- if mod_name in modules_stale:
- modules_stale.remove(mod_name)
- mod = USERPREF_PT_addons._addons_fake_modules.get(mod_name)
+ if mod is None:
+ mod = fake_module(mod_name, mod_path)
if mod:
- if mod.__time__ != os.path.getmtime(mod_path):
- print("Reloading", mod_name)
- del USERPREF_PT_addons._addons_fake_modules[mod_name]
- mod = None
-
- if mod is None:
- mod = fake_module(mod_name, mod_path)
- if mod:
- USERPREF_PT_addons._addons_fake_modules[mod_name] = mod
-
-
- # just incase we get stale modules, not likely
- for mod_stale in modules_stale:
- del USERPREF_PT_addons._addons_fake_modules[mod_stale]
- del modules_stale
-
- return list(USERPREF_PT_addons._addons_fake_modules.values())
+ USERPREF_PT_addons._addons_fake_modules[mod_name] = mod
+
- else:
- # never run this!, before it used 'ast' module
- pass
- '''
- # note, this still gets added to _bpy_types.TypeMap
- import bpy_types as _bpy_types
+ # just incase we get stale modules, not likely
+ for mod_stale in modules_stale:
+ del USERPREF_PT_addons._addons_fake_modules[mod_stale]
+ del modules_stale
- # sys.path.insert(0, None)
- for path in paths:
- # sys.path[0] = path
- modules.extend(bpy.utils.modules_from_path(path, loaded_modules))
+ mod_list = list(USERPREF_PT_addons._addons_fake_modules.values())
+ mod_list.sort(key=lambda mod: (mod.bl_addon_info['category'], mod.bl_addon_info['name']))
+ return mod_list
- if bpy.app.debug:
- print("Addon Script Load Time %.4f" % (time.time() - t_main))
-
- # del sys.path[0]
- return modules
- '''
-
-
-
-
-
-
def draw(self, context):
layout = self.layout
More information about the Bf-blender-cvs
mailing list