| 1 |
commit: df940e0b6d5f0ca25e83773f10f851f99af54043 |
| 2 |
Author: Slava Bacherikov <slava <AT> bacher09 <DOT> org> |
| 3 |
AuthorDate: Thu May 31 18:33:28 2012 +0000 |
| 4 |
Commit: Slava Bacherikov <slava <AT> bacherikov <DOT> org <DOT> ua> |
| 5 |
CommitDate: Thu May 31 18:33:28 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-packages.git;a=commit;h=df940e0b |
| 7 |
|
| 8 |
Add many homepages. |
| 9 |
|
| 10 |
--- |
| 11 |
gpackages/apps/packages/admin.py | 3 ++- |
| 12 |
.../packages/management/commands/scanpackages.py | 6 ++++++ |
| 13 |
gpackages/apps/packages/models.py | 11 ++++++++++- |
| 14 |
gpackages/main/urls.py | 4 ++-- |
| 15 |
4 files changed, 20 insertions(+), 4 deletions(-) |
| 16 |
|
| 17 |
diff --git a/gpackages/apps/packages/admin.py b/gpackages/apps/packages/admin.py |
| 18 |
index 9f76014..5773ce4 100644 |
| 19 |
--- a/gpackages/apps/packages/admin.py |
| 20 |
+++ b/gpackages/apps/packages/admin.py |
| 21 |
@@ -1,6 +1,6 @@ |
| 22 |
from django.contrib import admin |
| 23 |
from models import EbuildModel, PackageModel, LicensModel, CategoryModel, \ |
| 24 |
- UseFlagModel, RepositoryModel |
| 25 |
+ UseFlagModel, RepositoryModel, HomepageModel |
| 26 |
|
| 27 |
admin.site.register(EbuildModel) |
| 28 |
admin.site.register(PackageModel) |
| 29 |
@@ -8,3 +8,4 @@ admin.site.register(LicensModel) |
| 30 |
admin.site.register(CategoryModel) |
| 31 |
admin.site.register(UseFlagModel) |
| 32 |
admin.site.register(RepositoryModel) |
| 33 |
+admin.site.register(HomepageModel) |
| 34 |
|
| 35 |
diff --git a/gpackages/apps/packages/management/commands/scanpackages.py b/gpackages/apps/packages/management/commands/scanpackages.py |
| 36 |
index 6db27e4..31644f8 100644 |
| 37 |
--- a/gpackages/apps/packages/management/commands/scanpackages.py |
| 38 |
+++ b/gpackages/apps/packages/management/commands/scanpackages.py |
| 39 |
@@ -130,6 +130,12 @@ class Command(BaseCommand): |
| 40 |
ebuild_object.licenses.add(*get_licenses_objects(ebuild)) |
| 41 |
ebuild_object.use_flags.add(*get_uses_objects(ebuild)) |
| 42 |
get_keywords_objects(ebuild, ebuild_object) |
| 43 |
+ homepages_list = [] |
| 44 |
+ for homepage in ebuild.homepages: |
| 45 |
+ homepage_object = models.HomepageModel(url = homepage, |
| 46 |
+ ebuild = ebuild_object) |
| 47 |
+ homepages_list.append(homepage_object) |
| 48 |
+ models.HomepageModel.objects.bulk_create(homepages_list) |
| 49 |
|
| 50 |
|
| 51 |
print (datetime.datetime.now() - st).total_seconds() |
| 52 |
|
| 53 |
diff --git a/gpackages/apps/packages/models.py b/gpackages/apps/packages/models.py |
| 54 |
index b533f37..9da855f 100644 |
| 55 |
--- a/gpackages/apps/packages/models.py |
| 56 |
+++ b/gpackages/apps/packages/models.py |
| 57 |
@@ -117,7 +117,7 @@ class EbuildModel(models.Model): |
| 58 |
is_deleted = models.BooleanField(default = False) |
| 59 |
is_masked = models.BooleanField(default = False) |
| 60 |
|
| 61 |
- homepage = models.URLField(blank = True, null = True, max_length=255) |
| 62 |
+ #homepage = models.URLField(blank = True, null = True, max_length=255) |
| 63 |
description = models.TextField(blank = True, null = True) |
| 64 |
|
| 65 |
objects = managers.EbuildManager() |
| 66 |
@@ -211,3 +211,12 @@ class Keyword(models.Model): |
| 67 |
|
| 68 |
class Meta: |
| 69 |
unique_together = ('ebuild', 'arch') |
| 70 |
+ |
| 71 |
+ |
| 72 |
+class HomepageModel(models.Model): |
| 73 |
+ url = models.URLField(max_length=255) |
| 74 |
+ ebuild = models.ForeignKey(EbuildModel) |
| 75 |
+ |
| 76 |
+ def __unicode__(self): |
| 77 |
+ return self.url |
| 78 |
+ |
| 79 |
|
| 80 |
diff --git a/gpackages/main/urls.py b/gpackages/main/urls.py |
| 81 |
index c3a0045..aa0b806 100644 |
| 82 |
--- a/gpackages/main/urls.py |
| 83 |
+++ b/gpackages/main/urls.py |
| 84 |
@@ -16,9 +16,9 @@ urlpatterns = patterns('', |
| 85 |
) |
| 86 |
|
| 87 |
if DEBUG: |
| 88 |
- from packages.models import EbuildModel, PackageModel, UseFlagModel, LicensModel, CategoryModel, Keyword, ArchesModel |
| 89 |
+ from packages.models import EbuildModel, PackageModel, UseFlagModel, LicensModel, CategoryModel, Keyword, ArchesModel, HomepageModel |
| 90 |
from django.contrib import databrowse |
| 91 |
- databrowse.site.register(EbuildModel, PackageModel, UseFlagModel, LicensModel, CategoryModel, Keyword, ArchesModel) |
| 92 |
+ databrowse.site.register(EbuildModel, PackageModel, UseFlagModel, LicensModel, CategoryModel, Keyword, ArchesModel, HomepageModel) |
| 93 |
urlpatterns += ( |
| 94 |
url(r'^data/(.*)',databrowse.site.root), |
| 95 |
) |
Archives