pyzotero 1.5.27__tar.gz → 1.6.0__tar.gz

{pyzotero-1.5.27 → pyzotero-1.6.0}/.github/workflows/tests.yml

@@ -85,6 +85,6 @@ jobs:
         token: ${{ secrets.GITHUB_TOKEN }}
 
     - name: PyPI Publish
-      uses: pypa/gh-action-pypi-publish@v1.12.2
+      uses: pypa/gh-action-pypi-publish@v1.12.3
       with:
         packages-dir: ${{ steps.download.outputs.download-path }}

{pyzotero-1.5.27/src/pyzotero.egg-info → pyzotero-1.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyzotero
-Version: 1.5.27
+Version: 1.6.0
 Summary: Python wrapper for the Zotero API
 Author-email: Stephan Hügel <urschrei@gmail.com>
 License: # Blue Oak Model License

{pyzotero-1.5.27 → pyzotero-1.6.0}/doc/index.rst

@@ -23,7 +23,7 @@ Getting started (short version)
 3. You'll also need [*]_ to get an **API key** from the Zotero `site <https://www.zotero.org/settings/keys/new>`_
 4. Are you accessing your own Zotero library? Set``library_type`` to ``'user'``
 5. Are you accessing a shared group library? Set``library_type`` to ``'group'``
-6. **Read-only** access to your local Zotero library is available: set ``local=True`
+6. **Read-only** access to your local Zotero library is available: set ``local=True``
 
 
 .. _hello-world:

{pyzotero-1.5.27 → pyzotero-1.6.0}/src/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.5.27'
-__version_tuple__ = version_tuple = (1, 5, 27)
+__version__ = version = '1.6.0'
+__version_tuple__ = version_tuple = (1, 6, 0)

{pyzotero-1.5.27 → pyzotero-1.6.0}/src/pyzotero/zotero.py

@@ -24,8 +24,16 @@ import uuid
 import zipfile
 from collections import OrderedDict
 from functools import wraps
-from pathlib import Path
-from urllib.parse import parse_qs, parse_qsl, quote, urlencode, urlparse, urlunparse
+from pathlib import Path, PurePosixPath
+from urllib.parse import (
+    parse_qs,
+    parse_qsl,
+    quote,
+    unquote,
+    urlencode,
+    urlparse,
+    urlunparse,
+)
 
 import bibtexparser
 import feedparser
@@ -153,11 +161,6 @@ def retrieve(func):
         """
         if kwargs:
             self.add_parameters(**kwargs)
-        res = func(self, *args)
-        parsed = urlparse(res)
-        querydict = parse_qs(parsed.query)
-        if not querydict.get("locale"):
-            self.add_parameters(locale=self.locale)
         retrieved = self._retrieve_data(func(self, *args))
         # we now always have links in the header response
         self.links = self._extract_links()
@@ -277,8 +280,10 @@ class Zotero:
         """Store Zotero credentials"""
         if not local:
             self.endpoint = "https://api.zotero.org"
+            self.local = False
         else:
             self.endpoint = "http://localhost:23119/api"
+            self.local = True
         if library_id and library_type:
             self.library_id = library_id
             # library_type determines whether query begins w. /users or /groups
@@ -326,6 +331,21 @@ class Zotero:
         self.backoff = False
         self.backoff_duration = 0.0
 
+    def _check_for_component(self, url, component):
+        """Check a url path query fragment for a specific query parameter"""
+        if parse_qs(url).get(component):
+            return True
+        return False
+
+    def _striplocal(self, url):
+        if self.local:
+            parsed = urlparse(url)
+            purepath = PurePosixPath(unquote(parsed.path))
+            newpath = "/".join(purepath.parts[2:])
+            replaced = parsed._replace(path="/" + newpath)
+            return urlunparse(replaced)
+        return url
+
     def _set_backoff(self, duration):
         """
         Set a backoff
@@ -411,10 +431,15 @@ class Zotero:
         self.self_link = request
         # ensure that we wait if there's an active backoff
         self._check_backoff()
-        if params:
-            params["locale"] = self.locale
-        if not params:
-            params = {"locale": self.locale}
+        # don't set locale if the url already contains it
+        if params and self.links:
+            if not self._check_for_component(self.links.get("next"), "locale"):
+                params["locale"] = self.locale
+        if not params and self.links:
+            if not self._check_for_component(self.links.get("next"), "locale"):
+                params = {"locale": self.locale}
+            else:
+                params = {}
         self.request = requests.get(
             url=full_url, headers=self.default_headers(), params=params
         )
@@ -850,10 +875,10 @@ class Zotero:
     @retrieve
     def follow(self):
         """Return the result of the call to the URL in the 'Next' link"""
-        if self.links.get("next"):
-            return self.links.get("next")
-        else:
-            return
+        if n := self.links.get("next"):
+            newurl = self._striplocal(n)
+            return newurl
+        return
 
     def iterfollow(self):
         """Generator for self.follow()"""

{pyzotero-1.5.27 → pyzotero-1.6.0/src/pyzotero.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyzotero
-Version: 1.5.27
+Version: 1.6.0
 Summary: Python wrapper for the Zotero API
 Author-email: Stephan Hügel <urschrei@gmail.com>
 License: # Blue Oak Model License