clean: logging

CHANGELOG.md

@@ -217,57 +217,3 @@ All notable changes to this project will be documented in this file.
 - GPencil fill stroke
 - Sculpt and GPencil brushes deleted when joining a session (@Kysios)
 - Auto-updater doesn't work for master and develop builds
-
-## [0.5.0] - 2022-02-10
-
-### Added
-
-- New overall UI and UX (@Kysios)
-- Documentation overall update (@Kysios)
-- Server presets (@Kysios)
-- Server online status (@Kysios)
-- Draw connected user color in the user list
-- Private session (access protected with a password) (@Kysios)
-
-### Changed
-
-- Dependencies are now installed in the addon folder and correctly cleaned during the addon removal process
-
-### Fixed
-
-- Python 3.10 compatibility (@notfood)
-- Blender 3.x compatibility
-- Skin vertex radius synchronization (@kromar)
-- Sequencer audio strip synchronization
-- Crash with empty after a reconnection
-
-## [0.5.1] - 2022-02-10
-
-### Fixed
-
-- Auto updater breaks dependency auto installer
-- Auto updater update from tag
-
-## [0.5.2] - 2022-02-18
-
-### Fixed
-
-- Objects not selectable after user leaves session
-- Geometry nodes attribute toogle doesn't sync
-
-## [0.5.3] - 2022-03-11
-
-### Changed
-
-- Snapshots logs
-### Fixed
-
-- Server crashing during snapshots
-- Blender 3.1 numpy loading error during early connection process
-- Server docker arguments
-
-## [0.5.5] - 2022-06-12
-
-### Fixed
-
-- Numpy mesh serialization error

docs/conf.py

@@ -16,12 +16,12 @@ import sys
 
 # -- Project information -----------------------------------------------------
 
-project = 'Multi-User 0.5.x Documentation'
+project = 'Multi-User 0.5.0 Documentation'
 copyright = '2020, Swann Martinez'
 author = 'Swann Martinez, Poochy, Fabian'
 
 # The full version, including alpha/beta/rc tags
-version_release = '0.5.5'
+version_release = '0.5.1-develop'
 
 
 # -- General configuration ---------------------------------------------------

docs/hosting_internet/index.rst

@@ -206,9 +206,9 @@ You can run the dedicated server on any platform by following these steps:
 
     .. code-block:: bash
 
-        python -m pip install replication
+        python -m pip install replication==0.1.13
 
-3. Launch the server with:
+4. Launch the server with:
 
     .. code-block:: bash
 
@@ -562,7 +562,7 @@ The default Docker image essentially runs the equivalent of:
 
     .. code-block:: bash
 
-        replication.server -pwd admin -p 5555 -t 5000 -l DEBUG -lf multiuser_server.log
+        replication.serve -pwd admin -p 5555 -t 5000 -l DEBUG -lf multiuser_server.log
 
 This means the server will be launched with 'admin' as the administrator password, run on ports 5555:5558, use a timeout of 5 seconds, verbose 'DEBUG' log level, and with log files written to 'multiuser_server.log'. See :ref:`cmd-line` for a description of optional parameters.
 

multi_user/__init__.py

