Merge pull request #13 from jeanrhum/master

read mirrors conf path from env variable
This commit is contained in:
lanefu
2021-03-17 15:47:17 -04:00
committed by GitHub
2 changed files with 10 additions and 3 deletions

View File

@@ -17,8 +17,14 @@ from geolite2 import geolite2
from download_image_map import Parser
from mirror_list import Mirror
import os
mirror_path="mirrors.yaml"
if "ARMBIAN_MIRROR_CONF" in os.environ:
mirror_path=os.environ["ARMBIAN_MIRROR_CONF"]
mirror = Mirror()
#print("Mirrors conf file:",mirror_path)
mirror = Mirror(mirror_path)
if mirror.mode == "dl_map":
parser = Parser('userdata.csv')
DL_MAP = parser.parsed_data

View File

@@ -4,7 +4,8 @@ from ruamel.yaml import YAML
class Mirror():
def __init__(self):
def __init__(self,mirror_path='mirrors.yaml'):
self.mirror_path=mirror_path
self.load_mirrors()
self._list_position = dict()
self._list_max = dict()
@@ -22,7 +23,7 @@ class Mirror():
yaml.indent(mapping=2, sequence=4, offset=2)
yaml.preserve_quotes = True
with open('mirrors.yaml', 'r') as f:
with open(self.mirror_path, 'r') as f:
config = yaml.load(f)
self.mode = config['mode']
print("using mode: {}".format(self.mode))