diff --git a/cloudflare_ddns/__main__.py b/cloudflare_ddns/__main__.py index b1d2a3b..eda937b 100644 --- a/cloudflare_ddns/__main__.py +++ b/cloudflare_ddns/__main__.py @@ -1,8 +1,7 @@ import logging - -import click from typing import Tuple +import click from cloudflare_ddns.app import ApplicationJob from cloudflare_ddns.constants import DEFAULT_DELAY diff --git a/cloudflare_ddns/app.py b/cloudflare_ddns/app.py index a2890e2..6b295fd 100644 --- a/cloudflare_ddns/app.py +++ b/cloudflare_ddns/app.py @@ -4,11 +4,10 @@ from dataclasses import dataclass from typing import List, Tuple import requests +from cloudflare_ddns.constants import ACCEPTED_RECORDS, LIST_DNS, LIST_ZONES, PATCH_DNS, VERIFY_TOKEN +from cloudflare_ddns.utils import BearerAuth, CloudflareHTTPError, check_status, get_ip, parse_duration from requests import HTTPError -from cloudflare_ddns.constants import ACCEPTED_RECORDS, LIST_DNS, LIST_ZONES, VERIFY_TOKEN, PATCH_DNS -from cloudflare_ddns.utils import BearerAuth, parse_duration, get_ip, check_status, CloudflareHTTPError - log = logging.getLogger("ddns") diff --git a/cloudflare_ddns/utils.py b/cloudflare_ddns/utils.py index b72900a..5f2e24e 100644 --- a/cloudflare_ddns/utils.py +++ b/cloudflare_ddns/utils.py @@ -1,11 +1,10 @@ import re import requests -from requests import Request, Response, codes, HTTPError +from cloudflare_ddns.constants import BASE_ENDPOINT, IP_API_URL_IPV4, IP_API_URL_IPV6 +from requests import HTTPError, Request, Response, codes from requests.auth import AuthBase -from cloudflare_ddns.constants import IP_API_URL_IPV4, IP_API_URL_IPV6, BASE_ENDPOINT - DURATION_REGEX = re.compile( r"((?P\d+?) ?(days|day|D|d) ?)?" r"((?P\d+?) ?(hours|hour|H|h) ?)?"