@@ -19,7 +19,7 @@
 bl_info = {
     "name": "Multi-User",
     "author": "Swann Martinez",
-    "version": (0, 5, 8),
+    "version": (0, 4, 1),
     "description": "Enable real-time collaborative workflow inside blender",
     "blender": (2, 82, 0),
     "location": "3D View > Sidebar > Multi-User tab",

multi_user/addon_updater.py

@@ -1015,18 +1015,16 @@ class Singleton_updater(object):
 		for path, dirs, files in os.walk(base):
 			# prune ie skip updater folder
 			dirs[:] = [d for d in dirs if os.path.join(path,d) not in [self._updater_path]]
-
-			for directory in dirs:
-				shutil.rmtree(os.path.join(path,directory))
-
 			for file in files:
-				try:
+				for ptrn in self.remove_pre_update_patterns:
-					fl = os.path.join(path,file)
+					if fnmatch.filter([file],ptrn):
-					os.remove(fl)
+						try:
-					if self._verbose: print("Pre-removed file "+file)
+							fl = os.path.join(path,file)
-				except OSError:
+							os.remove(fl)
-					print("Failed to pre-remove "+file)
+							if self._verbose: print("Pre-removed file "+file)
-					self.print_trace()
+						except OSError:
+							print("Failed to pre-remove "+file)
+							self.print_trace()
 
 		# Walk through the temp addon sub folder for replacements
 		# this implements the overwrite rules, which apply after
@@ -1703,7 +1701,7 @@ class GitlabEngine(object):
 	def parse_tags(self, response, updater):
 		if response == None:
 			return []
-		return [{"name": tag["name"], "zipball_url": f"https://gitlab.com/slumber/multi-user/-/jobs/artifacts/{tag['name']}/download?job=build"} for tag in response]
+		return [{"name": tag["name"], "zipball_url": self.get_zip_url(tag["commit"]["id"], updater)} for tag in response]
 
 
 # -----------------------------------------------------------------------------

multi_user/addon_updater_ops.py

@@ -267,7 +267,7 @@ class addon_updater_update_now(bpy.types.Operator):
 	clean_install: bpy.props.BoolProperty(
 		name="Clean install",
 		description="If enabled, completely clear the addon's folder before installing new update, creating a fresh install",
-		default=True,
+		default=False,
 		options={'HIDDEN'}
 	)
 

multi_user/bl_types/bl_object.py

@@ -47,7 +47,10 @@ SHAPEKEY_BLOCK_ATTR = [
     'slider_max',
 ]
 
-
+CURVE_POINT = [
+    'location',
+    'handle_type_2',
+]
 if bpy.app.version >= (2,93,0):
     SUPPORTED_GEOMETRY_NODE_PARAMETERS = (int, str, float)
 else:
@@ -172,7 +175,7 @@ def load_modifier_geometry_node_props(dumped_modifier: dict, target_modifier: bp
     for input_index, inpt in enumerate(get_node_group_properties_identifiers(target_modifier.node_group)):
         dumped_value, dumped_type = dumped_modifier['props'][input_index]
         input_value = target_modifier[inpt[0]]
-        if dumped_type in ['INT', 'VALUE', 'STR', 'BOOL']:
+        if dumped_type in ['INT', 'VALUE', 'STR']:
             logging.info(f"{inpt[0]}/{dumped_value}")
             target_modifier[inpt[0]] = dumped_value
         elif dumped_type in ['RGBA', 'VECTOR']:
@@ -418,7 +421,8 @@ def dump_modifiers(modifiers: bpy.types.bpy_prop_collection)->dict:
             dumped_modifier['settings'] = dumper.dump(modifier.settings)
         elif modifier.type == 'UV_PROJECT':
             dumped_modifier['projectors'] =[p.object.name for p in modifier.projectors if p and p.object]
-
+        elif modifier.type == 'BEVEL' and modifier.profile_type == 'CUSTOM':
+            dumped_modifier['custom_profile'] = np_dump_collection(modifier.custom_profile.points, CURVE_POINT)
         dumped_modifiers.append(dumped_modifier)
     return dumped_modifiers
 
@@ -490,11 +494,31 @@ def load_modifiers(dumped_modifiers: list, modifiers: bpy.types.bpy_prop_collect
                     loaded_modifier.projectors[projector_index].object = target_object
                 else:
                     logging.error("Could't load projector target object {projector_object}")
+        elif loaded_modifier.type == 'BEVEL':
+            src_cust_profile  = dumped_modifier.get('custom_profile')
+            if src_cust_profile:
+                dst_points = loaded_modifier.custom_profile.points
+
+                # TODO: refactor to be diff-compatible
+                for p in dst_points:
+                    try:
+                        dst_points.remove(dst_points[0])
+                    except Exception:
+                        break 
+
+                for i in range(len(src_cust_profile['handle_type_2'])-len(dst_points)):
+                    dst_points.add(0,0)
+
+                
+                np_load_collection(src_cust_profile, dst_points, CURVE_POINT)
+
+                loaded_modifier.custom_profile.points.update()
+        
 
 
 def load_modifiers_custom_data(dumped_modifiers: dict, modifiers: bpy.types.bpy_prop_collection):
     """ Load modifiers custom data not managed by the dump_anything loader
-
+git 
         :param dumped_modifiers: modifiers to load
         :type dumped_modifiers: dict
         :param modifiers: target modifiers collection 

multi_user/bl_types/dump_anything.py

@@ -26,8 +26,7 @@ import numpy as np
 BPY_TO_NUMPY_TYPES = {
     'FLOAT': np.float32,
     'INT': np.int32,
-    'BOOL': bool,
+    'BOOL': np.bool}
-    'BOOLEAN': bool}
 
 PRIMITIVE_TYPES = ['FLOAT', 'INT', 'BOOLEAN']
 
@@ -582,6 +581,7 @@ class Loader:
                 else:
                     dst_curve.points.new(pos[0], pos[1])
         curves.update()
+    
 
     def _load_pointer(self, instance, dump):
         rna_property_type = instance.bl_rna_property.fixed_type

multi_user/environment.py

@@ -36,6 +36,8 @@ REPLICATION_DEPENDENCIES = {
 LIBS = os.path.join(os.path.dirname(os.path.abspath(__file__)), "libs")
 REPLICATION = os.path.join(LIBS,"replication")
 
+PYTHON_PATH = None
+SUBPROCESS_DIR = None
 
 rtypes = []
 
@@ -48,13 +50,13 @@ def module_can_be_imported(name: str) -> bool:
         return False
 
 
-def install_pip(python_path):
+def install_pip():
     # pip can not necessarily be imported into Blender after this
-    subprocess.run([str(python_path), "-m", "ensurepip"])
+    subprocess.run([str(PYTHON_PATH), "-m", "ensurepip"])
 
 
-def install_requirements(python_path:str, module_requirement: str, install_dir: str):
+def install_package(name: str, install_dir: str):
-    logging.info(f"Installing {module_requirement} dependencies in {install_dir}")
+    logging.info(f"installing {name} version...")
     env = os.environ
     if "PIP_REQUIRE_VIRTUALENV" in env:
         # PIP_REQUIRE_VIRTUALENV is an env var to ensure pip cannot install packages outside a virtual env
@@ -63,7 +65,23 @@ def install_requirements(python_path:str, module_requirement: str, install_dir:
         # env var for the subprocess.
         env = os.environ.copy()
         del env["PIP_REQUIRE_VIRTUALENV"]
-    subprocess.run([str(python_path), "-m", "pip", "install", "-r", f"{install_dir}/{module_requirement}/requirements.txt", "-t", install_dir], env=env)
+    subprocess.run([str(PYTHON_PATH), "-m", "pip", "install", f"{name}", "-t", install_dir], env=env)
+
+    if name in sys.modules:
+        del sys.modules[name]
+
+
+def check_package_version(name: str, required_version: str):
+    logging.info(f"Checking {name} version...")
+    out = subprocess.run([str(PYTHON_PATH), "-m", "pip", "show", name], capture_output=True)
+
+    version = VERSION_EXPR.search(out.stdout.decode())
+    if version and version.group() == required_version:
+        logging.info(f"{name} is up to date")
+        return True
+    else:
+        logging.info(f"{name} need an update")
+        return False
 
 
 def get_ip():
@@ -99,7 +117,21 @@ def remove_paths(paths: list):
         if path in sys.path:
             logging.debug(f"Removing {path} dir from the path.")
             sys.path.remove(path)
-      
+
+
+def install_modules(dependencies: list, python_path: str, install_dir: str):
+    global PYTHON_PATH, SUBPROCESS_DIR
+
+    PYTHON_PATH = Path(python_path)
+    SUBPROCESS_DIR = PYTHON_PATH.parent
+
+    if not module_can_be_imported("pip"):
+        install_pip()
+
+    for package_name in dependencies:
+        if not module_can_be_imported(package_name):
+            install_package(package_name, install_dir=install_dir)
+            module_can_be_imported(package_name)
 
 def register():
     if bpy.app.version >= (2,91,0):
@@ -107,21 +139,12 @@ def register():
     else:
         python_binary_path = bpy.app.binary_path_python
 
-    python_path = Path(python_binary_path)
-
     for module_name in list(sys.modules.keys()):
         if 'replication' in module_name:
             del sys.modules[module_name]
 
     setup_paths([LIBS, REPLICATION])
-
+    install_modules(REPLICATION_DEPENDENCIES, python_binary_path, install_dir=LIBS)
-    if not module_can_be_imported("pip"):
-        install_pip(python_path)
-
-    deps_not_installed = [package_name for package_name in REPLICATION_DEPENDENCIES if not module_can_be_imported(package_name)]
-    if any(deps_not_installed):
-        install_requirements(python_path, module_requirement='replication', install_dir=LIBS)
-    
 
 def unregister():
     remove_paths([REPLICATION, LIBS])

multi_user/operators.py

@@ -1036,7 +1036,7 @@ class SessionLoadSaveOperator(bpy.types.Operator, ImportHelper):
     def poll(cls, context):
         return True
 
-class SESSION_PT_ImportUser(bpy.types.Panel):
+class SessionImportUser(bpy.types.Panel):
     bl_space_type = 'FILE_BROWSER'
     bl_region_type = 'TOOL_PROPS'
     bl_label = "Users"
@@ -1300,7 +1300,7 @@ classes = (
     SessionNotifyOperator, 
     SessionSaveBackupOperator,
     SessionLoadSaveOperator,
-    SESSION_PT_ImportUser,
+    SessionImportUser,
     SessionStopAutoSaveOperator,
     SessionPurgeOperator,
     SessionPresetServerAdd,

multi_user/preferences.py

@@ -44,6 +44,13 @@ DEFAULT_PRESETS = {
         "admin_password": "admin",
         "server_password": ""
     },
+    "public session" : {
+        "server_name": "public session",
+        "ip": "51.75.71.183",
+        "port": 5555,
+        "admin_password": "",
+        "server_password": ""
+    },
 }
 
 def randomColor():

scripts/docker_server/Dockerfile

@@ -22,4 +22,4 @@ RUN pip install replication==$replication_version
 
 # Run the server with parameters
 ENTRYPOINT ["/bin/sh", "-c"]
-CMD  ["replication.server -apwd ${password} -spwd '' -p ${port} -t ${timeout} -l ${log_level} -lf ${log_file}"]
+CMD  ["replication.serve -apwd ${password} -spwd '' -p ${port} -t ${timeout} -l ${log_level} -lf ${log_file}"]