Merge branch 'master' into 'master'

Bugfix + get snapshots from captures See merge request labs-team/webarchive-api!4

Merge branch 'master' into 'master'
0b2adc5d · Stefan Karner · 47703c1f · d1b3f7a2 · 0b2adc5d · 0b2adc5d
Commit 0b2adc5d authored 6 years ago by Stefan Karner
--- a/sample2.ipynb
+++ b/sample2.ipynb
@@ -15,6 +15,7 @@
   },
   "outputs": [],
   "source": [
+    "import datetime\n",
    "from webarchiv import WebarchivSession\n",
    "\n",
    "apikey = 'Zz2tQls7fuaocX2pjrfc2npojqbGwXL2'\n",
@@ -30,7 +31,7 @@
  },
  {
   "cell_type": "code",
-   "execution_count": 17,
+   "execution_count": 2,
   "metadata": {},
   "outputs": [],
   "source": [
@@ -72,14 +73,14 @@
  },
  {
   "cell_type": "code",
-   "execution_count": 19,
+   "execution_count": 3,
   "metadata": {},
   "outputs": [
    {
     "name": "stdout",
     "output_type": "stream",
     "text": [
-      "2426\n"
+      "2473\n"
     ]
    }
   ],
@@ -96,7 +97,7 @@
  },
  {
   "cell_type": "code",
-   "execution_count": 26,
+   "execution_count": 5,
   "metadata": {
    "collapsed": false
   },
@@ -116,6 +117,13 @@
    "\n",
    "print (captureurl)"
   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": []
  }
 ],
 "metadata": {

 %% Cell type:markdown id: tags:

 Create a WebarchivSession Object with convenience methods for easy access with your API-Key

 %% Cell type:code id: tags:

 ``` python
+import datetime
 from webarchiv import WebarchivSession

 apikey = 'Zz2tQls7fuaocX2pjrfc2npojqbGwXL2'
 w = WebarchivSession(apikey)
 ```

 %% Cell type:markdown id: tags:

 Submit a URL search to get all archived capturedates of the requested URL

 %% Cell type:code id: tags:

 ``` python
 url = "http://www.onb.ac.at"
 response = w.wayback_search(url)
 ```

 %% Cell type:markdown id: tags:

 The search always returns the full response. Checking for status_code 200 before extracting the response is always a good idea

 %% Cell type:code id: tags:

 ``` python
 if response.status_code != 200:
    print("Something went wrong ...")
    exit(1)
 ```

 %% Cell type:markdown id: tags:

 Now it is safe to extract the response

 %% Cell type:markdown id: tags:

 Get the total number of captures of the requested URL

 %% Cell type:code id: tags:

 ``` python
 print(response.json()['total'])
 ```

 %% Output

-    2426
+    2473

 %% Cell type:markdown id: tags:

 Get the Archiveurl of the oldest Capuredate of the requested URL

 %% Cell type:code id: tags:

 ``` python
 capturedate = datetime.datetime.fromtimestamp(response.json()['hits'][0]['c']).strftime('%Y%m%d%H%M%S')

 captureurl = 'https://webarchiv.onb.ac.at/web/' + capturedate + '/' + url

 print (captureurl)
 ```

 %% Output

    https://webarchiv.onb.ac.at/web/20090916183601/http://www.onb.ac.at
+
+%% Cell type:code id: tags:
+
+``` python
+```

--- a/sample7.ipynb
+++ b/sample7.ipynb
--- a/webarchiv.py
+++ b/webarchiv.py
@@ -18,6 +18,15 @@ class WebarchivSession:
        """
        return '0.1.0'

+    @property
+    def api_path(self):
+        """
+        Protocol, domain and path prefix for the Webarchive API,
+        with a single positional format string placeholder
+        for the REST operation and parameters.
+        """
+        return 'https://webarchiv.onb.ac.at/api/'
+
    @property
    def base_url(self):
        """
@@ -25,7 +34,7 @@ class WebarchivSession:
        with a single positional format string placeholder
        for the REST operation and parameters.
        """
-        return 'https://webarchiv.onb.ac.at/api/{}'
+        return self.api_path + '/{}'

    @property
    def _error_template(self):
@@ -239,6 +248,8 @@ class WebarchivSession:
            self._display_http_error(e)
            print('Error:'.format(query_string))

+    def getSnapshotUrl(self, id):
+        return self.api_path + 'snapshot/' + id + "?t=" + self.token + "&apikey=" + self.api_key;

 if __name__ == '__main__':
    # noinspection SpellCheckingInspection