Browse Source

Only warn about _yenc when no SABYenc

pull/824/head
Safihre 8 years ago
parent
commit
9b4bd7a3f0
  1. 10
      SABnzbd.py
  2. 6
      interfaces/Config/templates/config.tmpl

10
SABnzbd.py

@ -432,11 +432,11 @@ def print_modules():
logging.info("SABYenc module (v%s)... found!", sabnzbd.constants.SABYENC_VERSION) logging.info("SABYenc module (v%s)... found!", sabnzbd.constants.SABYENC_VERSION)
else: else:
logging.error("SABYenc module... NOT found! Expecting v%s - https://sabnzbd.org/sabyenc", sabnzbd.constants.SABYENC_VERSION) logging.error("SABYenc module... NOT found! Expecting v%s - https://sabnzbd.org/sabyenc", sabnzbd.constants.SABYENC_VERSION)
# Only now we care about old-yEnc
if sabnzbd.decoder.HAVE_YENC: if sabnzbd.decoder.HAVE_YENC:
logging.info("_yenc module... found!") logging.info("_yenc module... found!")
else: else:
logging.warning(T('_yenc module... NOT found!')) logging.warning(T('_yenc module... NOT found!'))
if sabnzbd.HAVE_CRYPTOGRAPHY: if sabnzbd.HAVE_CRYPTOGRAPHY:
logging.info('Cryptography module (v%s)... found!', sabnzbd.HAVE_CRYPTOGRAPHY) logging.info('Cryptography module (v%s)... found!', sabnzbd.HAVE_CRYPTOGRAPHY)

6
interfaces/Config/templates/config.tmpl

@ -59,7 +59,7 @@
</td> </td>
</tr> </tr>
<!--#end if#--> <!--#end if#-->
<!--#if not $have_yenc#--> <!--#if not $have_yenc and not $have_sabyenc#-->
<tr> <tr>
<th scope="row">yEnc:</th> <th scope="row">yEnc:</th>
<td> <td>
@ -68,12 +68,12 @@
</td> </td>
</tr> </tr>
<!--#end if#--> <!--#end if#-->
<!--#if not $have_yenc#--> <!--#if not $have_sabyenc#-->
<tr> <tr>
<th scope="row">SABYenc:</th> <th scope="row">SABYenc:</th>
<td> <td>
<span class="label label-danger">$T('notAvailable')</span> <span class="label label-danger">$T('notAvailable')</span>
<a href="$helpuri$help_uri#no_yenc" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a> <a href="$helpuri$help_uri#no_sabyenc" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a>
</td> </td>
</tr> </tr>
<!--#end if#--> <!--#end if#-->

Loading…
Cancel
Save