mirror of
https://github.com/paperless-ngx/paperless-ngx.git
synced 2025-05-01 11:19:32 -05:00
Try again, properly hopefully
This commit is contained in:
parent
ed02609b6f
commit
3e9aa21fb8
@ -317,10 +317,8 @@ class Command(BaseCommand):
|
|||||||
|
|
||||||
# Check the files against the timeout
|
# Check the files against the timeout
|
||||||
still_waiting = {}
|
still_waiting = {}
|
||||||
for filepath in notified_files.items():
|
# last_event_time is time of the last inotify event for this file
|
||||||
# Time of the last inotify event for this file
|
for filepath, last_event_time in notified_files.items():
|
||||||
last_event_time = notified_files[filepath]
|
|
||||||
|
|
||||||
# Current time - last time over the configured timeout
|
# Current time - last time over the configured timeout
|
||||||
waited_long_enough = (
|
waited_long_enough = (
|
||||||
monotonic() - last_event_time
|
monotonic() - last_event_time
|
||||||
|
@ -294,7 +294,7 @@ class Command(CryptMixin, BaseCommand):
|
|||||||
manifest_dict = {}
|
manifest_dict = {}
|
||||||
|
|
||||||
# Build an overall manifest
|
# Build an overall manifest
|
||||||
for key in manifest_key_to_object_query.items():
|
for key, _ in manifest_key_to_object_query.items():
|
||||||
manifest_dict[key] = json.loads(
|
manifest_dict[key] = json.loads(
|
||||||
serializers.serialize("json", manifest_key_to_object_query[key]),
|
serializers.serialize("json", manifest_key_to_object_query[key]),
|
||||||
)
|
)
|
||||||
@ -370,7 +370,7 @@ class Command(CryptMixin, BaseCommand):
|
|||||||
|
|
||||||
# 4.1 write primary manifest to target folder
|
# 4.1 write primary manifest to target folder
|
||||||
manifest = []
|
manifest = []
|
||||||
for key in manifest_dict.items():
|
for key, _ in manifest_dict.items():
|
||||||
manifest.extend(manifest_dict[key])
|
manifest.extend(manifest_dict[key])
|
||||||
manifest_path = (self.target / "manifest.json").resolve()
|
manifest_path = (self.target / "manifest.json").resolve()
|
||||||
self.check_and_write_json(
|
self.check_and_write_json(
|
||||||
|
@ -160,7 +160,7 @@ class SetPermissionsMixin:
|
|||||||
},
|
},
|
||||||
}
|
}
|
||||||
if set_permissions is not None:
|
if set_permissions is not None:
|
||||||
for action in permissions_dict.items():
|
for action, _ in permissions_dict.items():
|
||||||
if action in set_permissions:
|
if action in set_permissions:
|
||||||
users = set_permissions[action]["users"]
|
users = set_permissions[action]["users"]
|
||||||
permissions_dict[action]["users"] = self._validate_user_ids(users)
|
permissions_dict[action]["users"] = self._validate_user_ids(users)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user