almost done, but commit anyway, my computer is crashing 2 times per

hour...so backup

diff --git a/testsuite/parser/Makefile.am b/testsuite/parser/Makefile.am
index 2e6f425..8474601 100644 (file)
--- a/testsuite/parser/Makefile.am
+++ b/testsuite/parser/Makefile.am
@@ -7,11 +7,12 @@ PACKAGE = parser
 
 LDADD = $(top_srcdir)/zypp/lib@PACKAGE@.la
 
-noinst_PROGRAMS = YUMtest ProductMetadataParserTest
+noinst_PROGRAMS = YUMtest ProductMetadataParserTest MediaMetadataParserTest
 
 YUMtest_SOURCES = YUMtest.cc
 
 ProductMetadataParserTest_SOURCES = ProductMetadataParserTest.cc
+MediaMetadataParserTest_SOURCES = MediaMetadataParserTest.cc
 
 EXTRA_DIST = lib/*.exp config/*.exp $(PACKAGE).test/*.exp
 

diff --git a/testsuite/parser/MediaMetadataParserTest.cc b/testsuite/parser/MediaMetadataParserTest.cc
new file mode 100644 (file)
index 0000000..371dc4b
--- /dev/null
+++ b/testsuite/parser/MediaMetadataParserTest.cc
@@ -0,0 +1,17 @@
+
+#include <zypp/parser/tagfile/MediaMetadataParser.h> 
+#include <zypp/base/Logger.h>
+#include <zypp/Pathname.h>
+
+using namespace zypp;
+using namespace zypp::parser::tagfile;
+
+int main()
+{
+  MediaMetadataParser parser;
+  MediaMetadataParser::MediaEntry entry;
+
+  parser.parse(Pathname("tagfiles/media/media-1-SLES-9-i386-RC5.txt"), entry);
+  //DBG << "arch: " << entry.arch["x86_64"].size() << std::endl;
+  return 0;
+}

diff --git a/zypp/parser/tagfile/Makefile.am b/zypp/parser/tagfile/Makefile.am
index 377873a..876e7a3 100644 (file)
--- a/zypp/parser/tagfile/Makefile.am
+++ b/zypp/parser/tagfile/Makefile.am
@@ -14,7 +14,8 @@ parsertagfileinclude_HEADERS = \
        Tags.h          \
        Grammar.h       \
        Parser.h \
-  ProductMetadataParser.h      
+  ProductMetadataParser.h      \
+       MediaMetadataParser.h
 
 noinst_LTLIBRARIES =   lib@PACKAGE@_parser_tagfile.la
 
@@ -24,7 +25,8 @@ lib@PACKAGE@_parser_tagfile_la_SOURCES = \
        ParseException.cc\
        Tags.cc         \
        Parser.cc \
-       ProductMetadataParser.cc
+       ProductMetadataParser.cc \
+       MediaMetadataParser.cc
 
 lib@PACKAGE@_parser_tagfile_la_LIBADD = 
 

diff --git a/zypp/parser/tagfile/MediaMetadataParser.cc b/zypp/parser/tagfile/MediaMetadataParser.cc
new file mode 100644 (file)
index 0000000..18ca283
--- /dev/null
+++ b/zypp/parser/tagfile/MediaMetadataParser.cc
@@ -0,0 +1,160 @@
+/*---------------------------------------------------------------------\
+|                          ____ _   __ __ ___                          |
+|                         |__  / \ / / . \ . \                         |
+|                           / / \ V /|  _/  _/                         |
+|                          / /__ | | | | | |                           |
+|                         /_____||_| |_| |_|                           |
+|                                                                      |
+\---------------------------------------------------------------------*/
+/** \file      zypp/parser/tagfile/MediaMetadataParser.cc
+ *
+*/
+#include <iostream>
+#include <fstream>
+#include <sstream>
+
+#include <boost/tokenizer.hpp>
+#include <boost/algorithm/string.hpp>
+
+#include "zypp/base/Logger.h"
+#include "zypp/base/PtrTypes.h"
+#include "zypp/base/String.h"
+
+#include "zypp/parser/tagfile/MediaMetadataParser.h"
+#include <boost/regex.hpp>
+#include "zypp/parser/tagfile/Grammar.h"
+
+using namespace std;
+using namespace boost;
+
+typedef find_iterator<string::iterator> string_find_iterator;
+
+///////////////////////////////////////////////////////////////////
+namespace zypp
+{ /////////////////////////////////////////////////////////////////
+  ///////////////////////////////////////////////////////////////////
+  namespace parser
+  { /////////////////////////////////////////////////////////////////
+    ///////////////////////////////////////////////////////////////////
+    namespace tagfile
+    { /////////////////////////////////////////////////////////////////
+
+      static void dumpRegexpResults( const boost::smatch &what )
+      {
+        for ( unsigned int k=0; k < what.size(); k++)
+        {
+          DBG << "[match "<< k << "] [" << what[k] << "]" << std::endl; 
+        }
+      }
+      
+      /*
+        File:  media
+        Location  /media.N/ directory on media
+        Content  two or more lines of ASCII as follows
+        <vendor>
+        <YYYYMMDDHHMMSS>
+        [<media count>]
+        [<media flags>]
+        [<media names>]
+
+        Currently defined flags:
+         
+        doublesided 
+        media is double sided, YaST will ask for 'front side' for odd-numbered media and 'back side' for even-numbered media.
+        The default is single-sided media.
+
+        <media names> may define alternate strings to use when asking to insert a certain media.
+         They are defined as <key><whitespace><value> pairs, separated by \n.
+         
+      */
+      
+      ///////////////////////////////////////////////////////////////////
+      //
+      //       METHOD NAME : Parser::parse
+      //       METHOD TYPE : void
+      //
+      void MediaMetadataParser::parse( const Pathname & file_r, MediaEntry &entry_r )
+      {
+        std::ifstream file(file_r.asString().c_str());
+        std::string buffer;
+        // read vendor
+        getline(file, entry_r.vendor);
+        // read timestamp
+        getline(file, entry_r.timestamp);
+        // skip flags for now
+        std::string media_count_str;
+        
+        getline(file, buffer);
+        regex is_digit_rx("^[\\d]+$");
+        boost::smatch what_digit;
+        
+        // for the first line here we dont have to consume one if
+        // there was no media
+        bool consume = false;  
+
+        if(boost::regex_match(buffer, what_digit, is_digit_rx))
+        {
+          // it was the media count
+          str::strtonum(buffer, entry_r.count);
+          // consume another line
+          consume = true;
+        }
+        
+        while(!file.eof())
+        {
+          // probably is the first line after we dont find the media number
+          if(consume)
+            getline(file, buffer);
+          // only once
+          consume = true;
+          boost::regex e("^MEDIA([\\d]+)(\\.([_A-Za-z]+)){0,1} (.+)$");
+          boost::smatch what;
+          if(boost::regex_match(buffer, what, e, boost::match_extra))
+          {
+            if ( what.size() < 5 )
+              std::cout << "ups!!!!" << std::endl;
+           
+            dumpRegexpResults(what);
+            
+            std::string key = what[2];
+            std::string value = what[5];
+            std::string modifier = what[4];
+          }
+          else
+          {
+            DBG << "** No Match found:  " << buffer << std::endl;
+          }
+        }
+      }
+
+      void MediaMetadataParser::parseLine( const string &key, const string &modif, const string &value, map< string, list<string> > &container)
+      {
+        if ( modif.size() == 0)
+          parseLine( key, value, container["default"]); 
+        else
+          parseLine( key, value, container[modif]);
+      }
+
+      void MediaMetadataParser::parseLine( const string &key, const string &modif, const string &value, map< string, string > &container)
+      {
+        if( modif.size() == 0)
+          container["default"] = value;
+        else
+          container[modif] = value;
+      }
+
+      void MediaMetadataParser::parseLine( const string &key, const string &value, std::list<std::string> &container)
+      {
+          str::split( value, std::back_inserter(container), " ");
+      }
+
+
+      /////////////////////////////////////////////////////////////////
+    } // namespace tagfile
+    ///////////////////////////////////////////////////////////////////
+    /////////////////////////////////////////////////////////////////
+  } // namespace parser
+  ///////////////////////////////////////////////////////////////////
+  /////////////////////////////////////////////////////////////////
+} // namespace zypp
+///////////////////////////////////////////////////////////////////

