diff --git a/CHANGES.md b/CHANGES.md index e77ccf1..5f1fb53 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,5 +1,25 @@ ### 0.21.0 (2019-xx-xx xx:xx:xx UTC) +* Add ability to use multiple SG apikeys +* Add UI for multiple apikeys to config/General/Web Interface +* Add jquery-qrcode 0.17.0 +* Change add apikey name to ERROR log messages +* Change add logging of errors from api +* Change add remote ip to error message +* Change add print command name for api in debug log +* Change add warning message to log if old Sick-Beard api call is used +* Change add an api call mapping helper for name changed functions (for printed warnings) +* Change ui typo in apiBuilder +* Fix display of fanart in apibuilder +* Add help command to apiBuilder and fix help call +* Fix add shows via api +* Change fix sg.searchqueue output +* Add missing sg.show.delete parameter "full" +* Add missing sg.setdefaults and sg.shutdown methods +* Change increase api version because missing sg.* methods are added +* Change add some extra checks for Sick-Beard call add (existing) show +* Change patch imdbpie to add cachedir folder and set imdbpie cachedir in SG +* Fix force search return values * Update attr 19.2.0.dev0 (154b4e5) to 19.2.0.dev0 (daf2bc8) * Update Beautiful Soup 4.7.1 (r497) to 4.8.0 (r526) * Update bencode to 2.1.0 (e8290df) diff --git a/HACKS.txt b/HACKS.txt index 94db0ec..cf446d2 100644 --- a/HACKS.txt +++ b/HACKS.txt @@ -9,6 +9,7 @@ Libs with customisations... /lib/hachoir_metadata/riff.py /lib/hachoir_parser/guess.py /lib/hachoir_parser/misc/torrent.py +/lib/imdbpie /lib/lockfile/mkdirlockfile.py /lib/rtorrent /lib/scandir/scandir.py diff --git a/gui/slick/css/dark.css b/gui/slick/css/dark.css index f2c5c7f..0f57aa5 100644 --- a/gui/slick/css/dark.css +++ b/gui/slick/css/dark.css @@ -651,10 +651,12 @@ config*.tmpl border-bottom:1px dotted #666 } +.qr-btn .glyphicon-qrcode, .component-group-desc p{ color:#ddd } +.dotted-surround, .test-notification{ border:1px dotted #ccc } diff --git a/gui/slick/css/light.css b/gui/slick/css/light.css index 20f25f3..3fdf63e 100644 --- a/gui/slick/css/light.css +++ b/gui/slick/css/light.css @@ -641,10 +641,12 @@ config*.tmpl border-bottom:1px dotted #666 } +.qr-btn .glyphicon-qrcode, .component-group-desc p{ color:#666 } +.dotted-surround, .test-notification{ border:1px dotted #ccc } diff --git a/gui/slick/css/style.css b/gui/slick/css/style.css index b4744ea..216abce 100644 --- a/gui/slick/css/style.css +++ b/gui/slick/css/style.css @@ -3029,6 +3029,7 @@ select .selected:before{ margin:0 !important } +.dotted-surround, .test-notification{ padding:5px; margin-bottom:10px; @@ -3151,6 +3152,18 @@ select .selected:before{ background-position:-104px 0 } +#api-keys > div{display:inline-block} +#api-keys span{float:left} +#api-keys span, #generate-result{line-height:22px} +#api-keys .api-key{width:235px} +#api-keys .app-name{width:135px} +.qr-btn{margin-right:6px} +.qr-btn .glyphicon-qrcode{cursor:pointer;font-size:15px} +.apikey-qr-dlg .qr-title{padding:0 25px 5px 25px;text-align:right} +.apikey-qr-dlg .qr-title em{color:#999;font-weight:bolder} +.apikey-qr-dlg .qr-title span{color:#333} +.apikey-qr-dlg .qr-body{padding:25px 25px 0} + /* ======================================================================= config_postProcessing.tmpl ========================================================================== */ diff --git a/gui/slick/interfaces/default/config_general.tmpl b/gui/slick/interfaces/default/config_general.tmpl index a90d84c..d609894 100644 --- a/gui/slick/interfaces/default/config_general.tmpl +++ b/gui/slick/interfaces/default/config_general.tmpl @@ -496,7 +496,7 @@ API enable -

