lgcosta/paperless-ngx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Docs only

Browse Source 
[skip ci]
This commit is contained in:
shamoon
2024-04-23 01:14:46 -07:00
parent fc1423057d
commit 872fc206b4
14 changed files with 132 additions and 323 deletions
Download Patch File Download Diff File Expand all files Collapse all files

154
src/documents/migrations/1047_correspondent_deleted_at_correspondent_restored_at_and_more.py
View File

@@ -1,154 +0,0 @@
# Generated by Django 4.2.11 on 2024-04-22 20:44
from django.db import migrations
from django.db import models
class Migration(migrations.Migration):
dependencies = [
("documents", "1046_workflowaction_remove_all_correspondents_and_more"),
]
operations = [
migrations.AddField(
model_name="correspondent",
name="deleted_at",
field=models.DateTimeField(blank=True, null=True),
),
migrations.AddField(
model_name="correspondent",
name="restored_at",
field=models.DateTimeField(blank=True, null=True),
),
migrations.AddField(
model_name="document",
name="deleted_at",
field=models.DateTimeField(blank=True, null=True),
),
migrations.AddField(
model_name="document",
name="restored_at",
field=models.DateTimeField(blank=True, null=True),
),
migrations.AddField(
model_name="documenttype",
name="deleted_at",
field=models.DateTimeField(blank=True, null=True),
),
migrations.AddField(
model_name="documenttype",
name="restored_at",
field=models.DateTimeField(blank=True, null=True),
),
migrations.AddField(
model_name="savedview",
name="deleted_at",
field=models.DateTimeField(blank=True, null=True),
),
migrations.AddField(
model_name="savedview",
name="restored_at",
field=models.DateTimeField(blank=True, null=True),
),
migrations.AddField(
model_name="storagepath",
name="deleted_at",
field=models.DateTimeField(blank=True, null=True),
),
migrations.AddField(
model_name="storagepath",
name="restored_at",
field=models.DateTimeField(blank=True, null=True),
),
migrations.AddField(
model_name="tag",
name="deleted_at",
field=models.DateTimeField(blank=True, null=True),
),
migrations.AddField(
model_name="tag",
name="restored_at",
field=models.DateTimeField(blank=True, null=True),
),
migrations.AddField(
model_name="workflow",
name="deleted_at",
field=models.DateTimeField(blank=True, null=True),
),
migrations.AddField(
model_name="workflow",
name="restored_at",
field=models.DateTimeField(blank=True, null=True),
),
migrations.AddField(
model_name="note",
name="deleted_at",
field=models.DateTimeField(blank=True, null=True),
),
migrations.AddField(
model_name="note",
name="restored_at",
field=models.DateTimeField(blank=True, null=True),
),
migrations.AddField(
model_name="customfield",
name="deleted_at",
field=models.DateTimeField(blank=True, null=True),
),
migrations.AddField(
model_name="customfield",
name="restored_at",
field=models.DateTimeField(blank=True, null=True),
),
migrations.AddField(
model_name="customfieldinstance",
name="deleted_at",
field=models.DateTimeField(blank=True, null=True),
),
migrations.AddField(
model_name="customfieldinstance",
name="restored_at",
field=models.DateTimeField(blank=True, null=True),
),
migrations.AddField(
model_name="savedviewfilterrule",
name="deleted_at",
field=models.DateTimeField(blank=True, null=True),
),
migrations.AddField(
model_name="savedviewfilterrule",
name="restored_at",
field=models.DateTimeField(blank=True, null=True),
),
migrations.AddField(
model_name="sharelink",
name="deleted_at",
field=models.DateTimeField(blank=True, null=True),
),
migrations.AddField(
model_name="sharelink",
name="restored_at",
field=models.DateTimeField(blank=True, null=True),
),
migrations.AddField(
model_name="workflowaction",
name="deleted_at",
field=models.DateTimeField(blank=True, null=True),
),
migrations.AddField(
model_name="workflowaction",
name="restored_at",
field=models.DateTimeField(blank=True, null=True),
),
migrations.AddField(
model_name="workflowtrigger",
name="deleted_at",
field=models.DateTimeField(blank=True, null=True),
),
migrations.AddField(
model_name="workflowtrigger",
name="restored_at",
field=models.DateTimeField(blank=True, null=True),
),
]

24
src/documents/migrations/1049_document_deleted_at_document_restored_at.py Normal file
View File

@@ -0,0 +1,24 @@
# Generated by Django 4.2.11 on 2024-04-23 07:56
from django.db import migrations
from django.db import models
class Migration(migrations.Migration):
dependencies = [
("documents", "1048_alter_savedviewfilterrule_rule_type"),
]
operations = [
migrations.AddField(
model_name="document",
name="deleted_at",
field=models.DateTimeField(blank=True, null=True),
),
migrations.AddField(
model_name="document",
name="restored_at",
field=models.DateTimeField(blank=True, null=True),
),
]

20
src/documents/models.py
View File

