Update AntiChinaVideoAds.js

rasso1 · Nov 12, 2014 · 6102b97 · 6102b97
1 parent 48c01d3
commit 6102b97
Showing 1 changed file with 22 additions and 10 deletions.
diff --git a/AntiChinaVideoAds.js b/AntiChinaVideoAds.js
@@ -46,21 +46,25 @@ AntiChinaVideoAds.prototype = {
         },
         'letv': {
             'player': 'chrome://AntiChinaVideoAds/content/swf/letv.swf',
-            're': /http:\/\/.*letv[\w]*\.com\/(hz|.*\/((?!(Live|seed|Disk))((C|S)[\w]{2,3})?(?!Live)[\w]{4}|swf))Player*\.swf/i
+            're': /http:\/\/.*letv[\w]*\.com\/(hz|.*\/(?!(Live|seed|Disk))((C|S)[\w]{2,3})?(?!Live)[\w]{4})Player[^\.]*\.swf/i
         },
-        'letv_live': {
+		'letv_live': {
             'player': 'chrome://AntiChinaVideoAds/content/swf/letvlive.swf',
             're': /http:\/\/.*letv[\w]*\.com\/p\/\d+\/\d+\/\d+\/newplayer\/LivePlayer\.swf/i
         },
         'letvskin': {
             'player': 'http://player.letvcdn.com/p/201407/24/15/newplayer/1/SSLetvPlayer.swf',
             're': /http:\/\/.*letv[\w]*\.com\/p\/\d+\/\d+\/(?!15)\d*\/newplayer\/\d+\/S?SLetvPlayer\.swf/i
         },
-        'pplive_live': {
-            'player': 'chrome://AntiChinaVideoAds/content/swf/pplive_live.swf',
-            're': /http:\/\/player\.pplive\.cn\/live\/.*\/player4live2\.swf/i
+        'pptv': {
+            'player': 'chrome://AntiChinaVideoAds/content/swf/pptv.swf',
+            're': /http:\/\/player.pplive.cn\/ikan\/.*\/player4player2\.swf/i
         },
-        'sohu': {
+		'pplive': {
+            'player': 'chrome://AntiChinaVideoAds/content/swf/pptvLive.swf',
+            're': /http:\/\/player.pplive.cn\/live\/.*\/player4live2\.swf/i
+        },
+		'sohu': {
            'player': 'chrome://AntiChinaVideoAds/content/swf/sohu.swf',
            're': /http:\/\/tv\.sohu\.com\/upload\/swf\/(?!(live|\d+)).*\d+\/(main|PlayerShell)\.swf/i
         },
@@ -72,10 +76,14 @@ AntiChinaVideoAds.prototype = {
            'player': 'chrome://AntiChinaVideoAds/content/swf/sohulive.swf',
            're': /http:\/\/tv\.sohu\.com\/upload\/swf\/(live\/|)\d+\/(main|PlayerShell)\.swf/i
         },
-        'pps': {
+		'pps': {
             'player': 'chrome://AntiChinaVideoAds/content/swf/pps.swf',
             're': /http:\/\/www\.iqiyi\.com\/player\/cupid\/.*\/pps[\w]+.swf/i
         },
+		'ppsiqiyi': {
+            'player': 'chrome://AntiChinaVideoAds/content/swf/iqiyi.swf',
+            're': /http:\/\/www\.iqiyi\.com\/common\/flashplayer\/\d+\/PPSMainPlayer.*\.swf/i
+		},	
         'wanhenda': {
             'player': 'http://yuntv.letv.com/bcloud.swf',
             're': /http:\/\/assets\.dwstatic\.com\/.*\/vppp\.swf/i
@@ -90,12 +98,16 @@ AntiChinaVideoAds.prototype = {
      	},			
 	    '17173_stream_customOut': {
             'player': 'chrome://AntiChinaVideoAds/content/swf/17173_Player_stream_out.swf',
-  	    're': /http:\/\/f\.v\.17173cdn\.com(\/\d+)?\/flash\/Player_stream_customOut\.swf/i
+  	    're': /http:\/\/f\.v\.17173cdn\.com(\/\d+)?\/flash\/Player_stream_(custom)?Out\.swf/i
 	    },			
         '17173_live': {
             'player': 'chrome://AntiChinaVideoAds/content/swf/17173_Player_stream.swf',
-            're': /http:\/\/f\.v\.17173cdn\.com\/\d+\/flash\/Player_stream\.swf/i
-        }
+            're': /http:\/\/f\.v\.17173cdn\.com\/\d+\/flash\/Player_stream(_firstpage)?\.swf/i
+        },
+		'baiduAD': {
+            'player': 'chrome://AntiChinaVideoAds/content/swf/baiduAD.swf',
+		    're': /http:\/\/list\.video\.baidu\.com\/swf\/advPlayer\.swf/i
+		}
     },
     os: Cc['@mozilla.org/observer-service;1']
             .getService(Ci.nsIObserverService),