Commit 77140230 authored by Dmitry Shelepnev's avatar Dmitry Shelepnev
Browse files

Add tests for sopdsscan.py module. Fix error in opdsdb.addcattree funcction

parent 079c2c69
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -79,8 +79,8 @@ def addcattree(cat_name, archive=0):
    catalog = findcat(cat_name)
    if catalog:
        return catalog
    if cat_name=="":
        return Catalog.objects.get_or_create(cat_name=".", path=".", cat_type=archive)[0]
    if cat_name in ("","."):
        return Catalog.objects.get_or_create(parent=None, cat_name=".", path=".", cat_type=0)[0]
    (head,tail)=os.path.split(cat_name)
    parent=addcattree(head)
    new_cat = Catalog.objects.create(parent=parent, cat_name=tail, path=cat_name, cat_type=archive)
+3 −2
Original line number Diff line number Diff line
@@ -11,15 +11,16 @@ from opds_catalog import fb2parse, settings, opdsdb


class opdsScanner:
    def __init__(self, logger):
    def __init__(self, logger=None):
        self.fb2parser=None
        self.init_parser()
        # TODO: Внести изменения, чтобы сделать возможным указывать вместо logger NULL (тогда либо логгер по умолчанию, либо просто логи будут отстутсвовать)

        if logger:
            self.logger = logger
        else:
            self.logger = logging.getLogger('')
            self.logger.setLevel(logging.NOTSET)
        self.init_stats()

    def init_stats(self):
        self.t1=datetime.timedelta(seconds=time.time())
Loading