Permalink
Browse files

Update to new last played

  • Loading branch information...
1 parent 710b291 commit e9aa6670eb9f735c361a389178608b073394a1dc @SharkHunter committed Oct 18, 2012
View
@@ -1,7 +1,8 @@
-http://cloud.github.com/downloads/SharkHunter/Channel/tv_plug_203.jar
+http://cloud.github.com/downloads/SharkHunter/Channel/tv_plug_204.jar
http://cloud.github.com/downloads/chocolateboy/pmsencoder/pmsencoder-1.6.2.jar
http://sharkhunter-shb.googlecode.com/svn/trunk/ps3mediaserver/extras/bin/curl.exe,extras/bin
http://sharkhunter-shb.googlecode.com/svn/trunk/ps3mediaserver/extras/bin/rtmpdump.exe,extras/bin
http://sharkhunter-shb.googlecode.com/svn/trunk/ps3mediaserver/extras/bin/youtube-dl.exe,extras/bin
http://sharkhunter-shb.googlecode.com/files/pepy.zip,extras
-https://github.com/rg3/youtube-dl/raw/2012.02.27/youtube-dl,extras/scripts,youtube-dl.py
+https://github.com/rg3/youtube-dl/raw/2012.10.09/youtube-dl,extras/scripts,youtube-dl.py
+touch,extras/pepy.zip
View
@@ -1,15 +1,21 @@
-version=0.1
+version=0.12
macrodef ezSwitch {
- switch {
- #<a href="magnet:?xt=urn:btih:7be37ac7f65dc78bf8b115629e60220c637fe0d1&dn=
- matcher=<a href=\"magnet:[^=]+=urn:btih:([^&]+)&dn=([^&]+)&tr
- order=url,name
- name=Furk
- action=upload
- script=furkUploadHash
- prop=name_unescape,monitor,monitor_type=parent,monitor_templ=tpbMonitor,crawl_mode=FLA+FLA
+ folder {
+ #<a href="/ep/38340/the-big-bang-theory-s06e02-hdtv-x264-lol/" title="The Big Bang Theory S06E02 HDTV x264-LOL (123.68 MB)"
+ matcher=<a href=\"(/ep/[^\"]+)\" title=\"([^\"]+)\" alt=
+ order=url,name
+ url=http://www.eztv.it
+ switch {
+ matcher=<a href=\"([^\"]+)\" class=\"download.*?title=\"([^\"]+)\"
+ order=url,name
+ name=Furk
+ action=upload
+ script=furkUploadUrl
+ prop=name_unescape
+ }
}
+
}
@@ -23,6 +29,7 @@ channel EZTV {
matcher=<a href=\"([^\"]+)\".*?>([^<]+)</a>
order=url,name
url=http://www.eztv.it
+ prop=monitor,monitor_type=parent,monitor_templ=tpbMonitor,crawl_mode=FLA+FLA+FLA
macro=ezSwitch
}
}
View
@@ -1,4 +1,4 @@
-version=0.38
+version=0.40
scriptdef furkSubs {
release='1
@@ -91,15 +91,14 @@ macrodef furkMacro {
url=http://api.furk.net/api/file/unlink?id=
}
folder {
-# <a class="button-large button-play" href="http://icd0q6s14tvhto8tuv82gg9ttb9j0t3ds40r71g.gcdn.biz/pls/JM56JAwhydBTrZo2Kw7FQCJxxfFEEjR9J2gZKiT7myqYD6g42PI7bMWCx49sSKKOyZC5kFkwQVDcckU3yP4SryQcf6eNKqam_CRwEXATzEA/Harry%20Potter%20and%20the%20Deathly%20Hallows%20Part%202%202011%20TS%20UnKnOwN.xspf">Play</a><br />
+ #<a class="button-large button-play" href="http://icd0q6s14tvhto8tuv82gg9ttb9j0t3ds40r71g.gcdn.biz/pls/JM56JAwhydBTrZo2Kw7FQCJxxfFEEjR9J2gZKiT7myqYD6g42PI7bMWCx49sSKKOyZC5kFkwQVDcckU3yP4SryQcf6eNKqam_CRwEXATzEA/Harry%20Potter%20and%20the%20Deathly%20Hallows%20Part%202%202011%20TS%20UnKnOwN.xspf">Play</a><br />
matcher=a class=\"button-large button-play\" href=\"([^\"]+)\">(Play)<
order=url
type=empty
media {
matcher=<title>([^<]+)</title>\s+<location>([^<]+)</location>
order=name,url
subtitle=swesub,s4u,ut.se
- #,subscene
prop=name_index=0
}
}
View
@@ -1,4 +1,4 @@
-version=0.55
+version=0.56
###############################
## IceFilms new method of
@@ -124,12 +124,23 @@ scriptdef 180Script {
regex='180upload.com/(.*)
match s_url
id=v1
+ regex='fname" value="([^"]+)"
+ scrape
+ fname=v1
+ op='&op=download1
+ s_postdata='id=
+ concat s_postdata id
+ concat s_postdata '&fname=
+ concat s_postdata fname
+ concat s_postdata '&method_free=Free+Download
+ tmp=s_postdata
+ concat s_postdata op
+ s_method='post
regex='name="rand" value="([^"]+)"
scrape
rand=v1
- s_postdata='op=download2&id=
- concat s_postdata id
- concat s_postdata '&rand=
+ s_postdata=tmp
+ concat s_postdata '&op=download2&down_direct=1&btn_download=Free+Download&rand=
concat s_postdata rand
s_method='post
#<a href="http://173.193.242.242/files/2/x3xa8wxs4nf1du/Altair_The_Walking_Dead.S02E12.HDTV.XviD-FQM.avi">
View
@@ -56,7 +56,7 @@ channel NaviX {
folder {
name=Navi-X Media Portal
url=http://www.navixtreme.com/playlist/50242/navi-xtreme_nxportal_home.plx
- prop=continue_name=(.*>>>.*|.*Next [Pp]age.*),continue_limit=6,auto_asx
+ #prop=continue_name=(.*>>>.*|.*Next [Pp]age.*),continue_limit=6,auto_asx
type=navix
subtitle=swesub,s4u,ut.se,allSubs
}
View
@@ -377,4 +377,5 @@ subdef ut.se {
select=title=\"[^\"]+" alt=\"[^\"]+\" href=\"(http://www.undertexter.se/laddatext[^\"]+)\">.*?Nedladdningar[^<]+<br>.*?<br>\s*([^<]+)</td>
select_order=url,name
prop=matcher_dotall
-}
+}
+
View
@@ -1,4 +1,4 @@
-version=0.57
+version=0.58
scriptdef svtFilter{
url=s_url
@@ -89,7 +89,7 @@ channel SVTPlay {
media {
matcher=BANDWIDTH=(\d+)\d###lcbr###3###rcbr###+.*?\n([^\n]+)
order=name,url
- prop=matcher_dotall,append_name=Kbps,relative_url=path,name_separator=###0
+ prop=matcher_dotall,append_name=Kbps,relative_url=path,name_separator=###0,name_index=1
}
}
}
@@ -28,8 +28,7 @@
import net.pms.io.OutputParams;
public class CH_plugin implements AdditionalFolderAtRoot, StartStopListener,
- FinalizeTranscoderArgsListener,
- LastPlayedParent {
+ FinalizeTranscoderArgsListener {
private static final long DEFAULT_POLL_INTERVAL=20000;
private static boolean initFetchPending=false;
@@ -313,10 +312,9 @@ public static void main(String[] args) {
System.exit(0);
}
- @Override
public DLNAResource create(String arg0) {
String[] tmp=arg0.split(">");
- Channel ch = chRoot.findChannel(tmp[1]);
+ Channel ch = Channels.findChannel(tmp[1]);
if(ch==null) // channel is gone?
return null;
Channels.debug("create lp cms "+tmp[2]+" ru "+tmp[0]+" channel "+ch);
@@ -118,8 +118,9 @@ public boolean addEntry(String newEntry) {
private boolean templateMatch(String entry) {
HashMap<String,String> vars=new HashMap<String,String>();
vars.put("entry", entry);
+ vars.put("nodebug", "1");
for(String old : oldEntries) {
- if(!ChannelUtil.empty(ChannelNaviXProc.simple(old, templ, vars)))
+ if(!ChannelUtil.empty(ChannelNaviXProc.simple(old, templ, vars)))
return false;
}
return true;
@@ -24,6 +24,11 @@
public static HashMap<String,String> nookies=new HashMap<String,String>();
private static long lastExpire=0;
+ private static void debug(String msg) {
+ if(ChannelUtil.empty(vars.get("nodebug")))
+ Channels.debug(msg);
+ }
+
private static String escapeChars(String str) {
StringBuilder sb=new StringBuilder();
// str=str.replaceAll("\\(", "\\\\\\(");
@@ -140,14 +145,14 @@ private static boolean parseV2(String[] lines,int start,String url,ChannelAuth a
boolean if_skip=false;
boolean if_true=false;
int maxV=0;
- Channels.debug("parse v2 ");
+ debug("parse v2 ");
vars.put("s_url", url);
for(int i=start;i<lines.length;i++) {
String line=lines[i];
if(ChannelUtil.ignoreLine(line))
continue;
line=line.trim();
- Channels.debug("navix proc line "+line);
+ debug("navix proc line "+line);
if(if_true)
if(line.startsWith("else")||line.startsWith("elseif")) {
if_skip=true;
@@ -177,11 +182,10 @@ private static boolean parseV2(String[] lines,int start,String url,ChannelAuth a
Proxy p=ChannelUtil.proxy(a);
if(action!=null&&action.equalsIgnoreCase("geturl")) {
// YUCK!! this sucks, we need to get the location out of the redirect...
- Channels.debug("geturl called "+sUrl);
+ debug("geturl called "+sUrl);
HttpURLConnection h=(HttpURLConnection)new URL(sUrl).openConnection(p);
h.setInstanceFollowRedirects(false);
h.connect();
- Channels.debug("connect return");
String hName="";
vars.put("geturl", h.getURL().toString());
Channels.debug("put "+h.getURL().toString());
@@ -220,7 +224,7 @@ private static boolean parseV2(String[] lines,int start,String url,ChannelAuth a
throw new Exception("empty scrape page");
}
vars.put("geturl", u.getURL().toString());
- Channels.debug("scrape page "+sPage);
+ debug("scrape page "+sPage);
vars.put("htmRaw", sPage);
// get headers and cookies
String hName="";
@@ -261,7 +265,7 @@ private static boolean parseV2(String[] lines,int start,String url,ChannelAuth a
if(line.startsWith("if ")) { // if block
String cond=line.substring(3);
- Channels.debug("if "+cond+" pattern "+ifparse.pattern());
+ debug("if "+cond+" pattern "+ifparse.pattern());
Matcher im=ifparse.matcher(cond);
String var;
String op=null;
@@ -271,15 +275,15 @@ private static boolean parseV2(String[] lines,int start,String url,ChannelAuth a
}
else {
var=getVar(im.group(1));
- Channels.debug("gc "+im.groupCount()+" "+var);
+ debug("gc "+im.groupCount()+" "+var);
if(im.groupCount()>1)
op=im.group(2);
if(im.groupCount()>2) {
String s=im.group(3);
comp=fixVar(s.trim(),getVar(s.trim()));
}
}
- Channels.debug("if var "+var+" op "+op+" comp "+comp);
+ debug("if var "+var+" op "+op+" comp "+comp);
if(op==null) { // no operator
if(var!=null) {
if_true=true;
@@ -346,7 +350,7 @@ private static boolean parseV2(String[] lines,int start,String url,ChannelAuth a
String res=ChannelUtil.append(getVar(ops[0].trim()),"",
fixVar(ops[1],getVar(ops[1])));
putVar(ops[0].trim(), res);
- Channels.debug("concat "+ops[0]+" res "+res);
+ debug("concat "+ops[0]+" res "+res);
continue;
}
@@ -358,13 +362,13 @@ private static boolean parseV2(String[] lines,int start,String url,ChannelAuth a
maxV=0;
vars.remove("nomatch");
if(!m.find()) {
- Channels.debug("no match "+re.pattern());
+ debug("no match "+re.pattern());
vars.put("nomatch","1");
}
else {
- Channels.debug("match "+m.groupCount());
+ debug("match "+m.groupCount());
for(int j=1;j<=m.groupCount();j++) {
- Channels.debug("match v"+j+" = "+m.group(j));
+ debug("match v"+j+" = "+m.group(j));
vars.put("v"+String.valueOf(j), m.group(j));
}
maxV=m.groupCount();
@@ -402,7 +406,7 @@ private static boolean parseV2(String[] lines,int start,String url,ChannelAuth a
if(key.startsWith("report_val ")) {
key=key.substring(11);
rvars.put(key, fixVar(val,vars.get(val)));
- Channels.debug("rvar ass "+key+"="+fixVar(val,vars.get(val)));
+ debug("rvar ass "+key+"="+fixVar(val,vars.get(val)));
}
else {
String realVal=fixVar(val,vars.get(val));
@@ -424,7 +428,7 @@ else if(key.startsWith("pms_stash.")) {
}
}
vars.put(key, realVal);
- Channels.debug("var ass "+key+"="+realVal);
+ debug("var ass "+key+"="+realVal);
}
continue;
}
@@ -438,7 +442,7 @@ else if(key.startsWith("pms_stash.")) {
String res=ChannelUtil.append(fixVar(ops[1],getVar(ops[1])),"",
getVar(ops[0].trim()));
putVar(ops[0].trim(), res);
- Channels.debug("prepend "+ops[0]+" res "+res);
+ debug("prepend "+ops[0]+" res "+res);
continue;
}
@@ -452,9 +456,9 @@ else if(key.startsWith("pms_stash.")) {
String arg=vars.get("url");
if(ChannelUtil.empty(arg))
arg=url;
- Channels.debug("call script "+nScript+" arg "+arg);
+ debug("call script "+nScript+" arg "+arg);
String r=ChannelScriptMgr.runScript(nScript, arg, null);
- Channels.debug("script returned "+r);
+ debug("script returned "+r);
// extract the url
String[] splits=r.split("&");
putVar("v1",r); // fallback data
@@ -36,8 +36,8 @@
public class Channels extends VirtualFolder implements FileListener {
// Version string
- public static final String VERSION="2.03";
- public static final String ZIP_VER="203";
+ public static final String VERSION="2.04";
+ public static final String ZIP_VER="204";
// Constants for RTMP string constructions
public static final int RTMP_MAGIC_TOKEN=1;

0 comments on commit e9aa667

Please sign in to comment.