Commit ef227bf555600a4a5b26cfce67fc4e332f983448
1 parent
adb2f8c8
--no commit message
Showing
2 changed files
with
77 additions
and
82 deletions
gen/com/upc/pbe/upcnews/R.java
1 | -/* AUTO-GENERATED FILE. DO NOT MODIFY. | |
2 | - * | |
3 | - * This class was automatically generated by the | |
4 | - * aapt tool from the resource data it found. It | |
5 | - * should not be modified by hand. | |
6 | - */ | |
7 | - | |
8 | -package com.upc.pbe.upcnews; | |
9 | - | |
10 | -public final class R { | |
11 | - public static final class attr { | |
12 | - } | |
13 | - public static final class drawable { | |
14 | - public static final int ic_action_search=0x7f020000; | |
15 | - public static final int ic_launcher=0x7f020001; | |
16 | - public static final int ic_menu_name=0x7f020002; | |
17 | - } | |
18 | - public static final class id { | |
19 | - public static final int AbsoluteLayout1=0x7f080009; | |
20 | - public static final int ImageView01=0x7f08000b; | |
21 | - public static final int ImageView1=0x7f08000a; | |
22 | - public static final int LinearLayout1=0x7f080000; | |
23 | - public static final int button=0x7f08000e; | |
24 | - public static final int button1=0x7f080002; | |
25 | - public static final int button2=0x7f080003; | |
26 | - public static final int button3=0x7f080004; | |
27 | - public static final int button4=0x7f080005; | |
28 | - public static final int button5=0x7f080006; | |
29 | - public static final int itemhelp=0x7f080011; | |
30 | - public static final int itemprefs=0x7f080010; | |
31 | - public static final int menu_settings=0x7f08000f; | |
32 | - public static final int textView1=0x7f080007; | |
33 | - public static final int textView2=0x7f080008; | |
34 | - public static final int textViewRoute=0x7f08000c; | |
35 | - public static final int textViewTitle=0x7f080001; | |
36 | - public static final int textViewXml=0x7f08000d; | |
37 | - } | |
38 | - public static final class layout { | |
39 | - public static final int dirs=0x7f030000; | |
40 | - public static final int help=0x7f030001; | |
41 | - public static final int main_activity=0x7f030002; | |
42 | - } | |
43 | - public static final class menu { | |
44 | - public static final int activity_main=0x7f070000; | |
45 | - public static final int menu=0x7f070001; | |
46 | - } | |
47 | - public static final class string { | |
48 | - public static final int app_name=0x7f050000; | |
49 | - public static final int button=0x7f05000c; | |
50 | - public static final int button1=0x7f05000d; | |
51 | - public static final int desc=0x7f050009; | |
52 | - public static final int descarregar=0x7f050003; | |
53 | - public static final int dir=0x7f05000a; | |
54 | - public static final int directoris=0x7f05000b; | |
55 | - public static final int help=0x7f050008; | |
56 | - public static final int hint=0x7f050004; | |
57 | - public static final int logodescription=0x7f05000f; | |
58 | - public static final int menu_settings=0x7f050001; | |
59 | - public static final int prefs=0x7f050007; | |
60 | - public static final int title=0x7f05000e; | |
61 | - public static final int title_activity_main=0x7f050002; | |
62 | - public static final int url=0x7f050005; | |
63 | - public static final int urlhint=0x7f050006; | |
64 | - } | |
65 | - public static final class style { | |
66 | - public static final int AppTheme=0x7f060000; | |
67 | - } | |
68 | - public static final class xml { | |
69 | - public static final int prefs=0x7f040000; | |
70 | - } | |
71 | -} | |
1 | +/* AUTO-GENERATED FILE. DO NOT MODIFY. | |
2 | + * | |
3 | + * This class was automatically generated by the | |
4 | + * aapt tool from the resource data it found. It | |
5 | + * should not be modified by hand. | |
6 | + */ | |
7 | + | |
8 | +package com.upc.pbe.upcnews; | |
9 | + | |
10 | +public final class R { | |
11 | + public static final class attr { | |
12 | + } | |
13 | + public static final class drawable { | |
14 | + public static final int ic_action_search=0x7f020000; | |
15 | + public static final int ic_launcher=0x7f020001; | |
16 | + public static final int ic_menu_name=0x7f020002; | |
17 | + } | |
18 | + public static final class id { | |
19 | + public static final int AbsoluteLayout1=0x7f080009; | |
20 | + public static final int ImageView01=0x7f08000b; | |
21 | + public static final int ImageView1=0x7f08000a; | |
22 | + public static final int LinearLayout1=0x7f080000; | |
23 | + public static final int button=0x7f08000e; | |
24 | + public static final int button1=0x7f080002; | |
25 | + public static final int button2=0x7f080003; | |
26 | + public static final int button3=0x7f080004; | |
27 | + public static final int button4=0x7f080005; | |
28 | + public static final int button5=0x7f080006; | |
29 | + public static final int itemhelp=0x7f080011; | |
30 | + public static final int itemprefs=0x7f080010; | |
31 | + public static final int menu_settings=0x7f08000f; | |
32 | + public static final int textView1=0x7f080007; | |
33 | + public static final int textView2=0x7f080008; | |
34 | + public static final int textViewRoute=0x7f08000c; | |
35 | + public static final int textViewTitle=0x7f080001; | |
36 | + public static final int textViewXml=0x7f08000d; | |
37 | + } | |
38 | + public static final class layout { | |
39 | + public static final int dirs=0x7f030000; | |
40 | + public static final int help=0x7f030001; | |
41 | + public static final int main_activity=0x7f030002; | |
42 | + } | |
43 | + public static final class menu { | |
44 | + public static final int activity_main=0x7f070000; | |
45 | + public static final int menu=0x7f070001; | |
46 | + } | |
47 | + public static final class string { | |
48 | + public static final int app_name=0x7f050000; | |
49 | + public static final int button=0x7f05000c; | |
50 | + public static final int button1=0x7f05000d; | |
51 | + public static final int desc=0x7f050009; | |
52 | + public static final int descarregar=0x7f050003; | |
53 | + public static final int dir=0x7f05000a; | |
54 | + public static final int directoris=0x7f05000b; | |
55 | + public static final int help=0x7f050008; | |
56 | + public static final int hint=0x7f050004; | |
57 | + public static final int logodescription=0x7f05000f; | |
58 | + public static final int menu_settings=0x7f050001; | |
59 | + public static final int prefs=0x7f050007; | |
60 | + public static final int title=0x7f05000e; | |
61 | + public static final int title_activity_main=0x7f050002; | |
62 | + public static final int url=0x7f050005; | |
63 | + public static final int urlhint=0x7f050006; | |
64 | + } | |
65 | + public static final class style { | |
66 | + public static final int AppTheme=0x7f060000; | |
67 | + } | |
68 | + public static final class xml { | |
69 | + public static final int prefs=0x7f040000; | |
70 | + } | |
71 | +} | ... | ... |
src/com/upc/pbe/upcnews/Parser.java
... | ... | @@ -12,6 +12,8 @@ public class Parser |
12 | 12 | private int currentList; //Indice de cada recurso distinto |
13 | 13 | private boolean expectSegment = false; |
14 | 14 | private boolean expectList = false; |
15 | + private Descarrega download; | |
16 | + Parser p = new Parser(); | |
15 | 17 | |
16 | 18 | public Parser() |
17 | 19 | { |
... | ... | @@ -24,6 +26,7 @@ public class Parser |
24 | 26 | * 0 indicates SEGMENTS |
25 | 27 | * 1 indicates MEDIA |
26 | 28 | */ |
29 | + download = new Descarrega(); | |
27 | 30 | } |
28 | 31 | |
29 | 32 | public ArrayList<ParentList> parseFile(String file) throws ErrorException, WarningException, InfoException |
... | ... | @@ -34,9 +37,7 @@ public class Parser |
34 | 37 | String[] lines = file.split("\n"); |
35 | 38 | for(int i = 0; i < lines.length; i++) |
36 | 39 | { |
37 | - /* | |
38 | - * TO-DO: Detectar los \ y juntarlos en una sola linea | |
39 | - */ | |
40 | + | |
40 | 41 | parseLine(lines[i],lists); |
41 | 42 | } |
42 | 43 | /* |
... | ... | @@ -296,6 +297,7 @@ public class Parser |
296 | 297 | pl.setDefault(Default); |
297 | 298 | pl.setName(Name); |
298 | 299 | pl.setType(Type); |
300 | + p.parseFile(download.doInBackground(URI)); | |
299 | 301 | /* |
300 | 302 | * Procesar URI y descargar listas recursivamente y añadir a la lista actual. |
301 | 303 | * |
... | ... | @@ -373,14 +375,7 @@ public class Parser |
373 | 375 | else if(expectList) |
374 | 376 | { |
375 | 377 | expectList = false; |
376 | - /* | |
377 | - * Aquí hay que bajarse la playlist que hay en la url contenida en line | |
378 | - * primero se baja el file, se pillan las lineas en un string enorme | |
379 | - * y se crea una nueva instancia de parser (pa no mezclar los argumentos) | |
380 | - * y se parsea con arte y gracia, luego se recogen los frutos | |
381 | - * | |
382 | - * TO-DO: Necesito la función de Marc | |
383 | - */ | |
378 | + p.parseFile(download.doInBackground(line)); | |
384 | 379 | } |
385 | 380 | else |
386 | 381 | { | ... | ... |