monkee.ch/SickGear
1
0
Fork 0
mirror of https://github.com/SickGear/SickGear.git synced 2024-12-18 16:53:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'feature/ChangeDepPP' into dev

Browse source
This commit is contained in:
JackDandy 2023-03-10 01:54:15 +00:00
commit 40badef803
4 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGES.md
View file

@ -8,6 +8,7 @@
* Change requirements for pure py3 * Change requirements for pure py3
* Change codebase cleanups * Change codebase cleanups
* Change improve perf by using generators with `any` * Change improve perf by using generators with `any`
* Change deprecate processEpisode used by nzbToMedia to advise how to configure API instead
[develop changelog] [develop changelog]

7
gui/slick/interfaces/default/inc_top.tmpl
View file

@ -395,6 +395,13 @@
</div> </div>
#end if #end if
## ##
#if $sickgear.MEMCACHE.get('DEPRECATE_PP_LEGACY')
<div style="background-color:#a00; margin-top:35px; padding:5px 5px 1px 5px">
<p>Mar 2020: The `<em><span style="color:#fff">nzbToMedia</em></span>` script began using the <em><span style="color:#fff">secure</em></span> API to process media</p>
<p>Mar 2023: To remove this red box, please follow this <a target="_blank" href="https://github.com/SickGear/SickGear/wiki/FAQ-nzbToMedia"><span style="color:#fff">guidance</span></a></p>
</div>
#end if
##
#set $items = [] #set $items = []
#try #try
#set void = $items.append($topmenu) #set void = $items.append($topmenu)

15
sickgear/webserve.py
View file

@ -3932,16 +3932,13 @@ class HomeProcessMedia(Home):
return self._generic_message('Postprocessing results', f'<pre>{result}</pre>') return self._generic_message('Postprocessing results', f'<pre>{result}</pre>')
# noinspection PyPep8Naming # noinspection PyPep8Naming
def processEpisode(self, dir_name=None, nzb_name=None, process_type=None, **kwargs): @staticmethod
""" legacy function name, stubbed but can _not_ be removed as this def processEpisode(**kwargs):
is potentially used in pp scripts located outside of SG path (need to verify this) """ legacy function name, stubbed and will be removed
""" """
kwargs['dir_name'] = dir_name or kwargs.pop('dir', None) logger.error('This endpoint is no longer to be used,'
kwargs['nzb_name'] = nzb_name or kwargs.pop('nzbName', None) ' nzbToMedia users please follow: https://github.com/SickGear/SickGear/wiki/FAQ-nzbToMedia')
kwargs['process_type'] = process_type or kwargs.pop('type', 'auto') sickgear.MEMCACHE['DEPRECATE_PP_LEGACY'] = True
kwargs['pp_version'] = kwargs.pop('ppVersion', '0')
return self.process_files(**kwargs)
class AddShows(Home): class AddShows(Home):

1
sickgear/webserveInit.py
View file

@ -216,7 +216,6 @@ class WebServer(threading.Thread):
# ---------------------------------------------------------------------------------------------------------- # ----------------------------------------------------------------------------------------------------------
# legacy deprecated Aug 2019 - NEVER remove as used in external scripts # legacy deprecated Aug 2019 - NEVER remove as used in external scripts
(r'%s/home/postprocess(/?.*)' % self.options['web_root'], webserve.HomeProcessMedia), (r'%s/home/postprocess(/?.*)' % self.options['web_root'], webserve.HomeProcessMedia),
(r'%s(/?update_watched_state_kodi/?)' % self.options['web_root'], webserve.NoXSRFHandler),
# regular catchall routes - keep here at the bottom # regular catchall routes - keep here at the bottom
(r'%s/home(/?.*)' % self.options['web_root'], webserve.Home), (r'%s/home(/?.*)' % self.options['web_root'], webserve.Home),
(r'%s/manage/(/?.*)' % self.options['web_root'], webserve.Manage), (r'%s/manage/(/?.*)' % self.options['web_root'], webserve.Manage),