trying to fix registering multiple models

jstacoder · jstacoder · commit d3d5ce4eecfb · 2017-04-06T15:12:49.000-07:00
diff --git a/flask_xxl/main.py b/flask_xxl/main.py
@@ -181,7 +181,15 @@ def _register_routes(self):
             if self.app.config.get('VERBOSE',False):
                 print 'Finished registering blueprints and url routes'
         else:
-            print 'skip[ped'    
+            if self.app.config.get('VERBOSE',False):
+                print 'skipped'    
+
+    def _check_for_registered_blueprint(self, bp):
+        found = False
+        for name in [str(x) for x in self.app.blueprints]:
+            if bp.__name__.split('.')[-1] in name:
+                found = True
+        return found
 
     def _setup_routes(self,routes):
         for route in routes:
@@ -202,7 +210,7 @@ def _setup_routes(self,routes):
                 if type(blueprint) == type(tuple()):
                     blueprint = blueprint[0]
                 blueprint.add_url_rule(pattern,endpoint or view.func_name,view_func=hasattr(view,'func_name') and view or view.as_view(endpoint))
-            if not blueprint in self.app.blueprints:
+            if not self._check_for_registered_blueprint(blueprint):
                 if self.app.config.get('VERBOSE',False):
                     print '\n\t\t\tNow registering {} as blueprint\n\n'.format(str(blueprint.name))
                 self.app.register_blueprint(blueprint)
diff --git a/setup.py b/setup.py
@@ -1,4 +1,4 @@
-VERSION = '0,9,16'
+VERSION = '0,9,17'
 import os
 from setuptools import setup, find_packages,findall
 from glob import glob

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-VERSION = '0,9,16'`
	`1`	`+VERSION = '0,9,17'`
`2`	`2`	`import os`
`3`	`3`	`from setuptools import setup, find_packages,findall`
`4`	`4`	`from glob import glob`