OwlBurst/Ponysearch
1
0
Fork 0
forked from Ponysearch/Ponysearch
Code Pull requests Activity

[mod] templates: rename field for <iframe> URL to iframe_src

Browse source 
Rename result field data_src to iframe_src

Suggested-by: @dalf https://github.com/searxng/searxng/pull/882#issuecomment-1037997402
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
This commit is contained in:
Markus Heiser 2022-02-13 16:12:46 +01:00
parent f5e8cfade2
commit 7352c6bc79
17 changed files with 31 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
searx/engines/bandcamp.py
View file

@ -4,7 +4,7 @@ Bandcamp (Music)
@website https://bandcamp.com/
@provide-api no
@results HTML
@parse url, title, content, publishedDate, data_src, thumbnail
@parse url, title, content, publishedDate, iframe_src, thumbnail
"""
from urllib.parse import urlencode, urlparse, parse_qs
@ -27,7 +27,7 @@ paging = True
base_url = "https://bandcamp.com/"
search_string = search_string = 'search?{query}&page={page}'
data_src = "https://bandcamp.com/EmbeddedPlayer/{type}={result_id}/size=large/bgcol=ffffff/linkcol=0687f5/tracklist=false/artwork=small/transparent=true/"
iframe_src = "https://bandcamp.com/EmbeddedPlayer/{type}={result_id}/size=large/bgcol=ffffff/linkcol=0687f5/tracklist=false/artwork=small/transparent=true/"
def request(query, params):
@ -71,9 +71,9 @@ def response(resp):
if thumbnail:
new_result['thumbnail'] = thumbnail[0]
if "album" in result.classes:
new_result["data_src"] = data_src.format(type='album', result_id=result_id)
new_result["iframe_src"] = iframe_src.format(type='album', result_id=result_id)
elif "track" in result.classes:
new_result["data_src"] = data_src.format(type='track', result_id=result_id)
new_result["iframe_src"] = iframe_src.format(type='track', result_id=result_id)
results.append(new_result)
return results

2
searx/engines/dailymotion.py
View file

@ -70,7 +70,7 @@ def response(resp):
'title': title,
'content': content,
'publishedDate': publishedDate,
'data_src': "https://www.dailymotion.com/embed/video/" + res['id'],
'iframe_src': "https://www.dailymotion.com/embed/video/" + res['id'],
'thumbnail': thumbnail,
}
)

4
searx/engines/deezer.py
View file

@ -23,7 +23,7 @@ paging = True
# search-url
url = 'https://api.deezer.com/'
search_url = url + 'search?{query}&index={offset}'
data_src = "https://www.deezer.com/plugins/player?type=tracks&id={audioid}"
iframe_src = "https://www.deezer.com/plugins/player?type=tracks&id={audioid}"
# do search-request
def request(query, params):
@ -53,7 +53,7 @@ def response(resp):
# append result
results.append(
{'url': url, 'title': title, 'data_src': data_src.format(audioid=result['id']), 'content': content}
{'url': url, 'title': title, 'iframe_src': iframe_src.format(audioid=result['id']), 'content': content}
)
# return results

2
searx/engines/invidious.py
View file

@ -91,7 +91,7 @@ def response(resp):
"template": "videos.html",
"author": result.get("author"),
"publishedDate": publishedDate,
"data_src": resp.search_params['base_url'] + '/embed/' + videoid,
"iframe_src": resp.search_params['base_url'] + '/embed/' + videoid,
"thumbnail": thumbnail,
}
)

4
searx/engines/mixcloud.py
View file

@ -24,7 +24,7 @@ paging = True
# search-url
url = 'https://api.mixcloud.com/'
search_url = url + 'search/?{query}&type=cloudcast&limit=10&offset={offset}'
data_src = "https://www.mixcloud.com/widget/iframe/?feed={url}"
iframe_src = "https://www.mixcloud.com/widget/iframe/?feed={url}"
# do search-request
def request(query, params):
@ -53,7 +53,7 @@ def response(resp):
{
'url': url,
'title': title,
'data_src': data_src.format(url=url),
'iframe_src': iframe_src.format(url=url),
'publishedDate': publishedDate,
'content': content,
}

2
searx/engines/peertube.py
View file

@ -74,7 +74,7 @@ def response(resp):
"title": title,
"content": content,
"publishedDate": publishedDate,
"data_src": sanitized_url + res["embedPath"],
"iframe_src": sanitized_url + res["embedPath"],
"thumbnail": thumbnail,
}
)

2
searx/engines/sepiasearch.py
View file

@ -98,7 +98,7 @@ def response(resp):
'length': length,
'template': 'videos.html',
'publishedDate': publishedDate,
'data_src': result.get('embedUrl'),
'iframe_src': result.get('embedUrl'),
'thumbnail': thumbnail,
}
)

2
searx/engines/soundcloud.py
View file

@ -98,7 +98,7 @@ def response(resp):
'url': result['permalink_url'],
'title': title,
'publishedDate': publishedDate,
'data_src': "https://w.soundcloud.com/player/?url=" + uri,
'iframe_src': "https://w.soundcloud.com/player/?url=" + uri,
'content': content,
}
)

2
searx/engines/spotify.py
View file

@ -67,7 +67,7 @@ def response(resp):
{
'url': url,
'title': title,
'data_src': "https://embed.spotify.com/?uri=spotify:track:" + result['id'],
'iframe_src': "https://embed.spotify.com/?uri=spotify:track:" + result['id'],
'content': content,
}
)

2
searx/engines/vimeo.py
View file

@ -57,7 +57,7 @@ def response(resp):
'content': '',
'template': 'videos.html',
'publishedDate': publishedDate,
'data_src': "https://player.vimeo.com/video/" + videoid,
'iframe_src': "https://player.vimeo.com/video/" + videoid,
'thumbnail': thumbnail,
}
)

2
searx/engines/youtube_api.py
View file

@ -78,7 +78,7 @@ def response(resp):
'content': content,
'template': 'videos.html',
'publishedDate': publishedDate,
'data_src': "https://www.youtube-nocookie.com/embed/" + videoid,
'iframe_src': "https://www.youtube-nocookie.com/embed/" + videoid,
'thumbnail': thumbnail,
}
)

4
searx/engines/youtube_noapi.py
View file

@ -85,7 +85,7 @@ def parse_next_page_response(response_text):
'author': section['ownerText']['runs'][0]['text'],
'length': section['lengthText']['simpleText'],
'template': 'videos.html',
'data_src': 'https://www.youtube-nocookie.com/embed/' + section['videoId'],
'iframe_src': 'https://www.youtube-nocookie.com/embed/' + section['videoId'],
'thumbnail': section['thumbnail']['thumbnails'][-1]['url'],
}
)
@ -156,7 +156,7 @@ def parse_first_page_response(response_text):
'author': author,
'length': length,
'template': 'videos.html',
'data_src': 'https://www.youtube-nocookie.com/embed/' + videoid,
'iframe_src': 'https://www.youtube-nocookie.com/embed/' + videoid,
'thumbnail': thumbnail,
}
)

2
searx/plugins/hostname_replace.py
View file

@ -17,7 +17,7 @@ replacements = {re.compile(p): r for (p, r) in settings[plugin_id].items()} if p
logger = logger.getChild(plugin_id)
parsed = 'parsed_url'
_url_fields = ['data_src', 'audio_src']
_url_fields = ['iframe_src', 'audio_src']
def on_result(request, search, result):

6
searx/templates/oscar/result_templates/default.html
View file

@ -3,13 +3,13 @@
{{- result_header(result, favicons, loop.index) -}}
{{- result_sub_header(result, loop.index) -}}
{%- if result.data_src -%}
{%- if result.iframe_src -%}
<small> &bull; <a class="text-info btn-collapse collapsed cursor-pointer media-loader disabled_if_nojs" data-toggle="collapse" data-target="#result-media-{{ index }}" data-btn-text-collapsed="{{ _('show media') }}" data-btn-text-not-collapsed="{{ _('hide media') }}" aria-labelledby="result-{{loop.index}}">{{ icon('music') }} {{ _('show media') }}</a></small>
{%- endif -%}
{% if result.data_src -%}
{% if result.iframe_src -%}
<div id="result-media-{{ index }}" class="embedded-content invisible">
<iframe data-src="{{result.data_src}}" frameborder="0" scrolling="no" allowfullscreen></iframe>
<iframe data-src="{{result.iframe_src}}" frameborder="0" scrolling="no" allowfullscreen></iframe>
</div>
{%- endif -%}

6
searx/templates/oscar/result_templates/videos.html
View file

@ -3,13 +3,13 @@
{{- result_header(result, favicons, loop.index) -}}
{{- result_sub_header(result, loop.index) -}}
{%- if result.data_src -%}
{%- if result.iframe_src -%}
<small> &bull; <a class="text-info btn-collapse collapsed cursor-pointer media-loader disabled_if_nojs" data-toggle="collapse" data-target="#result-video-{{ index }}" data-btn-text-collapsed="{{ _('show video') }}" data-btn-text-not-collapsed="{{ _('hide video') }}" aria-labelledby="result-{{loop.index}}">{{ icon('film') }} {{ _('show video') }}</a></small>
{%- endif -%}
{% if result.data_src -%}
{% if result.iframe_src -%}
<div id="result-video-{{ index }}" class="embedded-video collapse">
<iframe data-src="{{result.data_src}}" width="540" height="304" frameborder="0" scrolling="no" allowfullscreen></iframe>
<iframe data-src="{{result.iframe_src}}" width="540" height="304" frameborder="0" scrolling="no" allowfullscreen></iframe>
</div>
{%- endif %}

6
searx/templates/simple/result_templates/default.html
View file

@ -2,7 +2,7 @@
{{ result_header(result, favicons, image_proxify) -}}
{{- result_sub_header(result) -}}
{% if result.data_src -%}
{% if result.iframe_src -%}
<p class="altlink"> &bull; <a class="btn-collapse collapsed media-loader disabled_if_nojs" data-target="#result-media-{{ index }}" data-btn-text-collapsed="{{ _('show media') }}" data-btn-text-not-collapsed="{{ _('hide media') }}">{{ icon('music-note') }} {{ _('show media') }}</a></p>
{%- endif %}
{%- if result.content %}
@ -15,9 +15,9 @@
</p>
{% endif -%}
{{- result_sub_footer(result, proxify) -}}
{% if result.data_src -%}
{% if result.iframe_src -%}
<div id="result-media-{{ index }}" class="embedded-content invisible">
<iframe data-src="{{result.data_src}}" frameborder="0" allowfullscreen></iframe>
<iframe data-src="{{result.iframe_src}}" frameborder="0" allowfullscreen></iframe>
</div>
{%- endif %}
{% if result.audio_src -%}

6
searx/templates/simple/result_templates/videos.html
View file

@ -2,7 +2,7 @@
{{ result_header(result, favicons, image_proxify) }}
{{ result_sub_header(result) }}
{% if result.data_src -%}
{% if result.iframe_src -%}
<p class="altlink"> &bull; <a class="btn-collapse collapsed media-loader disabled_if_nojs" data-target="#result-video-{{ index }}" data-btn-text-collapsed="{{ _('show video') }}" data-btn-text-not-collapsed="{{ _('hide video') }}">{{ icon('film-outline') }} {{ _('show video') }}</a></p>
{%- endif %}
{%- if result.content %}
@ -16,9 +16,9 @@
{% endif -%}
</p>
{{- result_sub_footer(result, proxify) -}}
{% if result.data_src -%}
{% if result.iframe_src -%}
<div id="result-video-{{ index }}" class="embedded-video invisible">
<iframe data-src="{{result.data_src}}" frameborder="0" allowfullscreen></iframe>
<iframe data-src="{{result.iframe_src}}" frameborder="0" allowfullscreen></iframe>
</div>
{%- endif %}
{{ result_footer(result) }}