permit the use of the SickGear (and Legacy SickBeard) API

+

permit the use of the SickGear (and legacy SickBeard) API

 @@ -505,10 +505,22 @@ diff --git a/gui/slick/js/config.js b/gui/slick/js/config.js index a0f3780..23d8c66 100644 --- a/gui/slick/js/config.js +++ b/gui/slick/js/config.js @@ -232,16 +232,100 @@ $(document).ready(function () { } }); - $('#api_key').click(function () {$('#api_key').select()}); - $('#generate_new_apikey').click(function () { - $.get(sbRoot + '/config/general/generateKey', + var addQR = function(){ + if (0 < $('a[rel=qr]').length) { + var fancy = sbRoot + '/js/fancybox/jquery.fancybox'; + $.getScript(fancy + '.js', function () { + var head$ = $('head'); + if (!head$.find('link[href*="fancybox"]').length){ + head$.append(''); + !function(t,r){"object"==typeof exports&&"object"==typeof module?module.exports=r():"function"==typeof define&&define.amd?define("jquery-qrcode",[],r):"object"==typeof exports?exports["jquery-qrcode"]=r():t["jquery-qrcode"]=r()}("undefined"!=typeof self?self:this,function(){return function(e){var n={};function o(t){if(n[t])return n[t].exports;var r=n[t]={i:t,l:!1,exports:{}};return e[t].call(r.exports,r,r.exports,o),r.l=!0,r.exports}return o.m=e,o.c=n,o.d=function(t,r,e){o.o(t,r)||Object.defineProperty(t,r,{enumerable:!0,get:e})},o.r=function(t){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(t,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(t,"__esModule",{value:!0})},o.t=function(r,t){if(1&t&&(r=o(r)),8&t)return r;if(4&t&&"object"==typeof r&&r&&r.__esModule)return r;var e=Object.create(null);if(o.r(e),Object.defineProperty(e,"default",{enumerable:!0,value:r}),2&t&&"string"!=typeof r)for(var n in r)o.d(e,n,function(t){return r[t]}.bind(null,n));return e},o.n=function(t){var r=t&&t.__esModule?function(){return t.default}:function(){return t};return o.d(r,"a",r),r},o.o=function(t,r){return Object.prototype.hasOwnProperty.call(t,r)},o.p="",o(o.s=0)}([function(v,t,p){(function(t){function c(t){return t&&"string"==typeof t.tagName&&"IMG"===t.tagName.toUpperCase()}function a(t,r,e,n){var o={},i=p(2);i.stringToBytes=i.stringToBytesFuncs["UTF-8"];var a=i(e,r);a.addData(t),a.make(),n=n||0;var u=a.getModuleCount(),s=u+2*n;return o.text=t,o.level=r,o.version=e,o.module_count=s,o.is_dark=function(t,r){return r-=n,0<=(t-=n)&&t")[0].getContext("2d");i.font=o;var a=i.measureText(e.label).width,u=e.mSize,f=a/n,c=(1-f)*e.mPosX,l=(1-u)*e.mPosY,g=c+f,s=l+u;1===e.mode?t.add_blank(0,l-.01,n,s+.01):t.add_blank(c-.01,l-.01,.01+g,s+.01),r.fillStyle=e.fontcolor,r.font=o,r.fillText(e.label,c*n,l*n+.75*e.mSize*n)}(t,r,e):!c(e.image)||3!==n&&4!==n||function(t,r,e){var n=e.size,o=e.image.naturalWidth||1,i=e.image.naturalHeight||1,a=e.mSize,u=a*o/i,f=(1-u)*e.mPosX,c=(1-a)*e.mPosY,l=f+u,g=c+a;3===e.mode?t.add_blank(0,c-.01,n,g+.01):t.add_blank(f-.01,c-.01,.01+l,g+.01),r.drawImage(e.image,f*n,c*n,u*n,a*n)}(t,r,e)}function l(t,r,e,n,o,i,a,u){t.is_dark(a,u)&&r.rect(n,o,i,i)}function g(t,r,e,n,o,i,a,u){var f=t.is_dark,c=n+i,l=o+i,g=e.radius*i,s=a-1,h=a+1,d=u-1,v=u+1,p=f(a,u),w=f(s,d),y=f(s,u),m=f(s,v),b=f(a,v),k=f(h,v),C=f(h,u),B=f(h,d),x=f(a,d);p?function(t,r,e,n,o,i,a,u,f,c){a?t.moveTo(r+i,e):t.moveTo(r,e),u?(t.lineTo(n-i,e),t.arcTo(n,e,n,o,i)):t.lineTo(n,e),f?(t.lineTo(n,o-i),t.arcTo(n,o,r,o,i)):t.lineTo(n,o),c?(t.lineTo(r+i,o),t.arcTo(r,o,r,e,i)):t.lineTo(r,o),a?(t.lineTo(r,e+i),t.arcTo(r,e,n,e,i)):t.lineTo(r,e)}(r,n,o,c,l,g,!y&&!x,!y&&!b,!C&&!b,!C&&!x):function(t,r,e,n,o,i,a,u,f,c){a&&(t.moveTo(r+i,e),t.lineTo(r,e),t.lineTo(r,e+i),t.arcTo(r,e,r+i,e,i)),u&&(t.moveTo(n-i,e),t.lineTo(n,e),t.lineTo(n,e+i),t.arcTo(n,e,n-i,e,i)),f&&(t.moveTo(n-i,o),t.lineTo(n,o),t.lineTo(n,o-i),t.arcTo(n,o,n-i,o,i)),c&&(t.moveTo(r+i,o),t.lineTo(r,o),t.lineTo(r,o-i),t.arcTo(r,o,r+i,o,i))}(r,n,o,c,l,g,y&&x&&w,y&&b&&m,C&&b&&k,C&&x&&B)}function n(t,r){var e=h(r.text,r.ecLevel,r.minVersion,r.maxVersion,r.quiet);if(!e)return null;var n=d(t).data("qrcode",e),o=n[0].getContext("2d");return i(e,o,r),function(t,r,e){var n,o,i=t.module_count,a=e.size/i,u=l;for(0").attr("width",t.size).attr("height",t.size);return n(r,t)}function o(t){return f&&"canvas"===t.render?r(t):f&&"image"===t.render?function(t){return d("").attr("src",r(t)[0].toDataURL("image/png"))}(t):function(t){var r=h(t.text,t.ecLevel,t.minVersion,t.maxVersion,t.quiet);if(!r)return null;var e,n,o=t.size,i=t.background,a=Math.floor,u=r.module_count,f=a(o/u),c=a(.5*(o-f*u)),l={position:"relative",left:0,top:0,padding:0,margin:0,width:o,height:o},g={position:"absolute",padding:0,margin:0,width:f,height:f,"background-color":t.fill},s=d("
").data("qrcode",r).css(l);for(i&&s.css("background-color",i),e=0;e").css(g).css({left:c+n*f,top:c+e*f}).appendTo(s);return s}(t)}var e,u=t.window,d=u.jQuery,f=!(!(e=u.document.createElement("canvas")).getContext||!e.getContext("2d")),s={render:"canvas",minVersion:1,maxVersion:40,ecLevel:"L",left:0,top:0,size:200,fill:"#000",background:"#fff",text:"no text",radius:0,quiet:0,mode:0,mSize:.1,mPosX:.5,mPosY:.5,label:"no label",fontname:"sans",fontcolor:"#000",image:null};d.fn.qrcode=v.exports=function(t){var e=d.extend({},s,t);return this.each(function(t,r){"canvas"===r.nodeName.toLowerCase()?n(r,e):d(r).append(o(e))})}}).call(this,p(1))},function(t,r){var e;e=function(){return this}();try{e=e||new Function("return this")()}catch(t){"object"==typeof window&&(e=window)}t.exports=e},function(t,r,e){var n,o,i,a=function(){function i(t,r){function a(t,r){l=function(t){for(var r=new Array(t),e=0;e>e&1);l[Math.floor(e/3)][e%3+g-8-3]=n}for(e=0;e<18;e+=1){n=!t&&1==(r>>e&1);l[e%3+g-8-3][Math.floor(e/3)]=n}},d=function(t,r){for(var e=f<<3|r,n=y.getBCHTypeInfo(e),o=0;o<15;o+=1){var i=!t&&1==(n>>o&1);o<6?l[o][8]=i:o<8?l[o+1][8]=i:l[g-15+o][8]=i}for(o=0;o<15;o+=1){i=!t&&1==(n>>o&1);o<8?l[8][g-o-1]=i:o<9?l[8][15-o-1+1]=i:l[8][15-o-1]=i}l[g-8][8]=!t},v=function(t,r){for(var e=-1,n=g-1,o=7,i=0,a=y.getMaskFunction(r),u=g-1;0>>o&1)),a(n,u-f)&&(c=!c),l[n][u-f]=c,-1==(o-=1)&&(i+=1,o=7)}if((n+=e)<0||g<=n){n-=e,e=-e;break}}},p=function(t,r,e){for(var n=C.getRSBlocks(t,r),o=B(),i=0;i8*u)throw"code length overflow. ("+o.getLengthInBits()+">"+8*u+")";for(o.getLengthInBits()+4<=8*u&&o.put(0,4);o.getLengthInBits()%8!=0;)o.putBit(!1);for(;!(o.getLengthInBits()>=8*u||(o.put(236,8),o.getLengthInBits()>=8*u));)o.put(17,8);return function(t,r){for(var e=0,n=0,o=0,i=new Array(r.length),a=new Array(r.length),u=0;u',e+="";for(var n=0;n";for(var o=0;o';e+=""}return e+="",e+=""},h.createSvgTag=function(t,r){var e={};"object"==typeof t&&(t=(e=t).cellSize,r=e.margin),t=t||2,r=void 0===r?4*t:r;var n,o,i,a,u=h.getModuleCount()*t+2*r,f="";for(a="l"+t+",0 0,"+t+" -"+t+",0 0,-"+t+"z ",f+='>>8),r.push(255&o)):r.push(a)}}return r}};var a=1,u=2,o=4,f=8,w={L:1,M:0,Q:3,H:2},n=0,c=1,l=2,g=3,s=4,h=5,d=6,v=7,y=function(){function e(t){for(var r=0;0!=t;)r+=1,t>>>=1;return r}var r=[[],[6,18],[6,22],[6,26],[6,30],[6,34],[6,22,38],[6,24,42],[6,26,46],[6,28,50],[6,30,54],[6,32,58],[6,34,62],[6,26,46,66],[6,26,48,70],[6,26,50,74],[6,30,54,78],[6,30,56,82],[6,30,58,86],[6,34,62,90],[6,28,50,72,94],[6,26,50,74,98],[6,30,54,78,102],[6,28,54,80,106],[6,32,58,84,110],[6,30,58,86,114],[6,34,62,90,118],[6,26,50,74,98,122],[6,30,54,78,102,126],[6,26,52,78,104,130],[6,30,56,82,108,134],[6,34,60,86,112,138],[6,30,58,86,114,142],[6,34,62,90,118,146],[6,30,54,78,102,126,150],[6,24,50,76,102,128,154],[6,28,54,80,106,132,158],[6,32,58,84,110,136,162],[6,26,54,82,110,138,166],[6,30,58,86,114,142,170]],t={};return t.getBCHTypeInfo=function(t){for(var r=t<<10;0<=e(r)-e(1335);)r^=1335<>>8)},writeBytes:function(t,r,e){r=r||0,e=e||t.length;for(var n=0;n>>7-t%8&1)},put:function(t,r){for(var e=0;e>>r-e-1&1))},getLengthInBits:function(){return n},putBit:function(t){var r=Math.floor(n/8);e.length<=r&&e.push(0),t&&(e[r]|=128>>>n%8),n+=1}};return o},x=function(t){var r=a,n=t,e={getMode:function(){return r},getLength:function(t){return n.length},write:function(t){for(var r=n,e=0;e+2>>8&255)+(255&n),t.put(n,13),e+=2}if(e=e.length){if(0==i)return-1;throw"unexpected end of file./"+i}var t=e.charAt(n);if(n+=1,"="==t)return i=0,-1;t.match(/^\s$/)||(o=o<<6|a(t.charCodeAt(0)),i+=6)}var r=o>>>i-8&255;return i-=8,r}},a=function(t){if(65<=t&&t<=90)return t-65;if(97<=t&&t<=122)return t-97+26;if(48<=t&&t<=57)return t-48+52;if(43==t)return 62;if(47==t)return 63;throw"c:"+t};return r},L=function(t,r,e){for(var n=function(t,r){var n=t,o=r,g=new Array(t*r),e={setPixel:function(t,r,e){g[r*n+t]=e},write:function(t){t.writeString("GIF87a"),t.writeShort(n),t.writeShort(o),t.writeByte(128),t.writeByte(0),t.writeByte(0),t.writeByte(0),t.writeByte(0),t.writeByte(0),t.writeByte(255),t.writeByte(255),t.writeByte(255),t.writeString(","),t.writeShort(0),t.writeShort(0),t.writeShort(n),t.writeShort(o),t.writeByte(0);var r=i(2);t.writeByte(2);for(var e=0;255>>r!=0)throw"length over";for(;8<=n+r;)e.writeByte(255&(t<>>=8-n,n=o=0;o|=t<>>o-6),o-=6},t.flush=function(){if(0>6,128|63&n):n<55296||57344<=n?r.push(224|n>>12,128|n>>6&63,128|63&n):(e++,n=65536+((1023&n)<<10|1023&t.charCodeAt(e)),r.push(240|n>>18,128|n>>12&63,128|n>>6&63,128|63&n))}return r}(t)},o=[],void 0===(i="function"==typeof(n=function(){return a})?n.apply(r,o):n)||(t.exports=i)}])}); + } + $('a[rel=qr]').fancybox({ + padding: 0, + minWidth: 350, + minHeight: 350, + helpers: { + title: null, + overlay: { + locked: false, + css: {'background': 'rgba(0, 0, 0, 0.4)'} + } + }, + wrapCSS: 'apikey-qr-dlg', + afterLoad: function() { + var row = $(this.element).closest('div'); + this.content = '
App name: ' + row.find('.app-name').text() + '
'; + this.inner.prepend('
'); + $('.apikey-qr-dlg').find('.qr-body').html('').qrcode( + {render: 'image', fill: '#333', radius: 0.5, minVersion: 6, background: null, size: 300, text: row.find('.api-key').text() }); + } + }); + }); + } + }; + addQR(); + var generateApiKey = function(){ + var appName$ = $('#app-name'); + appName$.removeClass('warning'); + $('#generate-result').html(' ').removeClass('dotted-surround'); + $.getJSON(sbRoot + '/config/general/create_apikey', {app_name: appName$.val()}, function (data) { - if (data.error != undefined) { + if (undefined === data.error) { + var appInput$ = $('#app-name'); + if (undefined === data.added) { + appInput$.addClass('warning'); + $('#generate-result').html(data.result).addClass('dotted-surround'); + } else { + $('#tip-addkeys').hide(); + var newRow$ = $('#api-keys') + .append($('.new-key').first().clone(!0)) + .find('.new-key').last().removeClass('new-key'); + newRow$.find('.api-key').text(data.added); + newRow$.find('.app-name').text(appInput$.val()); + newRow$.find('a').attr('rel', 'qr'); + appInput$.val(''); + newRow$.show(); + addQR(); + } + } else { alert(data.error); - return; } - $('#api_key').val(data); }); + }; + $('#app-name').keypress(function(ev){ + if (13 === ev.which) { + ev.preventDefault(); + generateApiKey(); + return !1; + } + }); + $('#generate-api-key').on('click', generateApiKey); + $('.revoke').on('click', function(){ + $('#app-name').removeClass('warning'); + $('#generate-result').html(' ').removeClass('dotted-surround'); + var row$ = $(this).closest('div'), appName = row$.find('.app-name').text(); + if (confirm('Revoke "' + appName + '" apikey?')) { + $.getJSON(sbRoot + '/config/general/revoke_apikey', { + app_name: appName, + api_key: row$.find('.api-key').text()}, + function (data) { + if (undefined === data.error) { + if (undefined === data.removed) { + $('#app-name').addClass('warning'); + $('#generate-result').html(data.result).addClass('dotted-surround'); + } else { + row$.remove(); + if (!$('#api-keys').find('div:visible').length) { + $('#tip-addkeys').show(); + } + } + } else { + alert(data.error); + } + } + ); + } }); $('#branchCheckout').click(function () { diff --git a/sickbeard/__init__.py b/sickbeard/__init__.py index 080c3aa..0473974 100755 --- a/sickbeard/__init__.py +++ b/sickbeard/__init__.py @@ -818,7 +818,7 @@ def init_stage_1(console_logging): if not API_KEYS: tmp_api_key = check_setting_str(CFG, 'General', 'api_key', None) if None is not tmp_api_key: - API_KEYS = [['app-name', tmp_api_key]] + API_KEYS = [['app name (old key)', tmp_api_key]] DEBUG = bool(check_setting_int(CFG, 'General', 'debug', 0)) diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py index 0090e83..88f0630 100644 --- a/sickbeard/webserve.py +++ b/sickbeard/webserve.py @@ -5854,6 +5854,8 @@ class ConfigGeneral(Config): t.indexers = dict([(i, sickbeard.indexerApi().indexers[i]) for i in sickbeard.indexerApi().indexers if sickbeard.indexerApi(i).config['active']]) t.request_host = escape.xhtml_escape(self.request.host_name) + api_keys = '|||'.join([':::'.join(a) for a in sickbeard.API_KEYS]) + t.api_keys = api_keys and sickbeard.API_KEYS or [] return t.respond() def saveRootDirs(self, rootDirString=None): @@ -5912,44 +5914,60 @@ class ConfigGeneral(Config): m.update(r) # Return a hex digest of the md5, eg 49f68a5c8493ec2c0bf489821c21fc3b - logger.log(u'New API generated') + app_name = kwargs.get('app_name') + app_name = '' if not app_name else ' for [%s]' % app_name + logger.log(u'New apikey generated%s' % app_name) return m.hexdigest() - @staticmethod - def api_ui_func(name, key, delete=False): - # type: (AnyStr, AnyStr, bool) -> AnyStr - if not name: - return 'No Name given' - if 32 != len(key): - return 'key not valid' - if delete: - if key in [k[1] for k in sickbeard.API_KEYS]: - sickbeard.API_KEYS = [ak for ak in sickbeard.API_KEYS if key != ak[1]] - logger.log('APIKEY: [%s] removed' % name, logger.DEBUG) - return 'KEY removed' - else: - return 'KEY doesn\'t exists' + def create_apikey(self, app_name): + result = dict() + if not app_name: + result['result'] = 'Failed: no name given' + elif app_name in [k[0] for k in sickbeard.API_KEYS if k[0]]: + result['result'] = 'Failed: name is not unique' else: - if key in [k[1] for k in sickbeard.API_KEYS]: - return 'APIKEY already exists' - elif name in [k[0] for k in sickbeard.API_KEYS]: - return 'Key name is not unique' + api_key = self.generateKey(app_name=app_name) + if api_key in [k[1] for k in sickbeard.API_KEYS if k[0]]: + result['result'] = 'Failed: apikey already exists, try again' else: - sickbeard.API_KEYS.append([name, key]) - logger.log('APIKEY: [%s] added' % name, logger.DEBUG) - return 'APIKEY added' + sickbeard.API_KEYS.append([app_name, api_key]) + logger.log('Created apikey for [%s]' % app_name, logger.DEBUG) + result.update(dict(result='Success: apikey added', added=api_key)) + sickbeard.USE_API = 1 + sickbeard.save_config() + ui.notifications.message('Configuration Saved', ek.ek(os.path.join, sickbeard.CONFIG_FILE)) + + return json.dumps(result) + + @staticmethod + def revoke_apikey(app_name, api_key): + result = dict() + if not app_name: + result['result'] = 'Failed: no name given' + elif not api_key or 32 != len(re.sub('(?i)[^0-9a-f]', '', api_key)): + result['result'] = 'Failed: key not valid' + elif api_key not in [k[1] for k in sickbeard.API_KEYS if k[0]]: + result['result'] = 'Failed: key doesn\'t exist' + else: + sickbeard.API_KEYS = [ak for ak in sickbeard.API_KEYS if ak[0] and api_key != ak[1]] + logger.log('Revoked [%s] apikey [%s]' % (app_name, api_key), logger.DEBUG) + result.update(dict(result='Success: apikey removed', removed=True)) + sickbeard.save_config() + ui.notifications.message('Configuration Saved', ek.ek(os.path.join, sickbeard.CONFIG_FILE)) + + return json.dumps(result) def saveGeneral(self, log_dir=None, web_port=None, web_log=None, encryption_version=None, web_ipv6=None, web_ipv64=None, update_shows_on_start=None, show_update_hour=None, trash_remove_show=None, trash_rotate_logs=None, update_frequency=None, launch_browser=None, web_username=None, - use_api=None, api_keys=None, indexer_default=None, timezone_display=None, cpu_preset=None, file_logging_preset=None, + use_api=None, indexer_default=None, timezone_display=None, cpu_preset=None, file_logging_preset=None, web_password=None, version_notify=None, enable_https=None, https_cert=None, https_key=None, handle_reverse_proxy=None, send_security_headers=None, allowed_hosts=None, home_search_focus=None, display_freespace=None, sort_article=None, auto_update=None, notify_on_update=None, proxy_setting=None, proxy_indexers=None, anon_redirect=None, git_path=None, git_remote=None, calendar_unprotected=None, fuzzy_dating=None, trim_zero=None, date_preset=None, date_preset_na=None, time_preset=None, indexer_timeout=None, rootDir=None, show_dirs_with_dots=None, theme_name=None, default_home=None, - use_imdb_info=None, fanart_limit=None, show_tags=None, showlist_tagview=None): + use_imdb_info=None, fanart_limit=None, show_tags=None, showlist_tagview=None, **kwargs): results = [] @@ -6025,7 +6043,6 @@ class ConfigGeneral(Config): sickbeard.CALENDAR_UNPROTECTED = config.checkbox_to_value(calendar_unprotected) sickbeard.USE_API = config.checkbox_to_value(use_api) - sickbeard.API_KEYS = [a.split(':::') for a in api_keys.split('|')] sickbeard.WEB_PORT = config.to_int(web_port) # sickbeard.WEB_LOG is set in config.change_log_dir()