paradizelost/paperless-ngx
1
0
Fork 0
mirror of https://github.com/paperless-ngx/paperless-ngx.git synced 2025-04-02 13:45:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

Refactor: extract fn 'make_dirs'

Browse Source
This commit is contained in:
Erik Arvstedt 2018-05-11 14:01:12 +02:00
parent ea287e0db2
commit 873c98dddb
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/documents/consumer.py
View File

@ -43,10 +43,7 @@ class Consumer:
self.consume = consume self.consume = consume
self.scratch = scratch self.scratch = scratch
try: make_dirs(self.scratch)
os.makedirs(self.scratch)
except FileExistsError:
pass
if not self.consume: if not self.consume:
raise ConsumerError( raise ConsumerError(
@ -245,3 +242,11 @@ class Consumer:
with open(doc, "rb") as f: with open(doc, "rb") as f:
checksum = hashlib.md5(f.read()).hexdigest() checksum = hashlib.md5(f.read()).hexdigest()
return Document.objects.filter(checksum=checksum).exists() return Document.objects.filter(checksum=checksum).exists()
def make_dirs(*dirs):
for dir in dirs:
try:
os.makedirs(dir)
except FileExistsError:
pass

8
src/documents/management/commands/document_consumer.py
View File

@ -6,7 +6,7 @@ import time
from django.conf import settings from django.conf import settings
from django.core.management.base import BaseCommand, CommandError from django.core.management.base import BaseCommand, CommandError
from ...consumer import Consumer, ConsumerError from ...consumer import Consumer, ConsumerError, make_dirs
from ...mail import MailFetcher, MailFetcherError from ...mail import MailFetcher, MailFetcherError
@ -67,11 +67,7 @@ class Command(BaseCommand):
except (ConsumerError, MailFetcherError) as e: except (ConsumerError, MailFetcherError) as e:
raise CommandError(e) raise CommandError(e)
for path in (self.ORIGINAL_DOCS, self.THUMB_DOCS): make_dirs(self.ORIGINAL_DOCS, self.THUMB_DOCS)
try:
os.makedirs(path)
except FileExistsError:
pass
logging.getLogger(__name__).info( logging.getLogger(__name__).info(
"Starting document consumer at {}".format(directory) "Starting document consumer at {}".format(directory)