Fixed it?

katjabercic · Dec 1, 2023 · 4c653cb · 4c653cb
1 parent 6582b31
commit 4c653cb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/web/slurper/source_wikidata.py b/web/slurper/source_wikidata.py
@@ -75,9 +75,14 @@ def get_items(self):
             raw_item = BaseWdRawItem.raw_item(self.source, json_item)
             yield raw_item.to_item()
             if self.source != Item.Source.WIKIDATA:
-                raw_item.yield_switched_if_not_exists(Item.Source.WIKIDATA)
+                raw_item_wd = raw_item.switch_source_to(Item.Source.WIKIDATA)
+                if not raw_item_wd.item_exists():
+                    yield raw_item_wd.to_item()
             if raw_item.has_source(Item.Source.WIKIPEDIA_EN):
-                raw_item.yield_switched_if_not_exists(Item.Source.WIKIPEDIA_EN)
+                raw_item_wp_en = raw_item.switch_source_to(Item.Source.WIKIPEDIA_EN)
+                if not raw_item_wp_en.item_exists():
+                    yield raw_item_wp_en.to_item()
+
 
     def save_items(self):
         for item in self.get_items():

diff --git a/web/slurper/wd_raw_item.py b/web/slurper/wd_raw_item.py
@@ -69,11 +69,6 @@ def item_exists(self):
     def get_item(self) -> Optional[Item]:
         return self._get_item_queryset().first()
 
-    def yield_switched_if_not_exists(self, source):
-        switched = self.switch_source_to(source)
-        if not switched.item_exists():
-            yield switched.to_item()
-
     def save_link_to(self, source):
         target = self.switch_source_to(source)
         if target is not None: