fix small issues with archive refroctoring
This commit is contained in:
+4
-4
@@ -88,15 +88,15 @@ class Archive:
|
||||
data = None # "raw" json data
|
||||
db_con = None
|
||||
|
||||
def __init__(self, archive_name, archive_dir_or_db_config):
|
||||
def __init__(self, archive_name, config):
|
||||
|
||||
if isinstance(archive_dir_or_db_config, str):
|
||||
if isinstance(config, str):
|
||||
# need a filename or a dir name....
|
||||
print("reading archive " + archive_name, end='')
|
||||
archive_dir = archive_dir_or_db_config
|
||||
archive_dir = config
|
||||
(self.data, self.archive_name) = load_from_file(archive_name, archive_name, archive_dir)
|
||||
print(" - done.")
|
||||
elif isinstance(archive_dir_or_db_config, dict):
|
||||
elif isinstance(config, dict):
|
||||
self.archive_name = archive_name
|
||||
self.db_con = connect_db(config['database'], config['host'], config['user'], config['password'])
|
||||
|
||||
|
||||
Reference in New Issue
Block a user