altf4arnold/tldtest.net
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #72 from altf4arnold/fixing-atlas

Browse source 
[FIX] attempted fix
This commit is contained in:
Arnold Dechamps 2024-06-02 01:47:36 +02:00 committed by GitHub
parent 586c194c2a 0b34e75aff
commit 4aa1c09e41
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
atlas/atlascreator.py
View file

@ -69,20 +69,22 @@ def dbwriter(unicodetld, stack, measurement):
db = Atlas() db = Atlas()
db.unicodetld = unicodetld db.unicodetld = unicodetld
db.stack = stack db.stack = stack
db.measurement = measurement if measurement is not None:
db.measurement = measurement
db.save() db.save()
tld = TLD.objects.filter(unicodetld=unicodetld) tld = TLD.objects.filter(unicodetld=unicodetld)
if tld.exists(): if tld.exists():
primary_key = tld.values_list('pk', flat=True).first() primary_key = tld.values_list('pk', flat=True).first()
db = TLD.objects.get(pk=primary_key) db = TLD.objects.get(pk=primary_key)
if stack == 4: if measurement is not None:
db.atlasv4 = measurement if stack == 4:
db.save() db.atlasv4 = measurement
elif stack == 6: db.save()
db.atlasv6 = measurement elif stack == 6:
db.save() db.atlasv6 = measurement
else: db.save()
print("Unknown IP version") else:
print("Unknown IP version")
def main(): def main():

2
atlas/models.py
View file

@ -5,7 +5,7 @@ class Atlas(models.Model):
STACK = ((0, "Unknown"), (4, "IPv4"), (6, "IPv6")) STACK = ((0, "Unknown"), (4, "IPv4"), (6, "IPv6"))
unicodetld = models.CharField(max_length=100) unicodetld = models.CharField(max_length=100)
stack = models.IntegerField(default=0, choices=STACK) stack = models.IntegerField(default=0, choices=STACK)
measurement = models.IntegerField(default=0, blank=True, null=True) measurement = models.IntegerField(blank=True, null=True)
lastEdition = models.DateTimeField(auto_now=True) lastEdition = models.DateTimeField(auto_now=True)
def __str__(self): def __str__(self):

4
tldtester/models.py
View file

@ -39,8 +39,8 @@ class TLD(models.Model):
organisation = models.CharField(max_length=100) organisation = models.CharField(max_length=100)
rdap = models.CharField(max_length=10, default="No") rdap = models.CharField(max_length=10, default="No")
link = models.CharField(max_length=800, default="https://tldtest.net/") link = models.CharField(max_length=800, default="https://tldtest.net/")
atlasv4 = models.IntegerField(default=0, blank=True, null=True) atlasv4 = models.IntegerField(blank=True, null=True)
atlasv6 = models.IntegerField(default=0, blank=True, null=True) atlasv6 = models.IntegerField(blank=True, null=True)
def __str__(self): def __str__(self):
return self.tld return self.tld