Added logging file. Formated some of the outputs

.gitignore

@@ -0,0 +1,3 @@
+*.zip
+*.db
+.DS_Store

README.md

@@ -27,6 +27,15 @@ The program is best suited to be executed with e.g cron or any other system that
 Pull requests are welcome. For major changes, please open an issue first
 to discuss what you would like to change.
 
+## Support
+
+If you found a bug or you have sugestion for new features create an issue.
+
+## Future development
+
+- [ ] IPv6 support
+- [ ] Add and delete non existing (new) domains to DO account
+
 ## License
 
 [<img src="https://www.gnu.org/graphics/gplv3-with-text-136x68.png">](https://www.gnu.org/licenses/gpl-3.0.en.html)

ddns.py

@@ -9,6 +9,7 @@ import argparse
 import requests
 import os
 import time 
+from datetime import datetime
 from string import ascii_letters, digits
 from rich import print
 from argparse import RawTextHelpFormatter
@@ -16,7 +17,9 @@ from argparse import RawTextHelpFormatter
 homefilepath = Path.home()
 filepath = homefilepath.joinpath('.config/ddns')
 database = filepath.joinpath('ddns.db')
-app_version = '0.1'
+logfile = filepath.joinpath('ddns.log')
+logging.basicConfig(filename=logfile,level=logging.INFO)
+app_version = '0.3'
 
 
 def get_ip():
@@ -53,7 +56,7 @@ def connect_database():
 					api text NOT NULL)''')
 			c.execute('''CREATE TABLE IF NOT EXISTS ipservers
 			(id integer NOT NULL PRIMARY KEY,
-				ip4_server text,
+			 ip4_server text NOT NULL,
 			 ip6_server text)''')
 			c.execute('''CREATE TABLE IF NOT EXISTS domains
 			(id integer PRIMARY KEY,
@@ -61,7 +64,7 @@ def connect_database():
 			c.execute('''CREATE TABLE IF NOT EXISTS subdomains
 			(id integer PRIMARY KEY,
 			 main_id integer NOT NULL,
-			 name text,
+			 name text NOT NULL,
 			 current_ip4 text NOT NULL,
 			 current_ip6 text NULL)''')
 
@@ -238,10 +241,12 @@ def list_sub_domains(domain):
 			if count == 0:
 				print('[red]Error:[/red] No sub domains for [b]%s[/b]' % (domain))
 			else:
-				cursor.execute('SELECT name FROM subdomains WHERE main_id LIKE ?',(topdomain_id,) )
+				cursor.execute('SELECT name,last_updated FROM subdomains WHERE main_id LIKE ?',(topdomain_id,) )
 				subdomains = cursor.fetchall()
 				for i in subdomains:
-					print(i[0]+'.'+domain)
+					topdomain = i[0]+'.'+domain
+					topdomain = "{:<25}".format(topdomain)
+					print(topdomain+'\tLast updated : '+i[1])
 			print('\n')
 
 
@@ -264,7 +269,7 @@ def list_do_sub_domains(domain):
 				cursor.execute('SELECT COUNT(*) FROM subdomains WHERE id like ?',(str(k['id']),))
 				count = cursor.fetchone()[0]
 				if count == 0:
-					print(k['name']+'.'+domain+' ID : '+str(k['id']))
+					print(k['name']+'.'+domain+'\t\tID : '+str(k['id']))
 
 
 
@@ -317,6 +322,7 @@ def show_current_info():
 	print('API key 	: [b]%s[/b]' % (API))
 	print('IP v4 resolver 	: [b]%s[/b]' % (ipserver))
 	print('IP v6 resolver 	: [b]N/A[/b]')
+	print('Logfile 	: [b]%s[/b]' % (logfile))
 	print('Top domains 	: [b]%s[/b]' % (topdomains))
 	print('sub domains 	: [b]%s[/b]' % (subdomains))
 	print('')
@@ -352,12 +358,13 @@ def ip_server(ipserver, ip_type):
 
 
 
-def updateip():
+def updateip(force):
 	apikey = get_api()
 	current_ip = get_ip()
 	cursor = conn.cursor()
 	cursor.execute('SELECT COUNT(*) FROM subdomains')
 	count = cursor.fetchone()[0]
+	now = datetime.now()
 	if count == 0:
 		print('[red]Error: [/red]There are no dynamic domains active.'\
 			' Start by adding a new domain with [i]ddns -s test.example.com[/i]')
@@ -368,16 +375,29 @@ def updateip():
 			cursor.execute('SELECT name FROM domains WHERE id like (SELECT main_id from subdomains WHERE id = ?)',(i[0],))
 			domain_name = str(cursor.fetchone()[0])
 			subdomain_id = str(i[0])
-			data = {'type': 'A', 'data': current_ip}
-			#print(domain_name, subdomain_id,current_ip,data)
-			headers = {'Authorization': 'Bearer ' + apikey, "Content-Type": "application/json"}
-			response = requests.patch('https://api.digitalocean.com/v2/domains/'+domain_name+'/records/' + subdomain_id, data=json.dumps(data), headers=headers)
-			# response = response.json()
-			if str(response) != '<Response [200]>':
-				print('[red]Error: ' + str(response.json))
-			else:
-				cursor.execute('UPDATE subdomains SET current_ip4=? WHERE id = ?',(current_ip,subdomain_id,))
-				conn.commit()
+			# Chek if an update is required
+			req = urllib.request.Request('https://api.digitalocean.com/v2/domains/' + domain_name + '/records/' + subdomain_id)
+			req.add_header('Content-Type', 'application/json')
+			req.add_header('Authorization', 'Bearer ' + apikey)
+			current = urllib.request.urlopen(req)
+			remote = current.read().decode('utf-8')
+			remoteData = json.loads(remote)
+			remoteIP4 = remoteData['domain_record']['data']
+			if force == True:
+				remoteIP4 = '0.0.0.0'
+			# Only update domains with outdated IP's
+			if remoteIP4 != current_ip:
+				data = {'type': 'A', 'data': current_ip}
+				#print(domain_name, subdomain_id,current_ip,data)
+				headers = {'Authorization': 'Bearer ' + apikey, "Content-Type": "application/json"}
+				response = requests.patch('https://api.digitalocean.com/v2/domains/'+domain_name+'/records/' + subdomain_id, data=json.dumps(data), headers=headers)
+				# response = response.json()
+				if str(response) != '<Response [200]>':
+					logging.error(time.strftime("%Y-%m-%d %H:%M")+' - Error : ' + str(response.json))
+				else:
+					cursor.execute('UPDATE subdomains SET current_ip4=? WHERE id = ?',(current_ip,subdomain_id,))
+					cursor.execute('UPDATE subdomains SET last_updated=? WHERE id = ?',(now.strftime("%d/%m/%Y %H:%M:%S"),subdomain_id,))
+					conn.commit()
 
 
 
@@ -416,9 +436,22 @@ def local_add_subdomain(domain,domainid):
 
 
 
+def updatedb():
+	# Update DB with new column 20.03.23
+	# Add last updated field for subdomains
+	new_table = 'last_updated'
+	cursor = conn.cursor()
+	info = conn.execute("PRAGMA table_info('subdomains')").fetchall()
+	if not any(new_table in word for word in info):
+		add_column = "ALTER TABLE subdomains ADD COLUMN last_updated text"
+		conn.execute(add_column)
+		conn.commit()	
+
+
+
 # Commandline arguments
 conn = connect_database()
-
+updatedb()
 parser = argparse.ArgumentParser(prog='ddns',
 								description='Application to use domains from DigitalOcean account as dynamic '\
 								'DNS domain(s).\nThe app only supports IP4. IPv6 is planned for a later release!'\
@@ -429,6 +462,9 @@ parser = argparse.ArgumentParser(prog='ddns',
 parser.add_argument('-a', '--api', help='Add/Change API key.', 
 	nargs=1, metavar=('APIkey'), required=False, action="append")
 
+parser.add_argument('-f', '--force', help='Force update of IP address for all domains.', 
+	required=False, action="store_true")
+
 parser.add_argument('-l', '--list', help='List subdomains for supplied domain.', 
 	nargs=1, metavar=('domain'), required=False, action="append")
 
@@ -447,7 +483,7 @@ parser.add_argument('-t', '--top', help='Add a new domain from your DigitalOcean
 parser.add_argument('-s', '--sub', help='Add a new subdomain to your DigitalOcean account and use as dynamic DNS.\n',
 					required=False, nargs=1, metavar=('domain'), action='append')
 
-parser.add_argument('-k', '--local', help='Add an existing DigitalOcean domain to your ddns DB and use as dynamic DNS. Get ',
+parser.add_argument('-k', '--local', help='Add an existing DigitalOcean subdomain to your ddns DB and use as dynamic DNS.',
 					required=False, nargs=2, metavar=('domain','domainid'), action='append')
 
 parser.add_argument('-r', '--remove', help='Remove a subdomain from your DigitalOcean account and ddns.',
@@ -474,6 +510,8 @@ elif args['sub']:
 	add_subdomain(args['sub'][0][0])
 elif args['version']:
 	show_current_info()
+elif args['force']:
+	updateip(True)
 elif args['ipserver']:
 	ip_server(args['ipserver'][0][0],args['ipserver'][0][1])
 elif args['api']:
@@ -483,9 +521,7 @@ elif args['remove']:
 elif args['local']:
 	local_add_subdomain(args['local'][0][0],args['local'][0][1])
 else:
-	# get_ip()
-	# get_api()
-	updateip()
+	updateip(None)
 
 
 

requirements.txt

@@ -3,17 +3,20 @@ aiosignal==1.3.1
 async-timeout==4.0.2
 attrs==22.2.0
 certifi==2022.12.7
+cffi==1.15.1
 charset-normalizer==3.1.0
 click==8.1.3
 frozenlist==1.3.3
-gpg==1.18.0
+gpg==1.19.0
 idna==3.4
 markdown-it-py==2.2.0
 mdurl==0.1.2
 multidict==6.0.4
 notmuch==0.37
+notmuch2==0.37
 openai==0.27.0
 promptcli==1.0.4
+pycparser==2.21
 Pygments==2.14.0
 requests==2.28.2
 rich==13.3.1