remove last remnants of Paths, now only 1 directory per path AND created a new db-container subdir that takes the latest postgres image and adds a crontab / uses cron to run a bkup_users.sh script that dumps the person, refimg and linkage table so that if we ever blow the DB away, we dont lose the users

This commit is contained in:
2022-09-17 22:40:50 +10:00
parent 19bd4285e1
commit 71ec54807a
7 changed files with 36 additions and 40 deletions

View File

@@ -371,13 +371,11 @@ def GetEntries( OPT ):
paths = []
if OPT.path_type == 'Storage':
paths = SettingsSPath()
path = SettingsSPath()
elif OPT.path_type == 'Import':
paths = SettingsIPath()
path = SettingsIPath()
elif OPT.path_type == 'Bin':
paths.append(SettingsRBPath())
num_paths = len(paths)
path = SettingsRBPath()
num_entries=0
path_cnt=1
@@ -388,20 +386,13 @@ def GetEntries( OPT ):
update_last_eid = True
else:
update_last_eid = False
for path in paths:
if not os.path.exists(path):
continue
prefix = SymlinkName(OPT.path_type,path,path+'/')
if OPT.folders:
tmp_ents, tmp_num_ents = GetEntriesInFolderView( OPT, prefix )
else:
tmp_ents, tmp_num_ents = GetEntriesInFlatView( OPT, prefix )
entries += tmp_ents
num_entries += tmp_num_ents
# if we have another path, keep adding num_etnries, and last_eid is the last path, not this one, so reset to 0
if update_last_eid and path_cnt < num_paths:
OPT.last_eid=0
path_cnt += 1
prefix = SymlinkName(OPT.path_type,path,path+'/')
if OPT.folders:
tmp_ents, tmp_num_ents = GetEntriesInFolderView( OPT, prefix )
else:
tmp_ents, tmp_num_ents = GetEntriesInFlatView( OPT, prefix )
entries += tmp_ents
num_entries += tmp_num_ents
if update_last_eid:
# find pref... via path_type if we are here