diff --git a/zypp/parser/tagfile/MediaMetadataParser.h b/zypp/parser/tagfile/MediaMetadataParser.h
new file mode 100644 (file)
index 0000000..681850c
--- /dev/null
+++ b/zypp/parser/tagfile/MediaMetadataParser.h
@@ -0,0 +1,97 @@
+/*---------------------------------------------------------------------\
+|                          ____ _   __ __ ___                          |
+|                         |__  / \ / / . \ . \                         |
+|                           / / \ V /|  _/  _/                         |
+|                          / /__ | | | | | |                           |
+|                         /_____||_| |_| |_|                           |
+|                                                                      |
+\---------------------------------------------------------------------*/
+/** \file      zypp/parser/tagfile/Parser.h
+ *
+*/
+#ifndef ZYPP_PARSER_TAGFILE_MediaMetadataPARSER_H
+#define ZYPP_PARSER_TAGFILE_MediaMetadataPARSER_H
+
+#include <iosfwd>
+#include <set>
+#include <map>
+#include <list>
+
+#include "zypp/parser/tagfile/Tags.h"
+#include "zypp/parser/tagfile/ParseException.h"
+
+#include "zypp/Pathname.h"
+
+///////////////////////////////////////////////////////////////////
+namespace zypp
+{ /////////////////////////////////////////////////////////////////
+  ///////////////////////////////////////////////////////////////////
+  namespace parser
+  { /////////////////////////////////////////////////////////////////
+    ///////////////////////////////////////////////////////////////////
+    namespace tagfile
+    { /////////////////////////////////////////////////////////////////
+
+      ///////////////////////////////////////////////////////////////////
+      //
+      //       CLASS NAME : MediaMetadataParser
+      //
+      /** Tagfile parser. */
+      struct MediaMetadataParser
+      {
+        struct MediaEntry {
+          Pathname    dir;
+          std::string vendor;
+          std::string timestamp;
+          unsigned int count;
+          std::set<std::string> flags;
+          // map media number to ( map language -> description string )
+          // entry.alternate_names[1]["de"] -> "SUSE Linux"
+          std::map< unsigned int, std::map<std::string, std::string> > alternate_names;
+              
+          MediaEntry( const Pathname & dir_r = "/" ){
+            dir  = dir_r;
+          }
+          bool operator<( const MediaEntry & rhs ) const {
+            return( dir.asString() < rhs.dir.asString() );
+          }
+        };
+
+        typedef std::set<MediaEntry> MediaSet;
+
+
+        virtual ~MediaMetadataParser()
+        {}
+
+        /* Parse file and invoke consume on each tag found.
+         * \throw ParseException
+         * \todo more doc on Ecaptions.
+        */
+        void parse( const Pathname & file_r, MediaEntry &entry_r );
+        /* Parse a key.modifier (std::list of std::strings)
+         * That means, translatable tag with multiple values
+         * the default modifier will get the modifier of default (LABEL.de, LABEL as LANGUAGE.default)
+        */ 
+        void parseLine( const std::string &key, const std::string &modif, const std::string &value, std::map< std::string, std::list<std::string> > &container);
+        /*
+         * same as above, but the value is a single std::string, this means, translatable tags, with only 1 value
+        */
+        void parseLine( const std::string &key,const std::string &modif, const std::string &value, std::map< std::string, std::string > &container);
+        /*
+         * Non translatable tag with multiple values
+         */
+        void parseLine( const std::string &key, const std::string &value, std::list<std::string> &container);
+      };
+      ///////////////////////////////////////////////////////////////////
+
+      /////////////////////////////////////////////////////////////////
+    } // namespace tagfile
+    ///////////////////////////////////////////////////////////////////
+    /////////////////////////////////////////////////////////////////
+  } // namespace parser
+  ///////////////////////////////////////////////////////////////////
+  /////////////////////////////////////////////////////////////////
+} // namespace zypp
+///////////////////////////////////////////////////////////////////
+//
+#endif //  ZYPP_PARSER_TAGFILE_MediaMetadataPPARSER_H