removed blender pools addon preferences & added config.json load

afanasy/python/af.py

@@ -1174,8 +1174,8 @@ def renderGetLocal(self):
 class MongoDB():
     POOLS_DATABSE       = "afpools"
     POOLS_COLLECTION    = "pools"
-    status = None
-    connection = None
+    status              = None
+    connection          = None
 
     # Establishs the connection to MongoDB database.
     def connect(self, connection):
@@ -1198,9 +1198,9 @@ def findAllPools(self):
 
 class PoolsAddinAPI():
     @staticmethod
-    def getPools():
+    def getPools(config):
         MongoDB.connection = MongoDB()
-        MongoDB.connection.connect("mongodb://192.168.1.107:27017")
+        MongoDB.connection.connect("mongodb://" + config["host"]  + ":" + str(config["port"]))
         pools = MongoDB.connection.findAllPools()
         poolset = {("- No pool selected. -", "- No pool selected. -", "- No pool selected. -")}
         for pool in pools:

plugins/blender/addons/cgru_tools/__init__.py

@@ -30,7 +30,7 @@
     from . import utils
 
 import bpy
-
+import af
 
 def register():
     bpy.utils.register_module(__package__)
@@ -46,11 +46,10 @@ def register():
     else:
         utils.add_cgru_module_to_syspath(prefs.cgru_location)
 
-
 def unregister():
     del bpy.types.Scene.cgru
     bpy.utils.unregister_module(__name__)
 
 
 if __name__ == "__main__":
-    register()
+    register()

plugins/blender/addons/cgru_tools/addon_prefs.py

@@ -23,19 +23,9 @@ class CGRUAddonPreferences(AddonPreferences):
         name="CGRU version",
         default="NOT FOUND")
 
-    cgru_pool_server_host = StringProperty(
-        name="Pools MongoDB Host",
-        default="localhost")
-
-    cgru_pool_server_port = StringProperty(
-        name="Pools MongoDB Port",
-        default="27017")
-
     def draw(self, context):
         layout = self.layout
         col = layout.column()
         col.label(text="Please, set CGRU install root location")
         col.prop(self, "cgru_location")
-        col.label(text="CGRU version: %s" % self.cgru_version)
-        col.prop(self, "cgru_pool_server_host")
-        col.prop(self, "cgru_pool_server_port")
+        col.label(text="CGRU version: %s" % self.cgru_version)

plugins/blender/addons/cgru_tools/properties.py

@@ -108,4 +108,4 @@ class CGRUProperties(bpy.types.PropertyGroup):
 
     pools = EnumProperty(
         name="Render Pool",
-        items=af.PoolsAddinAPI.getPools())
+        items=af.PoolsAddinAPI.getPools(utils.get_afpools_config()))

plugins/blender/addons/cgru_tools/utils.py

@@ -4,6 +4,7 @@
 import sys
 import bpy
 import af
+import json
 
 CGRU_NOT_FOUND = 'NOT FOUND'
 
@@ -49,6 +50,14 @@ def get_movie_codecs(self, context):
 
     return codecs
 
-def get_all_pool_names():
-
-    return ["Pool 1", "Pool 2"]
+def get_afpools_config():
+    path = os.path.join(os.environ["CGRU_LOCATION"], "utilities", "poolsaddin", "config.json")
+    config = {
+        "host":"localhost",
+        "port":"27017"
+    }
+    with open(path) as json_file:
+        data = json.load(json_file)
+        config["host"] = data["mongodb_host"]
+        config["port"] = data["mongodb_port"]
+    return config

setup_pymongo.cmd

@@ -1,5 +1,7 @@
 @echo off
 
+rem -------- pymongo cgru ----------------------------------
+
 echo %CGRU_LOCATION%
 
 set PY_EXE=%CGRU_LOCATION%\python\python.exe
@@ -8,4 +10,6 @@ set PIP_INSTALL_PYMONGO=%PY_EXE% -m pip install pymongo
 
 echo %PY_INSTALL_PIP%
 call %PY_INSTALL_PIP%
-call %PIP_INSTALL_PYMONGO%
+call %PIP_INSTALL_PYMONGO%
+
+rem ---------------------------------------------------------