dynamicdns 0.1.0rc1__tar.gz → 0.1.0rc3__tar.gz

dynamicdns-0.1.0rc3/.vscode/settings.json

@@ -0,0 +1,7 @@
+{
+    "editor.defaultFormatter": "charliermarsh.ruff",
+    "editor.rulers": [
+        100
+    ],
+    "editor.formatOnSave": true,
+}

{dynamicdns-0.1.0rc1 → dynamicdns-0.1.0rc3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dynamicdns
-Version: 0.1.0rc1
+Version: 0.1.0rc3
 Summary: Collection of Dynamic DNS providers
 Project-URL: Documentation, https://github.com/tr4nt0r/dynamicdns#readme
 Project-URL: Issues, https://github.com/tr4nt0r/dynamicdns/issues

{dynamicdns-0.1.0rc1 → dynamicdns-0.1.0rc3}/src/dynamicdns/__init__.py

@@ -2,12 +2,12 @@
 #
 # SPDX-License-Identifier: MIT
 
-from .providers import Provider, ProviderConf, providers
+from .providers import Provider, ProviderConf, PROVIDERS
 from .updater import Updater
 
-__version__ = "0.1.0rc1"
+__version__ = "0.1.0rc3"
 __all__ = [
-    "providers",
+    "PROVIDERS",
     "Provider",
     "ProviderConf",
     "Updater",

{dynamicdns-0.1.0rc1 → dynamicdns-0.1.0rc3}/src/dynamicdns/const.py

@@ -2,7 +2,6 @@
 
 from typing import Final
 
-CONF_HOSTS: Final = "hosts"
 CONF_HOST: Final = "host"
 CONF_TOKEN: Final = "token"
 CONF_USERNAME: Final = "username"
@@ -13,3 +12,4 @@ CONF_VERBOSE: Final = "verbose"
 CONF_TXT: Final = "txt"
 CONF_CLEAR: Final = "clear"
 CONF_DOMAIN: Final = "domain"
+CONF_URL: Final = "url"

{dynamicdns-0.1.0rc1 → dynamicdns-0.1.0rc3}/src/dynamicdns/providers.py

@@ -16,6 +16,7 @@ from .const import (
     CONF_IPV6_ADDRESS,
     CONF_PASSWORD,
     CONF_TOKEN,
+    CONF_URL,
     CONF_USERNAME,
 )
 
@@ -23,12 +24,14 @@ from .const import (
 class Provider(StrEnum):
     """Dynamic DNS providers."""
 
-    DUCKDNS = "duckdns"
-    MYTHICBEASTS_IPV4 = "mythicbeasts_ipv4"
     ANYDNS = "anydns"
+    DUCKDNS = "duckdns"
     FREEDNS = "freedns"
     FREEDNS_IPV6 = "freedns_ipv6"
+    MYTHICBEASTS = "mythicbeasts"
     NAMECHEAP = "namecheap"
+    NO_IP = "no_ip"
+    CUSTOM = "custom"
 
 
 @dataclass(frozen=True, kw_only=True)
@@ -44,13 +47,16 @@ class ProviderConf:
 
     def render_url(self, data: dict[str, str]) -> URL:
         """Render the provider URL with given data and remove unused query parameters."""
-
-        url = URL(self.base_url)
+        url = URL(data.get(CONF_URL) or self.base_url)
         url = url.with_path(url.path.format(**data))
+        if url.user:
+            url = url.with_user(url.user.format(**data))
+        if url.password:
+            url = url.with_password(url.password.format(**data))
         return url % {k: data[v] for k, v in self.params.items() if v in data}
 
 
-providers: dict[Provider, ProviderConf] = {
+PROVIDERS: dict[Provider, ProviderConf] = {
     Provider.DUCKDNS: ProviderConf(
         name="Duck DNS",
         base_url="https://www.duckdns.org/update?verbose=true",
@@ -68,8 +74,8 @@ providers: dict[Provider, ProviderConf] = {
         ),
         success_fn=lambda x: x.startswith("OK"),
     ),
-    Provider.MYTHICBEASTS_IPV4: ProviderConf(
-        name="Mythic Beasts IPv4",
+    Provider.MYTHICBEASTS: ProviderConf(
+        name="Mythic Beasts",
         base_url="https://ipv4.api.mythic-beasts.com/dns/v2/dynamic/{domain}",
         method="POST",
         params={"username": CONF_USERNAME, "password": CONF_PASSWORD},
@@ -85,7 +91,7 @@ providers: dict[Provider, ProviderConf] = {
         name="AnyDNS.info",
         base_url="https://anydns.info/update.php",
         params={
-            "host": CONF_HOST,
+            "host": CONF_DOMAIN,
             "user": CONF_USERNAME,
             "password": CONF_PASSWORD,
             "ip": CONF_IP_ADDRESS,
@@ -93,14 +99,14 @@ providers: dict[Provider, ProviderConf] = {
         },
         schema=vol.Schema(
             {
-                vol.Required(CONF_HOST): str,
+                vol.Required(CONF_DOMAIN): str,
                 vol.Required(CONF_USERNAME): str,
                 vol.Required(CONF_PASSWORD): str,
             },
         ),
     ),
     Provider.FREEDNS: ProviderConf(
-        name="FreeDNS IPv4",
+        name="FreeDNS",
         base_url="https://sync.afraid.org/u/{token}/",
         params={"address": CONF_IP_ADDRESS},
         schema=vol.Schema({vol.Required(CONF_TOKEN): str}),
@@ -132,5 +138,31 @@ providers: dict[Provider, ProviderConf] = {
                 vol.Required(CONF_PASSWORD): str,
             }
         ),
+        success_fn=lambda x: "<ErrCount>0</ErrCount>" in x,
+    ),
+    Provider.NO_IP: ProviderConf(
+        name="NO-IP.com",
+        base_url="https://{username}:{password}@dynupdate.no-ip.com/nic/update",
+        params={
+            "hostname": CONF_DOMAIN,
+            "myip": CONF_IP_ADDRESS,
+        },
+        schema=vol.Schema(
+            {
+                vol.Required(CONF_DOMAIN, default="all.ddnskey.com"): str,
+                vol.Required(CONF_USERNAME): str,
+                vol.Required(CONF_PASSWORD): str,
+            }
+        ),
+        success_fn=lambda x: x.startswith(("good", "nochg")),
+    ),
+    Provider.CUSTOM: ProviderConf(
+        name="Custom dynamic DNS provider",
+        base_url="{url}",
+        params={
+            "ip": CONF_IP_ADDRESS,
+            "ipv6": CONF_IPV6_ADDRESS,
+        },
+        schema=vol.Schema({vol.Required(CONF_URL): str}),
     ),
 }

{dynamicdns-0.1.0rc1 → dynamicdns-0.1.0rc3}/src/dynamicdns/updater.py

@@ -6,7 +6,7 @@ import logging
 
 from aiohttp import ClientSession
 
-from .providers import Provider, providers
+from .providers import Provider, PROVIDERS
 
 _LOGGER = logging.getLogger(__package__)
 
@@ -23,15 +23,16 @@ class Updater:
         """Initialize."""
 
         self.session = session
-        self.method = providers[provider].method
-        self.url = providers[provider].render_url(data)
-        self.success = providers[provider].success_fn
+        self.provider = provider
+        self.method = PROVIDERS[provider].method
+        self.url = PROVIDERS[provider].render_url(data)
+        self.success = PROVIDERS[provider].success_fn
 
     async def update(self) -> bool:
         """Update the dynamic DNS record."""
 
         async with self.session.request(self.method, self.url) as res:
-            _LOGGER.debug(await res.text())
+            _LOGGER.debug("[%s]: %s", self.provider.name, await res.text())
             return (
                 self.success(await res.text()) if self.success is not None else res.ok
             )

dynamicdns-0.1.0rc1/.vscode/settings.json

@@ -1,4 +0,0 @@
-{
-    "editor.defaultFormatter": "charliermarsh.ruff",
-    "editor.rulers": [100],
-}