--no commit message

Imanol-Mikel Barba Sabariego
1 parent eafc5031
Showing 7 changed files with 193 additions and 40 deletions
.settings/org.eclipse.jdt.core.prefs
src/com/upc/pbe/upcnews/ErrorException.java
src/com/upc/pbe/upcnews/MainActivity.java
src/com/upc/pbe/upcnews/Parser.java
src/com/upc/pbe/upcnews/Playlist.java
src/com/upc/pbe/upcnews/Segment.java
src/com/upc/pbe/upcnews/WarningException.java
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.source=1.5
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
+package com.upc.pbe.upcnews;
+
+public class ErrorException extends Exception
+{
+	private static final long serialVersionUID = 1L;
+	public ErrorException(String message)
+	{
+		super(message);
+	}
+}
@@ -18,7 +18,7 @@ public class MainActivity extends Activity implements OnClickListener {
 	Button buttonDescarrega;
 	String file = "ejemplo.xml";
-	String folder = "Environment.getExternalStorageDirectory.getPath()"; // hauria de ser /sdcard/downloads
+	String folder = "Environment.getExternalStorageDirectory.getPath()";
 	TextView showText, showRoute;
 	@Override
@@ -11,9 +11,9 @@ public class Parser
 	}
-	public void setPlaylist(Playlist m3u8)
+	public void setPlaylist(Playlist pls)
 	{
-		playlist = m3u8;
+		playlist = pls;
 	}
 	public Playlist getPlaylist()
@@ -21,54 +21,92 @@ public class Parser
 		return playlist;
 	}
-	public void parseLine(String line)
+	public void parseLine(String line) throws ErrorException, WarningException
 	{
+		Playlist pls = getPlaylist();
 		int currentLine = 0;
-		boolean m3u8Validated = false;
-		if(true) //NIGGRADA PER QUE TIRI, JA HO MIRARÉ
+		int currentSegment = 0;
+		boolean expectSegment = false;
+		
+		if(pls == null)
+		{
+			throw new ErrorException("Playlist uninitialized");			
+		}
+		
+		if(line.isEmpty())
 		{
 			currentLine++;
 			return;
 		}
 		else
 		{
-			if(!m3u8Validated)
+			if(!pls.getValidated())
 			{
 				if(line.equals(STARTWORD))
 				{
-					m3u8Validated = true;
+					pls.setValidated(true);
+				}
+				else
+				{
+					throw new ErrorException("Playlist is not valid");
 				}
 			}
+			else
+			{
+				if(line.charAt(0) == '#')
+				{
+					if(line.substring(0,4).equals("#EXT"))
+					{
+						String[] extTag = line.split(":");
+						//switch(extTag[0]) Esto no se puede usar hasta JDK7 y Android no lo permite, diffikultyz???
+						if(extTag[0].equals("#EXT-X-MEDIA-SEQUENCE"))
+						{
+							pls.setSequence(Integer.parseInt(extTag[1]));
+						}
+						else if(extTag[0].equals("#EXT-X-TARGETDURATION"))
+						{
+							pls.setMaxDuration(Integer.parseInt(extTag[1]));
+						}
+						
+						else if(extTag[0].equals("#EXTINF"))
+						{
+							String[] args = extTag[1].split(",");
+							int duration = Integer.parseInt(args[0]);
+							if (duration > pls.getMaxDuration())
+							{
+								throw new ErrorException("Segment " + currentSegment + " on line " + currentLine 
+										+" exceeds max duration");
+							}
+							Segment s = new Segment(duration);
+							s.setName(args[1]);
+							pls.getSegments().add(s);
+							currentSegment++;
+							expectSegment = true;
+						}
+						
+						else if(extTag[0].equals("#EXT-X-STREAM-INF"))
+						{
+							
+						}
+						
+						else if(extTag[0].equals("#EXT-X-ENDLIST"))
+						{
+							//END REACHED, IGNORE AND LET THE FILE REACH EOF						
+						}
+						
+						else
+						{
+							throw new WarningException("Tag not implemented");
+						}
+					}
+					
+				}
+				
+			}
 		}
-	/*else
-		if [[ $M3U8_VALIDATED -eq 0 ]]; then
-			if [[ $line == "#EXTM3U" ]]; then
-				M3U8_VALIDATED=1
-			else
-				echo "ERROR: This is not an m3u8 file!!"
-				exit 1
-			fi
-		else
-			if [[ `echo $line | head -c1` == "#" ]]; then
-				if [[ `echo $line | head -c4` == "#EXT" ]]; then
-					case `echo $line | cut -d':' -f 1` in
-						"#EXT-X-MEDIA-SEQUENCE")
-							SEQUENCE_FIRST=`echo $line | cut -d':' -f 2`;
-							echo "INFO: First element to be played is: $SEQUENCE_FIRST";;
-						"#EXT-X-TARGETDURATION")
-							MAX_DURATION=`echo $line | cut -d':' -f 2`;
-							echo "INFO: Maximum segment duration is: $MAX_DURATION";;
-						"#EXTINF")
-							DURATION=`echo $line | cut -d':' -f 2 | cut -d',' -f 1`
-							if [[ $DURATION > $MAX_DURATION ]]; then
-								echo "ERROR: Segment $CURRENT_SEGMENT on line $CURRENT_LINE is larger than EXT-X-TARGETDURATION"
-								exit 1
-							else
-								NAME=`echo $line | cut -d':' -f 2 | cut -d',' -f 2`
-								EXTINF=1
-							fi;;
+	/*
 						"#EXT-X-STREAM-INF")
 							EXTXSTREAM=1
 							PROGRAMID=""
 package com.upc.pbe.upcnews;
+import java.util.ArrayList;
+
 public class Playlist
 {
-
+	private boolean validated;
+	private int sequenceFirst;
+	private int maxDuration;
+	private ArrayList<Segment> segments;
+	
+	public Playlist()
+	{
+		validated = false;
+		segments = new ArrayList<Segment>();
+	}
+	
+	public void setValidated(boolean val)
+	{
+		validated = val;
+	}
+	
+	public boolean getValidated()
+	{
+		return validated;
+	}
+	
+	public void setSequence(int seq)
+	{
+		sequenceFirst = seq;
+	}
+	
+	public int getSequence()
+	{
+		return sequenceFirst;
+	}
+	
+	public void setMaxDuration(int dur)
+	{
+		maxDuration = dur;
+	}
+	
+	public int getMaxDuration()
+	{
+		return maxDuration;
+	}
+	
+	public ArrayList<Segment> getSegments()
+	{
+		return segments;
+	}
 }
+
+package com.upc.pbe.upcnews;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+
+public class Segment
+{
+	private String name;
+	private int duration;
+	private URL url;
+	
+	public Segment(int dur)
+	{
+		name = "";
+		duration = dur;
+	}
+	
+	public void setName(String nam)
+	{
+		name = nam;
+	}
+	
+	public String getName()
+	{
+		return name;
+	}
+	
+	public int getDuration()
+	{
+		return duration;
+	}
+	public void setURL(String url) throws MalformedURLException
+	{
+		this.url = new URL(url);
+	}
+	
+	public URL getURL()
+	{
+		return url;
+	}
+}
+package com.upc.pbe.upcnews;
+
+public class WarningException extends Exception
+{
+	private static final long serialVersionUID = 1L;
+	public WarningException(String message)
+	{
+		super(message);
+	}
+}