From bbd6a0223056bb3c9b4a39d438d72116a9640ff4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20tom=20W=C3=B6rden?= <henrik@trineo.org>
Date: Sun, 22 Sep 2019 16:53:41 +0200
Subject: [PATCH] safer use of guard
---
src/caosadvancedtools/cfood.py | 41 ++++++++++++++------------------
src/caosadvancedtools/crawler.py | 16 +++++++------
src/caosadvancedtools/guard.py | 6 +++++
3 files changed, 33 insertions(+), 30 deletions(-)
diff --git a/src/caosadvancedtools/cfood.py b/src/caosadvancedtools/cfood.py
index cf665863..1310919d 100644
--- a/src/caosadvancedtools/cfood.py
+++ b/src/caosadvancedtools/cfood.py
@@ -38,6 +38,7 @@ import re
import caosdb as db
+from .guard import global_guard as guard
from .verbosity import INFO, VERBOSE
ENTITIES = {}
@@ -62,8 +63,7 @@ class AbstractCFood(object):
# function match()
_pattern = None
- def __init__(self, crawled_file, access=lambda x: x, verbosity=INFO,
- guard=None):
+ def __init__(self, crawled_file, access=lambda x: x, verbosity=INFO):
""" Abstract base class for Crawler food (CFood).
Parameters
@@ -82,7 +82,6 @@ class AbstractCFood(object):
self.identifiables = db.Container()
self.verbosity = verbosity
self.attached_ones = []
- self.guard = guard
@staticmethod
def get_re():
@@ -169,7 +168,7 @@ class AbstractCFood(object):
for el in self.to_be_updated:
print(el.name if el.name is not None else el.id)
print("/"*60)
- self.guard.safe_update(self.to_be_updated)
+ guard.safe_update(self.to_be_updated)
def attach(self, crawled_file):
self.attached_ones.append(crawled_file)
@@ -229,15 +228,18 @@ def assure_object_is_in_list(obj, containing_object, property_name,
If obj is a list, every element is added
"""
+ if datatype is None:
+ datatype = db.LIST(property_name)
+
if containing_object.get_property(property_name) is None:
- if datatype is None:
- datatype = db.LIST(property_name)
containing_object.add_property(property_name, value=[],
datatype=datatype)
- current_list = containing_object.get_property(property_name).value
- if not isinstance(current_list, list):
- current_list = [current_list]
+ if not isinstance(containing_object.get_property(property_name).value, list):
+ containing_object.get_property(property_name).value = [containing_object.get_property(property_name).value]
+ containing_object.get_property(property_name).value
+ containing_object.get_property(property_name).datatype = datatype
+ current_list = containing_object.get_property(property_name).value
if not isinstance(obj, list):
objects = [obj]
@@ -278,7 +280,7 @@ def assure_object_is_in_list(obj, containing_object, property_name,
to_be_updated.append(containing_object)
-def assure_has_parent(entity, parent, to_be_updated=None, guard=None, verbosity=INFO):
+def assure_has_parent(entity, parent, to_be_updated=None, verbosity=INFO):
"""
Checks whether `entity` has a parent with name `parent`.
@@ -312,16 +314,13 @@ def assure_has_parent(entity, parent, to_be_updated=None, guard=None, verbosity=
if to_be_updated is None:
get_ids_for_entities_with_names([entity])
- if guard is None:
- entity.update(unique=False)
- else:
- guard.safe_update(entity, unique=False)
+ guard.safe_update(entity, unique=False)
else:
to_be_updated.append(entity)
def assure_has_property(entity, name, value, to_be_updated=None,
- verbosity=INFO, guard=None, datatype=None):
+ verbosity=INFO, datatype=None):
"""
Checks whether `entity` has a property `name` with the value `value`.
@@ -345,8 +344,7 @@ def assure_has_property(entity, name, value, to_be_updated=None,
if to_be_updated is None:
get_ids_for_entities_with_names([entity])
- if guard is None:
- entity.update(unique=False)
+ guard.safe_update(entity, unique=False)
return
@@ -384,10 +382,7 @@ def assure_has_property(entity, name, value, to_be_updated=None,
if to_be_updated is None:
get_ids_for_entities_with_names([entity])
- if guard is None:
- entity.update(unique=False)
- else:
- guard.safe_update(entity, unique=False)
+ guard.safe_update(entity, unique=False)
else:
to_be_updated.append(entity)
@@ -427,8 +422,8 @@ class CMeal(object):
for group in cls.matching_groups:
if (group not in match.groupdict() or
- group not in cfood.match.groupdict()or
- match.group(group) == cfood.match.group(group)):
+ group not in cfood.match.groupdict() or
+ match.group(group) != cfood.match.group(group)):
suitable = False
if suitable:
diff --git a/src/caosadvancedtools/crawler.py b/src/caosadvancedtools/crawler.py
index d0c58a2f..d5da0a82 100644
--- a/src/caosadvancedtools/crawler.py
+++ b/src/caosadvancedtools/crawler.py
@@ -43,7 +43,8 @@ import caosdb as db
from caosdb.exceptions import TransactionError
from .cache import Cache
-from .guard import INSERT, RETRIEVE, UPDATE, Guard
+from .guard import INSERT, RETRIEVE, UPDATE
+from .guard import global_guard as guard
from .verbosity import DEBUG, INFO, VERBOSE
@@ -76,7 +77,7 @@ class Crawler(object):
def crawl(self, files, security_level=RETRIEVE):
errors_occured = False
tbs = []
- self.guard = Guard(level=security_level)
+ guard.set_level(level=security_level)
files = sorted(files, key=lambda x: x.path)
cfoods = []
@@ -102,9 +103,11 @@ class Crawler(object):
Cfood.__class__.__name__,
crawled_file.path))
try:
- cfoods.append(Cfood.cook(crawled_file, access=self.access,
- verbosity=self.verbosity,
- guard=self.guard))
+ cfood = Cfood.cook(crawled_file, access=self.access,
+ verbosity=self.verbosity)
+
+ if cfood is not None:
+ cfoods.append(cfood)
except Exception as e:
traceback.print_exc()
print(e)
@@ -161,7 +164,6 @@ class Crawler(object):
self.find_or_insert_identifiables(cfood.identifiables,
self.verbosity,
- guard=self.guard
)
if self.use_cache:
@@ -190,7 +192,7 @@ class Crawler(object):
# TODO remove static?
@staticmethod
- def find_or_insert_identifiables(identifiables, verbosity=INFO, guard=None):
+ def find_or_insert_identifiables(identifiables, verbosity=INFO):
""" Sets the ids of identifiables (that do not have already an id from the
cache) based on searching CaosDB and retrieves those entities.
The remaining entities (those which can not be retrieved) have no
diff --git a/src/caosadvancedtools/guard.py b/src/caosadvancedtools/guard.py
index 3e47e463..269ef77b 100644
--- a/src/caosadvancedtools/guard.py
+++ b/src/caosadvancedtools/guard.py
@@ -39,3 +39,9 @@ class Guard(object):
raise Exception("not allowed")
else:
obj.update(**kwargs)
+
+ def set_level(self, level):
+ self.level = level
+
+
+global_guard = Guard()
--
GitLab