diff --git a/bin/update-background.py b/bin/update-background.py index e72e599d..4b2ac197 100755 --- a/bin/update-background.py +++ b/bin/update-background.py @@ -32,23 +32,22 @@ if __name__ == "__main__": decode_responses=True) if r_serv.exists('ail:update_v1.5'): - if ail_version == 'v1.5': - onions_update_status = r_serv.get('v1.5:onions') - if onions_update_status is None: - update_file = os.path.join(os.environ['AIL_HOME'], 'update', 'v1.4', 'Update-ARDB_Onions.py') - process = subprocess.run(['python' ,update_file]) + onions_update_status = r_serv.get('v1.5:onions') + if onions_update_status is None: + update_file = os.path.join(os.environ['AIL_HOME'], 'update', 'v1.4', 'Update-ARDB_Onions.py') + process = subprocess.run(['python' ,update_file]) - metadata_update_status = r_serv.get('v1.5:metadata') - if metadata_update_status is None: - update_file = os.path.join(os.environ['AIL_HOME'], 'update', 'v1.4', 'Update-ARDB_Metadata.py') - process = subprocess.run(['python' ,update_file]) + metadata_update_status = r_serv.get('v1.5:metadata') + if metadata_update_status is None: + update_file = os.path.join(os.environ['AIL_HOME'], 'update', 'v1.4', 'Update-ARDB_Metadata.py') + process = subprocess.run(['python' ,update_file]) - tags_update_status = r_serv.get('v1.5:tags') - if tags_update_status is None: - update_file = os.path.join(os.environ['AIL_HOME'], 'update', 'v1.4', 'Update-ARDB_Tags.py') - process = subprocess.run(['python' ,update_file]) + tags_update_status = r_serv.get('v1.5:tags') + if tags_update_status is None: + update_file = os.path.join(os.environ['AIL_HOME'], 'update', 'v1.4', 'Update-ARDB_Tags.py') + process = subprocess.run(['python' ,update_file]) - tags_background_update_status = r_serv.get('v1.5:tags_background') - if tags_background_update_status is None: - update_file = os.path.join(os.environ['AIL_HOME'], 'update', 'v1.4', 'Update-ARDB_Tags_background.py') - process = subprocess.run(['python' ,update_file]) + tags_background_update_status = r_serv.get('v1.5:tags_background') + if tags_background_update_status is None: + update_file = os.path.join(os.environ['AIL_HOME'], 'update', 'v1.4', 'Update-ARDB_Tags_background.py') + process = subprocess.run(['python' ,update_file]) diff --git a/update/v1.4/Update-ARDB_Metadata.py b/update/v1.4/Update-ARDB_Metadata.py index 66462cbc..4fddb110 100755 --- a/update/v1.4/Update-ARDB_Metadata.py +++ b/update/v1.4/Update-ARDB_Metadata.py @@ -31,7 +31,6 @@ def update_hash_item(has_type): if r_serv_metadata.exists(hash_key): new_hash_key = hash_key.replace(PASTES_FOLDER, '', 1) res = r_serv_metadata.renamenx(hash_key, new_hash_key) - print(res) if res == 0: print('same key, double name: {}'.format(item_path)) # fusion @@ -106,7 +105,7 @@ if __name__ == '__main__': # update domain port domain = r_serv_metadata.hget(new_item_metadata, 'domain') if domain: - if domain[-3:] ?= ':80': + if domain[-3:] != ':80': r_serv_metadata.hset(new_item_metadata, 'domain', '{}:80'.format(domain)) super_father = r_serv_metadata.hget(new_item_metadata, 'super_father') if super_father: diff --git a/update/v1.4/Update-ARDB_Onions.py b/update/v1.4/Update-ARDB_Onions.py index 7dbd0550..5c249ba9 100755 --- a/update/v1.4/Update-ARDB_Onions.py +++ b/update/v1.4/Update-ARDB_Onions.py @@ -107,7 +107,11 @@ if __name__ == '__main__': print('onion_history:{}:{}'.format(onion_domain, date_history)) item_father = r_serv_onion.lrange('onion_history:{}:{}'.format(onion_domain, date_history), 0, 0) print('item_father: {}'.format(item_father)) - item_father = item_father[0] + try: + item_father = item_father[0] + except IndexError: + r_serv_onion.delete('onion_history:{}:{}'.format(onion_domain, date_history)) + continue #print(item_father) # delete old history r_serv_onion.delete('onion_history:{}:{}'.format(onion_domain, date_history)) diff --git a/update/v1.4/Update-ARDB_Tags.py b/update/v1.4/Update-ARDB_Tags.py index 2e100bf7..2f4ea4eb 100755 --- a/update/v1.4/Update-ARDB_Tags.py +++ b/update/v1.4/Update-ARDB_Tags.py @@ -85,7 +85,11 @@ if __name__ == '__main__': splitted_item_path = item_path.split('/') #print(tag) #print(item_path) - item_date = int( ''.join([splitted_item_path[-4], splitted_item_path[-3], splitted_item_path[-2]]) ) + try: + item_date = int( ''.join([splitted_item_path[-4], splitted_item_path[-3], splitted_item_path[-2]]) ) + except IndexError: + r_serv_tag.srem(tag, item_path) + continue # remove absolute path new_path = item_path.replace(PASTES_FOLDER, '', 1)