From 3f72cebd96bfd838ff04e32653a36c854c7a4ab7 Mon Sep 17 00:00:00 2001 From: mac12m99 <10120390+mac12m99@users.noreply.github.com> Date: Thu, 13 May 2021 20:13:13 +0200 Subject: [PATCH] ops --- channels/animeworld.py | 2 +- core/__init__.py | 10 ++++------ lib/sqlitedict.py | 4 ++-- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/channels/animeworld.py b/channels/animeworld.py index 408650f9..b61fa412 100644 --- a/channels/animeworld.py +++ b/channels/animeworld.py @@ -20,7 +20,7 @@ def get_cookie(): def get_data(item): - support.dbg() + # support.dbg() url = httptools.downloadpage(item.url, headers=headers, follow_redirects=True, only_headers=True).url data = support.match(url, headers=headers, follow_redirects=True).data if 'AWCookieVerify' in data: diff --git a/core/__init__.py b/core/__init__.py index ac442dbe..b232b5c2 100644 --- a/core/__init__.py +++ b/core/__init__.py @@ -14,7 +14,7 @@ except: from . import filetools from platformcode import config from collections import defaultdict -from lib.sqlitedict import SqliteDict, SqliteMultithread +from lib.sqlitedict import SqliteDict class nested_dict_sqlite(defaultdict): @@ -25,12 +25,10 @@ class nested_dict_sqlite(defaultdict): return value def close(self): - sqliteTH.close() - # for key in self.keys(): - # self[key].close() + for key in self.keys(): + self[key].close() self.clear() db_name = filetools.join(config.get_data_path(), "db.sqlite") -sqliteTH = SqliteMultithread(db_name, autocommit=True, journal_mode="DELETE", timeout=5) -db = nested_dict_sqlite(lambda table: SqliteDict(db_name, table, 'c', True, conn=sqliteTH)) +db = nested_dict_sqlite(lambda table: SqliteDict(db_name, table, 'c', True)) diff --git a/lib/sqlitedict.py b/lib/sqlitedict.py index 6beb08e2..3d0082c5 100644 --- a/lib/sqlitedict.py +++ b/lib/sqlitedict.py @@ -109,7 +109,7 @@ class SqliteDict(DictClass): VALID_FLAGS = ['c', 'r', 'w', 'n'] def __init__(self, filename=None, tablename='unnamed', flag='c', - autocommit=False, journal_mode="DELETE", encode=encode, decode=decode, timeout=5, conn=None): + autocommit=False, journal_mode="DELETE", encode=encode, decode=decode, timeout=5): """ Initialize a thread-safe sqlite-backed dictionary. The dictionary will be a table `tablename` in database file `filename`. A single file (=database) @@ -174,7 +174,7 @@ class SqliteDict(DictClass): self.timeout = timeout logger.info("opening Sqlite table %r in %r" % (tablename, filename)) - self.conn = self._new_conn() if not conn else conn + self.conn = self._new_conn() if self.flag == 'r': if self.tablename not in SqliteDict.get_tablenames(self.filename): msg = 'Refusing to create a new table "%s" in read-only DB mode' % tablename