From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.77) (envelope-from ) id 1SnHfE-00027M-9Q for garchives@archives.gentoo.org; Fri, 06 Jul 2012 23:10:16 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 635A7E056C; Fri, 6 Jul 2012 23:09:39 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 1F4BBE050E for ; Fri, 6 Jul 2012 23:09:38 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5BF571B4011 for ; Fri, 6 Jul 2012 23:09:37 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 00875E543E for ; Fri, 6 Jul 2012 23:09:34 +0000 (UTC) From: "Slava Bacherikov" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Slava Bacherikov" Message-ID: <1341590640.a5f76db6b3de800069672038421943b26a6b1bd2.bacher09@gentoo> Subject: [gentoo-commits] proj/gentoo-packages:master commit in: gpackages/apps/packages/, gpackages/apps/packages/management/commands/ X-VCS-Repository: proj/gentoo-packages X-VCS-Files: gpackages/apps/packages/management/commands/scanlicensetext.py gpackages/apps/packages/models.py gpackages/apps/packages/scan.py X-VCS-Directories: gpackages/apps/packages/ gpackages/apps/packages/management/commands/ X-VCS-Committer: bacher09 X-VCS-Committer-Name: Slava Bacherikov X-VCS-Revision: a5f76db6b3de800069672038421943b26a6b1bd2 X-VCS-Branch: master Date: Fri, 6 Jul 2012 23:09:34 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 4eb49393-8138-4190-bc36-c379f2162664 X-Archives-Hash: 03e7ac42864fcc55188b72274eb32595 commit: a5f76db6b3de800069672038421943b26a6b1bd2 Author: Slava Bacherikov bacher09 org> AuthorDate: Fri Jul 6 16:04:00 2012 +0000 Commit: Slava Bacherikov bacherikov org ua> CommitDate: Fri Jul 6 16:04:00 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gentoo-packag= es.git;a=3Dcommit;h=3Da5f76db6 Save license text to database --- .../management/commands/scanlicensetext.py | 17 ++++++++++++++= +++ gpackages/apps/packages/models.py | 3 ++- gpackages/apps/packages/scan.py | 12 ++++++++++++ 3 files changed, 31 insertions(+), 1 deletions(-) diff --git a/gpackages/apps/packages/management/commands/scanlicensetext.= py b/gpackages/apps/packages/management/commands/scanlicensetext.py new file mode 100644 index 0000000..40f9de4 --- /dev/null +++ b/gpackages/apps/packages/management/commands/scanlicensetext.py @@ -0,0 +1,17 @@ +from django.core.management.base import BaseCommand, CommandError +from packages.scan import Scanner +from optparse import make_option + + +class Command(BaseCommand): + option_list =3D BaseCommand.option_list + ( + make_option('--not-show-time', + action=3D'store_false', + dest=3D'show_time', + default=3DTrue, + help=3D'Show time of scanning'), + ) + args =3D '' + help =3D 'Will scan license text' + def handle(self, *args, **options): + Scanner(license_text =3D True, **options).scan() diff --git a/gpackages/apps/packages/models.py b/gpackages/apps/packages/= models.py index 1bfc2ba..c89db88 100644 --- a/gpackages/apps/packages/models.py +++ b/gpackages/apps/packages/models.py @@ -494,7 +494,8 @@ class LicenseModel(StatsModel): ) =20 name =3D models.CharField(unique =3D True, max_length =3D 60, db_ind= ex =3D True) - #description =3D TextField() + text =3D models.TextField(null =3D True) + #description =3D models.TextField() =20 # Autogenerated fields for fast stats #ebuilds_count =3D models.PositiveIntegerField(default =3D 0) diff --git a/gpackages/apps/packages/scan.py b/gpackages/apps/packages/sc= an.py index 0fdf488..e0cc09c 100644 --- a/gpackages/apps/packages/scan.py +++ b/gpackages/apps/packages/scan.py @@ -129,6 +129,7 @@ class Scanner(object): self.scan_local_use_descr =3D bool_get('scan_local_use', False) self.is_scan_license_groups =3D bool_get('scan_license_groups', = False) self.is_scan_news =3D bool_get('scan_news', False) + self.is_scan_license_text =3D bool_get('license_text', False) =20 def show_time(self): "Prints scan time" @@ -168,6 +169,9 @@ class Scanner(object): if self.is_scan_news: self.scan_news() =20 + if self.is_scan_license_text: + self.scan_license_text() + if self.is_show_time: self.show_time() =20 @@ -702,3 +706,11 @@ class Scanner(object): n_obj.save(force_update =3D True) self.update_related_to_news(n, n_obj) =20 + def scan_license_text(self): + licenses =3D models.LicenseModel.objects.all() + for license in licenses: + text =3D porttree.licenses.get_license(license.name) + if text: + license.text =3D smart_unicode(text, errors=3D'ignore') + license.save(force_update =3D True) +