AIL/ail-framework
7
0
Fork 0
mirror of https://github.com/ail-project/ail-framework.git synced 2024-11-23 06:37:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: [i2p] remove github comparison

Browse source
This commit is contained in:
David Cruciani 2022-04-19 17:19:23 +02:00
parent 66a0efa3bd
commit a0f74403ef
2 changed files with 2 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
bin/packages/HiddenServices.py
View file

@ -56,14 +56,11 @@ class HiddenServices(object):
self.port = port self.port = port
self.tags = {} self.tags = {}
if type == 'onion' or type == 'regular': if type == 'onion' or type == 'regular' or type == 'i2p':
self.paste_directory = os.path.join(os.environ['AIL_HOME'], config_loader.get_config_str("Directories", "pastes")) self.paste_directory = os.path.join(os.environ['AIL_HOME'], config_loader.get_config_str("Directories", "pastes"))
self.paste_crawled_directory = os.path.join(self.paste_directory, config_loader.get_config_str("Directories", "crawled")) self.paste_crawled_directory = os.path.join(self.paste_directory, config_loader.get_config_str("Directories", "crawled"))
self.paste_crawled_directory_name = config_loader.get_config_str("Directories", "crawled") self.paste_crawled_directory_name = config_loader.get_config_str("Directories", "crawled")
self.screenshot_directory = config_loader.get_files_directory('screenshot') self.screenshot_directory = config_loader.get_files_directory('screenshot')
elif type == 'i2p':
self.paste_directory = os.path.join(os.environ['AIL_HOME'], config_loader.get_config_str("Directories", "crawled_screenshot"))
self.screenshot_directory = config_loader.get_files_directory('screenshot')
else: else:
## TODO: # FIXME: add error ## TODO: # FIXME: add error
pass pass

8
var/www/modules/hiddenServices/Flask_hiddenServices.py
View file

@ -37,7 +37,7 @@ hiddenServices = Blueprint('hiddenServices', __name__, template_folder='template
faup = Faup() faup = Faup()
list_types=['onion', 'i2p', 'regular'] list_types=['onion', 'i2p', 'regular']
dic_type_name={'onion':'Onion', 'i2p':'I2P', 'regular':'Website'} dic_type_name={'onion':'Onion', 'i2p':'i2p', 'regular':'Website'}
# ============ FUNCTIONS ============ # ============ FUNCTIONS ============
@ -426,15 +426,9 @@ def auto_crawler():
if start > nb_auto_i2p: if start > nb_auto_i2p:
auto_crawler_domain_i2p = [] auto_crawler_domain_i2p = []
elif stop > nb_auto_i2p: elif stop > nb_auto_i2p:
<<<<<<< Updated upstream
auto_crawler_domain_i2p = list(r_serv_onion.smembers('auto_crawler_url:onion'))[start:nb_auto_i2p]
else:
auto_crawler_domain_i2p = list(r_serv_onion.smembers('auto_crawler_url:onion'))[start:stop]
=======
auto_crawler_domain_i2p = list(r_serv_onion.smembers('auto_crawler_url:i2p'))[start:nb_auto_i2p] auto_crawler_domain_i2p = list(r_serv_onion.smembers('auto_crawler_url:i2p'))[start:nb_auto_i2p]
else: else:
auto_crawler_domain_i2p = list(r_serv_onion.smembers('auto_crawler_url:i2p'))[start:stop] auto_crawler_domain_i2p = list(r_serv_onion.smembers('auto_crawler_url:i2p'))[start:stop]
>>>>>>> Stashed changes
if start > nb_auto_regular: if start > nb_auto_regular:
auto_crawler_domain_regular = [] auto_crawler_domain_regular = []