Merge pull request #77

* added timestamp to comicstatus.

* added timestamp to comicstatus.

comic/management/commands/scan_comics.py

@@ -1,114 +1,38 @@
-from pathlib import Path
+from typing import Optional, Union
 
-from PIL import UnidentifiedImageError
-from django.conf import settings
-from django.core.management.base import BaseCommand
+from django.contrib.auth import get_user_model
+from django.contrib.auth.models import User
+from django.core.management.base import BaseCommand, CommandParser
 from loguru import logger
 
 from comic.models import ComicBook, Directory
+from comic.processing import generate_directory
 
 
 class Command(BaseCommand):
     help = "Scan directories to Update Comic DB"
 
-    def __init__(self):
+    def __init__(self) -> None:
         super().__init__()
         self.OUTPUT = False
-        self.VERIFY_PAGES = False
 
-    def add_arguments(self, parser):
+    def add_arguments(self, parser: CommandParser) -> None:
         parser.add_argument(
             '--out',
             action='store_true',
             help='Output to console',
         )
-        parser.add_argument(
-            '--verify_pages',
-            action='store_true',
-            help='Output to console',
-        )
 
-    def handle(self, *args, **options):
-        self.VERIFY_PAGES = options.get('verify_pages', False)
+    def handle(self, *args, **options) -> None:
         self.OUTPUT = options.get('out', False)
         self.scan_directory()
 
-    def scan_directory(self, directory=False):
-
-        """
-
-        :type directory: Directory
-        """
-        if not directory:
-            comic_dir = settings.COMIC_BOOK_VOLUME
-        else:
-            comic_dir = Path(settings.COMIC_BOOK_VOLUME, directory.path)
-        if directory:
-            books = ComicBook.objects.filter(directory=directory)
-        else:
-            books = ComicBook.objects.filter(directory__isnull=True)
-        for book in books:
-            Path(comic_dir, book.file_name).is_file()
-            if not Path(comic_dir, book.file_name).is_file():
-                book.delete()
-        for file in sorted(comic_dir.glob('*')):
-            if file.is_dir():
-                if self.OUTPUT:
-                    logger.info(f"Scanning Directory {file}")
-                try:
-                    if directory:
-                        next_directory, created = Directory.objects.get_or_create(name=file.name, parent=directory)
-                    else:
-                        next_directory, created = Directory.objects.get_or_create(name=file.name, parent__isnull=True)
-                except Directory.MultipleObjectsReturned:
-                    if directory:
-                        next_directories = Directory.objects.filter(name=file.name, parent=directory)
-                    else:
-                        next_directories = Directory.objects.filter(name=file.name, parent__isnull=True)
-                    next_directories = next_directories.order_by('id')
-                    next_directory = next_directories.first()
-                    next_directories.exclude(id=next_directory.id).delete()
-                    logger.error(f'Duplicate Directory {file}')
-                    created = False
-                if created:
-                    next_directory.save()
-                self.scan_directory(next_directory)
-            else:
-                if file.suffix.lower() not in settings.SUPPORTED_FILES:
-                    continue
-                if self.OUTPUT:
-                    logger.info(f"Scanning File {file}")
-                try:
-                    if directory:
-                        try:
-                            book = ComicBook.objects.get(file_name=file.name, directory=directory)
-                        except ComicBook.MultipleObjectsReturned:
-                            logger.error(f'Duplicate Comic {file}')
-                            books = ComicBook.objects.filter(file_name=file.name, directory=directory).order_by('id')
-                            book = books.first()
-                            extra_books = books.exclude(id=book.id)
-                            extra_books.delete()
-                        if book.version == 0:
-                            book.version = 1
-                            book.save()
-                        if self.VERIFY_PAGES:
-                            logger.info(f'Verifing pages: {book}')
-                            book.verify_pages()
-                    else:
-                        book = ComicBook.objects.get(file_name=file.name, directory__isnull=True)
-                        if book.version == 0:
-                            if directory:
-                                book.directory = directory
-                            book.version = 1
-                            book.save()
-                        if self.VERIFY_PAGES:
-                            logger.info(f'Verifing pages: {book}')
-                            book.verify_pages()
-                except ComicBook.DoesNotExist:
-                    book = ComicBook.process_comic_book(file, directory)
-                    try:
-                        book.generate_thumbnail()
-                    except UnidentifiedImageError:
-                        book.generate_thumbnail(1)
-                    except:
-                        pass
+    def scan_directory(self, user: Optional[User] = None, directory: Optional[Directory] = None) -> None:
+        if not user:
+            user_model = get_user_model()
+            user = user_model.objects.first()
+        for item in generate_directory(user, directory):
+            item: Union[Directory, ComicBook]
+            if item.type == 'Directory':
+                logger.info(item)
+                self.scan_directory(user, item)