diff --git a/origin/origin_web/__init__.py b/origin/origin_web/__init__.py index f35f5d5..b0d6bf0 100644 --- a/origin/origin_web/__init__.py +++ b/origin/origin_web/__init__.py @@ -1,6 +1,4 @@ -from .origin_api import Origin_API -from .origin_api_tools import Origin_API_Tools from .origin_html import Origin_HTML @@ -9,6 +7,4 @@ class fHDHR_Origin_Web(): def __init__(self, fhdhr): self.fhdhr = fhdhr - self.origin_api = Origin_API(fhdhr) - self.origin_api_tools = Origin_API_Tools(fhdhr) self.origin_html = Origin_HTML(fhdhr) diff --git a/origin/origin_web/origin_api.py b/origin/origin_web/origin_api.py deleted file mode 100644 index a23494e..0000000 --- a/origin/origin_web/origin_api.py +++ /dev/null @@ -1,16 +0,0 @@ - - -class Origin_API(): - endpoints = ["/api/origin"] - endpoint_name = "api_origin" - endpoint_methods = ["GET", "POST"] - - def __init__(self, fhdhr): - self.fhdhr = fhdhr - - def __call__(self, *args): - return self.get(*args) - - def get(self, *args): - - return "Success" diff --git a/origin/origin_web/origin_api_tools.py b/origin/origin_web/origin_api_tools.py deleted file mode 100644 index a68b779..0000000 --- a/origin/origin_web/origin_api_tools.py +++ /dev/null @@ -1,78 +0,0 @@ -from flask import Response, request, redirect -import urllib.parse -import json - - -class Origin_API_Tools(): - endpoints = ["/api/origin/tools"] - endpoint_name = "api_origin_tools" - endpoint_methods = ["GET", "POST"] - - def __init__(self, fhdhr): - self.fhdhr = fhdhr - - def __call__(self, *args): - return self.get(*args) - - def get(self, *args): - - method = request.args.get('method', default="get", type=str) - - redirect_url = request.args.get('redirect', default=None, type=str) - - if method == "channels": - - dma = request.args.get('dma', default=self.fhdhr.originwrapper.originservice.location["DMA"], type=str) - stations_url = 'https://api.locastnet.org/api/watch/epg/%s' % dma - - try: - stationsReq = self.fhdhr.web.session.get(stations_url) - stationsReq.raise_for_status() - stationsRes = stationsReq.json() - except self.fhdhr.web.exceptions.HTTPError as err: - self.fhdhr.logger.error('Error while getting stations: %s' % err) - stationsRes = [{"error": 'Error while getting stations: %s' % err, "listings": []}] - - filtered_json = [] - for station_item in stationsRes: - station_item["listings"] = [] - filtered_json.append(station_item) - - stations_json = json.dumps(filtered_json, indent=4) - - return Response(status=200, - response=stations_json, - mimetype='application/json') - - elif method == "zipcode": - - zipcode = request.args.get('zipcode', default=None, type=str) - if not zipcode: - if redirect_url: - return redirect(redirect_url + "?retmessage=" + urllib.parse.quote("%s Success" % method)) - else: - return "%s Success" % method - - status_url = 'https://api.locastnet.org/api/watch/dma/zip/%s' % zipcode - - try: - statusReq = self.fhdhr.web.session.get(status_url) - statusReq.raise_for_status() - statusRes = statusReq.json() - except self.fhdhr.web.exceptions.HTTPError as err: - self.fhdhr.logger.error('Error while getting zipcode status: %s' % err) - statusRes = [{"error": 'Error while getting zipcode status: %s' % err, "listings": []}] - - status_json = json.dumps(statusRes, indent=4) - - return Response(status=200, - response=status_json, - mimetype='application/json') - - else: - return "%s Invalid Method" % method - - if redirect_url: - return redirect(redirect_url + "?retmessage=" + urllib.parse.quote("%s Success" % method)) - else: - return "%s Success" % method diff --git a/origin/origin_web/origin_html.py b/origin/origin_web/origin_html.py index 1788cb1..484ce1f 100644 --- a/origin/origin_web/origin_html.py +++ b/origin/origin_web/origin_html.py @@ -1,9 +1,6 @@ from flask import request, render_template_string import pathlib from io import StringIO -import datetime - -from fHDHR.tools import humanized_time class Origin_HTML():