[gentoo-commits] proj/R_overlay:master commit in: roverlay/depres/simpledeprule/, roverlay/util/

[André Erdmann]

commit:     b60aa29c76d44975a20ef6206473aa266947e225
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Fri Feb 21 23:00:06 2014 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Sat Feb 22 14:23:12 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=b60aa29c

roverlay/depres, rule reader: properly count files

fix a small bug that affects logging only where
SimpleDependencyRuleReader.read() always reports a file count of 0.

Also, remove an unnecessary "self._pool_add is [not] None" check.

---
 roverlay/depres/simpledeprule/reader.py    | 16 +++++++---------
 roverlay/depres/simpledeprule/rulemaker.py |  5 +++++
 roverlay/util/mapreader.py                 | 10 ++++++++++
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/roverlay/depres/simpledeprule/reader.py b/roverlay/depres/simpledeprule/reader.py
index 22f3cf3..3cdc7cf 100644
--- a/roverlay/depres/simpledeprule/reader.py
+++ b/roverlay/depres/simpledeprule/reader.py
@@ -36,8 +36,6 @@ class SimpleDependencyRuleReader ( object ):
 
       self._pool_add = pool_add
       self._when_done = when_done
-
-      self._fcount = 0
    # --- end of __init__  (...) ---
 
    def read ( self, files_or_dirs ):
@@ -52,17 +50,17 @@ class SimpleDependencyRuleReader ( object ):
             "Read method is for resolver, but pool_add is None."
       )
 
+      self._rmaker.file_count = 0
       self.read_files ( files_or_dirs )
 
       rule_count, pools = self._rmaker.done ( as_pool=True )
       self.logger.debug ( "Read {} rules in {} files.".format (
-         rule_count, self._fcount
+         rule_count, self._rmaker.file_count
       ) )
-      if self._pool_add is not None:
-         for p in pools: self._pool_add ( p )
 
-         if self._when_done is not None:
-            self._when_done()
-      else:
-         return pools
+      for p in pools:
+         self._pool_add ( p )
+
+      if self._when_done is not None:
+         self._when_done()
    # --- end of read (...) ---

diff --git a/roverlay/depres/simpledeprule/rulemaker.py b/roverlay/depres/simpledeprule/rulemaker.py
index 5daf058..8a4acc5 100644
--- a/roverlay/depres/simpledeprule/rulemaker.py
+++ b/roverlay/depres/simpledeprule/rulemaker.py
@@ -47,6 +47,7 @@ class SimpleRuleMaker ( roverlay.util.mapreader.MapFileParser ):
       self.deptype_kw      = 'deptype'
       self._deptype        = deptype.ALL
       self._deptype_once   = deptype.NONE
+      self.file_count      = 0
    # --- end of __init__ (...) ---
 
    def has_context ( self ):
@@ -62,6 +63,10 @@ class SimpleRuleMaker ( roverlay.util.mapreader.MapFileParser ):
       self._deptype_once = deptype.NONE
    # --- end of read_lines_begin (...) ---
 
+   def read_file_done ( self, filepath ):
+      self.file_count += 1
+   # --- end of read_file_done (...) ---
+
    def make_result ( self, as_pool=False ):
       rule_count = len ( self._items )
       if as_pool:

diff --git a/roverlay/util/mapreader.py b/roverlay/util/mapreader.py
index 36f4ba7..9ee0944 100644
--- a/roverlay/util/mapreader.py
+++ b/roverlay/util/mapreader.py
@@ -150,8 +150,17 @@ class MapFileParser ( object ):
       return ret
    # --- end of read_lines (...) ---
 
+   def read_file_begin ( self, filepath ):
+      pass
+   # --- end of read_file_begin (...) ---
+
+   def read_file_done ( self, filepath ):
+      pass
+   # --- end of read_file_done (...) ---
+
    def read_file ( self, filepath, handle_compressed=True ):
       ret = None
+      self.read_file_begin ( filepath )
       try:
          if handle_compressed:
             ret = self.read_lines (
@@ -166,6 +175,7 @@ class MapFileParser ( object ):
          )
          raise
 
+      self.read_file_done ( filepath )
       return ret
    # --- end of read_file (...) ---