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

[André Erdmann]

commit:     5e738c15639dddb86446e5c749d2c986f4350580
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Thu Aug 29 12:28:14 2013 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Thu Aug 29 12:28:14 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=5e738c15

common base object for Overlay,Category,...

---
 roverlay/overlay/base.py     | 34 ++++++++++++++++++++++++++++++++++
 roverlay/overlay/category.py | 10 +++++-----
 roverlay/overlay/root.py     | 12 ++++++------
 3 files changed, 45 insertions(+), 11 deletions(-)

diff --git a/roverlay/overlay/base.py b/roverlay/overlay/base.py
new file mode 100644
index 0000000..b380e8f
--- /dev/null
+++ b/roverlay/overlay/base.py
@@ -0,0 +1,34 @@
+# R overlay -- overlay package, overlay base object
+# -*- coding: utf-8 -*-
+# Copyright (C) 2013 André Erdmann <dywi@×××××××.de>
+# Distributed under the terms of the GNU General Public License;
+# either version 2 of the License, or (at your option) any later version.
+
+import logging
+
+import roverlay.util.objects
+
+class OverlayObject ( roverlay.util.objects.ReferenceTree ):
+
+   # always keep a (weak) reference to self:
+   # (a) Overlay: multiple Category objects use this ref
+   # (b) Category: ^ PackageDir ...
+   # (c) PackageDir: ^ PackageInfo ...
+   #
+   CACHE_REF = True
+
+   def __init__ ( self, name, logger, directory, parent ):
+      super ( OverlayObject, self ).__init__ ( parent )
+      self.name   = name
+      self.logger = (
+         logger.getChild ( name ) if logger else logging.getLogger ( name )
+      )
+      self.physical_location = directory
+   # --- end of __init__ (...) ---
+
+   # inherited:
+   #def get_parent
+   #def get_upper
+   #def get_ref
+
+# --- end of OverlayObject ---

diff --git a/roverlay/overlay/category.py b/roverlay/overlay/category.py
index 2fc3a4f..d2b2028 100644
--- a/roverlay/overlay/category.py
+++ b/roverlay/overlay/category.py
@@ -27,6 +27,7 @@ except ImportError:
 import roverlay.stats.collector
 
 import roverlay.overlay.pkgdir.base
+import roverlay.overlay.base
 ##import roverlay.overlay.pkgdir.packagedir_ebuildmanifest
 ##import roverlay.overlay.pkgdir.packagedir_newmanifest
 
@@ -77,14 +78,14 @@ class WriteQueueJob ( object ):
 
 # --- end of WriteQueueJob ---
 
-class Category ( object ):
+class Category ( roverlay.overlay.base.OverlayObject ):
 
    WRITE_JOBCOUNT = 3
 
    STATS = roverlay.stats.collector.static.overlay
 
    def __init__ ( self,
-      name, logger, directory, get_header, runtime_incremental
+      name, logger, directory, get_header, runtime_incremental, parent
    ):
       """Initializes a overlay/portage category (such as 'app-text', 'sci-R').
 
@@ -95,12 +96,11 @@ class Category ( object ):
       * get_header          -- function that returns an ebuild header
       * runtime_incremental -- enable/disable runtime incremental writing
                                for this category (and all created PackageDirs)
+      * parent              -- overlay object that created/creates this object
       """
-      self.logger              = logger.getChild ( name )
-      self.name                = name
+      super ( Category, self ).__init__ ( name, logger, directory, parent )
       self._lock               = threading.RLock()
       self._subdirs            = dict()
-      self.physical_location   = directory
       self.get_header          = get_header
       self.runtime_incremental = runtime_incremental
       self.packagedir_cls      = roverlay.overlay.pkgdir.base.get_class()

diff --git a/roverlay/overlay/root.py b/roverlay/overlay/root.py
index 6e3b1d7..1a07091 100644
--- a/roverlay/overlay/root.py
+++ b/roverlay/overlay/root.py
@@ -27,15 +27,15 @@ import threading
 import roverlay.config
 import roverlay.util
 import roverlay.overlay.additionsdir
+import roverlay.overlay.base
 import roverlay.overlay.category
 import roverlay.overlay.header
 import roverlay.overlay.pkgdir.base
 import roverlay.overlay.pkgdir.distroot.static
 
-class Overlay ( object ):
+class Overlay ( roverlay.overlay.base.OverlayObject ):
    DEFAULT_USE_DESC = (
       'byte-compile - enable byte compiling\n'
-      'R_suggests - install recommended packages'
    )
 
    @classmethod
@@ -124,9 +124,8 @@ class Overlay ( object ):
       * keep_n_ebuilds      -- number of ebuilds to keep (per package),
                                any "false" Value (None, 0, ...) disables this
       """
-      self.name                 = name
-      self.logger               = logger.getChild ( 'overlay' )
-      self.physical_location    = directory
+      super ( Overlay, self ).__init__ ( name, logger, directory, None )
+
       self.default_category     = default_category
 
       self._eclass_files        = eclass_files
@@ -203,7 +202,8 @@ class Overlay ( object ):
                   self.logger,
                   self.physical_location + os.sep + category,
                   get_header=self._header.get,
-                  runtime_incremental=self._runtime_incremental
+                  runtime_incremental=self._runtime_incremental,
+                  parent=self,
                )
                self._categories [category] = newcat
          finally: