Move data refreshing logic for getting datasets. Changes default behavior

Author: rliebz

dataverse/dataverse.py

@@ -12,11 +12,14 @@ class Dataverse(object):
     def __init__(self, connection, collection):
         self.connection = connection
         self.collection = collection
+
+        self._collection_info = None
         self._contents_json = None
 
     @property
     def is_published(self):
 
+        # Always check latest version
         collection_info = requests.get(
             self.collection.get('href'),
             auth=self.connection.auth,
@@ -61,6 +64,16 @@ def get_contents(self, refresh=False):
         self._contents_json = resp.json()['data']
         return self._contents_json
 
+    def get_collection_info(self, refresh=False):
+        if not refresh and self._collection_info:
+            return self._collection_info
+
+        self._collection_info = requests.get(
+            self.collection.get('href'),
+            auth=self.connection.auth,
+        ).content
+        return self._collection_info
+
     def publish(self):
         edit_uri = 'https://{0}/dvn/api/data-deposit/v1.1/swordv2/edit/dataverse/{1}'.format(
             self.connection.host, self.alias
@@ -94,6 +107,7 @@ def add_dataset(self, dataset):
 
         dataset.dataverse = self
         dataset._refresh(receipt=resp.content)
+        self.get_collection_info(refresh=True)
 
     def delete_dataset(self, dataset):
         if dataset._state == 'DELETED' or dataset._state == 'DEACCESSIONED':
@@ -111,22 +125,18 @@ def delete_dataset(self, dataset):
             )
 
         dataset._state = 'DEACCESSIONED'
+        self.get_collection_info(refresh=True)
 
-    def get_datasets(self):
-
-        collection_info = requests.get(
-            self.collection.get('href'),
-            auth=self.connection.auth,
-        ).content
-
+    def get_datasets(self, refresh=False):
+        collection_info = self.get_collection_info(refresh)
         entries = get_elements(collection_info, tag='entry')
         return [Dataset.from_dataverse(entry, self) for entry in entries]
 
-    def get_dataset_by_doi(self, doi):
-        return next((s for s in self.get_datasets() if s.doi == doi), None)
+    def get_dataset_by_doi(self, doi, refresh=False):
+        return next((s for s in self.get_datasets(refresh) if s.doi == doi), None)
 
-    def get_dataset_by_title(self, title):
-        return next((s for s in self.get_datasets() if s.title == title), None)
+    def get_dataset_by_title(self, title, refresh=False):
+        return next((s for s in self.get_datasets(refresh) if s.title == title), None)
 
-    def get_dataset_by_string_in_entry(self, string):
-        return next((s for s in self.get_datasets() if string in s.get_entry()), None)
+    def get_dataset_by_string_in_entry(self, string, refresh=False):
+        return next((s for s in self.get_datasets(refresh) if string in s.get_entry()), None)