[gentoo-commits] proj/gentoo-packages:master commit in: gpackages/apps/packages/

["Slava Bacherikov" <slava@bacherikov.org.ua>]

commit:     0d92c5b317de7af064dea7b14c0cce0b4b926430
Author:     Slava Bacherikov <slava <AT> bacher09 <DOT> org>
AuthorDate: Sun Jun  3 12:47:16 2012 +0000
Commit:     Slava Bacherikov <slava <AT> bacherikov <DOT> org <DOT> ua>
CommitDate: Sun Jun  3 12:47:16 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-packages.git;a=commit;h=0d92c5b3

Changes in models HerdsModel and MaintainerModel

---
 gpackages/apps/packages/managers.py |   24 +++++++++++++++++++
 gpackages/apps/packages/models.py   |   44 +++++++++++++++++++++++++++++++++-
 2 files changed, 66 insertions(+), 2 deletions(-)

diff --git a/gpackages/apps/packages/managers.py b/gpackages/apps/packages/managers.py
index 464b6ce..f613df2 100644
--- a/gpackages/apps/packages/managers.py
+++ b/gpackages/apps/packages/managers.py
@@ -101,3 +101,27 @@ class EbuildMixin(object):
 EbuildQuerySet, EbuildManager =   _gen_query_and_manager(EbuildMixin,
                                                         'EbuildQuerySet',
                                                         'EbuildManager')
+
+class HerdsMixin(object):
+    def filter(self, *args, **kwargs):
+        if 'herd__in' in kwargs:
+            herds = kwargs['herd__in']
+            del kwargs['herd__in']
+            kwargs['name__in'] = herds
+        return super(HerdsMixin, self).filter(*args, **kwargs)
+
+HerdsQuerySet, HerdsManager = _gen_query_and_manager(HerdsMixin,
+                                                     'HerdsQuerySet',
+                                                     'HerdsManager')
+
+class MaintainerMixin(object):
+    def filter(self, *args, **kwargs):
+        if 'maintainer__in'  in kwargs:
+            maintars = kwargs['maintainer__in']
+            del kwargs['maintainer__in']
+            kwargs['email__in'] = maintars
+        return super(MaintainerMixin, self).filter(*args, **kwargs)
+
+MaintainerQuerySet, MaintainerManager = _gen_query_and_manager(MaintainerMixin,
+                                                     'MaintainerQuerySet',
+                                                     'MaintainerManager')

diff --git a/gpackages/apps/packages/models.py b/gpackages/apps/packages/models.py
index e315c6b..2ad8faa 100644
--- a/gpackages/apps/packages/models.py
+++ b/gpackages/apps/packages/models.py
@@ -221,13 +221,53 @@ class Keyword(models.Model):
 
 
 class MaintainerModel(models.Model):
-    name = models.CharField( unique = True, max_length = 255)
-    email = models.EmailField()
+
+    def __init__(self, *args, **kwargs):
+        #TODO: Bad code, maybe use some libraries for overload methods
+        maintainer = None
+        if 'maintainer' in kwargs:
+            maintainer = kwargs['maintainer']
+            del kwargs['maintainer']
+        super(MaintainerModel, self).__init__(*args, **kwargs)
+        if maintainer is not None:
+            self.init_by_maintainer(maintainer)
+        
+    name = models.CharField(max_length = 255, blank = True, null = True)
+    email = models.EmailField(unique = True)
     role = models.TextField(blank = True, null = True)
 
+    objects = managers.MaintainerManager()
+
+    def init_by_maintainer(self, maintainer):
+        self.name = maintainer.name
+        self.email = maintainer.email
+        self.role = maintainer.role
+    
+    def __unicode__(self):
+        return ':'.join((unicode(self.name), self.email))
+
 class HerdsModel(models.Model):
+
+    def __init__(self, *args, **kwargs):
+        herd = None
+        if 'herd' in kwargs:
+            herd = kwargs['herd']
+            del kwargs['herd']
+        super(HerdsModel, self).__init__(*args, **kwargs)
+        if herd is not None:
+            self.init_by_herd(herd)
+
     name = models.CharField(unique = True, max_length = 150)
     email = models.EmailField()
     description = models.TextField(blank = True, null = True)
     maintainers = models.ManyToManyField(MaintainerModel, blank = True)
 
+    objects = managers.HerdsManager()
+
+    def init_by_herd(self, herd):
+        self.name = herd.name
+        self.email = herd.email
+        self.description = herd.description
+
+    def __unicode__(self):
+        return self.name