From ef227bf555600a4a5b26cfce67fc4e332f983448 Mon Sep 17 00:00:00 2001 From: Equip de Desenvolupadors de PBE Date: Wed, 5 Dec 2012 13:34:22 +0000 Subject: [PATCH] --- gen/com/upc/pbe/upcnews/R.java | 142 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------- src/com/upc/pbe/upcnews/Parser.java | 17 ++++++----------- 2 files changed, 77 insertions(+), 82 deletions(-) diff --git a/gen/com/upc/pbe/upcnews/R.java b/gen/com/upc/pbe/upcnews/R.java index ba09742..849a54a 100644 --- a/gen/com/upc/pbe/upcnews/R.java +++ b/gen/com/upc/pbe/upcnews/R.java @@ -1,71 +1,71 @@ -/* AUTO-GENERATED FILE. DO NOT MODIFY. - * - * This class was automatically generated by the - * aapt tool from the resource data it found. It - * should not be modified by hand. - */ - -package com.upc.pbe.upcnews; - -public final class R { - public static final class attr { - } - public static final class drawable { - public static final int ic_action_search=0x7f020000; - public static final int ic_launcher=0x7f020001; - public static final int ic_menu_name=0x7f020002; - } - public static final class id { - public static final int AbsoluteLayout1=0x7f080009; - public static final int ImageView01=0x7f08000b; - public static final int ImageView1=0x7f08000a; - public static final int LinearLayout1=0x7f080000; - public static final int button=0x7f08000e; - public static final int button1=0x7f080002; - public static final int button2=0x7f080003; - public static final int button3=0x7f080004; - public static final int button4=0x7f080005; - public static final int button5=0x7f080006; - public static final int itemhelp=0x7f080011; - public static final int itemprefs=0x7f080010; - public static final int menu_settings=0x7f08000f; - public static final int textView1=0x7f080007; - public static final int textView2=0x7f080008; - public static final int textViewRoute=0x7f08000c; - public static final int textViewTitle=0x7f080001; - public static final int textViewXml=0x7f08000d; - } - public static final class layout { - public static final int dirs=0x7f030000; - public static final int help=0x7f030001; - public static final int main_activity=0x7f030002; - } - public static final class menu { - public static final int activity_main=0x7f070000; - public static final int menu=0x7f070001; - } - public static final class string { - public static final int app_name=0x7f050000; - public static final int button=0x7f05000c; - public static final int button1=0x7f05000d; - public static final int desc=0x7f050009; - public static final int descarregar=0x7f050003; - public static final int dir=0x7f05000a; - public static final int directoris=0x7f05000b; - public static final int help=0x7f050008; - public static final int hint=0x7f050004; - public static final int logodescription=0x7f05000f; - public static final int menu_settings=0x7f050001; - public static final int prefs=0x7f050007; - public static final int title=0x7f05000e; - public static final int title_activity_main=0x7f050002; - public static final int url=0x7f050005; - public static final int urlhint=0x7f050006; - } - public static final class style { - public static final int AppTheme=0x7f060000; - } - public static final class xml { - public static final int prefs=0x7f040000; - } -} +/* AUTO-GENERATED FILE. DO NOT MODIFY. + * + * This class was automatically generated by the + * aapt tool from the resource data it found. It + * should not be modified by hand. + */ + +package com.upc.pbe.upcnews; + +public final class R { + public static final class attr { + } + public static final class drawable { + public static final int ic_action_search=0x7f020000; + public static final int ic_launcher=0x7f020001; + public static final int ic_menu_name=0x7f020002; + } + public static final class id { + public static final int AbsoluteLayout1=0x7f080009; + public static final int ImageView01=0x7f08000b; + public static final int ImageView1=0x7f08000a; + public static final int LinearLayout1=0x7f080000; + public static final int button=0x7f08000e; + public static final int button1=0x7f080002; + public static final int button2=0x7f080003; + public static final int button3=0x7f080004; + public static final int button4=0x7f080005; + public static final int button5=0x7f080006; + public static final int itemhelp=0x7f080011; + public static final int itemprefs=0x7f080010; + public static final int menu_settings=0x7f08000f; + public static final int textView1=0x7f080007; + public static final int textView2=0x7f080008; + public static final int textViewRoute=0x7f08000c; + public static final int textViewTitle=0x7f080001; + public static final int textViewXml=0x7f08000d; + } + public static final class layout { + public static final int dirs=0x7f030000; + public static final int help=0x7f030001; + public static final int main_activity=0x7f030002; + } + public static final class menu { + public static final int activity_main=0x7f070000; + public static final int menu=0x7f070001; + } + public static final class string { + public static final int app_name=0x7f050000; + public static final int button=0x7f05000c; + public static final int button1=0x7f05000d; + public static final int desc=0x7f050009; + public static final int descarregar=0x7f050003; + public static final int dir=0x7f05000a; + public static final int directoris=0x7f05000b; + public static final int help=0x7f050008; + public static final int hint=0x7f050004; + public static final int logodescription=0x7f05000f; + public static final int menu_settings=0x7f050001; + public static final int prefs=0x7f050007; + public static final int title=0x7f05000e; + public static final int title_activity_main=0x7f050002; + public static final int url=0x7f050005; + public static final int urlhint=0x7f050006; + } + public static final class style { + public static final int AppTheme=0x7f060000; + } + public static final class xml { + public static final int prefs=0x7f040000; + } +} diff --git a/src/com/upc/pbe/upcnews/Parser.java b/src/com/upc/pbe/upcnews/Parser.java index 68cf3b2..74750e3 100644 --- a/src/com/upc/pbe/upcnews/Parser.java +++ b/src/com/upc/pbe/upcnews/Parser.java @@ -12,6 +12,8 @@ public class Parser private int currentList; //Indice de cada recurso distinto private boolean expectSegment = false; private boolean expectList = false; + private Descarrega download; + Parser p = new Parser(); public Parser() { @@ -24,6 +26,7 @@ public class Parser * 0 indicates SEGMENTS * 1 indicates MEDIA */ + download = new Descarrega(); } public ArrayList parseFile(String file) throws ErrorException, WarningException, InfoException @@ -34,9 +37,7 @@ public class Parser String[] lines = file.split("\n"); for(int i = 0; i < lines.length; i++) { - /* - * TO-DO: Detectar los \ y juntarlos en una sola linea - */ + parseLine(lines[i],lists); } /* @@ -296,6 +297,7 @@ public class Parser pl.setDefault(Default); pl.setName(Name); pl.setType(Type); + p.parseFile(download.doInBackground(URI)); /* * Procesar URI y descargar listas recursivamente y añadir a la lista actual. * @@ -373,14 +375,7 @@ public class Parser else if(expectList) { expectList = false; - /* - * Aquí hay que bajarse la playlist que hay en la url contenida en line - * primero se baja el file, se pillan las lineas en un string enorme - * y se crea una nueva instancia de parser (pa no mezclar los argumentos) - * y se parsea con arte y gracia, luego se recogen los frutos - * - * TO-DO: Necesito la función de Marc - */ + p.parseFile(download.doInBackground(line)); } else { -- libgit2 0.22.2