CIRCL
/
PyCIRCLean
mirror of https://github.com/CIRCL/PyCIRCLean
2
0
Fork 0
Code Issues Releases Wiki Activity

Fix description string behavior 

* Make description string property return a string instead of array
pull/21/head
Dan Puttick 2017-07-20 13:17:45 -04:00
parent fe82a5ac0d
commit dee35a5331
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
kittengroomer/helpers.py
View File

@ -36,7 +36,7 @@ class FileBase(object):
self.is_dangerous = False self.is_dangerous = False
self.copied = False self.copied = False
self.symlink_path = None self.symlink_path = None
self.description_string = [] # array of descriptions to be joined self._description_string = [] # array of descriptions to be joined
self._errors = {} self._errors = {}
self._user_defined = {} self._user_defined = {}
self.should_copy = True self.should_copy = True
@ -90,18 +90,24 @@ class FileBase(object):
@property @property
def description_string(self): def description_string(self):
return self.__description_string if len(self._description_string) == 0:
return ''
elif len(self._description_string) == 1:
return self._description_string[0]
else:
ret_string = ', '.join(self._description_string)
return ret_string.strip(', ')
@description_string.setter @description_string.setter
def description_string(self, value): def description_string(self, value):
if hasattr(self, 'description_string'): if hasattr(self, 'description_string'):
if isinstance(value, str): if isinstance(value, str):
if value not in self.__description_string: if value not in self._description_string:
self.__description_string.append(value) self._description_string.append(value)
else: else:
raise TypeError("Description_string can only include strings") raise TypeError("Description_string can only include strings")
else: else:
self.__description_string = value self._description_string = value
def set_property(self, prop_string, value): def set_property(self, prop_string, value):
""" """
@ -139,6 +145,7 @@ class FileBase(object):
'subtype': self.subtype, 'subtype': self.subtype,
'extension': self.extension, 'extension': self.extension,
'is_dangerous': self.is_dangerous, 'is_dangerous': self.is_dangerous,
'is_symlink': self.is_symlink,
'symlink_path': self.symlink_path, 'symlink_path': self.symlink_path,
'copied': self.copied, 'copied': self.copied,
'description_string': self.description_string, 'description_string': self.description_string,