Add page_split + use on svt

Author: SharkHunter

channels/svt.ch

@@ -1,4 +1,4 @@
-version=0.98
+version=1.00
 
 scriptdef svtFilter{
 	url=s_url
@@ -145,7 +145,7 @@ channel SVTPlay {
 		type=ATZ
 		url=http://www.svtplay.se/program
 		folder {
-			 matcher=<a href=\"(/[^\"]+)\".*?class=\".*?play_alphabetic-li[^\"]+\">([^<]+)</a>
+			 matcher=<a href=\"(/[^\"]+)\" title.*?class=\".*?play_alphabetic-li[^\"]+\">([^<]+)</a>
 			 order=url,name
 			 url=http://www.svtplay.se/
 			 prop=matcher_dotall,monitor
@@ -155,7 +155,7 @@ channel SVTPlay {
 		  		matcher=<a title=\"[^\"]+\".*?href=\"(/video/[^\"]+)\".*?class=\"[^\"]+\".*?<img.*?alt=\"([^\"]+)\".*?src=\"([^\"]+)\"
 				order=url,name,thumb
 				action_name=crawl
-				prop=matcher_dotall,monitor,crawl_mode=FLA+HML
+				prop=matcher_dotall,monitor,crawl_mode=FLA+HML,page_split=(.*)Mer fr.n <a href=\"
 				folder {
 					type=empty
 					matcher=data-json-href=\"([^\"]+)\"

src/com/sharkhunter/channel/Channel.java

@@ -361,7 +361,7 @@ public ChannelAuth prepareCom() {
 	}
 
 	public void addSearcher(String id,SearchObj obj) {
-		searchFolders.put(id,obj);
+		searchFolders.put(id, obj);
 	}
 
 	public void research(String str,String id,DLNAResource res) {
@@ -383,6 +383,13 @@ public void research(String str,String id,DLNAResource res) {
 		if(obj==null)
 			return;
 		obj.search(str, res);
+	}	
+	public void searchAll(String str, DLNAResource res) {
+		for(String id : searchFolders.keySet()) {
+			SearchObj sobj = searchFolders.get(id);
+			if(sobj!=null)
+				sobj.search(str,res);
+		}
 	}
 
 	public HashMap<String,String> getSubMap(String realName,int id) {

src/com/sharkhunter/channel/ChannelMatcher.java

@@ -12,6 +12,7 @@ public class ChannelMatcher implements ChannelProps{
 	 private Matcher matcher;
 	 private Channel parent;
 	 private int flags;
+	 private String pageReg;
 	 private HashMap<String,ChannelMatcher> embed;
 
 	 private static final String lcbr="###lcbr###";
@@ -28,6 +29,7 @@ public class ChannelMatcher implements ChannelProps{
 		 this.properties=prop;
 		 regexp=null;
 		 parent=null;
+		 pageReg = null;
 		 flags=Pattern.MULTILINE;
 		 embed=new HashMap<String,ChannelMatcher>();
 	  }
@@ -41,6 +43,7 @@ public void processProps(String[] props) {
 			 flags|=Pattern.DOTALL;
 		 if(ChannelUtil.getProperty(props, "no_case"))
 			 flags|=Pattern.CASE_INSENSITIVE;
+		 pageReg = ChannelUtil.getPropertyValue(props, "page_split");
 		 for(String key : embed.keySet()) {
 			 ChannelMatcher m=embed.get(key);
 			 m.processProps(props);
@@ -72,6 +75,14 @@ public void startMatch(String str) {
 		 if(ChannelUtil.empty(regStr))
 			 return;
 		 regexp=Pattern.compile(fixReg(regStr),flags);
+		 if(!ChannelUtil.empty(pageReg)) {
+			 // inherit flags
+			 Pattern re = Pattern.compile(fixReg(pageReg), flags);
+			 Matcher m1 = re.matcher(str);
+			 if(m1.find()) {
+				 str = m1.group(1);
+			 }
+		 }
 		 this.matcher=this.regexp.matcher(str);
 	 }
 

src/com/sharkhunter/channel/ChannelMonitor.java

@@ -16,6 +16,7 @@ public class ChannelMonitor {
 	private boolean scanning;
 	private String templ;
 	private String search;
+	private boolean try_search;
 
 	ChannelMonitor(ChannelFolder cf,ArrayList<String> oldEntries,String name) {
 		this.cf=cf;
@@ -24,6 +25,7 @@ public class ChannelMonitor {
 		templ=null;
 		search=null;
 		scanning=false;
+		try_search = false;
 	}
 
 	public void setTemplate(String t) {
@@ -33,6 +35,8 @@ public void setTemplate(String t) {
 	public void setSearch(String s) {
 		search=s;
 	}
+
+	public void setTrySearch(boolean b) { try_search = b; }
 
 	public void scan() {
 		if(scanning)
@@ -43,8 +47,13 @@ public void scan() {
 		try {
 			if(!ChannelUtil.empty(search))
 				cf.search(search, dummy);
-			else
+			else {
+				if(try_search) {
+					Channel ch = cf.getChannel();
+					ch.searchAll(name, dummy);
+				}
 				cf.match(dummy);
+			}
 		} catch (MalformedURLException e) {
 			scanning=false;
 			return;

src/com/sharkhunter/channel/ChannelPMSSaveFolder.java

@@ -241,7 +241,7 @@ public InputStream getThumbnailInputStream() {
 	}
 
 	public void childDone() {
-		childDone=System.currentTimeMillis();
+		//childDone=System.currentTimeMillis();
 	}
 
 	public boolean preventAutoPlay() {

src/com/sharkhunter/channel/ChannelPMSSubSelector.java

@@ -5,6 +5,7 @@
 import java.util.TreeMap;
 import java.util.TreeSet;
 
+import net.pms.dlna.DLNAMediaSubtitle;
 import org.apache.commons.lang.StringUtils;
 
 import net.pms.dlna.DLNAResource;

src/com/sharkhunter/channel/Channels.java

@@ -40,7 +40,7 @@
 public class Channels extends VirtualFolder implements FileListener {
 
 	// Version string
-	public static final String VERSION="2.22";
+	public static final String VERSION="2.25";
 	public static final String ZIP_VER="211";
 
 	// Constants for RTMP string constructions
@@ -1293,6 +1293,7 @@ private void parseMonitorFile() {
 			StringBuilder sb=null;
 			String templ=null;
 			String search=null;
+			boolean try_search = false;
 			while ((str = in.readLine()) != null) {
 				if(ChannelUtil.empty(str))
 					continue;
@@ -1316,13 +1317,15 @@ private void parseMonitorFile() {
 								ChannelMonitor m=new ChannelMonitor(mf,entries,name);
 								m.setTemplate(templ);
 								m.setSearch(search);
+								m.setTrySearch(try_search);
 								monMgr.add(m);
 								// Clear all vars
 								name=null;
 								templ=null;
 								entries=null;
 								owner=null;
 								search=null;
+								try_search = false;
 							}
 						}
 					}
@@ -1354,6 +1357,10 @@ private void parseMonitorFile() {
 					sb=new StringBuilder();
 					continue;
 				}
+				if(str.startsWith("try_search=")) {
+					try_search = str.substring(11).equalsIgnoreCase("true");
+					continue;
+				}
 				if(str.startsWith("name=")) {
 					if(ChannelUtil.empty(name)) { // only pick 1st name, just to simplify parsing
 						name=str.substring(5);
@@ -1409,6 +1416,7 @@ public static void monitor(DLNAResource res,ChannelFolder cf,
 		String nameProp=cf.getProp("monitor_name");
 		String washedName=monNameWash(res.getName(),templ,searched,nameProp);
 		StringBuffer sb=new StringBuffer();
+		boolean try_search = cf.getProperty("monitor_try_search");
 		if(newFile) {
 			sb.append("######\n");
 			sb.append("## NOTE!!!!!\n");
@@ -1423,6 +1431,8 @@ public static void monitor(DLNAResource res,ChannelFolder cf,
 			ChannelUtil.appendVarLine(sb, "templ", templ);
 		if(!ChannelUtil.empty(searched))
 			ChannelUtil.appendVarLine(sb, "search", searched);
+		if(try_search)
+			ChannelUtil.appendVarLine(sb, "try_search", "true");
 		ArrayList<String> entries=new ArrayList<String>();
 		for(DLNAResource r : res.getChildren()) {
 			if(ChannelUtil.filterInternals(r))
@@ -1440,6 +1450,7 @@ public static void monitor(DLNAResource res,ChannelFolder cf,
     		String str=lines[i].trim();
     	    if(str.startsWith("monitor")||
     	       str.startsWith("owner")||
+			   str.startsWith("try_search") ||
     	       str.startsWith("templ")) {
     	    	// skip the start lines
     	    	continue;
@@ -1453,6 +1464,7 @@ public static void monitor(DLNAResource res,ChannelFolder cf,
     			ChannelMonitor m=new ChannelMonitor(mf,entries,washedName);
     			m.setTemplate(templ);
     			m.setSearch(searched);
+				m.setTrySearch(try_search);
     			inst.monMgr.add(m);
     			continue;
     	    }