diff --git a/backend/server/api.py b/backend/server/api.py index 5bd4d02..d1a2c88 100644 --- a/backend/server/api.py +++ b/backend/server/api.py @@ -15,15 +15,9 @@ from server.lib.xtream import XTream logging.basicConfig(format="%(levelname)s:%(message)s", level=logging.DEBUG) logger = logging.getLogger(__name__) -provider = XTream( - config.provider['server'], - config.provider['username'], - config.provider['password'] -) - -epg = EPGParser( - config.provider['epgurl'] -) +# epg = EPGParser( +# config.provider['epgurl'] +# ) app = FastAPI() origins = [ "https://dev-streams.fergl.ie:3000", @@ -43,10 +37,17 @@ app.add_middleware( ) -@app.get("/epg/{channel_id}") -async def get_channel_epg(channel_id): - listings = epg.get_listings(channel_id) - return listings +# @app.get("/epg/{channel_id}") +# async def get_channel_epg(channel_id): +# listings = epg.get_listings(channel_id) +# return listings + +def __get_provider(request): + return XTream( + config.provider['server'], + config.provider['username'], + config.provider['password'] + ) @app.get("/channels") diff --git a/hosting/docker-compose.yaml b/hosting/docker-compose.yaml index fa6e2ff..6b7292b 100644 --- a/hosting/docker-compose.yaml +++ b/hosting/docker-compose.yaml @@ -1,8 +1,8 @@ version: "3.3" services: backend: - image: fergalmoran/xtream-backend - container_name: "xtream-backend" + image: fergalmoran/xtreamium-backend + container_name: "xtreamium-backend" environment: - TZ=Europe/Dublin networks: @@ -12,13 +12,13 @@ services: - db labels: - "traefik.enable=true" - - "traefik.http.routers.xtream-backend.rule=Host(`api.streams.fergl.ie`)" - - "traefik.http.routers.xtream-backend.entrypoints=websecure" - - "traefik.http.routers.xtream-backend.tls.certresolver=noodles-resolver" - - "traefik.http.services.xtream-backend.loadbalancer.server.port=80" + - "traefik.http.routers.xtreamium-backend.rule=Host(`api.streams.fergl.ie`)" + - "traefik.http.routers.xtreamium-backend.entrypoints=websecure" + - "traefik.http.routers.xtreamium-backend.tls.certresolver=noodles-resolver" + - "traefik.http.services.xtreamium-backend.loadbalancer.server.port=80" frontend: - image: fergalmoran/xtream-frontend - container_name: "xtream-frontend" + image: fergalmoran/xtreamium-frontend + container_name: "xtreamium-frontend" environment: - TZ=Europe/Dublin networks: @@ -28,10 +28,10 @@ services: - db labels: - "traefik.enable=true" - - "traefik.http.routers.xtream-frontend.rule=Host(`streams.fergl.ie`)" - - "traefik.http.routers.xtream-frontend.entrypoints=websecure" - - "traefik.http.routers.xtream-frontend.tls.certresolver=noodles-resolver" - - "traefik.http.services.xtream-frontend.loadbalancer.server.port=80" + - "traefik.http.routers.xtreamium-frontend.rule=Host(`streams.fergl.ie`)" + - "traefik.http.routers.xtreamium-frontend.entrypoints=websecure" + - "traefik.http.routers.xtreamium-frontend.tls.certresolver=noodles-resolver" + - "traefik.http.services.xtreamium-frontend.loadbalancer.server.port=80" networks: traefik_proxy: