From d8c80c24fc29f92875c195acd57c64de322b5afc Mon Sep 17 00:00:00 2001 From: Kevin Fronczak Date: Tue, 26 May 2020 01:47:05 +0000 Subject: [PATCH] Update string formatting --- blinkpy/api.py | 52 +++++++++++++----------------------- blinkpy/blinkpy.py | 11 ++++---- blinkpy/camera.py | 4 +-- blinkpy/helpers/constants.py | 16 +++++------ 4 files changed, 32 insertions(+), 51 deletions(-) diff --git a/blinkpy/api.py b/blinkpy/api.py index 2df9127..faefa48 100644 --- a/blinkpy/api.py +++ b/blinkpy/api.py @@ -47,9 +47,7 @@ def request_login( def request_verify(auth, blink, verify_key): """Send verification key to blink servers.""" - url = "{}/api/v4/account/{}/client/{}/pin/verify".format( - blink.urls.base_url, blink.account_id, blink.client_id - ) + url = f"{blink.urls.base_url}/api/v4/account/{blink.account_id}/client/{blink.client_id}/pin/verify" data = dumps({"pin": verify_key}) return auth.query( url=url, headers=auth.header, data=data, json_resp=False, reqtype="post", @@ -58,7 +56,7 @@ def request_verify(auth, blink, verify_key): def request_networks(blink): """Request all networks information.""" - url = "{}/networks".format(blink.urls.base_url) + url = f"{blink.urls.base_url}/networks" return http_get(blink, url) @@ -69,7 +67,7 @@ def request_network_status(blink, network): :param blink: Blink instance. :param network: Sync module network id. """ - url = "{}/network/{}".format(blink.urls.base_url, network) + url = f"{blink.urls.base_url}/network/{network}" return http_get(blink, url) @@ -80,7 +78,7 @@ def request_syncmodule(blink, network): :param blink: Blink instance. :param network: Sync module network id. """ - url = "{}/network/{}/syncmodules".format(blink.urls.base_url, network) + url = f"{blink.urls.base_url}/network/{network}/syncmodules" return http_get(blink, url) @@ -92,7 +90,7 @@ def request_system_arm(blink, network): :param blink: Blink instance. :param network: Sync module network id. """ - url = "{}/network/{}/arm".format(blink.urls.base_url, network) + url = f"{blink.urls.base_url}/network/{network}/arm" return http_post(blink, url) @@ -104,7 +102,7 @@ def request_system_disarm(blink, network): :param blink: Blink instance. :param network: Sync module network id. """ - url = "{}/network/{}/disarm".format(blink.urls.base_url, network) + url = f"{blink.urls.base_url}/network/{network}/disarm" return http_post(blink, url) @@ -116,16 +114,14 @@ def request_command_status(blink, network, command_id): :param network: Sync module network id. :param command_id: Command id to check. """ - url = "{}/network/{}/command/{}".format(blink.urls.base_url, network, command_id) + url = f"{blink.urls.base_url}/network/{network}/command/{command_id}" return http_get(blink, url) @Throttle(seconds=MIN_THROTTLE_TIME) def request_homescreen(blink): """Request homescreen info.""" - url = "{}/api/v3/accounts/{}/homescreen".format( - blink.urls.base_url, blink.account_id - ) + url = f"{blink.urls.base_url}/api/v3/accounts/{blink.account_id}/homescreen" return http_get(blink, url) @@ -137,7 +133,7 @@ def request_sync_events(blink, network): :param blink: Blink instance. :param network: Sync module network id. """ - url = "{}/events/network/{}".format(blink.urls.base_url, network) + url = f"{blink.urls.base_url}/events/network/{network}" return http_get(blink, url) @@ -150,9 +146,7 @@ def request_new_image(blink, network, camera_id): :param network: Sync module network id. :param camera_id: Camera ID of camera to request new image from. """ - url = "{}/network/{}/camera/{}/thumbnail".format( - blink.urls.base_url, network, camera_id - ) + url = f"{blink.urls.base_url}/network/{network}/camera/{camera_id}/thumbnail" return http_post(blink, url) @@ -165,14 +159,14 @@ def request_new_video(blink, network, camera_id): :param network: Sync module network id. :param camera_id: Camera ID of camera to request new video from. """ - url = "{}/network/{}/camera/{}/clip".format(blink.urls.base_url, network, camera_id) + url = f"{blink.urls.base_url}/network/{network}/camera/{camera_id}/clip" return http_post(blink, url) @Throttle(seconds=MIN_THROTTLE_TIME) def request_video_count(blink): """Request total video count.""" - url = "{}/api/v2/videos/count".format(blink.urls.base_url) + url = f"{blink.urls.base_url}/api/v2/videos/count" return http_get(blink, url) @@ -185,9 +179,7 @@ def request_videos(blink, time=None, page=0): :param page: Page number to get videos from. """ timestamp = get_time(time) - url = "{}/api/v1/accounts/{}/media/changed?since={}&page={}".format( - blink.urls.base_url, blink.account_id, timestamp, page - ) + url = f"{blink.urls.base_url}/api/v1/accounts/{blink.account_id}/media/changed?since={timestamp}&page={page}" return http_get(blink, url) @@ -198,7 +190,7 @@ def request_cameras(blink, network): :param Blink: Blink instance. :param network: Sync module network id. """ - url = "{}/network/{}/cameras".format(blink.urls.base_url, network) + url = f"{blink.urls.base_url}/network/{network}/cameras" return http_get(blink, url) @@ -210,9 +202,7 @@ def request_camera_info(blink, network, camera_id): :param network: Sync module network id. :param camera_id: Camera ID of camera to request info from. """ - url = "{}/network/{}/camera/{}/config".format( - blink.urls.base_url, network, camera_id - ) + url = f"{blink.urls.base_url}/network/{network}/camera/{camera_id}/config" return http_get(blink, url) @@ -224,9 +214,7 @@ def request_camera_sensors(blink, network, camera_id): :param network: Sync module network id. :param camera_id: Camera ID of camera to request sesnor info from. """ - url = "{}/network/{}/camera/{}/signals".format( - blink.urls.base_url, network, camera_id - ) + url = f"{blink.urls.base_url}/network/{network}/camera/{camera_id}/signals" return http_get(blink, url) @@ -239,9 +227,7 @@ def request_motion_detection_enable(blink, network, camera_id): :param network: Sync module network id. :param camera_id: Camera ID of camera to enable. """ - url = "{}/network/{}/camera/{}/enable".format( - blink.urls.base_url, network, camera_id - ) + url = f"{blink.urls.base_url}/network/{network}/camera/{camera_id}/enable" return http_post(blink, url) @@ -253,9 +239,7 @@ def request_motion_detection_disable(blink, network, camera_id): :param network: Sync module network id. :param camera_id: Camera ID of camera to disable. """ - url = "{}/network/{}/camera/{}/disable".format( - blink.urls.base_url, network, camera_id - ) + url = f"{blink.urls.base_url}/network/{network}/camera/{camera_id}/disable" return http_post(blink, url) diff --git a/blinkpy/blinkpy.py b/blinkpy/blinkpy.py index ae4fc73..1d60d1e 100644 --- a/blinkpy/blinkpy.py +++ b/blinkpy/blinkpy.py @@ -277,9 +277,9 @@ class Blink: _LOGGER.debug("%s: %s is marked as deleted.", camera_name, address) continue - clip_address = "{}{}".format(self.urls.base_url, address) - filename = "{}-{}".format(camera_name, created_at) - filename = "{}.mp4".format(slugify(filename)) + clip_address = f"{self.urls.base_url}{address}" + filename = f"{camera_name}-{created_at}" + filename = f"{slugify(filename)}.mp4" filename = os.path.join(path, filename) if not debug: @@ -294,8 +294,9 @@ class Blink: _LOGGER.info("Downloaded video to %s", filename) else: print( - ("Camera: {}, Timestamp: {}, " "Address: {}, Filename: {}").format( - camera_name, created_at, address, filename + ( + f"Camera: {camera_name}, Timestamp: {created_at}, " + "Address: {address}, Filename: {filename}" ) ) diff --git a/blinkpy/camera.py b/blinkpy/camera.py index de97c5a..8823d7e 100644 --- a/blinkpy/camera.py +++ b/blinkpy/camera.py @@ -127,7 +127,7 @@ class BlinkCamera: ) if thumb_addr is not None: - new_thumbnail = "{}{}.jpg".format(self.sync.urls.base_url, thumb_addr) + new_thumbnail = f"{self.sync.urls.base_url}{thumb_addr}.jpg" try: self.motion_detected = self.sync.motion[self.name] @@ -138,7 +138,7 @@ class BlinkCamera: if self.name in self.sync.last_record: clip_addr = self.sync.last_record[self.name]["clip"] self.last_record = self.sync.last_record[self.name]["time"] - self.clip = "{}{}".format(self.sync.urls.base_url, clip_addr) + self.clip = f"{self.sync.urls.base_url}{clip_addr}" # If the thumbnail or clip have changed, update the cache update_cached_image = False diff --git a/blinkpy/helpers/constants.py b/blinkpy/helpers/constants.py index e7b623d..e270c92 100644 --- a/blinkpy/helpers/constants.py +++ b/blinkpy/helpers/constants.py @@ -6,7 +6,7 @@ MAJOR_VERSION = 0 MINOR_VERSION = 16 PATCH_VERSION = "0-rc1" -__version__ = "{}.{}.{}".format(MAJOR_VERSION, MINOR_VERSION, PATCH_VERSION) +__version__ = f"{MAJOR_VERSION}.{MINOR_VERSION}.{PATCH_VERSION}" REQUIRED_PYTHON_VER = (3, 6, 0) @@ -14,7 +14,7 @@ PROJECT_NAME = "blinkpy" PROJECT_PACKAGE_NAME = "blinkpy" PROJECT_LICENSE = "MIT" PROJECT_AUTHOR = "Kevin Fronczak" -PROJECT_COPYRIGHT = " 2017, {}".format(PROJECT_AUTHOR) +PROJECT_COPYRIGHT = f" 2017, {PROJECT_AUTHOR}" PROJECT_URL = "https://github.com/fronzbot/blinkpy" PROJECT_EMAIL = "kfronczak@gmail.com" PROJECT_DESCRIPTION = "A Blink camera Python library " "running on Python 3." @@ -40,19 +40,15 @@ PROJECT_CLASSIFIERS = [ PROJECT_GITHUB_USERNAME = "fronzbot" PROJECT_GITHUB_REPOSITORY = "blinkpy" -PYPI_URL = "https://pypi.python.org/pypi/{}".format(PROJECT_PACKAGE_NAME) +PYPI_URL = f"https://pypi.python.org/pypi/{PROJECT_PACKAGE_NAME}" """ URLS """ BLINK_URL = "immedia-semi.com" -DEFAULT_URL = "{}.{}".format("rest-prod", BLINK_URL) -BASE_URL = "https://{}".format(DEFAULT_URL) -LOGIN_ENDPOINT = "{}/api/v4/account/login".format(BASE_URL) -LOGIN_URLS = [ - "{}/api/v4/account/login".format(BASE_URL), - "{}/api/v3/login".format(BASE_URL), -] +DEFAULT_URL = f"rest-prod.{BLINK_URL}" +BASE_URL = f"https://{DEFAULT_URL}" +LOGIN_ENDPOINT = f"{BASE_URL}/api/v4/account/login" """ Dictionaries