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

[Slava Bacherikov]

commit:     14341591e6b6bc0d6699ba81ddea8cf26df45384
Author:     Slava Bacherikov <slava <AT> bacher09 <DOT> org>
AuthorDate: Tue May 29 07:03:48 2012 +0000
Commit:     Slava Bacherikov <slava <AT> bacherikov <DOT> org <DOT> ua>
CommitDate: Tue May 29 07:03:48 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-packages.git;a=commit;h=14341591

Add get_or_create for EbuildModel

---
 gpackages/apps/packages/managers.py |   50 +++++++++++++++++++++++++----------
 gpackages/apps/packages/models.py   |   12 ++++++++
 2 files changed, 48 insertions(+), 14 deletions(-)

diff --git a/gpackages/apps/packages/managers.py b/gpackages/apps/packages/managers.py
index ec3a55b..2d01508 100644
--- a/gpackages/apps/packages/managers.py
+++ b/gpackages/apps/packages/managers.py
@@ -4,21 +4,20 @@ import packages.models
 
 
 class PackageMixin(object):
-    def get_or_create(self, **kwargs):
-        if 'package' in kwargs:
-            po = kwargs['package']
-            if isinstance(po, Package):
-                del kwargs['package']
-                if 'category' not in kwargs:
-                    co, created = packages.models.CategoryModel. \
-                            objects.get_or_create(category = po.category)
-                    kwargs.update({'category': co})
-                
-                kwargs.update({'name': po.name})
+    def get(self, package = None, *args, **kwargs):
+        if package is not None and isinstance(package, Package):
+            try:
+                category = packages.models.CategoryModel.objects.get(category = package.category)
+            except packages.models.CategoryModel.DoesNotExist:
+                raise self.model.DoesNotExist
+            name = package.name
+            if len(args)>=1:
+                args[0] = name
+            if len(args)>=2:
+                args[1] = category
             else:
-                raise ValueError("Bad package object")
-
-        return super(PackageMixin, self).get_or_create(**kwargs)
+                kwargs.update({'name': name, 'category': category})
+        return super(PackageMixin, self).get(*args, **kwargs)
 
 class PackageQuerySet(PackageMixin, models.query.QuerySet):
     pass
@@ -45,3 +44,26 @@ class KeywordQuerySet(KeywordMixin, models.query.QuerySet):
 class KeywordManager(KeywordMixin, models.Manager):
     def get_query_set(self):
         return KeywordQuerySet(self.model, using=self._db)
+
+
+class EbuildMixin(object):
+    def get(self, ebuild=None, *args, **kwargs):
+        if ebuild is not None and isinstance(ebuild, Ebuild):
+            try:
+                package = packages.models.PackageModel.objects.get(package = ebuild.package)
+            except packages.models.PackageModel.DoesNotExist:
+                raise self.model.DoesNotExist
+            version = ebuild.version
+            revision = ebuild.revision
+            kwargs.update({ 'version': version,
+                            'revision': revision,
+                            'package': package })
+        return super(EbuildMixin, self).get(*args, **kwargs)
+            
+
+class EbuildQuerySet(EbuildMixin, models.query.QuerySet):
+    pass
+
+class EbuildManager(EbuildMixin, models.Manager):
+    def get_query_set(self):
+        return EbuildQuerySet(self.model, using=self._db)

diff --git a/gpackages/apps/packages/models.py b/gpackages/apps/packages/models.py
index e64fcc1..313e77c 100644
--- a/gpackages/apps/packages/models.py
+++ b/gpackages/apps/packages/models.py
@@ -106,6 +106,18 @@ class EbuildModel(models.Model):
 
     homepage = models.URLField()
     description = models.TextField(blank = True, null = True)
+
+    objects = managers.EbuildManager()
+
+    def __init__(self, *args, **kwargs ):
+        # TODO: Bug fix
+        ebuild = None
+        if 'ebuild' in kwargs:
+            ebuild = kwargs['ebuild']
+            del kwargs['ebuild']
+        super(EbuildModel, self).__init__(*args, **kwargs)
+        if ebuild is not None and isinstance(ebuild, Ebuild):
+            self.init_with_keywords(ebuild)
     
     def __unicode__(self):
         return '%s-%s' % (self.package, self.version)