From 8899bff5e4d84bab2c3611de5a23b258ea7896d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Fri, 7 Dec 2018 12:25:48 +0100 Subject: [PATCH] Fixed Flamenco exclusion filter bug There was a mistake in an older version of the property tooltip, showing semicolon-separated instead of space-separated. We now just handle both. --- blender_cloud/blender.py | 4 ++-- blender_cloud/flamenco/bat_interface.py | 9 +++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/blender_cloud/blender.py b/blender_cloud/blender.py index 04ebe4f..2002376 100644 --- a/blender_cloud/blender.py +++ b/blender_cloud/blender.py @@ -219,8 +219,8 @@ class BlenderCloudPreferences(AddonPreferences): flamenco_manager = PointerProperty(type=flamenco.FlamencoManagerGroup) flamenco_exclude_filter = StringProperty( name='File Exclude Filter', - description='Filter like "*.abc;*.mkv" to prevent certain files to be packed ' - 'into the output directory', + description='Space-separated list of filename filters, like "*.abc *.mkv", to prevent ' + 'matching files from being packed into the output directory', default='', update=project_specific.store, ) diff --git a/blender_cloud/flamenco/bat_interface.py b/blender_cloud/flamenco/bat_interface.py index 0157ffd..ad2e7b6 100644 --- a/blender_cloud/flamenco/bat_interface.py +++ b/blender_cloud/flamenco/bat_interface.py @@ -2,9 +2,10 @@ import asyncio import logging +import pathlib +import re import threading import typing -import pathlib import bpy from blender_asset_tracer import pack @@ -114,7 +115,11 @@ async def copy(context, as packer: with _packer_lock: if exclusion_filter: - packer.exclude(*exclusion_filter.split()) + # There was a mistake in an older version of the property tooltip, + # showing semicolon-separated instead of space-separated. We now + # just handle both. + filter_parts = re.split('[ ;]+', exclusion_filter.strip(' ;')) + packer.exclude(*filter_parts) packer.progress_cb = BatProgress() _running_packer = packer