eriks/erepublik-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
Eriks K 2021-02-03 00:48:13 +02:00
parent 5e638806b5
commit e95ffbd505
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
erepublik/access_points.py
View File

@ -84,10 +84,8 @@ class SlowRequests(Session):
body = f"[{utils.now().strftime('%F %T')}]\tURL: '{url}'\tMETHOD: {method}\tARGS: {args}\n" body = f"[{utils.now().strftime('%F %T')}]\tURL: '{url}'\tMETHOD: {method}\tARGS: {args}\n"
with open(self.request_log_name, 'ab') as file: with open(self.request_log_name, 'ab') as file:
file.write(body.encode("UTF-8")) file.write(body.encode("UTF-8"))
pass
def _log_response(self, url, resp, redirect: bool = False): def _log_response(self, url, resp, redirect: bool = False):
from erepublik import Citizen
if self.debug: if self.debug:
if resp.history and not redirect: if resp.history and not redirect:
for hist_resp in resp.history: for hist_resp in resp.history:
@ -96,7 +94,7 @@ class SlowRequests(Session):
fd_path = 'debug/requests' fd_path = 'debug/requests'
fd_time = self.last_time.strftime('%Y/%m/%d/%H-%M-%S') fd_time = self.last_time.strftime('%Y/%m/%d/%H-%M-%S')
fd_name = utils.slugify(url[len(Citizen.url):]) fd_name = utils.slugify(url[len(CitizenBaseAPI.url):])
fd_extra = '_REDIRECT' if redirect else "" fd_extra = '_REDIRECT' if redirect else ""
try: try:
@ -107,7 +105,6 @@ class SlowRequests(Session):
filename = f'{fd_path}/{fd_time}_{fd_name}{fd_extra}.{fd_ext}' filename = f'{fd_path}/{fd_time}_{fd_name}{fd_extra}.{fd_ext}'
utils.write_file(filename, resp.text) utils.write_file(filename, resp.text)
pass
class CitizenBaseAPI: class CitizenBaseAPI:
@ -147,9 +144,11 @@ class CitizenBaseAPI:
def _get_main_session_unlock_popup(self) -> Response: def _get_main_session_unlock_popup(self) -> Response:
return self.get(f'{self.url}/main/sessionUnlockPopup') return self.get(f'{self.url}/main/sessionUnlockPopup')
def _post_main_session_get_challenge(self, captcha_id: int) -> Response: def _post_main_session_get_challenge(self, captcha_id: int, image_id: str = "") -> Response:
env = dict(l=['tets', ], s=[], c=["l_chathwe", "l_chatroom"], m=0) env = dict(l=['tets', ], s=[], c=["l_chathwe", "l_chatroom"], m=0)
data = dict(_token=self.token, captchaId=captcha_id, env=utils.b64json(env)) data = dict(_token=self.token, captchaId=captcha_id, env=utils.b64json(env))
if image_id:
data.update(imageId=image_id, isRefresh=True)
return self.post(f'{self.url}/main/sessionGetChallenge', data=data) return self.post(f'{self.url}/main/sessionGetChallenge', data=data)
def _post_main_session_unlock( def _post_main_session_unlock(
@ -490,7 +489,6 @@ class ErepublikMilitaryAPI(CitizenBaseAPI):
return self.post(f"{self.url}/military/fightDeploy-startDeploy", data=data) return self.post(f"{self.url}/military/fightDeploy-startDeploy", data=data)
class ErepublikPoliticsAPI(CitizenBaseAPI): class ErepublikPoliticsAPI(CitizenBaseAPI):
def _get_candidate_party(self, party_slug: str) -> Response: def _get_candidate_party(self, party_slug: str) -> Response:
return self.get(f"{self.url}/candidate/{party_slug}") return self.get(f"{self.url}/candidate/{party_slug}")