@@ -29,7 +29,7 @@ from documents.data_models import DocumentSource
from documents.parsers import get_default_file_extension
class ModelWithOwner(SoftDeleteModel):
class ModelWithOwner(models.Model):
owner = models.ForeignKey(
User,
blank=True,
@@ -132,7 +132,7 @@ class StoragePath(MatchingModel):
verbose_name_plural = _("storage paths")
class Document(ModelWithOwner):
class Document(SoftDeleteModel, ModelWithOwner):
STORAGE_TYPE_UNENCRYPTED = "unencrypted"
STORAGE_TYPE_GPG = "gpg"
STORAGE_TYPES = (
@@ -462,7 +462,7 @@ class SavedView(ModelWithOwner):
return f"SavedView {self.name}"
class SavedViewFilterRule(SoftDeleteModel):
class SavedViewFilterRule(models.Model):
RULE_TYPES = [
(0, _("title contains")),
(1, _("content contains")),
@@ -694,7 +694,7 @@ class PaperlessTask(models.Model):
return f"Task {self.task_id}"
class Note(SoftDeleteModel):
class Note(models.Model):
note = models.TextField(
_("content"),
blank=True,
@@ -734,7 +734,7 @@ class Note(SoftDeleteModel):
return self.note
class ShareLink(SoftDeleteModel):
class ShareLink(models.Model):
class FileVersion(models.TextChoices):
ARCHIVE = ("archive", _("Archive"))
ORIGINAL = ("original", _("Original"))
@@ -794,7 +794,7 @@ class ShareLink(SoftDeleteModel):
return f"Share Link for {self.document.title}"
class CustomField(SoftDeleteModel):
class CustomField(models.Model):
"""
Defines the name and type of a custom field
"""
@@ -840,7 +840,7 @@ class CustomField(SoftDeleteModel):
return f"{self.name} : {self.data_type}"
class CustomFieldInstance(SoftDeleteModel):
class CustomFieldInstance(models.Model):
"""
A single instance of a field, attached to a CustomField for the name and type
and attached to a single Document to be metadata for it
@@ -941,7 +941,7 @@ if settings.AUDIT_LOG_ENABLED:
auditlog.register(CustomFieldInstance)
class WorkflowTrigger(SoftDeleteModel):
class WorkflowTrigger(models.Model):
class WorkflowTriggerMatching(models.IntegerChoices):
# No auto matching
NONE = MatchingModel.MATCH_NONE, _("None")
@@ -1045,7 +1045,7 @@ class WorkflowTrigger(SoftDeleteModel):
return f"WorkflowTrigger {self.pk}"
class WorkflowAction(SoftDeleteModel):
class WorkflowAction(models.Model):
class WorkflowActionType(models.IntegerChoices):
ASSIGNMENT = (
1,
@@ -1264,7 +1264,7 @@ class WorkflowAction(SoftDeleteModel):
return f"WorkflowAction {self.pk}"
class Workflow(SoftDeleteModel):
class Workflow(models.Model):
name = models.CharField(_("name"), max_length=256, unique=True)
order = models.IntegerField(_("order"), default=0)

2
src/documents/signals/handlers.py
View File

@@ -308,8 +308,6 @@ def cleanup_document_deletion(sender, instance, force=False, **kwargs):
now = timezone.localtime(timezone.now())
if now - instance.deleted_at < timedelta(days=settings.EMPTY_TRASH_DELAY):
return
# print(instance.pk, force, kwargs)
return
with FileLock(settings.MEDIA_LOCK):
if settings.TRASH_DIR:
# Find a non-conflicting filename in case a document with the same

17
src/documents/tasks.py
View File

@@ -307,27 +307,10 @@ def empty_trash(doc_ids=None):
if doc_ids is not None
else Document.deleted_objects.filter(deleted_at__gt=cutoff)
)
# print(documents, doc_ids)
for doc in documents:
# with disable_signal(
# post_delete,
# receiver=cleanup_document_deletion,
# sender=Document,
# ):
doc.delete()
post_delete.send(
sender=Document,
instance=doc,
force=True,
)
# messages.log_messages()
# if messages.has_error:
# raise SanityCheckFailedException("Sanity check failed with errors. See log.")
# elif messages.has_warning:
# return "Sanity check exited with warnings. See log."
# elif len(messages) > 0:
# return "Sanity check exited with infos. See log."
# else:
# return "No issues detected."

3
src/documents/views.py
View File

@@ -2077,9 +2077,6 @@ class TrashView(PassUserMixin):
serializer = self.get_serializer(data=request.data)
serializer.is_valid(raise_exception=True)
# user = self.request.user
# method = serializer.validated_data.get("method")
# parameters = serializer.validated_data.get("parameters")
doc_ids = serializer.validated_data.get("documents")
action = serializer.validated_data.get("action")
if action == "restore":

44
src/paperless_mail/migrations/0024_mailaccount_deleted_at_mailaccount_restored_at_and_more.py
View File

@@ -1,44 +0,0 @@
# Generated by Django 4.2.11 on 2024-04-22 20:44
from django.db import migrations
from django.db import models
class Migration(migrations.Migration):
dependencies = [
("paperless_mail", "0023_remove_mailrule_filter_attachment_filename_and_more"),
]
operations = [
migrations.AddField(
model_name="mailaccount",
name="deleted_at",
field=models.DateTimeField(blank=True, null=True),
),
migrations.AddField(
model_name="mailaccount",
name="restored_at",
field=models.DateTimeField(blank=True, null=True),
),
migrations.AddField(
model_name="mailrule",
name="deleted_at",
field=models.DateTimeField(blank=True, null=True),
),
migrations.AddField(
model_name="mailrule",
name="restored_at",
field=models.DateTimeField(blank=True, null=True),
),
migrations.AddField(
model_name="processedmail",
name="deleted_at",
field=models.DateTimeField(blank=True, null=True),
),
migrations.AddField(
model_name="processedmail",
name="restored_at",
field=models.DateTimeField(blank=True, null=True),
),
]