pyzotero 1.5.28__py3-none-any.whl → 1.6.1__py3-none-any.whl

_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.5.28'
-__version_tuple__ = version_tuple = (1, 5, 28)
+__version__ = version = '1.6.1'
+__version_tuple__ = version_tuple = (1, 6, 1)

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
@@ -272,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
@@ -321,6 +331,22 @@ 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):
+        """We need to remve the leading "/api" substring from urls if we're running in local mode"""
+        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
@@ -406,10 +432,16 @@ 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
+        # we always add a locale if it's a "standalone" or first call
+        needs_locale = not self.links or not self._check_for_component(
+            self.links.get("next"), "locale"
+        )
+        if needs_locale:
+            if params:
+                params["locale"] = self.locale
+            else:
+                params = {"locale": self.locale}
         self.request = requests.get(
             url=full_url, headers=self.default_headers(), params=params
         )
@@ -845,10 +877,11 @@ 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)
+            print(newurl)
+            return newurl
+        return
 
     def iterfollow(self):
         """Generator for self.follow()"""

{pyzotero-1.5.28.dist-info → pyzotero-1.6.1.dist-info}/METADATA

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

pyzotero-1.6.1.dist-info/RECORD

@@ -0,0 +1,10 @@
+_version.py,sha256=edFVVa8HpVPfLqL2y6CKtViSqJREfmXxInA-HCy-134,411
+pyzotero/__init__.py,sha256=5QI4Jou9L-YJAf_oN9TgRXVKgt_Unc39oADo2Ch8bLI,243
+pyzotero/zotero.py,sha256=Qk3vuJxv4rbD_Q0sg_8nc8QXVAboJ9_eZWrLuJLkW_4,76313
+pyzotero/zotero_errors.py,sha256=UPhAmf2K05cnoeIl2wjufWQedepg7vBKb-ShU0TdlL4,2582
+pyzotero-1.6.1.dist-info/AUTHORS,sha256=ZMicxg7lRScOYbxzMPznlzMbmrFIUIHwg-NvljEMbRQ,110
+pyzotero-1.6.1.dist-info/LICENSE.md,sha256=bhy1CPMj1zWffD9YifFmSeBzPylsrhb1qP8OCEx5Etw,1550
+pyzotero-1.6.1.dist-info/METADATA,sha256=TCxweUVtZbjMDFDrFtZMDzKCFm4j8VMNkwzbJ2kJUZ0,7204
+pyzotero-1.6.1.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+pyzotero-1.6.1.dist-info/top_level.txt,sha256=BOPNkPk5VtNDCy_li7Xftx6k0zG8STGxh-KgckcxLEw,18
+pyzotero-1.6.1.dist-info/RECORD,,

pyzotero-1.5.28.dist-info/RECORD

@@ -1,10 +0,0 @@
-_version.py,sha256=0H-JgqeGiV_8mNGxbNI0y353Aqa7XZVSkG8ibJE_edo,413
-pyzotero/__init__.py,sha256=5QI4Jou9L-YJAf_oN9TgRXVKgt_Unc39oADo2Ch8bLI,243
-pyzotero/zotero.py,sha256=SIBYg38twZkZowO2MbZQXrF15IUJfnH0fBVF86xDr14,75234
-pyzotero/zotero_errors.py,sha256=UPhAmf2K05cnoeIl2wjufWQedepg7vBKb-ShU0TdlL4,2582
-pyzotero-1.5.28.dist-info/AUTHORS,sha256=ZMicxg7lRScOYbxzMPznlzMbmrFIUIHwg-NvljEMbRQ,110
-pyzotero-1.5.28.dist-info/LICENSE.md,sha256=bhy1CPMj1zWffD9YifFmSeBzPylsrhb1qP8OCEx5Etw,1550
-pyzotero-1.5.28.dist-info/METADATA,sha256=E692i0SYizzrEYVYMzjUUfKvGmRs9WoZTxxOxpah1ZI,7205
-pyzotero-1.5.28.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-pyzotero-1.5.28.dist-info/top_level.txt,sha256=BOPNkPk5VtNDCy_li7Xftx6k0zG8STGxh-KgckcxLEw,18
-pyzotero-1.5.28.dist-info/RECORD,,