diff --git a/common/lib/module_loader.py b/common/lib/module_loader.py index 8a1792cbf..b555801ec 100644 --- a/common/lib/module_loader.py +++ b/common/lib/module_loader.py @@ -243,7 +243,7 @@ def expand_datasources(self): self.datasources[datasource_id]["has_worker"] = bool(worker) self.datasources[datasource_id]["has_options"] = self.datasources[datasource_id]["has_worker"] and \ bool(self.workers["%s-search" % datasource_id].get_options()) - self.datasources[datasource_id]["importable"] = worker and hasattr(worker, "is_from_extension") and worker.is_from_extension + self.datasources[datasource_id]["importable"] = worker and hasattr(worker, "is_from_zeeschuimer") and worker.is_from_zeeschuimer def load_worker_class(self, worker): """ diff --git a/datasources/gab/search_gab.py b/datasources/gab/search_gab.py index 4b200b667..2ad7dfc34 100644 --- a/datasources/gab/search_gab.py +++ b/datasources/gab/search_gab.py @@ -16,7 +16,7 @@ class SearchGab(Search): title = "Import scraped Gab data" # title displayed in UI description = "Import Gab data collected with an external tool such as Zeeschuimer." # description displayed in UI extension = "ndjson" # extension of result file, used internally and in UI - is_from_extension = True + is_from_zeeschuimer = True fake = "" # not available as a processor for existing datasets diff --git a/datasources/imgur/search_imgur.py b/datasources/imgur/search_imgur.py index d3e55c38d..b8c80ec5b 100644 --- a/datasources/imgur/search_imgur.py +++ b/datasources/imgur/search_imgur.py @@ -18,7 +18,7 @@ class SearchNineGag(Search): title = "Import scraped Imgur data" # title displayed in UI description = "Import Imgur data collected with an external tool such as Zeeschuimer." # description displayed in UI extension = "ndjson" # extension of result file, used internally and in UI - is_from_extension = True + is_from_zeeschuimer = True # not available as a processor for existing datasets accepts = [None] diff --git a/datasources/instagram/search_instagram.py b/datasources/instagram/search_instagram.py index b82e4ca3e..3a3b76f4c 100644 --- a/datasources/instagram/search_instagram.py +++ b/datasources/instagram/search_instagram.py @@ -21,7 +21,7 @@ class SearchInstagram(Search): title = "Import scraped Instagram data" # title displayed in UI description = "Import Instagram data collected with an external tool such as Zeeschuimer." # description displayed in UI extension = "ndjson" # extension of result file, used internally and in UI - is_from_extension = True + is_from_zeeschuimer = True # not available as a processor for existing datasets accepts = [None] diff --git a/datasources/linkedin/search_linkedin.py b/datasources/linkedin/search_linkedin.py index f954782e0..f357341ed 100644 --- a/datasources/linkedin/search_linkedin.py +++ b/datasources/linkedin/search_linkedin.py @@ -21,7 +21,7 @@ class SearchLinkedIn(Search): title = "Import scraped LinkedIn data" # title displayed in UI description = "Import LinkedIn data collected with an external tool such as Zeeschuimer." # description displayed in UI extension = "ndjson" # extension of result file, used internally and in UI - is_from_extension = True + is_from_zeeschuimer = True # not available as a processor for existing datasets accepts = [None] diff --git a/datasources/ninegag/search_9gag.py b/datasources/ninegag/search_9gag.py index 973de82ba..e5d6c267b 100644 --- a/datasources/ninegag/search_9gag.py +++ b/datasources/ninegag/search_9gag.py @@ -19,7 +19,7 @@ class SearchNineGag(Search): title = "Import scraped 9gag data" # title displayed in UI description = "Import 9gag data collected with an external tool such as Zeeschuimer." # description displayed in UI extension = "ndjson" # extension of result file, used internally and in UI - is_from_extension = True + is_from_zeeschuimer = True # not available as a processor for existing datasets accepts = [None] diff --git a/datasources/tiktok_comments/search_tiktok_comments.py b/datasources/tiktok_comments/search_tiktok_comments.py index d44581193..efaffc21d 100644 --- a/datasources/tiktok_comments/search_tiktok_comments.py +++ b/datasources/tiktok_comments/search_tiktok_comments.py @@ -20,7 +20,7 @@ class SearchTikTokComments(Search): title = "Import scraped Tiktok comment data" # title displayed in UI description = "Import Tiktok comment data collected with an external tool such as Zeeschuimer." # description displayed in UI extension = "ndjson" # extension of result file, used internally and in UI - is_from_extension = True + is_from_zeeschuimer = True # not available as a processor for existing datasets accepts = [None] diff --git a/datasources/truth/search_truth.py b/datasources/truth/search_truth.py index 52057e0fa..c1743e12c 100644 --- a/datasources/truth/search_truth.py +++ b/datasources/truth/search_truth.py @@ -16,7 +16,7 @@ class SearchGab(Search): title = "Import scraped Truth Social data" # title displayed in UI description = "Import Truth Social data collected with an external tool such as Zeeschuimer." # description displayed in UI extension = "ndjson" # extension of result file, used internally and in UI - is_from_extension = True + is_from_zeeschuimer = True fake = "" # not available as a processor for existing datasets diff --git a/datasources/twitter-import/search_twitter.py b/datasources/twitter-import/search_twitter.py index baa506923..9acb2b45c 100644 --- a/datasources/twitter-import/search_twitter.py +++ b/datasources/twitter-import/search_twitter.py @@ -20,7 +20,7 @@ class SearchTwitterViaZeeschuimer(Search): title = "Import scraped X/Twitter data" # title displayed in UI description = "Import X/Twitter data collected with an external tool such as Zeeschuimer." # description displayed in UI extension = "ndjson" # extension of result file, used internally and in UI - is_from_extension = True + is_from_zeeschuimer = True # not available as a processor for existing datasets accepts = [] diff --git a/webtool/templates/data-overview.html b/webtool/templates/data-overview.html index 7b371178f..f31f2178d 100644 --- a/webtool/templates/data-overview.html +++ b/webtool/templates/data-overview.html @@ -45,7 +45,7 @@

Metadata

  • The data for this data source are gathered and stored by this 4CAT instance.
  • {% elif label == "static" %}
  • The data for this datasource are not updated anymore and show a static snapshot.
  • - {% elif label == "extension" %} + {% elif label == "zeeschuimer" %}
  • The data for this datasource are collected with Zeeschuimer.
  • {% elif label == "external" %}
  • The data for this datasource is collected externally (API or custom upload).
  • diff --git a/webtool/views/views_misc.py b/webtool/views/views_misc.py index 6433b530e..aed8c2d03 100644 --- a/webtool/views/views_misc.py +++ b/webtool/views/views_misc.py @@ -155,8 +155,8 @@ def data_overview(datasource=None): if is_static: labels.append("static") - if hasattr(worker_class, "is_from_extension"): - labels.append("extension") + if hasattr(worker_class, "is_from_zeeschuimer"): + labels.append("zeeschuimer") # Get daily post counts for local datasource to display in a graph if is_local == "local":