Handle punycode domains

recordmaster/_data.py

@@ -47,8 +47,9 @@ def import_records(self, data: dict, domain: str = "", root: str = ""):
                 setattr(self, key, val)
             else:
                 logging.warning(
-                    "Ignored importing record data for domain '%s'. Key: '%s', Value: '%s'",
+                    "Ignored importing record data for domain '%s.%s'. Key: '%s', Value: '%s'",
                     domain,
+                    self.name,
                     key,
                     val,
                 )
@@ -92,7 +93,7 @@ def to_local_conf_format(self, records: list[Record], ignore_types: list) -> dic
 
             data[name].append(rec_yaml)
 
-        return {self.name: data}
+        return {convert_punycode(self.name, False): data}
 
 
 def dc2json(domain: Domain) -> str:
@@ -119,3 +120,11 @@ def cache_data(domain: Domain, debug: bool):
     if debug:
         logging.debug("[%s] Current data of the domain after matching:", domain.name)
         print(jsondc)
+
+
+def convert_punycode(domain: str, is_punycode: bool = True) -> str:
+    """Convert a domain name from human-readable to punycode, or vice versa"""
+    if is_punycode:
+        return domain.encode("idna").decode()
+
+    return domain.encode().decode("idna")

recordmaster/_get_records.py

@@ -26,7 +26,7 @@ def find_valid_local_records_files(configdir: str) -> list[str]:
         file = path.abspath(path.join(configdir, file))
         if file.endswith((".yaml", ".yml")):
             dcfg_files_abs.append(file)
-        elif file.endswith(".sample"):
+        elif file.endswith((".sample", ".git")):
             pass
         else:
             logging.warning(
@@ -62,7 +62,7 @@ def convert_dict_to_yaml(data: dict) -> str:
         data_sorted[domain] = records_sorted
 
     # Dump as YAML
-    return yaml.dump(data_sorted, sort_keys=False)
+    return yaml.dump(data_sorted, sort_keys=False, allow_unicode=True)
 
 
 def convert_local_records_to_data(domain: Domain, records: dict) -> None:

recordmaster/_sync_records.py

@@ -103,7 +103,7 @@ def delete_unconfigured_at_remote(
             # Run the deletion of the nameserver record with API
             inwx_api(api, "nameserver.deleteRecord", interactive=interactive, dry=dry, id=rec.id)
         else:
-            logging.info(
+            logging.debug(
                 "[%s] This remote record is not configured locally, but you "
                 "requested to not delete remote records of this type: %s",
                 domain.name,

recordmaster/main.py

@@ -12,7 +12,7 @@
 
 from . import __version__, configure_logger
 from ._api import api_login
-from ._data import Domain, cache_data
+from ._data import Domain, cache_data, convert_punycode
 from ._get_records import (
     check_local_records_config,
     combine_local_records,
@@ -150,8 +150,7 @@ def sync(
         # Initialise a new domain dataclass to hold the different local and
         # remote records
         domain = Domain()
-
-        domain.name = domainname
+        domain.name = convert_punycode(domainname)
 
         # Read local configuration into domain dataclass
         convert_local_records_to_data(domain, records)
@@ -225,7 +224,7 @@ def convert(
     """The convert command"""
     # Create and initiate domain dataclass
     domain = Domain()
-    domain.name = converted_domain
+    domain.name = convert_punycode(converted_domain)
 
     # Read remote configuration into domain dataclass
     convert_remote_records_to_data(api, domain, api_response)