amarillo/amarillo-core
5
0
Fork 0
Code Issues 17 Pull requests Packages Projects Releases Wiki Activity

Use /data for region and agency configuration
All checks were successful
Amarillo/amarillo-gitea/amarillo-core/pipeline/head This commit looks good
Details

Browse source
This commit is contained in:
Csaba 2024-04-05 14:28:51 +02:00
parent 6af3250bea
commit 66cc746937
5 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -145,6 +145,7 @@ data/gtfs/
data/grfs data/grfs
data/tmp data/tmp
data/users/** data/users/**
data/**
#these files are under app/static but they get copied to the outside directory on startup #these files are under app/static but they get copied to the outside directory on startup
logging.conf logging.conf

2
amarillo/routers/carpool.py
View file

@ -135,7 +135,7 @@ async def save_carpool(carpool, folder: str = 'data/carpool'):
async def assert_agency_exists(agency_id: str): async def assert_agency_exists(agency_id: str):
agency_exists = os.path.exists(f"conf/agency/{agency_id}.json") agency_exists = os.path.exists(f"data/agency/{agency_id}.json")
if not agency_exists: if not agency_exists:
raise HTTPException( raise HTTPException(
status_code=status.HTTP_404_NOT_FOUND, status_code=status.HTTP_404_NOT_FOUND,

3
amarillo/services/agencies.py
View file

@ -12,8 +12,7 @@ class AgencyService:
def __init__(self): def __init__(self):
self.agencies: Dict[str, Agency] = {} self.agencies: Dict[str, Agency] = {}
for agency_file_name in glob('data/agency/*.json'):
for agency_file_name in glob('conf/agency/*.json'):
with open(agency_file_name) as agency_file: with open(agency_file_name) as agency_file:
dict = json.load(agency_file) dict = json.load(agency_file)
agency = Agency(**dict) agency = Agency(**dict)

2
amarillo/services/config.py
View file

@ -7,6 +7,6 @@ class Config(BaseSettings):
ride2go_query_data: str ride2go_query_data: str
env: str = 'DEV' env: str = 'DEV'
graphhopper_base_url: str = 'https://api.mfdz.de/gh' graphhopper_base_url: str = 'https://api.mfdz.de/gh'
stop_sources_file: str = 'conf/stop_sources.json' stop_sources_file: str = 'data/stop_sources.json'
config = Config(_env_file='config', _env_file_encoding='utf-8') config = Config(_env_file='config', _env_file_encoding='utf-8')

3
amarillo/services/regions.py
View file

@ -9,8 +9,7 @@ class RegionService:
def __init__(self): def __init__(self):
self.regions: Dict[str, Region] = {} self.regions: Dict[str, Region] = {}
for region_file_name in glob('data/region/*.json'):
for region_file_name in glob('conf/region/*.json'):
with open(region_file_name) as region_file: with open(region_file_name) as region_file:
dict = json.load(region_file) dict = json.load(region_file)
region = Region(**dict) region = Region(**dict)