From 46e709c9986f4fa1ae57499141f575bef2dfdddf Mon Sep 17 00:00:00 2001 From: zx900930 Date: Mon, 15 Feb 2021 01:39:57 +0100 Subject: [PATCH 01/21] improve chinese language codes matching rules --- bazarr/list_subtitles.py | 6 ++---- libs/subliminal_patch/core.py | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/bazarr/list_subtitles.py b/bazarr/list_subtitles.py index 4b7dd2133..cc819e28f 100644 --- a/bazarr/list_subtitles.py +++ b/bazarr/list_subtitles.py @@ -545,10 +545,8 @@ def guess_external_subtitles(dest_folder, subtitles): detected_language = guess_language(text) #add simplified and traditional chinese detection if detected_language == 'zh': - simplified_chinese = [".chs", ".sc", ".zhs", ".hans", ".gb", u"简", u"双语"] - if any(ext in str(subtitle_path).lower() for ext in simplified_chinese): - detected_language == 'zh' - else: + traditional_chinese = [".cht", ".tc", ".traditional",".zh-tw", ".zht", "hant", "big5", u"繁", u"雙語"] + if any(ext in (str(subtitle_path).lower())[:-16] for ext in traditional_chinese): detected_language == 'zt' except UnicodeDecodeError: detector = Detector() diff --git a/libs/subliminal_patch/core.py b/libs/subliminal_patch/core.py index 76e11402a..07cd6ad91 100644 --- a/libs/subliminal_patch/core.py +++ b/libs/subliminal_patch/core.py @@ -637,8 +637,8 @@ def _search_external_subtitles(path, languages=None, only_one=False, scandir_gen hi = any(i for i in hi_tag if i in adv_tag) #add simplified/traditional chinese detection - simplified_chinese = ["chs", "sc", "zhs", "hans", "gb", u"简", u"双语"] - traditional_chinese = ["cht", "tc", "zht", "hant", "big5", u"繁", u"雙語"] + simplified_chinese = ["chs", "sc", "zhs", "hans","zh-hans", "gb", "简", "简中", "简体", "简体中文", "中英双语", "中日双语","中法双语"] + traditional_chinese = ["cht", "tc", "zht", "hant","zh-hant", "big5", "繁", "繁中", "繁体", "繁體","繁体中文", "繁體中文", "正體中文", "中英雙語", "中日雙語","中法雙語"] FULL_LANGUAGE_LIST.extend(simplified_chinese) FULL_LANGUAGE_LIST.extend(traditional_chinese) p_root = p_root.replace('zh-TW', 'zht') From f235c7fee6b7809480e8755de24ffd647fc11fe6 Mon Sep 17 00:00:00 2001 From: morpheus65535 Date: Sun, 14 Feb 2021 21:03:27 -0500 Subject: [PATCH 02/21] Version bump --- bazarr/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bazarr/main.py b/bazarr/main.py index 7ab47c6e0..2f63b1473 100644 --- a/bazarr/main.py +++ b/bazarr/main.py @@ -1,6 +1,6 @@ # coding=utf-8 -bazarr_version = '0.9.1' +bazarr_version = '0.9.1.1' import os From 41c3deb5fad56054473c70ce0ad8a8a835591e36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Morav=C4=8D=C3=ADk=2C=20Marian?= Date: Mon, 15 Feb 2021 07:40:00 +0100 Subject: [PATCH 03/21] Update Datatables and all Datatables plugins to latest --- static/css/bazarr.css | 18 +- .../datatables/dataTables.responsive.min.js | 30 - static/datatables/dataTables.select.min.js | 38 -- static/datatables/datatables.min.css | 15 +- static/datatables/datatables.min.js | 547 ++++++++++++------ static/datatables/rowGroup.dataTables.min.css | 1 - static/datatables/select.bootstrap4.min.css | 1 - static/datatables/select.dataTables.min.css | 1 - views/_main.html | 17 +- views/settingslanguages.html | 14 +- views/settingsradarr.html | 6 +- views/settingssonarr.html | 6 +- 12 files changed, 397 insertions(+), 297 deletions(-) delete mode 100644 static/datatables/dataTables.responsive.min.js delete mode 100644 static/datatables/dataTables.select.min.js delete mode 100644 static/datatables/rowGroup.dataTables.min.css delete mode 100644 static/datatables/select.bootstrap4.min.css delete mode 100644 static/datatables/select.dataTables.min.css diff --git a/static/css/bazarr.css b/static/css/bazarr.css index c88a3eebf..6b6af0df2 100644 --- a/static/css/bazarr.css +++ b/static/css/bazarr.css @@ -376,9 +376,21 @@ a.link:hover, a.link:focus { padding-top: 0px; } .dt-buttons { - display: inline-block; - padding-top: 0; - margin-bottom: 0; } + display: inline-block; + padding-top: 0; + margin-bottom: 0; +} + +.dt-buttons button:disabled { + cursor: default; + background: #ffffff; + border: 1px solid #727b84 !important; + color: #727b84 !important; } +.dt-buttons button.disabled:hover { + background: #ffffff; + opacity: 0.7; + color: #727b84 !important; + border: 1px solid #727b84; } .tooltip { pointer-events: none; } diff --git a/static/datatables/dataTables.responsive.min.js b/static/datatables/dataTables.responsive.min.js deleted file mode 100644 index e41e5d319..000000000 --- a/static/datatables/dataTables.responsive.min.js +++ /dev/null @@ -1,30 +0,0 @@ -/*! - Responsive 2.2.3 - 2014-2018 SpryMedia Ltd - datatables.net/license -*/ -(function(d){"function"===typeof define&&define.amd?define(["jquery","datatables.net"],function(l){return d(l,window,document)}):"object"===typeof exports?module.exports=function(l,j){l||(l=window);if(!j||!j.fn.dataTable)j=require("datatables.net")(l,j).$;return d(j,l,l.document)}:d(jQuery,window,document)})(function(d,l,j,q){function t(a,b,c){var e=b+"-"+c;if(n[e])return n[e];for(var d=[],a=a.cell(b,c).node().childNodes,b=0,c=a.length;btd, >th", -e).each(function(e){e=b.column.index("toData",e);!1===a.s.current[e]&&d(this).css("display","none")})});b.on("destroy.dtr",function(){b.off(".dtr");d(b.table().body()).off(".dtr");d(l).off("resize.dtr orientationchange.dtr");d.each(a.s.current,function(b,e){!1===e&&a._setColumnVis(b,!0)})});this.c.breakpoints.sort(function(a,b){return a.widthb.width?-1:0});this._classLogic();this._resizeAuto();c=this.c.details;!1!==c.type&&(a._detailsInit(),b.on("column-visibility.dtr",function(){a._timer&& -clearTimeout(a._timer);a._timer=setTimeout(function(){a._timer=null;a._classLogic();a._resizeAuto();a._resize();a._redrawChildren()},100)}),b.on("draw.dtr",function(){a._redrawChildren()}),d(b.table().node()).addClass("dtr-"+c.type));b.on("column-reorder.dtr",function(){a._classLogic();a._resizeAuto();a._resize()});b.on("column-sizing.dtr",function(){a._resizeAuto();a._resize()});b.on("preXhr.dtr",function(){var e=[];b.rows().every(function(){this.child.isShown()&&e.push(this.id(true))});b.one("draw.dtr", -function(){a._resizeAuto();a._resize();b.rows(e).every(function(){a._detailsDisplay(this,false)})})});b.on("init.dtr",function(){a._resizeAuto();a._resize();d.inArray(false,a.s.current)&&b.columns.adjust()});this._resize()},_columnsVisiblity:function(a){var b=this.s.dt,c=this.s.columns,e,f,g=c.map(function(a,b){return{columnIdx:b,priority:a.priority}}).sort(function(a,b){return a.priority!==b.priority?a.priority-b.priority:a.columnIdx-b.columnIdx}),h=d.map(c,function(e,c){return!1===b.column(c).visible()? -"not-visible":e.auto&&null===e.minWidth?!1:!0===e.auto?"-":-1!==d.inArray(a,e.includeIn)}),m=0;e=0;for(f=h.length;em-c[k].minWidth?(s=!0,h[k]=!1):h[k]=!0,m-=c[k].minWidth)}g=!1;e=0;for(f=c.length;e=k&&f(d,b[c].name)}else{if("not-"===g){c=0;for(g=b.length;c").append(h).appendTo(f)}d("").append(g).appendTo(e);"inline"===this.c.details.type&&d(c).addClass("dtr-inline collapsed");d(c).find("[name]").removeAttr("name");d(c).css("position","relative"); -c=d("
").css({width:1,height:1,overflow:"hidden",clear:"both"}).append(c);c.insertBefore(a.table().node());g.each(function(c){c=a.column.index("fromVisible",c);b[c].minWidth=this.offsetWidth||0});c.remove()}},_setColumnVis:function(a,b){var c=this.s.dt,e=b?"":"none";d(c.column(a).header()).css("display",e);d(c.column(a).footer()).css("display",e);c.column(a).nodes().to$().css("display",e);d.isEmptyObject(n)||c.cells(null,a).indexes().each(function(a){r(c,a.row,a.column)})},_tabIndexes:function(){var a= -this.s.dt,b=a.cells({page:"current"}).nodes().to$(),c=a.settings()[0],e=this.c.details.target;b.filter("[data-dtr-keyboard]").removeData("[data-dtr-keyboard]");"number"===typeof e?a.cells(null,e,{page:"current"}).nodes().to$().attr("tabIndex",c.iTabIndex).data("dtr-keyboard",1):("td:first-child, th:first-child"===e&&(e=">td:first-child, >th:first-child"),d(e,a.rows({page:"current"}).nodes()).attr("tabIndex",c.iTabIndex).data("dtr-keyboard",1))}});i.breakpoints=[{name:"desktop",width:Infinity},{name:"tablet-l", -width:1024},{name:"tablet-p",width:768},{name:"mobile-l",width:480},{name:"mobile-p",width:320}];i.display={childRow:function(a,b,c){if(b){if(d(a.node()).hasClass("parent"))return a.child(c(),"child").show(),!0}else{if(a.child.isShown())return a.child(!1),d(a.node()).removeClass("parent"),!1;a.child(c(),"child").show();d(a.node()).addClass("parent");return!0}},childRowImmediate:function(a,b,c){if(!b&&a.child.isShown()||!a.responsive.hasHidden())return a.child(!1),d(a.node()).removeClass("parent"), -!1;a.child(c(),"child").show();d(a.node()).addClass("parent");return!0},modal:function(a){return function(b,c,e){if(c)d("div.dtr-modal-content").empty().append(e());else{var f=function(){g.remove();d(j).off("keypress.dtr")},g=d('
').append(d('
').append(d('
').append(e())).append(d('
×
').click(function(){f()}))).append(d('
').click(function(){f()})).appendTo("body"); -d(j).on("keyup.dtr",function(a){27===a.keyCode&&(a.stopPropagation(),f())})}a&&a.header&&d("div.dtr-modal-content").prepend("

"+a.header(b)+"

")}}};var n={};i.renderer={listHiddenNodes:function(){return function(a,b,c){var e=d('