diff --git a/channels/vvvvid.py b/channels/vvvvid.py
index ef7a2b64..9828fa8a 100644
--- a/channels/vvvvid.py
+++ b/channels/vvvvid.py
@@ -4,7 +4,7 @@
# ----------------------------------------------------------
import requests, sys, inspect
from core import support, tmdb
-from platformcode import autorenumber, logger
+from platformcode import autorenumber, logger, config
host = support.config.get_channel_url()
@@ -197,7 +197,7 @@ def findvideos(item):
url = url.split()[-1]
itemlist.append(
item.clone(action= 'play',
- title='direct',
+ title=config.get_localized_string(30137),
url= 'https://or01.top-ix.org/videomg/_definst_/mp4:' + item.url + '/' + url,
server= 'directo')
)
@@ -207,7 +207,7 @@ def findvideos(item):
itemlist.append(
item.clone(action= 'play',
- title='direct',
+ title=config.get_localized_string(30137),
url= item.url + '?' + key,
server= 'directo')
)
diff --git a/resources/skins/Default/720p/GlobalSearch.xml b/resources/skins/Default/720p/GlobalSearch.xml
index 839d5c41..2b2a769f 100644
--- a/resources/skins/Default/720p/GlobalSearch.xml
+++ b/resources/skins/Default/720p/GlobalSearch.xml
@@ -498,6 +498,20 @@
center
+
+ No Server Title
+ 150
+ 35
+ 450
+ 60
+
+ FFFFFFFF
+ 00000000
+ left
+ center
+
+ !ListItem.Property(servername)
+
@@ -565,6 +579,20 @@
center
+
+ No Server Title
+ 150
+ 35
+ 450
+ 60
+
+ FFFFFFFF
+ 00000000
+ left
+ center
+
+ !ListItem.Property(servername)
+
diff --git a/servers/akvideo.json b/servers/akvideo.json
index c8305d65..fe7575a3 100644
--- a/servers/akvideo.json
+++ b/servers/akvideo.json
@@ -22,7 +22,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "$ADDON[plugin.video.kod 60654]",
+ "label": "$ADDON[plugin.video.kod 70708]",
"type": "bool",
"visible": true
},
diff --git a/servers/anavids.json b/servers/anavids.json
index bdc73b86..4b7fc58c 100644
--- a/servers/anavids.json
+++ b/servers/anavids.json
@@ -17,7 +17,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/animeid.json b/servers/animeid.json
index 21086eba..dd665438 100644
--- a/servers/animeid.json
+++ b/servers/animeid.json
@@ -17,7 +17,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/anonfile.json b/servers/anonfile.json
index 5a7cd15a..ec27fd8b 100644
--- a/servers/anonfile.json
+++ b/servers/anonfile.json
@@ -17,7 +17,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/archiveorg.json b/servers/archiveorg.json
index ef60d243..7f38cbb4 100644
--- a/servers/archiveorg.json
+++ b/servers/archiveorg.json
@@ -17,7 +17,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/backin.json b/servers/backin.json
index 050a3e71..c751c943 100644
--- a/servers/backin.json
+++ b/servers/backin.json
@@ -21,7 +21,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/badshare.json b/servers/badshare.json
index ae4265e9..079cab25 100644
--- a/servers/badshare.json
+++ b/servers/badshare.json
@@ -17,7 +17,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/bdupload.json b/servers/bdupload.json
index c9708b6b..50eea6ce 100644
--- a/servers/bdupload.json
+++ b/servers/bdupload.json
@@ -21,7 +21,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/cinemaupload.json b/servers/cinemaupload.json
index 448525a8..c7627a01 100644
--- a/servers/cinemaupload.json
+++ b/servers/cinemaupload.json
@@ -21,7 +21,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/clicknupload.json b/servers/clicknupload.json
index 068bd3e5..2d2d8889 100644
--- a/servers/clicknupload.json
+++ b/servers/clicknupload.json
@@ -21,7 +21,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/clipwatching.json b/servers/clipwatching.json
index 87c03421..d84e2fe8 100644
--- a/servers/clipwatching.json
+++ b/servers/clipwatching.json
@@ -21,7 +21,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/cloudvideo.json b/servers/cloudvideo.json
index 6016fbdd..ee4c442d 100644
--- a/servers/cloudvideo.json
+++ b/servers/cloudvideo.json
@@ -17,7 +17,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/crunchyroll.json b/servers/crunchyroll.json
index 895e132e..1eee02ca 100644
--- a/servers/crunchyroll.json
+++ b/servers/crunchyroll.json
@@ -17,7 +17,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/dailymotion.json b/servers/dailymotion.json
index 25e8b935..d454aeaa 100644
--- a/servers/dailymotion.json
+++ b/servers/dailymotion.json
@@ -21,7 +21,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/deltabit.json b/servers/deltabit.json
index f392a7d1..ed0e8e07 100644
--- a/servers/deltabit.json
+++ b/servers/deltabit.json
@@ -17,7 +17,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/directo.json b/servers/directo.json
index 7fb11746..0e74446c 100644
--- a/servers/directo.json
+++ b/servers/directo.json
@@ -50,7 +50,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/doodstream.json b/servers/doodstream.json
index 165628c4..3743c7f5 100644
--- a/servers/doodstream.json
+++ b/servers/doodstream.json
@@ -17,7 +17,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/dostream.json b/servers/dostream.json
index 4c9745bd..9435b1c2 100644
--- a/servers/dostream.json
+++ b/servers/dostream.json
@@ -17,7 +17,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/downace.json b/servers/downace.json
index 721dd84e..decdc6d8 100644
--- a/servers/downace.json
+++ b/servers/downace.json
@@ -17,7 +17,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/facebook.json b/servers/facebook.json
index 9a6f54f1..a37b6f6b 100644
--- a/servers/facebook.json
+++ b/servers/facebook.json
@@ -21,7 +21,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/fastplay.json b/servers/fastplay.json
index 411c2f40..291307bb 100755
--- a/servers/fastplay.json
+++ b/servers/fastplay.json
@@ -17,7 +17,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/fembed.json b/servers/fembed.json
index a5f53139..de73ab15 100644
--- a/servers/fembed.json
+++ b/servers/fembed.json
@@ -14,7 +14,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/fex.json b/servers/fex.json
index a22348de..2ccc5997 100644
--- a/servers/fex.json
+++ b/servers/fex.json
@@ -17,7 +17,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/filefactory.json b/servers/filefactory.json
index 99b7b565..ed63f53b 100644
--- a/servers/filefactory.json
+++ b/servers/filefactory.json
@@ -21,7 +21,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/filepup.json b/servers/filepup.json
index 945f5994..d2c5c0f9 100644
--- a/servers/filepup.json
+++ b/servers/filepup.json
@@ -17,7 +17,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/filescdn.json b/servers/filescdn.json
index c1810508..7448aebc 100644
--- a/servers/filescdn.json
+++ b/servers/filescdn.json
@@ -17,7 +17,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/filesmonster.json b/servers/filesmonster.json
index 19408a7f..d2e4f40b 100644
--- a/servers/filesmonster.json
+++ b/servers/filesmonster.json
@@ -20,7 +20,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/flashx.json b/servers/flashx.json
index b1a9e13d..231c65f7 100644
--- a/servers/flashx.json
+++ b/servers/flashx.json
@@ -24,7 +24,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/fourshared.json b/servers/fourshared.json
index 4b60a6e5..1efd7f51 100644
--- a/servers/fourshared.json
+++ b/servers/fourshared.json
@@ -31,7 +31,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/gamovideo.json b/servers/gamovideo.json
index 5432f2fc..eee03921 100755
--- a/servers/gamovideo.json
+++ b/servers/gamovideo.json
@@ -17,7 +17,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/gigasize.json b/servers/gigasize.json
index 0b2b0576..29a1c02a 100644
--- a/servers/gigasize.json
+++ b/servers/gigasize.json
@@ -25,7 +25,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/googlevideo.json b/servers/googlevideo.json
index 8886b7d5..1ca06c9b 100644
--- a/servers/googlevideo.json
+++ b/servers/googlevideo.json
@@ -17,7 +17,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/gounlimited.json b/servers/gounlimited.json
index d2b5fec0..dfaad755 100644
--- a/servers/gounlimited.json
+++ b/servers/gounlimited.json
@@ -21,7 +21,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/gvideo.json b/servers/gvideo.json
index 22fc4bb3..b2839bc7 100644
--- a/servers/gvideo.json
+++ b/servers/gvideo.json
@@ -37,7 +37,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/hdload.json b/servers/hdload.json
index 167caf95..58635ef0 100644
--- a/servers/hdload.json
+++ b/servers/hdload.json
@@ -17,7 +17,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/hdmario.json b/servers/hdmario.json
index bb80a103..649515b7 100644
--- a/servers/hdmario.json
+++ b/servers/hdmario.json
@@ -17,7 +17,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/hugefiles.json b/servers/hugefiles.json
index 6be802b5..6fde0486 100644
--- a/servers/hugefiles.json
+++ b/servers/hugefiles.json
@@ -20,7 +20,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/idtbox.json b/servers/idtbox.json
index 0dea7d55..6f143dd9 100644
--- a/servers/idtbox.json
+++ b/servers/idtbox.json
@@ -17,7 +17,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/jawcloud.json b/servers/jawcloud.json
index 975bc12e..8fcef964 100644
--- a/servers/jawcloud.json
+++ b/servers/jawcloud.json
@@ -17,7 +17,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/jetload.json b/servers/jetload.json
index 447cbe94..bc46f8c0 100644
--- a/servers/jetload.json
+++ b/servers/jetload.json
@@ -17,7 +17,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/mailru.json b/servers/mailru.json
index 624d731d..b3925c44 100644
--- a/servers/mailru.json
+++ b/servers/mailru.json
@@ -21,7 +21,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/mediafire.json b/servers/mediafire.json
index 8abc34ee..46ff6665 100644
--- a/servers/mediafire.json
+++ b/servers/mediafire.json
@@ -21,7 +21,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/mega.json b/servers/mega.json
index af59ebaf..c7f8c4c5 100644
--- a/servers/mega.json
+++ b/servers/mega.json
@@ -36,7 +36,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/mixdrop.json b/servers/mixdrop.json
index b63ebd24..dc33cd93 100644
--- a/servers/mixdrop.json
+++ b/servers/mixdrop.json
@@ -17,7 +17,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/mp4upload.json b/servers/mp4upload.json
index d46b4135..f2ced1e7 100644
--- a/servers/mp4upload.json
+++ b/servers/mp4upload.json
@@ -19,7 +19,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/mydaddy.json b/servers/mydaddy.json
index 671b9418..ca0becd0 100644
--- a/servers/mydaddy.json
+++ b/servers/mydaddy.json
@@ -17,7 +17,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/mystream.json b/servers/mystream.json
index 6f8e60db..2549ee09 100644
--- a/servers/mystream.json
+++ b/servers/mystream.json
@@ -17,7 +17,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/myupload.json b/servers/myupload.json
index fdd2bcc8..3ddbf417 100644
--- a/servers/myupload.json
+++ b/servers/myupload.json
@@ -17,7 +17,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/netutv.json b/servers/netutv.json
index c8124fc6..49cda818 100755
--- a/servers/netutv.json
+++ b/servers/netutv.json
@@ -36,7 +36,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/nowvideo.json b/servers/nowvideo.json
index 5a39d41c..3beb9b3e 100644
--- a/servers/nowvideo.json
+++ b/servers/nowvideo.json
@@ -26,7 +26,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/okru.json b/servers/okru.json
index dcc42f28..0ed2c3bd 100644
--- a/servers/okru.json
+++ b/servers/okru.json
@@ -22,7 +22,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/onefichier.json b/servers/onefichier.json
index 1f0b14d2..f0dec829 100644
--- a/servers/onefichier.json
+++ b/servers/onefichier.json
@@ -26,7 +26,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/onlystream.json b/servers/onlystream.json
index 4129e9cd..72fb3e77 100644
--- a/servers/onlystream.json
+++ b/servers/onlystream.json
@@ -17,7 +17,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/rapidgator.json b/servers/rapidgator.json
index 3448d62f..a208a349 100644
--- a/servers/rapidgator.json
+++ b/servers/rapidgator.json
@@ -21,7 +21,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/rcdnme.json b/servers/rcdnme.json
index 6f8f4771..5dd14287 100644
--- a/servers/rcdnme.json
+++ b/servers/rcdnme.json
@@ -17,7 +17,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/rutube.json b/servers/rutube.json
index 1079f56a..496f6005 100644
--- a/servers/rutube.json
+++ b/servers/rutube.json
@@ -20,7 +20,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/samaup.json b/servers/samaup.json
index d1c2187b..dfe9063d 100644
--- a/servers/samaup.json
+++ b/servers/samaup.json
@@ -17,7 +17,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/sendvid.json b/servers/sendvid.json
index 5dff7072..e1e1ac64 100755
--- a/servers/sendvid.json
+++ b/servers/sendvid.json
@@ -17,7 +17,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/speedvideo.json b/servers/speedvideo.json
index c91a0a27..55bf2d00 100644
--- a/servers/speedvideo.json
+++ b/servers/speedvideo.json
@@ -17,7 +17,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/streamtape.json b/servers/streamtape.json
index 5e6cb39e..b735c997 100644
--- a/servers/streamtape.json
+++ b/servers/streamtape.json
@@ -14,7 +14,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/streamz.json b/servers/streamz.json
index 5c1f3ed5..129f8d4d 100644
--- a/servers/streamz.json
+++ b/servers/streamz.json
@@ -17,7 +17,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/supervideo.json b/servers/supervideo.json
index 0434ee84..fabccac0 100644
--- a/servers/supervideo.json
+++ b/servers/supervideo.json
@@ -21,7 +21,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/thevid.json b/servers/thevid.json
index 0da109c9..e723747b 100644
--- a/servers/thevid.json
+++ b/servers/thevid.json
@@ -17,7 +17,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/thevideobee.json b/servers/thevideobee.json
index 45ccb4da..c6a24f4f 100644
--- a/servers/thevideobee.json
+++ b/servers/thevideobee.json
@@ -17,7 +17,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/torrent.json b/servers/torrent.json
index 12b59037..7b0bb703 100644
--- a/servers/torrent.json
+++ b/servers/torrent.json
@@ -62,7 +62,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/turbobit.json b/servers/turbobit.json
index 693b9a81..2e206895 100644
--- a/servers/turbobit.json
+++ b/servers/turbobit.json
@@ -21,7 +21,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/turbovid.json b/servers/turbovid.json
index 54cc8057..564868e0 100644
--- a/servers/turbovid.json
+++ b/servers/turbovid.json
@@ -17,7 +17,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/tusfiles.json b/servers/tusfiles.json
index 0dcf9cd5..92c13339 100644
--- a/servers/tusfiles.json
+++ b/servers/tusfiles.json
@@ -17,7 +17,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/unsupported.json b/servers/unsupported.json
index 066467c3..16cda209 100644
--- a/servers/unsupported.json
+++ b/servers/unsupported.json
@@ -17,7 +17,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": false
},
diff --git a/servers/uploadedto.json b/servers/uploadedto.json
index 5097d423..4934da71 100644
--- a/servers/uploadedto.json
+++ b/servers/uploadedto.json
@@ -34,7 +34,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/uppom.json b/servers/uppom.json
index fe9b3bea..f7509b04 100644
--- a/servers/uppom.json
+++ b/servers/uppom.json
@@ -17,7 +17,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/upstream.json b/servers/upstream.json
index 0172432b..8bd05840 100644
--- a/servers/upstream.json
+++ b/servers/upstream.json
@@ -17,7 +17,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/uptobox.json b/servers/uptobox.json
index c30d430d..a54c62c2 100644
--- a/servers/uptobox.json
+++ b/servers/uptobox.json
@@ -25,7 +25,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/upvid.json b/servers/upvid.json
index b5122e69..00aaf9c2 100644
--- a/servers/upvid.json
+++ b/servers/upvid.json
@@ -17,7 +17,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/uqload.json b/servers/uqload.json
index 505e4d85..9a361b42 100644
--- a/servers/uqload.json
+++ b/servers/uqload.json
@@ -17,7 +17,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/userscloud.json b/servers/userscloud.json
index 3205bd9c..8a72bd45 100644
--- a/servers/userscloud.json
+++ b/servers/userscloud.json
@@ -21,7 +21,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/vevio.json b/servers/vevio.json
index d8bd1f45..9ad090be 100644
--- a/servers/vevio.json
+++ b/servers/vevio.json
@@ -17,7 +17,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/vidcloud.json b/servers/vidcloud.json
index 3e974588..21882336 100644
--- a/servers/vidcloud.json
+++ b/servers/vidcloud.json
@@ -21,7 +21,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/videobin.json b/servers/videobin.json
index 57209c51..f7ec3af0 100644
--- a/servers/videobin.json
+++ b/servers/videobin.json
@@ -17,7 +17,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/videomega.json b/servers/videomega.json
index 5dd00bec..2f97d68a 100644
--- a/servers/videomega.json
+++ b/servers/videomega.json
@@ -17,7 +17,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/vidfast.json b/servers/vidfast.json
index 9bfee90e..693b50ce 100644
--- a/servers/vidfast.json
+++ b/servers/vidfast.json
@@ -17,7 +17,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/vidlox.json b/servers/vidlox.json
index d4f6a88d..f3b386eb 100644
--- a/servers/vidlox.json
+++ b/servers/vidlox.json
@@ -17,7 +17,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/vidmoly.json b/servers/vidmoly.json
index c1b5c1c0..e8d4d984 100644
--- a/servers/vidmoly.json
+++ b/servers/vidmoly.json
@@ -21,7 +21,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/vidoza.json b/servers/vidoza.json
index 05c1a3a8..997832ff 100644
--- a/servers/vidoza.json
+++ b/servers/vidoza.json
@@ -20,7 +20,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/vidtodo.json b/servers/vidtodo.json
index 6ceeedf0..fa25c7cd 100755
--- a/servers/vidtodo.json
+++ b/servers/vidtodo.json
@@ -17,7 +17,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/vidtome.json b/servers/vidtome.json
index b404034a..82ff9685 100644
--- a/servers/vidtome.json
+++ b/servers/vidtome.json
@@ -21,7 +21,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/vidup.json b/servers/vidup.json
index e1297257..3a44c83c 100755
--- a/servers/vidup.json
+++ b/servers/vidup.json
@@ -17,7 +17,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/vimeo.json b/servers/vimeo.json
index 2b0d433a..04053b66 100644
--- a/servers/vimeo.json
+++ b/servers/vimeo.json
@@ -21,7 +21,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/vimpleru.json b/servers/vimpleru.json
index d89ce595..479ce5c7 100644
--- a/servers/vimpleru.json
+++ b/servers/vimpleru.json
@@ -22,7 +22,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/vivo.json b/servers/vivo.json
index 58ac6202..5f653935 100644
--- a/servers/vivo.json
+++ b/servers/vivo.json
@@ -17,7 +17,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/vk.json b/servers/vk.json
index e50928ef..885ffc0d 100755
--- a/servers/vk.json
+++ b/servers/vk.json
@@ -39,7 +39,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/vshare.json b/servers/vshare.json
index e1488ee6..a4e2f676 100644
--- a/servers/vshare.json
+++ b/servers/vshare.json
@@ -26,7 +26,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/vudeo.json b/servers/vudeo.json
index 9a6b4731..6bf6630c 100644
--- a/servers/vudeo.json
+++ b/servers/vudeo.json
@@ -17,7 +17,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/vupplayer.json b/servers/vupplayer.json
index fe4e5c6f..6df012d8 100644
--- a/servers/vupplayer.json
+++ b/servers/vupplayer.json
@@ -17,7 +17,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/vvvvid.json b/servers/vvvvid.json
index 42be33e2..f20d6bd1 100644
--- a/servers/vvvvid.json
+++ b/servers/vvvvid.json
@@ -17,7 +17,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/watchanimestream.json b/servers/watchanimestream.json
index 8fe58ba7..badc9617 100644
--- a/servers/watchanimestream.json
+++ b/servers/watchanimestream.json
@@ -17,7 +17,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/watchvideo.json b/servers/watchvideo.json
index a6bc4c1b..c090e484 100644
--- a/servers/watchvideo.json
+++ b/servers/watchvideo.json
@@ -21,7 +21,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/wstream.json b/servers/wstream.json
index f9668a6a..86f20526 100644
--- a/servers/wstream.json
+++ b/servers/wstream.json
@@ -26,7 +26,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "$ADDON[plugin.video.kod 60654]",
+ "label": "$ADDON[plugin.video.kod 70708]",
"type": "bool",
"visible": true
},
diff --git a/servers/youdbox.json b/servers/youdbox.json
index ab9e3263..aff46ba7 100644
--- a/servers/youdbox.json
+++ b/servers/youdbox.json
@@ -17,7 +17,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/yourupload.json b/servers/yourupload.json
index 9c61f454..0d978bb1 100755
--- a/servers/yourupload.json
+++ b/servers/yourupload.json
@@ -27,7 +27,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/youtube.json b/servers/youtube.json
index 34a81972..d8235284 100755
--- a/servers/youtube.json
+++ b/servers/youtube.json
@@ -25,7 +25,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/youwatch.json b/servers/youwatch.json
index 1c4bc87a..ffea3ec2 100644
--- a/servers/youwatch.json
+++ b/servers/youwatch.json
@@ -20,7 +20,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/servers/zippyshare.json b/servers/zippyshare.json
index 48df2b5a..4d136ce6 100644
--- a/servers/zippyshare.json
+++ b/servers/zippyshare.json
@@ -21,7 +21,7 @@
"default": false,
"enabled": true,
"id": "black_list",
- "label": "@60654",
+ "label": "@70708",
"type": "bool",
"visible": true
},
diff --git a/specials/globalsearch.py b/specials/globalsearch.py
index 92b1c4b6..ac072617 100644
--- a/specials/globalsearch.py
+++ b/specials/globalsearch.py
@@ -377,7 +377,7 @@ class SearchWindow(xbmcgui.WindowXMLDialog):
for result in channelResults:
if result: items.append(self.makeItem(result))
pos = self.RESULTS.getSelectedPosition()
- # self.RESULTS.reset()
+ self.RESULTS.reset()
self.RESULTS.addItems(items)
self.RESULTS.selectItem(pos)
if results:
@@ -646,6 +646,7 @@ class SearchWindow(xbmcgui.WindowXMLDialog):
elif not item.action:
self.getControl(QUALITYTAG).setText(item.fulltitle)
else:
+ logger.debug(item)
it = self.makeItem(item.tourl())
other.append(it)
diff --git a/specials/search.py b/specials/search.py
index dd0bb466..79bb6d07 100644
--- a/specials/search.py
+++ b/specials/search.py
@@ -86,10 +86,11 @@ def saved_search(item):
for saved_search_text in saved_searches_list:
itemlist.append(
- Item(channel=item.channel,
- action="new_search",
+ Item(channel=item.channel if not config.get_setting('new_search') else 'globalsearch',
+ action="new_search" if not config.get_setting('new_search') else 'Search',
title=typo(saved_search_text.split('{}')[0], 'bold'),
search_text=saved_search_text.split('{}')[0],
+ text=saved_search_text.split('{}')[0],
mode='all',
thumbnail=get_thumb('search.png')))
diff --git a/specials/setting.py b/specials/setting.py
index 2de2882e..78755a20 100644
--- a/specials/setting.py
+++ b/specials/setting.py
@@ -241,6 +241,7 @@ def server_debrid_config(item):
def servers_blacklist(item):
server_list = servertools.get_servers_list()
+ black_list = config.get_setting("black_list", server='servers')
blacklisted = []
list_controls = []
@@ -252,10 +253,10 @@ def servers_blacklist(item):
control = server_parameters["name"]
# control.setArt({'thumb:': server_parameters['thumb'] if 'thumb' in server_parameters else config.get_online_server_thumb(server)})
- if defaults.get("black_list", False) or config.get_setting("black_list", server=server):
- blacklisted.append(i)
-
- list_controls.append(control)
+ if not config.get_setting("black_list", server=server):
+ list_controls.append(control)
+ if defaults.get("black_list", False) or server in black_list:
+ blacklisted.append(i)
list_servers.append(server)
ris = platformtools.dialog_multiselect(config.get_localized_string(60550), list_controls, preselect=blacklisted)
if ris is not None: