monkee.ch/SickGear
1
0
Fork 0
mirror of https://github.com/SickGear/SickGear.git synced 2024-11-22 04:45:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'main' into dev

Browse source
This commit is contained in:
JackDandy 2023-10-12 11:50:04 +01:00
commit 7771250103
3 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CHANGES.md
View file

@ -11,6 +11,11 @@
* Add support for Brotli compression * Add support for Brotli compression
### 3.30.4 (2023-10-12 11:50:00 UTC)
* Add metadata source attribution in footer
### 3.30.3 (2023-10-10 07:30:00 UTC) ### 3.30.3 (2023-10-10 07:30:00 UTC)
* Change bad anon redirect service for an open source service * Change bad anon redirect service for an open source service

5
gui/slick/interfaces/default/inc_bottom.tmpl
View file

@ -3,7 +3,7 @@
#import sickgear #import sickgear
#from sickgear import db #from sickgear import db
#from sickgear.common import Quality, SKIPPED, WANTED #from sickgear.common import Quality, SKIPPED, WANTED
#from sickgear.helpers import df #from sickgear.helpers import anon_url, df
#from sickgear.webserve import MainHandler #from sickgear.webserve import MainHandler
<% def sg_var(varname, default=False): return getattr(sickgear, varname, default) %>#slurp# <% def sg_var(varname, default=False): return getattr(sickgear, varname, default) %>#slurp#
<% def sg_str(varname, default=''): return getattr(sickgear, varname, default) %>#slurp# <% def sg_str(varname, default=''): return getattr(sickgear, varname, default) %>#slurp#
@ -97,11 +97,12 @@ if min_output:
<td style="text-align:left">$drive[0]</td> <td style="text-align:left">$drive[0]</td>
</tr> </tr>
#end for #end for
</tobdy> </tbody>
</table> </table>
</div> </div>
#end if #end if
#end if #end if
<p style="margin-top:6px">Metadata from <a href=<%= anon_url('https://thetvdb.com') %> rel="noreferrer" onclick="window.open(this.href, '_blank'); return false;">TheTVDB</a>, <a href=<%= anon_url('https://tvmaze.com') %> rel="noreferrer" onclick="window.open(this.href, '_blank'); return false;">TVmaze</a>, and <a href=<%= anon_url('https://tmdb.org') %> rel="noreferrer" onclick="window.open(this.href, '_blank'); return false;">TMDB</a>
</div> </div>
<script> <script>
var footerTimeUrl = '$localRoot/get-footer-time'; var footerTimeUrl = '$localRoot/get-footer-time';

2
sickgear/metadata/generic.py
View file

@ -1012,7 +1012,7 @@ class GenericMetadata(object):
): ):
# type: (...) -> Optional[bytes, List[AnyStr]] # type: (...) -> Optional[bytes, List[AnyStr]]
""" """
Gets an image URL from theTVDB.com, fanart.tv and TMDB.com, downloads it and returns the data. Gets an image URL from theTVDB.com, fanart.tv and TMDB.org, downloads it and returns the data.
If type is fanart, multiple image src urls are returned instead of a single data image. If type is fanart, multiple image src urls are returned instead of a single data image.
image_type: type of image to retrieve (currently supported: fanart, poster, banner, poster_thumb, banner_thumb) image_type: type of image to retrieve (currently supported: fanart, poster, banner, poster_thumb, banner_thumb)