python-ballchasing 0.1.20__tar.gz → 0.1.22__tar.gz

{python-ballchasing-0.1.20/python_ballchasing.egg-info → python-ballchasing-0.1.22}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-ballchasing
-Version: 0.1.20
+Version: 0.1.22
 Summary: A Python wrapper around the Ballchasing API
 Home-page: https://github.com/Rolv-Arild/python-ballchasing
 Author: Rolv-Arild Braaten

{python-ballchasing-0.1.20 → python-ballchasing-0.1.22}/ballchasing/__init__.py

@@ -28,7 +28,7 @@ __author__       = 'Rolv-Arild Braaten'
 __email__        = 'rolv_arild@hotmail.com'
 __copyright__    = 'Copyright (c) 2020 Rolv-Arild Braaten'
 __license__      = 'Apache License 2.0'
-__version__      = '0.1.20'
+__version__      = '0.1.22'
 __url__          = 'https://github.com/Rolv-Arild/python-ballchasing'
 __download_url__ = 'https://pypi.python.org/pypi/python-ballchasing'
 __description__  = 'A Python wrapper around the Ballchasing API'

{python-ballchasing-0.1.20 → python-ballchasing-0.1.22}/ballchasing/api.py

@@ -2,6 +2,7 @@ import os
 import time
 from datetime import datetime
 from typing import Optional, Iterator, Union, List
+from urllib.parse import parse_qs, urlparse
 
 from requests import sessions, Response, ConnectionError
 
@@ -115,7 +116,7 @@ class Api:
                     replay_before: Optional[Union[str, datetime]] = None,
                     count: int = 150,
                     sort_by: Optional[AnyReplaySortBy] = None,
-                    sort_dir: Union[AnySortDir] = SortDir.DESCENDING,
+                    sort_dir: AnySortDir = SortDir.DESCENDING,
                     deep: bool = False
                     ) -> Iterator[dict]:
         """
@@ -174,9 +175,9 @@ class Api:
             if "next" not in d:
                 break
 
-            url = d["next"]
+            next_url = d["next"]
             left -= len(batch)
-            params = {}
+            params["after"] = parse_qs(urlparse(next_url).query)["after"][0]
 
     def get_replay(self, replay_id: str) -> dict:
         """
@@ -196,16 +197,17 @@ class Api:
         """
         self._request(f"/replays/{replay_id}", self._session.patch, json=params)
 
-    def upload_replay(self, replay_file, visibility: Optional[AnyVisibility] = None) -> dict:
+    def upload_replay(self, replay_file, visibility: Optional[AnyVisibility] = None, group: Optional[str] = None) -> dict:
         """
         Use this API to upload a replay file to ballchasing.com.
 
         :param replay_file: replay file to upload.
         :param visibility: to set the visibility of the uploaded replay.
+        :param group: to upload the replay to an existing group.
         :return: the result of the POST request.
         """
         return self._request(f"/v2/upload", self._session.post, files={"file": replay_file},
-                             params={"visibility": visibility}).json()
+                             params={"group": group, "visibility": visibility}).json()
 
     def delete_replay(self, replay_id: str) -> None:
         """
@@ -222,8 +224,8 @@ class Api:
                    created_before: Optional[Union[str, datetime]] = None,
                    created_after: Optional[Union[str, datetime]] = None,
                    count: int = 200,
-                   sort_by: Union[AnyGroupSortBy] = GroupSortBy.CREATED,
-                   sort_dir: Union[AnySortDir] = SortDir.DESCENDING
+                   sort_by: AnyGroupSortBy = GroupSortBy.CREATED,
+                   sort_dir: AnySortDir = SortDir.DESCENDING
                    ) -> Iterator[dict]:
         """
         This endpoint lets you filter and retrieve replay groups.
@@ -258,14 +260,14 @@ class Api:
             if "next" not in d:
                 break
 
-            url = d["next"]
+            next_url = d["next"]
             left -= len(batch)
-            params = {}
+            params["after"] = parse_qs(urlparse(next_url).query)["after"][0]
 
     def create_group(self,
                      name: str,
-                     player_identification: Union[AnyPlayerIdentification],
-                     team_identification: Union[AnyTeamIdentification],
+                     player_identification: AnyPlayerIdentification,
+                     team_identification: AnyTeamIdentification,
                      parent: Optional[str] = None
                      ) -> dict:
         """

{python-ballchasing-0.1.20 → python-ballchasing-0.1.22/python_ballchasing.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-ballchasing
-Version: 0.1.20
+Version: 0.1.22
 Summary: A Python wrapper around the Ballchasing API
 Home-page: https://github.com/Rolv-Arild/python-ballchasing
 Author: Rolv-Arild Braaten