From f89ee284afb79ab1c18040e6c324804ab90a9d42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20tom=20W=C3=B6rden?= <henrik@trineo.org>
Date: Mon, 5 Aug 2019 10:26:22 +0200
Subject: [PATCH] API: identifiables are no longer returned, but an instance
variable
---
src/caosadvancedtools/cfood.py | 3 ++-
src/caosadvancedtools/crawler.py | 8 ++++----
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/caosadvancedtools/cfood.py b/src/caosadvancedtools/cfood.py
index d96b47c6..cfed5fba 100644
--- a/src/caosadvancedtools/cfood.py
+++ b/src/caosadvancedtools/cfood.py
@@ -76,6 +76,7 @@ class AbstractCFood(object):
self.crawled_path = crawled_file.path
self.match = type(self).match(crawled_file.path)
self.to_be_updated = db.Container()
+ self.identifiables = db.Container()
@staticmethod
def get_re():
@@ -103,7 +104,7 @@ class AbstractCFood(object):
def create_identifiables(self):
"""
- must return a Container with the identifiables
+ should set the instance variable Container with the identifiables
"""
raise NotImplementedError()
diff --git a/src/caosadvancedtools/crawler.py b/src/caosadvancedtools/crawler.py
index 24c974b9..334f9848 100644
--- a/src/caosadvancedtools/crawler.py
+++ b/src/caosadvancedtools/crawler.py
@@ -78,16 +78,16 @@ class Crawler(object):
if Cfood.match(crawled_file.path) is not None:
try:
cfood = Cfood(crawled_file, access=self.access)
- identifiables = cfood.create_identifiables()
+ cfood.create_identifiables()
if self.use_cache:
hashes = self.cache.update_ids_from_cache(
- identifiables)
+ cfood.identifiables)
- self.find_or_insert_identifiables(identifiables)
+ self.find_or_insert_identifiables(cfood.identifiables)
if self.use_cache:
- self.cache.insert_list(hashes, identifiables)
+ self.cache.insert_list(hashes, cfood.identifiables)
cfood.update_identifiables()
cfood.push_identifiables_to_CaosDB()
--
GitLab