Skip to content

Commit 56d4f54

Browse files
committed
Support custom uri for bridgeBBCC format
1 parent 33f361d commit 56d4f54

2 files changed

Lines changed: 10 additions & 1 deletion

File tree

backend/flask/app/apis/exports.py

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ def parse_open_dccon_rel_path(data, url):
122122
def parse_bridge_bbcc_general(data, url, relpath):
123123
REGEX_DATA = r'dcConsData\s*=\s*\[(\s*({\s*[\s\S]*?}\s*)*)\s*,?\s*\]'
124124
REGEX_NAME = r'(name)(\s*:\s*")'
125+
REGEX_URI = r'(uri)(\s*:\s*")'
125126
REGEX_KEYWORDS = r'(keywords)(\s*:\s*\[)'
126127
REGEX_TAGS = r'(tags)(\s*:\s*\[)'
127128

@@ -131,6 +132,7 @@ def parse_bridge_bbcc_general(data, url, relpath):
131132

132133
dccons_jo = '[{elements}]'.format(elements=match.group(1))
133134
dccons_jo = re.sub(REGEX_NAME, r'"\1"\2', dccons_jo)
135+
dccons_jo = re.sub(REGEX_URI, r'"\1"\2', dccons_jo)
134136
dccons_jo = re.sub(REGEX_KEYWORDS, r'"\1"\2', dccons_jo)
135137
dccons_jo = re.sub(REGEX_TAGS, r'"\1"\2', dccons_jo)
136138

@@ -161,7 +163,13 @@ def parse_bridge_bbcc_general(data, url, relpath):
161163
if not isinstance(name, str):
162164
abort(500, 'Invalid data format: "name" on {index}th dccon must be string'.format(index=index + 1))
163165

164-
path = urljoin(url, relpath.format(name=name))
166+
if 'uri' in dccon:
167+
uri = dccon['uri']
168+
if not isinstance(uri, str):
169+
abort(500, 'Invalid data format: "uri" on {index}th dccon must be string'.format(index=index + 1))
170+
path = uri
171+
else:
172+
path = urljoin(url, relpath.format(name=name))
165173

166174
for keyword in keywords:
167175
if not isinstance(keyword, str):

settings.env.example

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ POSTGRES_PASSWORD=passwordpassworpasswopasswpasspaspap
33
TWITCH_EXTENSION_SECRET=asdf
44
TWITCH_EXTENSION_CLIENT_ID=asdf
55
TWITCH_EXTENSION_VERSION=0.0.1
6+
TWITCH_EXTENSION_OWNER_ID=0
67
IMGPROXY_PROTOCOL=http
78
IMGPROXY_HOSTNAME=localhost:8090
89
IMGPROXY_KEY=95dc3eea9d8ed20996234b783cae76751d9a1bac7e0132085d9c26fb28b338db7bb23b2e0f5e9a58c710c12b9a9121d3ed5eb2430b31f0d4fb054bcb964fa5f4

0 commit comments

Comments
 (0)