[gentoo-commits] proj/R_overlay:master commit in: roverlay/rpackage/

["André Erdmann" <dywi@mailerd.de>]

commit:     5a33555ed99796d0277466e2e7009f9eae2f1d35
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Thu Jul 25 08:46:39 2013 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Thu Jul 25 08:46:39 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=5a33555e

rpackage/descriptionreader: parse files directly

For testing.

---
 roverlay/rpackage/descriptionreader.py | 54 ++++++++++++++++++++++++----------
 1 file changed, 39 insertions(+), 15 deletions(-)

diff --git a/roverlay/rpackage/descriptionreader.py b/roverlay/rpackage/descriptionreader.py
index f18aa15..b589489 100644
--- a/roverlay/rpackage/descriptionreader.py
+++ b/roverlay/rpackage/descriptionreader.py
@@ -13,6 +13,7 @@ import sys
 import tarfile
 import os.path
 import time
+import logging
 
 from roverlay          import config, util, strutil
 from roverlay.rpackage import descriptionfields
@@ -68,6 +69,28 @@ class DescriptionReader ( object ):
 
    # --- end of __init__ (...) ---
 
+   def parse_file ( self, filepath ):
+      desc_lines = self._get_desc_from_file ( filepath )
+      if desc_lines is None:
+         return None
+      else:
+         raw_data  = self._get_raw_data ( desc_lines )
+         read_data = self._make_read_data ( raw_data )
+         if read_data is None:
+            return None
+         else:
+            return ( self._verify_read_data ( read_data ), read_data )
+   # --- end of parse_file (...) ---
+
+   @classmethod
+   def parse_files ( cls, *filepaths ):
+      instance = cls (
+         None, logging.getLogger(), read_now=False, write_desc=False
+      )
+      for filepath in filepaths:
+         yield instance.parse_file ( filepath )
+   # --- end of parse_files (...) ---
+
    def get_desc ( self, run_if_unset=True ):
       if not hasattr ( self, 'desc_data' ):
          if run_if_unset:
@@ -272,19 +295,7 @@ class DescriptionReader ( object ):
 
    # --- end of _get_desc_from_file (...) ---
 
-   def _get_raw_data ( self ):
-      try:
-         desc_lines = self._get_desc_from_file (
-            self.fileinfo ['package_file'],
-            self.fileinfo ['package_name']
-         )
-
-      except Exception as err:
-         #self.logger.exception ( err )
-         # error message should suffice
-         self.logger.warning ( err )
-         return None
-
+   def _get_raw_data ( self, desc_lines ):
       raw = dict()
 
       field_context = None
@@ -432,9 +443,22 @@ class DescriptionReader ( object ):
       are "useless" (not suited to create an ebuild for it,
       e.g. if OS_TYPE is not unix).
       """
+      read_data = None
+      try:
+         desc_lines = self._get_desc_from_file (
+            self.fileinfo ['package_file'],
+            self.fileinfo ['package_name']
+         )
+      except Exception as err:
+         #self.logger.exception ( err )
+         # error message should suffice
+         self.logger.warning ( err )
+      else:
+         if desc_lines is not None:
+            raw_data  = self._get_raw_data ( desc_lines )
+            read_data = self._make_read_data ( raw_data )
+
 
-      raw_data  = self._get_raw_data()
-      read_data = self._make_read_data ( raw_data )
 
       self.desc_data = None