Aroy/Gallery-Archivist
1
0
Fork 0
Code Issues 5 Pull requests Projects Releases Packages 1 Wiki Activity Actions

Compare commits

base: Aroy:7e6dd9d82d1d4b98ee559e642719a17d9f6777da
Branches Tags
Aroy:main
Aroy:Phoenix
..
compare: Aroy:6e8ff8a4e62eda2ea00564012a869d7fef97a768
Branches Tags
Aroy:main
Aroy:Phoenix

No commits in common. "7e6dd9d82d1d4b98ee559e642719a17d9f6777da" and "6e8ff8a4e62eda2ea00564012a869d7fef97a768" have entirely different histories.
7e6dd9d82d ... 6e8ff8a4e6

2 changed files with 15 additions and 23 deletions
Show stats Expand all files Collapse all files

16
archivist/apps/files/models.py
View file

@ -23,11 +23,9 @@ def get_upload_to_banner(instance, filename):
class User_Profile_Images(models.Model): class User_Profile_Images(models.Model):
file_hash = models.CharField(unique=True, max_length=64) file_hash = models.CharField(unique=True, max_length=64,)
file_name = models.CharField(max_length=150, blank=True) file_name = models.CharField(max_length=150, blank=True)
file = models.FileField(upload_to=get_upload_to_profile, blank=True) file = models.FileField(upload_to=get_upload_to_profile, blank=True)
file_mime = models.CharField(max_length=64, blank=True)
file_ext = models.CharField(max_length=64, blank=True)
date_added = models.DateTimeField(auto_now_add=True, editable=True) date_added = models.DateTimeField(auto_now_add=True, editable=True)
class Meta: class Meta:
@ -43,11 +41,9 @@ class User_Profile_Images(models.Model):
class User_Banner_Images(models.Model): class User_Banner_Images(models.Model):
file_hash = models.CharField(unique=True, max_length=64) file_hash = models.CharField(unique=True, max_length=64,)
file_name = models.CharField(max_length=150, blank=True) file_name = models.CharField(max_length=150, blank=True)
file = models.FileField(upload_to=get_upload_to_banner, blank=True) file = models.FileField(upload_to=get_upload_to_banner, blank=True)
file_mime = models.CharField(max_length=64, blank=True)
file_ext = models.CharField(max_length=64, blank=True)
date_added = models.DateTimeField(auto_now_add=True, editable=True) date_added = models.DateTimeField(auto_now_add=True, editable=True)
class Meta: class Meta:
@ -63,11 +59,9 @@ class User_Banner_Images(models.Model):
class Submission_File(models.Model): class Submission_File(models.Model):
file_hash = models.CharField(unique=True, max_length=64) file_hash = models.CharField(unique=True, max_length=64,)
file_name = models.CharField(max_length=150, blank=True) file_name = models.CharField(max_length=150, blank=True)
file = models.FileField(upload_to=get_upload_to_submission, blank=True) file = models.FileField(upload_to=get_upload_to_submission, blank=True)
file_mime = models.CharField(max_length=64, blank=True)
file_ext = models.CharField(max_length=64, blank=True)
date_added = models.DateTimeField(auto_now_add=True, editable=True) date_added = models.DateTimeField(auto_now_add=True, editable=True)
class Meta: class Meta:
@ -83,11 +77,9 @@ class Submission_File(models.Model):
class Metadata_Files(models.Model): class Metadata_Files(models.Model):
file_hash = models.CharField(unique=True, max_length=64) file_hash = models.CharField(unique=True, max_length=64,)
file_name = models.CharField(max_length=150, blank=True) file_name = models.CharField(max_length=150, blank=True)
file = models.FileField(upload_to=get_upload_to_metadata, blank=True) file = models.FileField(upload_to=get_upload_to_metadata, blank=True)
file_mime = models.CharField(max_length=64, blank=True)
file_ext = models.CharField(max_length=64, blank=True)
date_added = models.DateTimeField(auto_now_add=True, editable=True) date_added = models.DateTimeField(auto_now_add=True, editable=True)
class Meta: class Meta:

6
docker-compose-dev.yml
View file

@ -7,7 +7,7 @@ services:
dockerfile: Dockerfile dockerfile: Dockerfile
args: args:
- USER_ID=1000 - USER_ID=1000
image: git.aroy-art.com/aroy/gallery-archivist:dev image: gallery-archivist:dev
#container_name: django #container_name: django
command: > command: >
sh -c "cd archivist sh -c "cd archivist
@ -27,7 +27,7 @@ services:
celery-worker: celery-worker:
#build: . #build: .
image: git.aroy-art.com/aroy/gallery-archivist:dev image: gallery-archivist:dev
#container_name: celery_worker #container_name: celery_worker
command: > command: >
sh -c "cd archivist sh -c "cd archivist
@ -44,7 +44,7 @@ services:
celery-beat: celery-beat:
#build: . #build: .
image: git.aroy-art.com/aroy/gallery-archivist:dev image: gallery-archivist:dev
command: > command: >
sh -c "cd archivist sh -c "cd archivist
&& celery -A core beat -l INFO" && celery -A core beat -l INFO"