Admin basket: fix if importer_class is None

This commit is contained in:
phil 2024-04-20 11:08:41 +05:30
parent c613fd35d9
commit d08e40d579
2 changed files with 4 additions and 3 deletions

View file

@ -38,7 +38,7 @@ class Basket:
who don't have that role. who don't have that role.
""" """
name: ClassVar[str] name: ClassVar[str]
importer_class: Type[Importer] importer_class: Type[Importer] | None = None
importer: Importer importer: Importer
_custom_module: str | None = None _custom_module: str | None = None
columns: list[str] = ['name', 'time', 'import', 'delete'] columns: list[str] = ['name', 'time', 'import', 'delete']
@ -47,7 +47,7 @@ class Basket:
def __init__(self): def __init__(self):
self.base_dir = Path(conf.admin.basket.base_dir) / self.name self.base_dir = Path(conf.admin.basket.base_dir) / self.name
if self.importer_class: if self.importer_class is not None:
self.importer = self.importer_class() self.importer = self.importer_class()
self.importer.basket = self self.importer.basket = self

View file

@ -1,6 +1,7 @@
import datetime import datetime
import logging import logging
import re import re
from typing import Any
from collections import defaultdict, OrderedDict from collections import defaultdict, OrderedDict
from math import isnan from math import isnan
from mimetypes import guess_type from mimetypes import guess_type
@ -39,7 +40,7 @@ class Importer:
The main process is executed by do_import(file) The main process is executed by do_import(file)
Subclasses should define read_file and process_df. Subclasses should define read_file and process_df.
""" """
basket = None # type hint: baskets.Basket basket: Any = None # type hint: baskets.Basket
async def do_import(self, file_record, dry_run=False, **kwargs) -> BasketImportResult: async def do_import(self, file_record, dry_run=False, **kwargs) -> BasketImportResult:
""" """