From 27bb82767bfb19c76178711412c43568ec2175c3 Mon Sep 17 00:00:00 2001
From: Neshura <neshura@proton.me>
Date: Mon, 28 Nov 2022 20:25:42 +0100
Subject: [PATCH] Various bugfixes and changes

1: Script had AAAA hardcoded, this would've changed all records to AAAA.
2: Script was not saving the DNS Records ids, only their names this would've made it impossible to actually edit the DNS Record
3: Lowered the amount of printing going on, removed irrelevant information such as zoneid from the print statements, also removed most printing during the update phase
---
 cloudflare-dns-new.py | 37 +++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/cloudflare-dns-new.py b/cloudflare-dns-new.py
index c2e0b93..46da1cc 100644
--- a/cloudflare-dns-new.py
+++ b/cloudflare-dns-new.py
@@ -46,15 +46,19 @@ class DNSUpdater:
             print(f"Zone ID: {zone['id']} | Zone Name: {zone['name']}")
 
     def get_dns_records(self, log=False):
-        dns_records = self._cloudflare.zones.dns_records.get(self.zone_id)
+        dns_records_all = self._cloudflare.zones.dns_records.get(self.zone_id)
 
-        dns_names = {'A' : [], 'AAAA' : []}
-        for dnsrecord in dns_records:
-            if log:
-                print(f"DNS Name: {dnsrecord['name']} | ID: {dnsrecord['id']} | Type : {dnsrecord['type']} | IP: {dnsrecord['content']}")
-            dns_names[dnsrecord['type']].append(dnsrecord["name"])
+        dns_records_to_update = {'A' : [], 'AAAA' : []}
+        for dnsrecord in dns_records_all:
+            if dnsrecord['type'] in ['A', 'AAAA']:
+                if log:
+                    print(f"DNS Name: {dnsrecord['name']} | Type : {dnsrecord['type']} | IP: {dnsrecord['content']}")
+                dns_records_to_update[dnsrecord['type']].append(dnsrecord)
+            else:
+                if log:
+                    print(f"| Unknow DNS | Type: {dnsrecord['type']} | Zone: {dnsrecord['name']}")
 
-        self.DNSNAMES = copy.deepcopy(dns_names)
+        self.DNSRECORDS = copy.deepcopy(dns_records_to_update)
     
     def update_records(self):
         if self.IPVER == 'skip':
@@ -76,18 +80,15 @@ class DNSUpdater:
         print(names_replace)
         for name in names_replace:
             fullname = f"{name}.{self.HOSTNAME}"
-            print(fullname)
 
-            for x in self.DNSNAMES:
-                if x['name'] == fullname:
-                    dns_record_id = x['id'] 
-            print(dns_record_id)
-
-            if fullname in self.DNSNAMES[dnstype]:
-                new_dnsrecord = {"name": fullname, "type": "AAAA", "content": self.IPNEW}
-                print(f"Sending request {new_dnsrecord}")
-                r = self._cloudflare.zones.dns_records.patch(self.zone_id, dns_record_id, data=new_dnsrecord)
-                print(r)
+            for record in self.DNSRECORDS[dnstype]:
+                if record['name'] == fullname:
+                    new_dnsrecord = {"name": fullname, "type": dnstype, "content": self.IPNEW}
+                    print(f"Sending request {new_dnsrecord}")
+                    res = self._cloudflare.zones.dns_records.patch(self.zone_id, record['id'], data=new_dnsrecord)
+                    if res['content'] != new_dnsrecord['content']:
+                        print(res)
+                              
 
 
 if __name__ == '__main__':