diff --git a/logs_collector/collector/migrations/0004_rename_sha1_archive_md5_remove_archive_size.py b/logs_collector/collector/migrations/0004_rename_sha1_archive_md5_remove_archive_size.py new file mode 100644 index 0000000..4bdfd6f --- /dev/null +++ b/logs_collector/collector/migrations/0004_rename_sha1_archive_md5_remove_archive_size.py @@ -0,0 +1,22 @@ +# Generated by Django 4.2 on 2023-08-08 09:17 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('collector', '0003_alter_archive_ticket'), + ] + + operations = [ + migrations.RenameField( + model_name='archive', + old_name='sha1', + new_name='md5', + ), + migrations.RemoveField( + model_name='archive', + name='size', + ), + ] diff --git a/logs_collector/collector/models.py b/logs_collector/collector/models.py index fb16f80..437b789 100644 --- a/logs_collector/collector/models.py +++ b/logs_collector/collector/models.py @@ -28,8 +28,7 @@ class Archive(models.Model): blank=True, null=True ) - size = models.CharField(max_length=50, blank=True, editable=False) - sha1 = models.CharField(max_length=1024, editable=False) + md5 = models.CharField(max_length=1024, editable=False) time_create = models.DateTimeField(auto_now_add=True) time_update = models.DateTimeField(auto_now=True) ticket = models.ForeignKey( @@ -41,12 +40,12 @@ class Archive(models.Model): user = models.ForeignKey(User, on_delete=models.CASCADE) def save(self, *args, **kwargs): - # calculate sha 1 hash sum and write sha1 field to db + # calculate sha 1 hash sum and write md5 field to db with self.file.open('rb') as f: - sha1 = hashlib.sha1() + md5 = hashlib.md5() for byte_block in iter(lambda: f.read(4096), b""): - sha1.update(byte_block) - self.sha1 = sha1.hexdigest() + md5.update(byte_block) + self.md5 = md5.hexdigest() # Call the "real" save() method super().save(*args, **kwargs) diff --git a/logs_collector/collector/templates/collector/includes/ticket_archives.html b/logs_collector/collector/templates/collector/includes/ticket_archives.html index ffcb81b..4cec5ae 100644 --- a/logs_collector/collector/templates/collector/includes/ticket_archives.html +++ b/logs_collector/collector/templates/collector/includes/ticket_archives.html @@ -8,8 +8,8 @@
- SHA1: - {{ archive.sha1 }} + MD5: + {{ archive.md5 }}