From 8dd521b90108a964173b3d8cc1435c1fe1dff9e5 Mon Sep 17 00:00:00 2001 From: skeezix Date: Tue, 24 Mar 2009 21:47:19 -0400 Subject: [PATCH] Merged in changes from dflemstr (thanks!) Fixed a couple NULLs in there (well fixed, or a quick hack to cover 'em up, whichever :) Redid sample apps to use new PXML format so they actually provide info to discotest --- Makefile | 7 +- docs/PXML_proposed_spec.html | 446 ++++++++++++++++++ docs/PXML_schema.xsd | 123 +++++ docs/examples/PXML.xml | 43 ++ include/pnd_pxml.h | 24 +- include/pnd_pxml_names.h | 88 ++++ lib/pnd_pxml.c | 136 ++++-- lib/pnd_tinyxml.cpp | 443 ++++++++--------- test/rawpxmltest.c | 72 +++ testdata/app2/sampleapp4/PXML.xml | 107 ++--- testdata/apps/sampleapp/PXML.xml | 86 ---- testdata/apps/sampleapp1/PXML.xml | 41 ++ .../{sampleapp => sampleapp1}/program.exe | 0 testdata/apps/sampleapp1/zeldaicon.png | Bin 0 -> 14866 bytes testdata/apps/sampleapp2/PXML.xml | 105 ++--- testdata/apps/sampleapp2/zeldaicon.png | Bin 0 -> 14866 bytes testdata/apps/sampleapp3/PXML.xml | 107 ++--- testdata/pndsample/x86_echo.pnd | Bin 387551 -> 387644 bytes testdata/pndsample/x86_echo/PXML.xml | 28 +- testdata/pndsample/x86_ls.pnd | Bin 489775 -> 488547 bytes testdata/pndsample/x86_ls/PXML.xml | 90 +--- 21 files changed, 1244 insertions(+), 702 deletions(-) create mode 100644 docs/PXML_proposed_spec.html create mode 100644 docs/PXML_schema.xsd create mode 100644 docs/examples/PXML.xml create mode 100644 include/pnd_pxml_names.h create mode 100644 test/rawpxmltest.c delete mode 100644 testdata/apps/sampleapp/PXML.xml create mode 100644 testdata/apps/sampleapp1/PXML.xml rename testdata/apps/{sampleapp => sampleapp1}/program.exe (100%) create mode 100644 testdata/apps/sampleapp1/zeldaicon.png create mode 100644 testdata/apps/sampleapp2/zeldaicon.png diff --git a/Makefile b/Makefile index f2122a4..daa1877 100644 --- a/Makefile +++ b/Makefile @@ -22,10 +22,10 @@ SOLIB1 = libpnd.so.1.0.1 # versioned name XMLOBJ = lib/tinyxml/tinystr.o lib/tinyxml/tinyxml.o lib/tinyxml/tinyxmlerror.o lib/tinyxml/tinyxmlparser.o ALLOBJ = pnd_conf.o pnd_container.o pnd_discovery.o pnd_pxml.o pnd_notify.o pnd_locate.o pnd_tinyxml.o pnd_pndfiles.o pnd_apps.o pnd_utility.o pnd_desktop.o -all: ${SOLIB} ${LIB} conftest discotest notifytest locatetest pndnotifyd +all: ${SOLIB} ${LIB} conftest discotest notifytest locatetest pndnotifyd rawpxmltest clean: - ${RM} -f ${ALLOBJ} ${XMLOBJ} ${LIB} ${SOLIB1} locatetest.o bin/locatetest conftest.o bin/conftest discotest.o bin/discotest bin/notifytest notifytest.o bin/pndnotifyd pndnotifyd.o ${SOLIB} testdata/dotdesktop/*.desktop testdata/apps/*.pnd testdata/dotdesktop/*.png deployment/usr/lib/libpnd* deployment/usr/bin/pndnotifyd deployment/usr/pandora/scripts/* deployment/etc/sudoers deployment/etc/init.d/pndnotifyd + ${RM} -f ${ALLOBJ} ${XMLOBJ} ${LIB} ${SOLIB1} locatetest.o bin/locatetest conftest.o bin/conftest discotest.o bin/discotest bin/notifytest notifytest.o bin/rawpxmltest rawpxmltest.o bin/pndnotifyd pndnotifyd.o ${SOLIB} testdata/dotdesktop/*.desktop testdata/apps/*.pnd testdata/dotdesktop/*.png deployment/usr/lib/libpnd* deployment/usr/bin/pndnotifyd deployment/usr/pandora/scripts/* deployment/etc/sudoers deployment/etc/init.d/pndnotifyd ${RM} -rf deployment/media find . -name "*~*" -exec rm {} \; -print @@ -87,3 +87,6 @@ notifytest: notifytest.o ${LIB} locatetest: locatetest.o ${SOLIB1} ${CC} -lstdc++ -o bin/locatetest locatetest.o ${SOLIB1} + +rawpxmltest: rawpxmltest.o ${LIB} + ${CC} -lstdc++ -o bin/rawpxmltest rawpxmltest.o ${LIB} diff --git a/docs/PXML_proposed_spec.html b/docs/PXML_proposed_spec.html new file mode 100644 index 0000000..b4b019f --- /dev/null +++ b/docs/PXML_proposed_spec.html @@ -0,0 +1,446 @@ + + + + The PXML file format + + + +

The PXML file format specification

+ + +

Introduction

+

+ Attention: at the present time, the PXML file format isn't set in stone, and is therefore subject to change. + There is no guarantee that the format or the schema are bug-free or will be changed at any time. + Please wait until this standard is finished before writing a PXML file. +

+

+ This is the human-readable specification for the PXML file format. + The PXML file format is used in your applications for the OpenPandora® that you package in .pnd-files or distribute otherwise, to make it possible for menus and launchers to use your applications and their properties. +

+

+ A PXML file should be appended to your .pnd-file, using the tools provided for that purpose, or put in a directory that you want to serve as a redistributable package, to make it possible for launchers and menus to find it. + It should have the name PXML.xml not case sensitive, and there should only be one such file. + The contents of the PXML file should also comply to this specification without exception, to guarantee that everyone will be able to read it. +

+

+ The PXML format is XML-based and fully XML-compliant, which means that it can be read and written by any XML reader or writer. + Included with this specification should also be a .xsd-file, which is used by XML tools to validate PXML files. + A .xsd-file is also known as a XML schema, and can be called the computer-readable version of this document. It is very good practice to validate your PXML-files with that schema before publishing them. +

+

+ To write a PXML file, you also need to know the basics of writing a XML file. + It boils down to the following: +

    +
  1. If an element contains text or other elements, it needs a start-tag and an end-tag. This looks like this: +
    + <exampleelement someattribute="something">something inside it</exampleeelement> +
    +
    2. +
  2. If an element does not contain other elements or text, but only attributes, it looks like this: +
    + <exampleelement2 someattribute="something" /> +
    +
    3. +
+

+ + +

Format

+

+ The PXML-file is split up into multiple so-called elements, each of which specify one property of the + .pnd-package. + All of these elements are surrounded with a <PXML>-tag, which tells the readers of the file that the data within that tag belongs to a PXML file. The tag and elements should be defined as follows: +

+ +

The PXML-tag

+

+ The PXML-tag serves as the container for all PXML elements. It is the first thing that should occur in your PXML file. + An example <PXML>-tag would look like this: +

+
+ <PXML xmlns="http://openpandora.org/namespaces/PXML" id="uniqueID">
+   <!--All of the PXML elements should be put here-->
+ </PXML> +
+

+ As you can see, the PXML tag accepts a few attributes, namely the id and xmlns attributes. +

+

+ The xmlns attribute is required by the XML standard, and guarantees that this file will be identified as a PXML file. + You must include the xmlns attribute, exactly as shown, in your PXML file, with the URL as specified. + Only then can it be guaranteed that the file will be read at all by launchers and menu apps. +

+

+ The id attribute specifies an identifier for your PND package, and should be something globally unique so that no two PND packages have the same id. + This can be achieved by appending some random number to your application name, and to use that as your id; or to simply generate a completely random, very long id. + If this id already is used in another PND file, those two PND files will conflict with each other, and unforseeable errors will occur. + Please put effort into generating an unique id for your PXML-file. +

+ +

The title element

+

Description

+

+ The title element specifies the text that is shown to the users of your PND file as the application title. + This element can be specified multiple times in multiple languages the language is indicated by the lang attribute. +

+

+ At least one title-element is required, in the en_US American English language. +

+

Example

+
+ <title lang="en_US">Your application name</title>

+ <title lang="de_DE">Deinen Programmnamen</title> +
+ +

The description element

+

Description

+

+ The description element specifies the text that is shown to the users of your PND file as the application description. + This element can be specified multiple times in multiple languages the language is indicated by the lang attribute. +

+

+ At least one description-element is required, in the en_US American English language. +

+

Example

+
+ <description lang="en_US">Your long description of this application, describing it's purpose and highlighting it's features.</description>

+ <description lang="de_DE">Deine etwas längere Programmbeschreibung, die den Sinn des Programmes und den wichtigsten Features beschreiben sollte.</description> +
+ +

The exec element

+

Description

+

+ The exec element should specify all the information needed to execute your application.
+ An exec element must be included in every PXML file. + It accepts the following attributes: +

+

+ The command attribute specifies the path to the executable file. + This should be a relative path to a file within the PND package. +

+

+ The startdir attribute specifies the starting directory Also known as the working directory that the application should start in. + This should be a relative path to a directory within the PND package, or to a well-known directory in the Pandora file system. +

+

+ The standalone attribute specifies wether or not this application can run on its own, or if it needs parameters to run.
+ A value of true or 1 means that the application can be run without parameters.
+ A value of false or 0 means that the application must be run with parameters. +

+

+ The background attribute specifies wether or not this application should run in the background, and it should be possible to switch to other apps while it is running, or if it is the only application that should be running.
+ A value of true or 1 means that the application can run in the background.
+ A value of false or 0 means that the application must be run as the only application. +

+

Example

+
+ <exec background="true" startdir="/usr/share/icons/" standalone="true" command="./myprogram"/> +
+ +

The icon element

+

Description

+

+ The icon element should specify a nice icon for your program.
+ An icon element is optional. + It accepts the following attributes: +

+

+ The src attribute specifies the path to the image file used as the icon. +

+

Example

+
+ <icon src="./images/icon.png"/> +
+ +

The previewpics element

+

Description

+

+ The previewpics element is an element that contains multiple other elements.
+ A previewpics element is optional. +

+

+ It contains multiple pic-elements. Every pic-element represents one preview picture. + If the previewpics element is specified, it must contain at least one pic element. +

+

+ The src attribute on a pic element specifies the path to the image file used as the preview picture. +

+

Example

+
+ <previewpics>
+   <pic src="./preview/pic1.jpg"/>
+   <pic src="./preview/pic2.jpg"/>
+ </previewpics> +
+ +

The author element

+

Description

+

+ The author element is an element that is used by the author to introduce him/herself.
+ An author element is optional. It accepts the following attributes: +

+

+ The name attribute specifies the name of the author. +

+

+ The website attribute specifies the website of the author. +

+

+ The email attribute specifies the e-mail of the author.
+ This attribute is not yet supported. +

+

Example

+
+ <author name="Bjornhild Andersson" website="http://some.website.with.author.info"/> +
+ +

The version element

+

Description

+

+ The version element specifies the application version.
+ A version element is required. It accepts the following attributes: +

+

+ The major attribute specifies the major version number. This number should be 0 or more. +

+

+ The minor attribute specifies the minor version number. This number should be 0 or more. +

+

+ The release attribute specifies the release number. This number should be 0 or more. +

+

+ The build attribute specifies what build the application is at. This number should be 0 or more. +

+

Example

+
+ <version major="1" minor="1" release="1" build="2"/> +
+ +

The osversion element

+

Description

+

+ The osversion element specifies the application version.
+ An osversion element is optional. It accepts the same attributes as the version element. +

Example

+
+ <osversion major="1" minor="1" release="1" build="2"/> +
+ +

The categories element

+

Description

+

+ The categories element is an element that contains multiple other elements.
+ A categories element is required, and must contain at least one category. +

+

+ It contains multiple category-elements. Every category-element represents one category that this app can be sorted into. + Valid categories are (among others): +

    +
  1. Development
    2. +
  2. Education
    3. +
  3. Games
    4. +
  4. Graphics
    5. +
  5. Internet
    6. +
  6. Multimedia
    7. +
  7. Office
    8. +
  8. Settings
    9. +
  9. System
    10. +
  10. Utilities
    11. +
+

+

+ The category-element takes one attribute: The name-attribute. + This attribute represents the category name, which preferrably should be one of the above. +

+

+ A category-element can contain further child-elements: subcategory-elements. + These represent the subcategories of a category that the app will be sorted into. +

+

+ The subcategory-element also takes a name-attribute; this attibute can contain any name for your subcategory. +

+

Example

+
+ <categories>
+   <category name="Games">
+     <subcategory name="Strategy"/>
+     <subcategory name="Turn-based"/>
+   </category>
+   <category name="Graphics">
+     <subcategory name="Image Editors"/>
+   </category>
+ </categories>
+
+ +

The associations element

+

Description

+

+ The associations element is an element that contains multiple other elements.
+ An associations element is optional, except if exec.standalone is false. +

+

+ It contains multiple association-elements. Every association-element represents one file action association. +

+

+ The name attribute on an association element specifies the user-friendly action name for the association. +

+

+ The filetype attribute on an association element specifies what file types (in MIME format) that this association should apply to. +

+

+ The exec attribute on an association element specifies the command-line arguments that should be given to the program, when this action is performed. + The exec can contain a %s, which indicates where the file name of the file, that the action is performed on, should be inserted.
+ For example, if the exec-line is --file %s --type lol, and you have a file "lol.bmp" that the action is performed on, the exec-line is transformed into --file "lol.bmp" --type lol +

+

Example

+
+ <associations>
+   <association name="Open Bitmap Image" filetype="image/bmp" exec="-f %s --no-deinterlacing"/>
+   <association name="Crash the computer with a stylesheet" filetype="text/css" exec="-f %s --crash-on-success"/>
+ </associations> +
+ +

The clockspeed element

+

Description

+

+ The clockspeed element specifies what clockspeed this app should run at.
+ A clockspeed element is optional. It accepts the following attributes: +

+

+ The frequency attribute specifies the wanted frequency, in megahertz mHz. +

+

Example

+
+ <clockspeed frequency="600"/> +
+ + +

Example file

+
+ <?xml version="1.0" encoding="UTF-8"?>
+ <PXML id="youruniqueID" xmlns="http://openpandora.org/namespaces/PXML">
+   <title lang="en_US">Program Title</title>
+   <title lang="de_DE">German Program Title</title>
+
+   <exec background="true" startdir="/usr/share/icons/" standalone="true" command="./program"/>
+
+   <icon src="./program.png"/>
+
+   <description lang="en_US">This is the English Description of the file.</description>
+   <description lang="de_DE">This would be the German description.</description>
+
+   <previewpics>
+     <pic src="./preview/pic1.jpg"/>
+     <pic src="./preview/pic2.jpg"/>
+   </previewpics>
+
+   <author name="Some Dudeson" website="http://a.bc.de"/>
+
+   <version major="1" minor="1" release="1" build="2"/>
+   <osversion major="1" minor="0" release="0" build="0"/>
+
+   <categories>
+     <category name="Main category">
+     <subcategory name="Subcategory 1"/>
+     <subcategory name="Subcategory 2"/>
+     </category>
+     <category name="Alternative category">
+       <subcategory name="Alternative Subcategory 1"/>
+     </category>
+   </categories>
+
+   <associations>
+     <association name="View Word File" filetype="application/msword" exec="-f %s -t doc"/>
+   </associations>
+
+   <clockspeed frequency="600"/><!--Frequency in Hz-->
+ </PXML>
+
+ + +

Validation

+

To validate a PXML file, you need a XSD (XML schema) validator, and you have to know how to use it.

+

You will also need to put the XML schema for the PXML format in the same folder as your PXML file.

+

+ When you have done that, and know how to use it, you need to change a few things in your PXML file. + In your PXML tag, change the contents from this: +

+
+ <PXML id="..." xmlns="http://openpandora.org/namespaces/PXML">... +
+

...to this:

+
+ <PXML id="..." xmlns="http://openpandora.org/namespaces/PXML" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="PXML_schema.xsd">... +
+

+ Now the PXML file can be validated. +

+ + \ No newline at end of file diff --git a/docs/PXML_schema.xsd b/docs/PXML_schema.xsd new file mode 100644 index 0000000..2d28bbe --- /dev/null +++ b/docs/PXML_schema.xsd @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/docs/examples/PXML.xml b/docs/examples/PXML.xml new file mode 100644 index 0000000..76f1e11 --- /dev/null +++ b/docs/examples/PXML.xml @@ -0,0 +1,43 @@ + + + Program Title + German Program Title + + + + + + This is the English Description of the file. + This would be the German description. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ......kfujl........ + ......qwe......fwer..... + diff --git a/include/pnd_pxml.h b/include/pnd_pxml.h index 775aef0..f54b9b7 100644 --- a/include/pnd_pxml.h +++ b/include/pnd_pxml.h @@ -9,7 +9,7 @@ extern "C" { // this code is for very basic PXML.xml file parsing #define PXML_FILENAME "PXML.xml" /* a specification defined name */ -#define PXML_TAGHEAD "" /* case insensitive */ +#define PXML_TAGHEAD "" /* case insensitive */ // use this handle to interact with PXML; this hides the mechanics of parsing a PXML file so that @@ -42,6 +42,7 @@ char *pnd_pxml_get_app_name_en ( pnd_pxml_handle h ); char *pnd_pxml_get_app_name_de ( pnd_pxml_handle h ); char *pnd_pxml_get_app_name_it ( pnd_pxml_handle h ); char *pnd_pxml_get_app_name_fr ( pnd_pxml_handle h ); +char *pnd_pxml_get_app_name ( pnd_pxml_handle h, char *iso_lang ); char *pnd_pxml_get_unique_id ( pnd_pxml_handle h ); char *pnd_pxml_get_standalone ( pnd_pxml_handle h ); char *pnd_pxml_get_icon ( pnd_pxml_handle h ); @@ -49,6 +50,7 @@ char *pnd_pxml_get_description_en ( pnd_pxml_handle h ); char *pnd_pxml_get_description_de ( pnd_pxml_handle h ); char *pnd_pxml_get_description_it ( pnd_pxml_handle h ); char *pnd_pxml_get_description_fr ( pnd_pxml_handle h ); +char *pnd_pxml_get_description ( pnd_pxml_handle h, char *iso_lang); char *pnd_pxml_get_previewpic1 ( pnd_pxml_handle h ); char *pnd_pxml_get_previewpic2 ( pnd_pxml_handle h ); char *pnd_pxml_get_author_name ( pnd_pxml_handle h ); @@ -90,17 +92,21 @@ unsigned char pnd_is_pxml_valid_app ( pnd_pxml_handle h ); // returns 1 when pxm typedef struct { - char *title_en; - char *title_de; - char *title_it; - char *title_fr; + char *language; + char *string; +} pnd_localized_string_t; + +typedef struct +{ + pnd_localized_string_t *titles; + int titles_c; + int titles_alloc_c; char *unique_id; char *standalone; char *icon; - char *description_en; - char *description_de; - char *description_it; - char *description_fr; + pnd_localized_string_t *descriptions; + int descriptions_c; + int descriptions_alloc_c; char *previewpic1; char *previewpic2; char *author_name; diff --git a/include/pnd_pxml_names.h b/include/pnd_pxml_names.h new file mode 100644 index 0000000..5076736 --- /dev/null +++ b/include/pnd_pxml_names.h @@ -0,0 +1,88 @@ +#ifndef h_pnd_pxml_names_h +#define h_pnd_pxml_names_h + +#ifdef __cplusplus +extern "C" { +#endif + +/* ...*/ +#define PND_PXML_ATTRNAME_UID "id" + +/* */ +#define PND_PXML_ENAME_TITLE "title" +#define PND_PXML_ATTRNAME_TITLELANG "lang" + +/* <description lang="...">... */ +#define PND_PXML_ENAME_DESCRIPTION "description" +#define PND_PXML_ATTRNAME_DESCRLANG "lang" + +/* <exec background="true" standalone="false" command="..." startdir="..." /> */ +#define PND_PXML_ENAME_EXEC "exec" +#define PND_PXML_ATTRNAME_EXECBG "background" +#define PND_PXML_ATTRNAME_EXECSTAL "standalone" +#define PND_PXML_ATTRNAME_EXECCMD "command" +#define PND_PXML_ATTRNAME_EXECWD "startdir" + +/* <icon src="..." /> */ +#define PND_PXML_ENAME_ICON "icon" +#define PND_PXML_ATTRNAME_ICONSRC "src" + +/* <previewpics> + * <pic src="..." /> + * </previewpics> + */ +#define PND_PXML_NODENAME_PREVPICS "previewpics" +#define PND_PXML_ENAME_PREVPIC "pic" +#define PND_PXML_ATTRNAME_PREVPICSRC "src" + +/* <author name="..." website="..." email="..." /> */ +#define PND_PXML_ENAME_AUTHOR "author" +#define PND_PXML_ATTRNAME_AUTHORNAME "name" +#define PND_PXML_ATTRNAME_AUTHORWWW "website" +#define PND_PXML_ATTRNAME_AUTHOREMAIL "email" + +/* <version major="1" minor="1" release="1" build="2" /> */ +#define PND_PXML_ENAME_VERSION "version" +#define PND_PXML_ATTRNAME_VERMAJOR "major" +#define PND_PXML_ATTRNAME_VERMINOR "minor" +#define PND_PXML_ATTRNAME_VERREL "release" +#define PND_PXML_ATTRNAME_VERBUILD "build" + +/* <osversion major="1" minor="0" release="0" build="0" /> */ +#define PND_PXML_ENAME_OSVERSION "osversion" +#define PND_PXML_ATTRNAME_OSVERMAJOR "major" +#define PND_PXML_ATTRNAME_OSVERMINOR "minor" +#define PND_PXML_ATTRNAME_OSVERREL "release" +#define PND_PXML_ATTRNAME_OSVERBUILD "build" + +/* <categories> + * <category name="..."> + * <subcategory name="..." /> + * </category> + * </categories> + */ +#define PND_PXML_NODENAME_CATS "categories" +#define PND_PXML_ENAME_CAT "category" +#define PND_PXML_ATTRNAME_CATNAME "name" +#define PND_PXML_ENAME_SUBCAT "subcategory" +#define PND_PXML_ATTRNAME_SUBCATNAME "name" + +/* <associations> + * <association name="CSS File" filetype="text/css" exec="-f %s -t css" /> + * </associations> + */ +#define PND_PXML_NODENAME_ASSOCS "associations" +#define PND_PXML_ENAME_ASSOC "association" +#define PND_PXML_ATTRNAME_ASSOCNAME "name" +#define PND_PXML_ATTRNAME_ASSOCFTYPE "filetype" +#define PND_PXML_ATTRNAME_ASSOCARGS "arguments" + +/* <clockspeed frequency="600" /> */ +#define PND_PXML_ENAME_CLOCK "clockspeed" +#define PND_PXML_ATTRNAME_CLOCKFREQ "frequency" + +#ifdef __cplusplus +} // extern "C" +#endif + +#endif /* ifndef h_pnd_pxml_names_h */ \ No newline at end of file diff --git a/lib/pnd_pxml.c b/lib/pnd_pxml.c index 78c41e7..6b1c96e 100644 --- a/lib/pnd_pxml.c +++ b/lib/pnd_pxml.c @@ -40,39 +40,31 @@ pnd_pxml_handle pnd_pxml_fetch_buffer ( char *filename, char *buffer ) { void pnd_pxml_delete ( pnd_pxml_handle h ) { pnd_pxml_t *p = (pnd_pxml_t*) h; - if ( p -> title_en ) { - free ( p -> title_en ); - } - if ( p -> title_de ) { - free ( p -> title_de ); - } - if ( p -> title_it ) { - free ( p -> title_it ); - } - if ( p -> title_fr ) { - free ( p -> title_fr ); + int i; + if (p->titles) { + for (i = 0; i < p->titles_c; i++) + { + free(p->titles[i].language); + free(p->titles[i].string); + } + free(p->titles); } - if ( p -> unique_id ) { - free ( p -> unique_id ); + + if (p->descriptions) { + for (i = 0; i < p->descriptions_c; i++) + { + free(p->descriptions[i].language); + free(p->descriptions[i].string); + } + free(p->descriptions); } + if ( p -> standalone ) { free ( p -> standalone ); } if ( p -> icon ) { free ( p -> icon ); } - if ( p -> description_en ) { - free ( p -> description_en ); - } - if ( p -> description_de ) { - free ( p -> description_de ); - } - if ( p -> description_it ) { - free ( p -> description_it ); - } - if ( p -> description_fr ) { - free ( p -> description_fr ); - } if ( p -> previewpic1 ) { free ( p -> previewpic1 ); } @@ -167,25 +159,50 @@ void pnd_pxml_delete ( pnd_pxml_handle h ) { free ( p -> startdir ); } + free(p); /*very important!*/ + return; } void pnd_pxml_set_app_name ( pnd_pxml_handle h, char *v ) { + /* + * Please do not use this function if it can be avoided; it is only here for compatibility. + * The function might fail on low memory, and there's no way for the user to know when this happens. + */ pnd_pxml_t *p = (pnd_pxml_t*) h; - if ( p -> title_en ) { - free ( p -> title_en ); - p -> title_en = NULL; + char has_en_field = 0; + int i; + + if (!v) return; /*TODO: add error information? Make it possible to set the string to NULL?*/ + + for (i = 0; i < p->titles_c; i++) + { + if (strncmp("en", p->titles[i].language, 2) == 0) /*strict comparison; match "en_US", "en_GB" etc... All these are set.*/ + { + free(p->titles[i].string); + p->titles[i].string = strdup(v); + has_en_field = 1; + } } - if ( v ) { - p -> title_en = strdup ( v ); + if (!has_en_field) + { + p->titles_c++; + if (p->titles_c > p->titles_alloc_c) //we don't have enough strings allocated + { + p->titles_alloc_c <<= 1; + p->titles = (pnd_localized_string_t *)realloc((void*)p->titles, p->titles_alloc_c); + if (!p->titles) return; //errno = ENOMEM + } + p->titles[p->titles_c - 1].language = "en_US"; + p->titles[p->titles_c - 1].string = strdup(v); } return; } unsigned char pnd_is_pxml_valid_app ( pnd_pxml_handle h ) { - pnd_pxml_t *p = (pnd_pxml_t*) h; + //pnd_pxml_t *p = (pnd_pxml_t*) h; //unused atm // for now, lets just verify the exec-path is valid @@ -241,24 +258,48 @@ signed char pnd_pxml_merge_override ( pnd_pxml_handle h, char *searchpath ) { return ( retval ); } +char *pnd_pxml_get_best_localized_string(pnd_localized_string_t strings[], int strings_c, char *iso_lang) +{ + int i; + int similarity_weight = 0xff; /*Set to something Really Bad in the beginning*/ + char *best_match = NULL; + + for(i = 0; i < strings_c; i++) + { + int new_weight = abs(strcmp(strings[i].language, iso_lang)); + if (new_weight < similarity_weight) + { + similarity_weight = new_weight; + best_match = strings[i].string; + } + } + + if ( best_match ) { + return strdup(best_match); + } + + return ( NULL ); +} + +char *pnd_pxml_get_app_name ( pnd_pxml_handle h, char *iso_lang ) { + pnd_pxml_t *p = (pnd_pxml_t *) h; + return pnd_pxml_get_best_localized_string(p->titles, p->titles_c, iso_lang); +} + char *pnd_pxml_get_app_name_en ( pnd_pxml_handle h ) { - pnd_pxml_t *p = (pnd_pxml_t*) h; - return ( p -> title_en ); + return pnd_pxml_get_app_name(h, "en"); } char *pnd_pxml_get_app_name_de ( pnd_pxml_handle h ) { - pnd_pxml_t *p = (pnd_pxml_t*) h; - return ( p -> title_de ); + return pnd_pxml_get_app_name(h, "de"); } char *pnd_pxml_get_app_name_it ( pnd_pxml_handle h ) { - pnd_pxml_t *p = (pnd_pxml_t*) h; - return ( p -> title_it ); + return pnd_pxml_get_app_name(h, "it"); } char *pnd_pxml_get_app_name_fr ( pnd_pxml_handle h ) { - pnd_pxml_t *p = (pnd_pxml_t*) h; - return ( p -> title_fr ); + return pnd_pxml_get_app_name(h, "fr"); } char *pnd_pxml_get_unique_id ( pnd_pxml_handle h ) { @@ -276,24 +317,25 @@ char *pnd_pxml_get_icon ( pnd_pxml_handle h ) { return ( p -> icon ); } +char *pnd_pxml_get_app_description ( pnd_pxml_handle h, char *iso_lang ) { + pnd_pxml_t *p = (pnd_pxml_t *) h; + return pnd_pxml_get_best_localized_string(p->descriptions, p->descriptions_c, iso_lang); +} + char *pnd_pxml_get_description_en ( pnd_pxml_handle h ) { - pnd_pxml_t *p = (pnd_pxml_t*) h; - return ( p -> description_en ); + return pnd_pxml_get_app_description(h, "en"); } char *pnd_pxml_get_description_de ( pnd_pxml_handle h ) { - pnd_pxml_t *p = (pnd_pxml_t*) h; - return ( p -> description_de ); + return pnd_pxml_get_app_description(h, "de"); } char *pnd_pxml_get_description_it ( pnd_pxml_handle h ) { - pnd_pxml_t *p = (pnd_pxml_t*) h; - return ( p -> description_it ); + return pnd_pxml_get_app_description(h, "it"); } char *pnd_pxml_get_description_fr ( pnd_pxml_handle h ) { - pnd_pxml_t *p = (pnd_pxml_t*) h; - return ( p -> description_fr ); + return pnd_pxml_get_app_description(h, "fr"); } char *pnd_pxml_get_previewpic1 ( pnd_pxml_handle h ) { diff --git a/lib/pnd_tinyxml.cpp b/lib/pnd_tinyxml.cpp index e0f2daa..9fbb25f 100644 --- a/lib/pnd_tinyxml.cpp +++ b/lib/pnd_tinyxml.cpp @@ -3,6 +3,9 @@ #include "../include/pnd_pxml.h" #include "pnd_tinyxml.h" +//Easily change the tag names if required (globally in this file): +#include "pnd_pxml_names.h" + extern "C" { unsigned char pnd_pxml_load ( const char* pFilename, pnd_pxml_t *app ) { @@ -34,303 +37,275 @@ unsigned char pnd_pxml_load ( const char* pFilename, pnd_pxml_t *app ) { return ( pnd_pxml_parse ( pFilename, b, len, app ) ); } -unsigned char pnd_pxml_parse ( const char *pFilename, char *buffer, unsigned int length, pnd_pxml_t *app ) { - - //TiXmlDocument doc(pFilename); - //if (!doc.LoadFile()) return; +char *pnd_pxml_get_attribute(TiXmlElement *elem, const char *name) +{ + const char *value = elem->Attribute(name); + if (value) + return strdup(value); + else + return NULL; +} - TiXmlDocument doc; +unsigned char pnd_pxml_parse_titles(const TiXmlHandle hRoot, pnd_pxml_t *app) +{ + TiXmlElement *pElem; + app->titles_alloc_c = 4; //TODO: adjust this based on how many titles a PXML usually has. Power of 2. - doc.Parse ( buffer ); + app->titles = (pnd_localized_string_t *)malloc(sizeof(pnd_localized_string_t) * app->titles_alloc_c); + if (!app->titles) return (0); //errno = NOMEM - TiXmlHandle hDoc(&doc); - TiXmlElement* pElem; - TiXmlHandle hRoot(0); - - pElem=hDoc.FirstChildElement().Element(); - if (!pElem) return ( 0 ); - hRoot=TiXmlHandle(pElem); - - pElem = hRoot.FirstChild( "title" ).FirstChildElement("en").Element(); - if ( pElem ) + //Go through all title tags and load them. + for (pElem = hRoot.FirstChild(PND_PXML_ENAME_TITLE).Element(); pElem; + pElem = pElem->NextSiblingElement(PND_PXML_ENAME_TITLE)) { - app->title_en = strdup(pElem->GetText()); - } - pElem = hRoot.FirstChild( "title" ).FirstChildElement("de").Element(); - if ( pElem ) - { - app->title_de = strdup(pElem->GetText()); - } + if ( ! pElem->GetText() ) { + continue; + } - pElem = hRoot.FirstChild( "title" ).FirstChildElement("it").Element(); - if ( pElem ) - { - app->title_it = strdup(pElem->GetText()); - } - - pElem = hRoot.FirstChild( "title" ).FirstChildElement("fr").Element(); - if ( pElem ) - { - app->title_fr = strdup(pElem->GetText()); - } + char *text = strdup(pElem->GetText()); + if (!text) continue; - pElem=hRoot.FirstChild("unique_id").Element(); - if (pElem) - { - app->unique_id = strdup(pElem->GetText()); - } + char *lang = pnd_pxml_get_attribute(pElem, PND_PXML_ATTRNAME_TITLELANG); + if (!lang) continue; - pElem=hRoot.FirstChild("standalone").Element(); - if (pElem) - { - app->standalone = strdup(pElem->GetText()); - } - - pElem=hRoot.FirstChild("icon").Element(); - if (pElem) - { -#if 0 - char anotherbuffer [ FILENAME_MAX ]; - strcpy ( anotherbuffer, pFilename ); - char *s = strstr ( anotherbuffer, PXML_FILENAME ); - if ( s ) { - strcpy ( s, strdup(pElem->GetText())); - app->icon = strdup(anotherbuffer); - } else if ( ( s = strrchr ( anotherbuffer, '/' ) ) ) { - s += 1; - strcpy ( s, strdup(pElem->GetText())); - app->icon = strdup(anotherbuffer); + app->titles_c++; + if (app->titles_c > app->titles_alloc_c) //we don't have enough strings allocated + { + app->titles_alloc_c <<= 1; + app->titles = (pnd_localized_string_t *)realloc((void*)app->titles, app->titles_alloc_c); + if (!app->titles) return (0); //errno = ENOMEM } -#endif - app->icon = strdup ( pElem->GetText() ); - } - - pElem = hRoot.FirstChild( "description" ).FirstChildElement("en").Element(); - if ( pElem ) - { - app->description_en = strdup(pElem->GetText()); - } - - pElem = hRoot.FirstChild( "description" ).FirstChildElement("de").Element(); - if ( pElem ) - { - app->description_de = strdup(pElem->GetText()); - } - pElem = hRoot.FirstChild( "description" ).FirstChildElement("it").Element(); - if ( pElem ) - { - app->description_it = strdup(pElem->GetText()); - } - - pElem = hRoot.FirstChild( "description" ).FirstChildElement("fr").Element(); - if ( pElem ) - { - app->description_fr = strdup(pElem->GetText()); - } - - pElem = hRoot.FirstChild( "previewpic" ).FirstChildElement("pic1").Element(); - if ( pElem ) - { - app->previewpic1 = strdup(pElem->GetText()); + pnd_localized_string_t *title = &app->titles[app->titles_c - 1]; + title->language = lang; + title->string = text; } - pElem = hRoot.FirstChild( "previewpic" ).FirstChildElement("pic2").Element(); - if ( pElem ) - { - app->previewpic2 = strdup(pElem->GetText()); - } + return (1); +} - pElem = hRoot.FirstChild( "author" ).FirstChildElement("name").Element(); - if ( pElem ) - { - app->author_name = strdup(pElem->GetText()); - } +unsigned char pnd_pxml_parse_descriptions(const TiXmlHandle hRoot, pnd_pxml_t *app) +{ + TiXmlElement *pElem; + app->descriptions_alloc_c = 4; //TODO: adjust this based on how many descriptions a PXML usually has. Power of 2. - pElem = hRoot.FirstChild( "author" ).FirstChildElement("website").Element(); - if ( pElem ) + app->descriptions = (pnd_localized_string_t *)malloc(sizeof(pnd_localized_string_t) * app->descriptions_alloc_c); + if (!app->descriptions) { - app->author_website = strdup(pElem->GetText());; + app->descriptions_alloc_c = 0; + return (0); //errno = NOMEM } - pElem = hRoot.FirstChild( "version" ).FirstChildElement("major").Element(); - if ( pElem ) + for (pElem = hRoot.FirstChild(PND_PXML_ENAME_DESCRIPTION).Element(); pElem; + pElem = pElem->NextSiblingElement(PND_PXML_ENAME_DESCRIPTION)) { - app->version_major = strdup(pElem->GetText()); - } - pElem = hRoot.FirstChild( "version" ).FirstChildElement("minor").Element(); - if ( pElem ) - { - app->version_minor = strdup(pElem->GetText()); - } + if ( ! pElem->GetText() ) { + continue; + } - pElem = hRoot.FirstChild( "version" ).FirstChildElement("release").Element(); - if ( pElem ) - { - app->version_release = strdup(pElem->GetText()); - } + char *text = strdup(pElem->GetText()); + if (!text) continue; - pElem = hRoot.FirstChild( "version" ).FirstChildElement("build").Element(); - if ( pElem ) - { - app->version_build = strdup(pElem->GetText()); - } + char *lang = pnd_pxml_get_attribute(pElem, PND_PXML_ATTRNAME_DESCRLANG); + if (!lang) continue; - pElem=hRoot.FirstChild("exec").Element(); - if (pElem) - { -#if 0 - char anotherbuffer [ FILENAME_MAX ]; - strcpy ( anotherbuffer, pFilename ); - char *s = strstr ( anotherbuffer, PXML_FILENAME ); - printf ( "exec %s\n", pElem->GetText() ); - if ( s ) { - strcpy ( s, strdup(pElem->GetText())); - app->exec = strdup(anotherbuffer); - } else if ( ( s = strrchr ( anotherbuffer, '/' ) ) ) { - s += 1; - strcpy ( s, strdup(pElem->GetText())); - app->exec = strdup(anotherbuffer); + app->descriptions_c++; + if (app->descriptions_c > app->descriptions_alloc_c) //we don't have enough strings allocated + { + app->descriptions_alloc_c <<= 1; + app->descriptions = (pnd_localized_string_t*)realloc((void*)app->descriptions, app->descriptions_alloc_c); + if (!app->descriptions) return (0); //errno = ENOMEM } -#endif - app->exec = strdup ( pElem->GetText() ); - } - pElem = hRoot.FirstChild( "category" ).FirstChildElement("main").Element(); - if ( pElem ) - { - app->main_category = strdup(pElem->GetText()); + pnd_localized_string_t *description = &app->descriptions[app->descriptions_c - 1]; + description->language = lang; + description->string = text; } + return (1); +} - pElem = hRoot.FirstChild( "category" ).FirstChildElement("subcategory1").Element(); - if ( pElem ) - { - app->subcategory1 = strdup(pElem->GetText()); - } +unsigned char pnd_pxml_parse ( const char *pFilename, char *buffer, unsigned int length, pnd_pxml_t *app ) { + //Load the XML document + TiXmlDocument doc; + doc.Parse(buffer); - pElem = hRoot.FirstChild( "category" ).FirstChildElement("subcategory2").Element(); - if ( pElem ) - { - app->subcategory2 = strdup(pElem->GetText()); - } + TiXmlElement *pElem = NULL; - pElem = hRoot.FirstChild( "altcategory" ).FirstChildElement("main").Element(); - if ( pElem ) - { - app->altcategory = strdup(pElem->GetText()); - } + //Find the root element + TiXmlHandle hDoc(&doc); + TiXmlHandle hRoot(0); - pElem = hRoot.FirstChild( "altcategory" ).FirstChildElement("subcategory1").Element(); - if ( pElem ) - { - app->altsubcategory1 = strdup(pElem->GetText()); - } + pElem = hDoc.FirstChild("PXML").Element(); + if (!pElem) return (0); + hRoot = TiXmlHandle(pElem); - pElem = hRoot.FirstChild( "altcategory" ).FirstChildElement("subcategory2").Element(); - if ( pElem ) - { - app->altsubcategory2 = strdup(pElem->GetText()); - } + //Get unique ID first. + app->unique_id = pnd_pxml_get_attribute(hRoot.Element(), PND_PXML_ATTRNAME_UID); - pElem = hRoot.FirstChild( "osversion" ).FirstChildElement("major").Element(); - if ( pElem ) - { - app->osversion_major = strdup(pElem->GetText()); - } + //Everything related to the title: + pnd_pxml_parse_titles(hRoot, app); - pElem = hRoot.FirstChild( "osversion" ).FirstChildElement("minor").Element(); - if ( pElem ) - { - app->osversion_minor = strdup(pElem->GetText()); - } - - pElem = hRoot.FirstChild( "osversion" ).FirstChildElement("release").Element(); - if ( pElem ) - { - app->osversion_release = strdup(pElem->GetText()); - } + //Everything description-related: + pnd_pxml_parse_descriptions(hRoot, app); - pElem = hRoot.FirstChild( "osversion" ).FirstChildElement("build").Element(); - if ( pElem ) + //Everything launcher-related in one tag: + if ( (pElem = hRoot.FirstChild(PND_PXML_ENAME_EXEC).Element()) ) { - app->osversion_build = strdup(pElem->GetText()); + app->background = pnd_pxml_get_attribute(pElem, PND_PXML_ATTRNAME_EXECBG); //if this returns NULL, the struct is filled with NULL. No need to check. + app->standalone = pnd_pxml_get_attribute(pElem, PND_PXML_ATTRNAME_EXECSTAL); + app->exec = pnd_pxml_get_attribute(pElem, PND_PXML_ATTRNAME_EXECCMD); + app->startdir = pnd_pxml_get_attribute(pElem, PND_PXML_ATTRNAME_EXECWD); } - pElem = hRoot.FirstChild( "associationitem1" ).FirstChildElement("name").Element(); - if ( pElem ) + //The app icon: + if ( (pElem = hRoot.FirstChild(PND_PXML_ENAME_ICON).Element()) ) { - app->associationitem1_name = strdup(pElem->GetText()); + app->icon = pnd_pxml_get_attribute(pElem, PND_PXML_ATTRNAME_ICONSRC); } - pElem = hRoot.FirstChild( "associationitem1" ).FirstChildElement("filetype").Element(); - if ( pElem ) + //The preview pics: + if ( (pElem = hRoot.FirstChild(PND_PXML_NODENAME_PREVPICS).Element()) ) { - app->associationitem1_filetype = strdup(pElem->GetText()); - } + //TODO: Change this if pnd_pxml_t gains the feature of more pics than 2. + if ( (pElem = pElem->FirstChildElement(PND_PXML_ENAME_PREVPIC)) ) + { + app->previewpic1 = pnd_pxml_get_attribute(pElem, PND_PXML_ATTRNAME_PREVPICSRC); - pElem = hRoot.FirstChild( "associationitem1" ).FirstChildElement("parameter").Element(); - if ( pElem ) - { - app->associationitem1_parameter = strdup(pElem->GetText()); - } + if ( (pElem = pElem->NextSiblingElement(PND_PXML_ENAME_PREVPIC)) ) + { + app->previewpic2 = pnd_pxml_get_attribute(pElem, PND_PXML_ATTRNAME_PREVPICSRC); + } + } + } //previewpic - pElem = hRoot.FirstChild( "associationitem2" ).FirstChildElement("name").Element(); - if ( pElem ) + //The author info: + if ( (pElem = hRoot.FirstChild(PND_PXML_ENAME_AUTHOR).Element()) ) { - app->associationitem2_name = strdup(pElem->GetText()); + app->author_name = pnd_pxml_get_attribute(pElem, PND_PXML_ATTRNAME_AUTHORNAME); + app->author_website = pnd_pxml_get_attribute(pElem, PND_PXML_ATTRNAME_AUTHORWWW); + //TODO: Uncomment this if the author gets email support. + //app->author_email = pnd_pxml_get_attribute(pElem, PND_PXML_ATTRNAME_AUTHOREMAIL)); } - pElem = hRoot.FirstChild( "associationitem2" ).FirstChildElement("filetype").Element(); - if ( pElem ) + //The version info: + if ( (pElem = hRoot.FirstChild(PND_PXML_ENAME_VERSION).Element()) ) { - app->associationitem2_filetype = strdup(pElem->GetText()); + app->version_major = pnd_pxml_get_attribute(pElem, PND_PXML_ATTRNAME_VERMAJOR); + app->version_minor = pnd_pxml_get_attribute(pElem, PND_PXML_ATTRNAME_VERMINOR); + app->version_release = pnd_pxml_get_attribute(pElem, PND_PXML_ATTRNAME_VERREL); + app->version_build = pnd_pxml_get_attribute(pElem, PND_PXML_ATTRNAME_VERBUILD); } - pElem = hRoot.FirstChild( "associationitem2" ).FirstChildElement("parameter").Element(); - if ( pElem ) + //The OS version info: + if ( (pElem = hRoot.FirstChild(PND_PXML_ENAME_OSVERSION).Element()) ) { - app->associationitem2_parameter = strdup(pElem->GetText()); + app->osversion_major = pnd_pxml_get_attribute(pElem, PND_PXML_ATTRNAME_OSVERMAJOR); + app->osversion_minor = pnd_pxml_get_attribute(pElem, PND_PXML_ATTRNAME_OSVERMINOR); + app->osversion_release = pnd_pxml_get_attribute(pElem, PND_PXML_ATTRNAME_OSVERREL); + app->osversion_build = pnd_pxml_get_attribute(pElem, PND_PXML_ATTRNAME_OSVERBUILD); } - pElem = hRoot.FirstChild( "associationitem3" ).FirstChildElement("name").Element(); - if ( pElem ) + int i; //For now, we need to keep track of the index of categories. + //Categories: + if ( (pElem = hRoot.FirstChildElement(PND_PXML_NODENAME_CATS).Element()) ) //First, enter the "categories" node. { - app->associationitem3_name = strdup(pElem->GetText()); - } + i = 0; - pElem = hRoot.FirstChild( "associationitem3" ).FirstChildElement("filetype").Element(); - if ( pElem ) - { - app->associationitem3_filetype = strdup(pElem->GetText()); - } + //Goes through all the top-level categories and their sub-categories. i helps limit these to 2. + for (pElem = pElem->FirstChildElement(PND_PXML_ENAME_CAT); pElem && i < 2; + pElem = pElem->NextSiblingElement(PND_PXML_ENAME_CAT), i++) + { + //TODO: Fix pnd_pxml_t so that there can be more than 2 category 'trees' and more than 2 subcategories. Then this can be removed. + switch (i) + { + case 0: //first category counts as the main cat for now + app->main_category = pnd_pxml_get_attribute(pElem, PND_PXML_ATTRNAME_CATNAME); + break; - pElem = hRoot.FirstChild( "associationitem3" ).FirstChildElement("parameter").Element(); - if ( pElem ) - { - app->associationitem3_parameter = strdup(pElem->GetText()); - } + case 1: //...second as the alternative + app->altcategory = pnd_pxml_get_attribute(pElem, PND_PXML_ATTRNAME_CATNAME); + } - pElem=hRoot.FirstChild("clockspeed").Element(); - if (pElem) - { - app->clockspeed = strdup(pElem->GetText()); + TiXmlElement *pSubCatElem; //the sub-elements for a main category. + int j = 0; //the subcategory index within this category + + //Goes through all the subcategories within this category. j helps limit these to 2. + for (pSubCatElem = pElem->FirstChildElement(PND_PXML_ENAME_SUBCAT); pSubCatElem && j < 2; + pSubCatElem = pSubCatElem->NextSiblingElement(PND_PXML_ENAME_SUBCAT), j++) + { + char *subcat = pnd_pxml_get_attribute(pSubCatElem, PND_PXML_ATTRNAME_SUBCATNAME); + if (!(subcat)) continue; + + //TODO: This is ugly. Fix pnd_pxml_t so that there can be more than 2 category 'trees' and more than 2 subcategories. Then this can be removed. + switch (j & (i << 1)) + { + case 0: + app->subcategory1 = subcat; + break; + case 1: + app->subcategory2 = subcat; + break; + case 2: + app->altsubcategory1 = subcat; + break; + case 3: + app->altsubcategory2 = subcat; + } + } + } } - pElem=hRoot.FirstChild("background").Element(); - if (pElem) - { - app->background = strdup(pElem->GetText()); + //All file associations: + //Step into the associations node + if ( (pElem = hRoot.FirstChild(PND_PXML_NODENAME_ASSOCS).Element()) ) + { + i = 0; + //Go through all associations. i serves as index; since the format only supports 3 associations we need to keep track of the number. + for (pElem = pElem->FirstChildElement(PND_PXML_ENAME_ASSOC); pElem && i < 3; + pElem = pElem->NextSiblingElement(PND_PXML_ENAME_ASSOC), i++) + { + char *name = pnd_pxml_get_attribute(pElem, PND_PXML_ATTRNAME_ASSOCNAME); + char *filetype = pnd_pxml_get_attribute(pElem, PND_PXML_ATTRNAME_ASSOCFTYPE); + char *paramter = pnd_pxml_get_attribute(pElem, PND_PXML_ATTRNAME_ASSOCARGS); + + if (!(name && filetype && paramter)) continue; + + switch(i) //TODO: same problem here: only 3 associations supported + { + case 0: + { + app->associationitem1_name = name; + app->associationitem1_filetype = filetype; + app->associationitem1_parameter = paramter; + break; + } + case 1: + { + app->associationitem2_name = name; + app->associationitem2_filetype = filetype; + app->associationitem2_parameter = paramter; + break; + } + case 2: + { + app->associationitem3_name = name; + app->associationitem3_filetype = filetype; + app->associationitem3_parameter = paramter; + } + } + } } - pElem=hRoot.FirstChild("startdir").Element(); + //Performance related things (aka: Clockspeed XD): + pElem = hRoot.FirstChild(PND_PXML_ENAME_CLOCK).Element(); if (pElem) { - app->startdir = strdup(pElem->GetText()); + app->clockspeed = pnd_pxml_get_attribute(pElem, PND_PXML_ATTRNAME_CLOCKFREQ); } - return ( 1 ); + return (1); } } // extern C diff --git a/test/rawpxmltest.c b/test/rawpxmltest.c new file mode 100644 index 0000000..26e3a96 --- /dev/null +++ b/test/rawpxmltest.c @@ -0,0 +1,72 @@ +#include <stdio.h> +#include <stdlib.h> +#include <string.h> + +#include <pnd_pxml.h> + +//A simple test for the new format. No content-checking whatsoever... +//lots of ^C^V +//Used like a unit test, almost +int main (int argc, char **argv) +{ + if (argc != 2) + { + printf("Wrong nr of args.\nUsage: %s <pxml filename>\n", argv[0]); + return 1; + } + + pnd_pxml_handle h = pnd_pxml_fetch(argv[1]); + + if (!h) + { + printf("Could not load file \"%s\"\n", argv[1]); + return 1; + } + + char *data; //for all values + + if ( (data = pnd_pxml_get_app_name_en(h)) ) printf("Appname(en): %s\n", data); + if ( (data = pnd_pxml_get_app_name_de(h)) ) printf("Appname(de): %s\n", data); + if ( (data = pnd_pxml_get_app_name_it(h)) ) printf("Appname(it): %s\n", data); + if ( (data = pnd_pxml_get_app_name_fr(h)) ) printf("Appname(fr): %s\n", data); + + if ( (data = pnd_pxml_get_unique_id(h)) ) printf("UID: %s\n", data); + + if ( (data = pnd_pxml_get_standalone(h)) ) printf("Standalone: %s\n", data); + + if ( (data = pnd_pxml_get_icon(h)) ) printf("Icon: %s\n", data); + + if ( (data = pnd_pxml_get_description_en(h)) ) printf("Description(en): %s\n", data); + if ( (data = pnd_pxml_get_description_de(h)) ) printf("Description(de): %s\n", data); + if ( (data = pnd_pxml_get_description_it(h)) ) printf("Description(it): %s\n", data); + if ( (data = pnd_pxml_get_description_fr(h)) ) printf("Description(fr): %s\n", data); + + if ( (data = pnd_pxml_get_previewpic1(h)) ) printf("Pic1: %s\n", data); + if ( (data = pnd_pxml_get_previewpic2(h)) ) printf("Pic2: %s\n", data); + + if ( (data = pnd_pxml_get_author_name(h)) ) printf("Author name: %s\n", data); + if ( (data = pnd_pxml_get_author_website(h)) ) printf("Author website: %s\n", data); + + if ( (data = pnd_pxml_get_version_major(h)) ) printf("Version major: %s\n", data); + if ( (data = pnd_pxml_get_version_minor(h)) ) printf("Version minor: %s\n", data); + if ( (data = pnd_pxml_get_version_release(h)) ) printf("Version release: %s\n", data); + if ( (data = pnd_pxml_get_version_build(h)) ) printf("Version build: %s\n", data); + + if ( (data = pnd_pxml_get_osversion_major(h)) ) printf("OSVersion major: %s\n", data); + if ( (data = pnd_pxml_get_osversion_minor(h)) ) printf("OSVersion minor: %s\n", data); + if ( (data = pnd_pxml_get_osversion_release(h)) ) printf("OSVersion release: %s\n", data); + if ( (data = pnd_pxml_get_osversion_build(h)) ) printf("OSVersion build: %s\n", data); + + if ( (data = pnd_pxml_get_exec(h)) ) printf("Application exec: %s\n", data); + + if ( (data = pnd_pxml_get_main_category(h)) ) printf("Category 1: %s\n", data); + if ( (data = pnd_pxml_get_subcategory1(h)) ) printf("Category 1 sub 1: %s\n", data); + if ( (data = pnd_pxml_get_subcategory2(h)) ) printf("Category 1 sub 2: %s\n", data); + if ( (data = pnd_pxml_get_altcategory(h)) ) printf("Category 2: %s\n", data); + if ( (data = pnd_pxml_get_altsubcategory1(h)) ) printf("Category 2 sub 1: %s\n", data); + if ( (data = pnd_pxml_get_altsubcategory2(h)) ) printf("Category 2 sub 2: %s\n", data); + + pnd_pxml_delete(h); + + return 0; +} diff --git a/testdata/app2/sampleapp4/PXML.xml b/testdata/app2/sampleapp4/PXML.xml index bbc7afb..61a1c74 100644 --- a/testdata/app2/sampleapp4/PXML.xml +++ b/testdata/app2/sampleapp4/PXML.xml @@ -1,86 +1,43 @@ -<PXML> -<title> - <en>sample 4</en> - <de>Program Title in German Language</de> - <fr>Program Title in French Language</fr> - <it>Program Title in Italian Language</it> - + + + Sample App 4 Alt Path + Sample App 4 Alt Path - German -345jaloo + -Yes + -zeldaicon.png + This is the English Description of the file. + This would be the German description. - - This is the [b]English Description[/b] of the file. - Can use [i]multiple lines[/i] and BBCode. - The German Description - The Italian Description - The French Description - + + + + - - ./preview/pic1.jpg - ./preview/pic2.jpg - + - - EvilDragon - http://www.openpandora.org - + + - - 1 - 1 - 1 - 2 - + + + + + + + + + -program.exe + + + + - -
Main category
- Subcategory 1 - Subcategory 2 - - - -
Alternate category
- Alternate Subcategory 1 - Alternate Subcategory 2 - - - - 1 - 1 - 1 - 2 - - - - View this Picture - jpg,bmp,gif - ­view - - - - Convert this Picture - jpg,bmp,gif - ­convert - - - - Watch This Movie - mpg,avi,wmv - ­convert - - -600 - -Yes - -../differentdir + + ......kfujl........ + ......qwe......fwer..... - diff --git a/testdata/apps/sampleapp/PXML.xml b/testdata/apps/sampleapp/PXML.xml deleted file mode 100644 index 776b9b7..0000000 --- a/testdata/apps/sampleapp/PXML.xml +++ /dev/null @@ -1,86 +0,0 @@ - - - - <en>Program Title</en> - <de>Program Title in German Language</de> - <fr>Program Title in French Language</fr> - <it>Program Title in Italian Language</it> - - -123shaboo - -Yes - -program.png - - - This is the [b]English Description[/b] of the file. - Can use [i]multiple lines[/i] and BBCode. - The German Description - The Italian Description - The French Description - - - - ./preview/pic1.jpg - ./preview/pic2.jpg - - - - EvilDragon - http://www.openpandora.org - - - - 1 - 1 - 1 - 2 - - -program.exe - - -
Main category
- Subcategory 1 - Subcategory 2 - - - -
Alternate category
- Alternate Subcategory 1 - Alternate Subcategory 2 - - - - 1 - 1 - 1 - 2 - - - - View this Picture - jpg,bmp,gif - ­view - - - - Convert this Picture - jpg,bmp,gif - ­convert - - - - Watch This Movie - mpg,avi,wmv - ­convert - - -600 - -Yes - -../differentdir - - diff --git a/testdata/apps/sampleapp1/PXML.xml b/testdata/apps/sampleapp1/PXML.xml new file mode 100644 index 0000000..893c1cd --- /dev/null +++ b/testdata/apps/sampleapp1/PXML.xml @@ -0,0 +1,41 @@ + + + Sample App 1 + Sample App 1 - German + + + + This is the English Description of the file. + This would be the German description. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ......kfujl........ + ......qwe......fwer..... + diff --git a/testdata/apps/sampleapp/program.exe b/testdata/apps/sampleapp1/program.exe similarity index 100% rename from testdata/apps/sampleapp/program.exe rename to testdata/apps/sampleapp1/program.exe diff --git a/testdata/apps/sampleapp1/zeldaicon.png b/testdata/apps/sampleapp1/zeldaicon.png new file mode 100644 index 0000000000000000000000000000000000000000..140a39386bfe401a5c2d8406bfd0caf568318f08 GIT binary patch literal 14866 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 #<|oyxycV^Z26=k++2w7qH+;7A97fyhppC3v)rE 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

v;u8cxhX+l~3hEj$>wWI`e}tM2dAlDCK>6pd z32Gw4Xm)fGqhSCDf-%G-fSm#hVJA(~mLQ^l4?<|16c7qpAw42M5KU=BJ0VIdHbN&V zT!)qkahw2n4H$t;kR@n=(2N{$B7>@eN&yTGjImbPEUlV07M!ou^^Xl5g(}; z7oiywt{D{u_BBF-;5CF1KR*p0A4(%�`vKtA}`Dug(XoLrPuM38z|z|mj~fUi0fN`(@V3J4>vBt=l9VEm3cK;5Lbhiz@p zZF*dBK!(|hjQ1T-v$O)7L&F&+F3tzdO%7X{AGIK)Y>C6>W=E|ESx^(?bJ)fbIATXQ z!ejPXm>;mUM)`+w=#Z1Wy1NU)GZ{LBJzsBxK&@bZt&jlCut3d-AV4EBSThPSC`>yp zTqhpBM!DNqX4Kzy|ta zgpY>$W2hk_6+tjtBRXs|Hbg<|0(3xeA^x;FAVb_u&D#Sw;^~e`iag878PQGM(TNU! z1U5Ds(x%3LJG->)ZFlPH68YHKq1g^CEp|!a-#_^Xvt5R@R^W23#s zhLG3+BO`p>XJqJ=5C_U|ANUvi`5=7C-WC&6bRF!#4B()LD<+%(vCYQ=rXmsn#OzG~ zeH-xcKr=K}^Kd)t?t0kO<&cXr3Icd5frA|$0XpzFnvMgOW&lKuVFnO4w;O5tJWRl+ zj*ZPubq#iY!42x4ZNW>&8Qe^UfrI^SLp{>M*cjGsiNnUmJ2W&Lf`arM92ooeYuH%p zIy!(OFm=ep#LUA3cNdP0>N`7uAe^UrNk==^@L4Wtv^!M-(-20%*#M9@HgR09mVwi|DBRl~|^ucl^TR3w(ru(5Yzc{#tLoPmG# zR^Q%kr@jtC21XuMZHWU01|}{p?|kyf*x9oTH8m|88^)nSXb(Adg~ju(e1&~8He0v<%0O^v7l4I~<1pP~K%1A^`B z+Gk*7>F)964f4-reRb_i7B7pjXQ!T%17q(_hOVs*LstvD;Nrdd`di|Vf#Cs^fP3~b zjvUpnu-LD!ze`K&kdYBXTSLvtoS}L2u%#J3)hx_*>FEF}(QOQ!Dr}jWAqws{CqQ=G zZ)t%d==;EV6-YC4b6kbm`hbb)L1O}yU(j@@Ms$yX9*v>91AHTo-``=hh zzkdB%3f_6y#n7?0W*F$~)lg&T*`U1B!r;SM_UY+u3H)kHfS@gL$M~S%8=w{bz39GO zbfjB;-wU?0bGv>X&@()2WQwa8+FIc8kf|}_&_QiW%isOs_vE$kh54BDG{grr6O%pK zdYa}|JNNHp=weQ-t+`7_2Nv$p(b*DkoVx;8R$;RZdkpjec=a9FF0O5EMqj&uP50mY ztnJ42u%Qv-=utW{?$puRtE+QRSNG}PzKj>qzr68HS{9daaQ}W?-J@n^`*aOe|sSVfG)!nJ7iHM8 z|95<;y1PqP`wr~Z(;@gSkE*X2*v;6ZgB}uWXa5iMA2zEQ86DC?_B=Q+I!^ulva-Il zb;rR2hf#m&=Jo4D%2aX;+04W?*M=hppZN*SO$~dBS$iM&&MR?K2 zd`Uwc{oAjlvmG!08@@JQ3zIh6NgqR}+dp?}UhcM^gp_^zjBIQ_`1oUZ&>!D<$16C1 zv2PdQMMDEB198Yu$moncd-iE*ZSaD#2uKICb+^;ue|CPaw)P#MToosEzK1(o(idW= z00{XGeE-h$8Mwff0FRiy{QOr>;8j@6fD$uUsNDAJX(B7_R#!h_Yz(EqkHE_zL%oB# z+Ju)wM~^Ue?I1IP-8;y^|1EZ6(tuEh6u{WMd;gImjGa3fyLO?V+Hr6nJ{f!WV8j@E z_mcB__W##9vy;(1*pF8m@p^ - - - <en>Program Title</en> - <de>Program Title in German Language</de> - <fr>Program Title in French Language</fr> - <it>Program Title in Italian Language</it> - + + + Sample App 2 + Sample App 2 - German -124bingle + -Yes + - - This is the [b]English Description[/b] of the file. - Can use [i]multiple lines[/i] and BBCode. - The German Description - The Italian Description - The French Description - + This is the English Description of the file. + This would be the German description. - - ./preview/pic1.jpg - ./preview/pic2.jpg - + + + + - - EvilDragon - http://www.openpandora.org - + - - 1 - 1 - 1 - 2 - + + -program.exe + + + + + + + + + - -

Main category
- Subcategory 1 - Subcategory 2 - + + + + - -
Alternate category
- Alternate Subcategory 1 - Alternate Subcategory 2 - - - - 1 - 1 - 1 - 2 - - - - View this Picture - jpg,bmp,gif - ­view - - - - Convert this Picture - jpg,bmp,gif - ­convert - - - - Watch This Movie - mpg,avi,wmv - ­convert - - -600 - -Yes - -../differentdir + + ......kfujl........ + ......qwe......fwer..... diff --git a/testdata/apps/sampleapp2/zeldaicon.png b/testdata/apps/sampleapp2/zeldaicon.png new file mode 100644 index 0000000000000000000000000000000000000000..140a39386bfe401a5c2d8406bfd0caf568318f08 GIT binary patch literal 14866 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 #<|oyxycV^Z26=k++2w7qH+;7A97fyhppC3v)rE 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

v;u8cxhX+l~3hEj$>wWI`e}tM2dAlDCK>6pd z32Gw4Xm)fGqhSCDf-%G-fSm#hVJA(~mLQ^l4?<|16c7qpAw42M5KU=BJ0VIdHbN&V zT!)qkahw2n4H$t;kR@n=(2N{$B7>@eN&yTGjImbPEUlV07M!ou^^Xl5g(}; z7oiywt{D{u_BBF-;5CF1KR*p0A4(%�`vKtA}`Dug(XoLrPuM38z|z|mj~fUi0fN`(@V3J4>vBt=l9VEm3cK;5Lbhiz@p zZF*dBK!(|hjQ1T-v$O)7L&F&+F3tzdO%7X{AGIK)Y>C6>W=E|ESx^(?bJ)fbIATXQ z!ejPXm>;mUM)`+w=#Z1Wy1NU)GZ{LBJzsBxK&@bZt&jlCut3d-AV4EBSThPSC`>yp zTqhpBM!DNqX4Kzy|ta zgpY>$W2hk_6+tjtBRXs|Hbg<|0(3xeA^x;FAVb_u&D#Sw;^~e`iag878PQGM(TNU! z1U5Ds(x%3LJG->)ZFlPH68YHKq1g^CEp|!a-#_^Xvt5R@R^W23#s zhLG3+BO`p>XJqJ=5C_U|ANUvi`5=7C-WC&6bRF!#4B()LD<+%(vCYQ=rXmsn#OzG~ zeH-xcKr=K}^Kd)t?t0kO<&cXr3Icd5frA|$0XpzFnvMgOW&lKuVFnO4w;O5tJWRl+ zj*ZPubq#iY!42x4ZNW>&8Qe^UfrI^SLp{>M*cjGsiNnUmJ2W&Lf`arM92ooeYuH%p zIy!(OFm=ep#LUA3cNdP0>N`7uAe^UrNk==^@L4Wtv^!M-(-20%*#M9@HgR09mVwi|DBRl~|^ucl^TR3w(ru(5Yzc{#tLoPmG# zR^Q%kr@jtC21XuMZHWU01|}{p?|kyf*x9oTH8m|88^)nSXb(Adg~ju(e1&~8He0v<%0O^v7l4I~<1pP~K%1A^`B z+Gk*7>F)964f4-reRb_i7B7pjXQ!T%17q(_hOVs*LstvD;Nrdd`di|Vf#Cs^fP3~b zjvUpnu-LD!ze`K&kdYBXTSLvtoS}L2u%#J3)hx_*>FEF}(QOQ!Dr}jWAqws{CqQ=G zZ)t%d==;EV6-YC4b6kbm`hbb)L1O}yU(j@@Ms$yX9*v>91AHTo-``=hh zzkdB%3f_6y#n7?0W*F$~)lg&T*`U1B!r;SM_UY+u3H)kHfS@gL$M~S%8=w{bz39GO zbfjB;-wU?0bGv>X&@()2WQwa8+FIc8kf|}_&_QiW%isOs_vE$kh54BDG{grr6O%pK zdYa}|JNNHp=weQ-t+`7_2Nv$p(b*DkoVx;8R$;RZdkpjec=a9FF0O5EMqj&uP50mY ztnJ42u%Qv-=utW{?$puRtE+QRSNG}PzKj>qzr68HS{9daaQ}W?-J@n^`*aOe|sSVfG)!nJ7iHM8 z|95<;y1PqP`wr~Z(;@gSkE*X2*v;6ZgB}uWXa5iMA2zEQ86DC?_B=Q+I!^ulva-Il zb;rR2hf#m&=Jo4D%2aX;+04W?*M=hppZN*SO$~dBS$iM&&MR?K2 zd`Uwc{oAjlvmG!08@@JQ3zIh6NgqR}+dp?}UhcM^gp_^zjBIQ_`1oUZ&>!D<$16C1 zv2PdQMMDEB198Yu$moncd-iE*ZSaD#2uKICb+^;ue|CPaw)P#MToosEzK1(o(idW= z00{XGeE-h$8Mwff0FRiy{QOr>;8j@6fD$uUsNDAJX(B7_R#!h_Yz(EqkHE_zL%oB# z+Ju)wM~^Ue?I1IP-8;y^|1EZ6(tuEh6u{WMd;gImjGa3fyLO?V+Hr6nJ{f!WV8j@E z_mcB__W##9vy;(1*pF8m@p^ - - <en>sample 3</en> - <de>Program Title in German Language</de> - <fr>Program Title in French Language</fr> - <it>Program Title in Italian Language</it> - + + + Sample App 3 + Sample App 3 - German -256twinky + -Yes + -zeldaicon.png + This is the English Description of the file. + This would be the German description. - - This is the [b]English Description[/b] of the file. - Can use [i]multiple lines[/i] and BBCode. - The German Description - The Italian Description - The French Description - + + + + - - ./preview/pic1.jpg - ./preview/pic2.jpg - + - - EvilDragon - http://www.openpandora.org - + + - - 1 - 1 - 1 - 2 - + + + + + + + + + -program.exe + + + + - -

Main category
- Subcategory 1 - Subcategory 2 - - - -
Alternate category
- Alternate Subcategory 1 - Alternate Subcategory 2 - - - - 1 - 1 - 1 - 2 - - - - View this Picture - jpg,bmp,gif - ­view - - - - Convert this Picture - jpg,bmp,gif - ­convert - - - - Watch This Movie - mpg,avi,wmv - ­convert - - -600 - -Yes - -../differentdir + + ......kfujl........ + ......qwe......fwer..... - diff --git a/testdata/pndsample/x86_echo.pnd b/testdata/pndsample/x86_echo.pnd index 23b75c0b46d23073ba4f9f08b6d9e305961c12bd..d3891db1497566be4d85424230ce2c80932d45c3 100644 GIT binary patch delta 1361 zcmeH_!EVzq7{}WpcE~^=%G7}nvMh08P0}`ETa{*)7A|9(v`ykxd9mAgP3#b-N_Q$+ z4?I96?(hOoxD<&4?*MmR0Hj_xgOjFfKtjC0BwMll{lA~Tzw>?jQu_3@^zQA8>sQv- z9^Ri7a=E-5AD)lS^JDA$=e?>?tr$jaQ`cuzUEkJgnS=5EsI;2d%d9uX${aMlGu^p8 zUwVbot<{b1UK((x`qlNdjR&*w>*;neS;ZlFkbcHLrY~=pvXWe`U@o#oANMo3YsLaM z$=_Xh|GDT70bw@Blyw{M_~>zY3+`BodGPG%E*N+&6AkEupNBiHl=aSJQN2pF27yG@8Q)u6I7jSq8-Ta8pZybJ;MX!=&A8Ep?y_o{+#p>>?oslL4{839@_LfcKfKJq-E;0%<1* zF%23}O*RZ8mou^m+uV~NsrJs=MAiT`ONnWCNQ50wKX&qGwMPyWK#tHMpvAf_6%J@- z#JrP)I#fQHso`ZL@s-)9*wkEtjd9{ggpA7h0E9q#)XwwwhsbU9b2{=dp zfG@-f4w66MpnLy79Nj&)4;#Tza1nBH?)RPVp8H)+^7IyMzecaGjweIWnaK%1G&ID) zb60Mja1K8CSP&CZI+l_XqUg(_m=ooa&(Fw$nbCgQ%+e9WV$-abc4jSS{d zemlDX$yRNRVtx!!1J_c?MXDT{NB{s-f#SSn7A>NC?iSN|u4;Jh8ntu+d4m|mDk)MV zfDq&d){pX4iyF#dP~HF~=vDhi{klyw^?QF%@<`}eCk7O*78;)x{q?%Ey{ zcpg=3VibsG8Wiu)3K9mmfuT%mRKa?EuXkaFfK`Z1i>6g){&b=mI14Y&?bAr;kWj2t z_xq%THwVCTB{*t;CDti`We~4?ZS`FFn_6b~?Dy^X(M;v2Qlhkg;gf>e7e19_4k83G h3^DQ`$>Ep#v+3P)k&FCK_-`ki`;7^+`3v3O^b=?%lk5Nh diff --git a/testdata/pndsample/x86_echo/PXML.xml b/testdata/pndsample/x86_echo/PXML.xml index 8523743..a0b8351 100644 --- a/testdata/pndsample/x86_echo/PXML.xml +++ b/testdata/pndsample/x86_echo/PXML.xml @@ -1,24 +1,12 @@ - - - - <en>x86 echo</en> - <de>Program Title in German Language</de> - <fr>Program Title in French Language</fr> - <it>Program Title in Italian Language</it> - + + + PND Echo + PND Echo - German -123456x86echo + -Yes - -my_echo - - -
Main category
- Subcategory 1 - Subcategory 2 - - -200 + This is the English Description of the file. + This would be the German description. diff --git a/testdata/pndsample/x86_ls.pnd b/testdata/pndsample/x86_ls.pnd index 2fd9cc5f22163a1cb1db92cdffdb19511f34006d..1cc6c85866065dffc420aa5b29174111f9501aef 100644 GIT binary patch delta 1386 zcmeH_-D(p-6vvaT>BSZmtfdN8hJhl2+1-4AHe|OTsqRJX2W`Q-Fx{DCS9fRDoehcJ zL>kBoSJ|z4jSE^Y~P-5 z17-cj1La4sNca<@AbM@iMjs|yt8yn(o3q7d^m8(}c_?m@%PEIxRe!pl!983_af6HL z*NbVsH0%RH9fm#HHsQ(fv*HuDZK?HxmoIifFYqZhp&Q3xP1jjSXox6g5z<)H)+q`I z50OK-o~R*ErM}kV-epa<+ts=iDHpF$(uMBGaY=xR9_2Bj4uO5(VH3V0t(L}75c)(5 zDb{?hxs1680)eYhwwE@Wm+vwM#U7(3Ojfs!6^z$tQGw20@b?w@s|2I nKQ0VyWoR!A?Q283aBeTJ&aUPvnZB#J62tnxb9HVjw`zX?G)K&_ delta 3851 zcmeHJ&ube;6tw2~Z~*enwgC#ecCF~sx-#)Q%CNSb7Kb~8IG z#l38aLHDA6K<&MxP-yI{{*>g>gA1k5d%xM$u2!*IXz8g)*xH%*zJ2eTZ{Ez)>tD(* zelP#{;+w0bmG_q3J}b@5&ExNt``i02gfT* zg*o2({`%!K(BOlUoA0MXue9>c$E7nobcTU@Qe9YB{^;7-;JcHpAT0g!?3~TSp-TQbbu3ScpD;5*v*^SLrH?&L) zVQ?7PlYU!LZ#3N3sL_y%(eP6yJ&NajD%ufkGs^@J@Rqy~eor!CcZ%?qj5VIC3-O;R z>hkIMKpK`gCTdub;7=p=h&!ZKU%$Sw3D%nQ#B3N=sHkwL>kCG{VsIAb@W$Ns1^Jq} z4%MSdAljCh*x+s4f>QJTN)l2I#QN5Upu_+nAB$>--$TTb)!rF|u>yWx- zrUPWi;~Exw#%wItJ9?BH89l?IY^qq>mq&V89_51U;%hX_%$fxkN&SaWGqcvn!^vbc z1c@mpLKWuqX)xGLIYBZDn~3bH$#hKVR_rP!1(?1`OtUUTtC3q7a`oXqVfYuXWnAM_ zqogQkk)UDuVJ7ivqTso```24HiEP9uzA*G{PW35AfqAvO3_nN3>m#g>`yRJdByq!K z^{5ZEItmy;;jcBlV6DwtmYG|@IH0&M8RR9SAN1it)#nynp-I}fnD-nP$TB_>JHCJ# z>OZ1`n@&dqqxd|foDs60W3-+#`hqHbcceGsu8$R7AdUxdXqT_`yza%~#9EyRoxfp& z%s5l7Z$AkG#vHO)t)jjsb9kH7e$tkHB%JiBFU;Y^#V?h^C8< - - - <en>x86 ls</en> - <de>Program Title in German Language</de> - <fr>Program Title in French Language</fr> - <it>Program Title in Italian Language</it> - + + + PND ls + PND ls - German -123456x86ls + -Yes + -zeldaicon.png - - - This is the [b]English Description[/b] of the file. - Can use [i]multiple lines[/i] and BBCode. - The German Description - The Italian Description - The French Description - - - - ./preview/pic1.jpg - ./preview/pic2.jpg - - - - EvilDragon - http://www.openpandora.org - - - - 1 - 1 - 1 - 2 - - -./my_ls - - -
Main category
- Subcategory 1 - Subcategory 2 - - - -
Alternate category
- Alternate Subcategory 1 - Alternate Subcategory 2 - - - - 1 - 1 - 1 - 2 - - - - View this Picture - jpg,bmp,gif - ­view - - - - Convert this Picture - jpg,bmp,gif - ­convert - - - - Watch This Movie - mpg,avi,wmv - ­convert - - -600 - -Yes - -../differentdir + This is the English Description of the file. + This would be the German description. -- 2.47.3