src_prepare/euscan-ng
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

euscanwww: starting implementing Celery tasks

Browse Source 
Basic tasks.py module, some fixes in the management commands

Signed-off-by: volpino <fox91@anche.no>
This commit is contained in:
volpino
2012-05-30 22:54:55 +02:00
parent c36f625a54
commit 56c4d79fb2
5 changed files with 126 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
euscanwww/djeuscan/management/commands/scan_metadata.py
View File

@@ -18,7 +18,7 @@ class ScanMetadata(object):
self.style = color_style()
@commit_on_success
def run(self, query=None, obj=None):
def scan(self, query=None, obj=None):
matches = Query(query).find(
include_masked=True,
in_installed=False,
@@ -158,10 +158,10 @@ class Command(BaseCommand):
if options['all']:
for pkg in Package.objects.all():
scan_metadata.run('%s/%s' % (pkg.category, pkg.name), pkg)
scan_metadata.scan('%s/%s' % (pkg.category, pkg.name), pkg)
elif len(args) > 0:
for package in args:
scan_metadata.run(package)
scan_metadata.scan(package)
else:
for package in sys.stdin.readlines():
scan_metadata.run(package[:-1])
scan_metadata.scan(package[:-1])

21
euscanwww/djeuscan/management/commands/scan_portage.py
View File

@@ -3,8 +3,8 @@ import portage
import sys
import os
import re
from optparse import make_option
from collections import defaultdict
from django.db.transaction import commit_on_success
from django.core.management.base import BaseCommand
@@ -14,13 +14,10 @@ from djeuscan.models import Package, Version, VersionLog
class ScanPortage(object):
def __init__(self, stdout=None, **options):
if stdout is None:
self.stdout = sys.stdout
else:
self.stdout = stdout
def __init__(self, stdout=None, options=None):
self.stdout = sys.stdout if stdout is None else stdout
self.options = defaultdict(None) if options is None else options
self.options = options
self.style = color_style()
self._cache = {'packages': {}, 'versions': {}}
self._overlays = None
@@ -84,7 +81,7 @@ class ScanPortage(object):
return self._overlays
@commit_on_success
def run(self, query=None):
def scan(self, query=None):
env = os.environ
env['MY'] = "<category>/<name>-<version>:<slot> [<overlaynum>]\n"
@@ -312,7 +309,7 @@ class Command(BaseCommand):
help = 'Scans portage tree and fills database'
def handle(self, *args, **options):
scan_portage = ScanPortage(stdout=self.stdout, **options)
scan_portage = ScanPortage(stdout=self.stdout, options=options)
if not options['quiet']:
self.stdout.write('Scanning portage tree...\n')
@@ -329,13 +326,13 @@ class Command(BaseCommand):
self.stdout.write('done\n')
if options['all']:
scan_portage.run()
scan_portage.scan()
elif len(args):
for package in args:
scan_portage.run(package)
scan_portage.scan(package)
else:
for package in sys.stdin.readlines():
scan_portage.run(package[:-1])
scan_portage.scan(package[:-1])
if options['purge-versions']:
purge_versions(options)

49
euscanwww/djeuscan/management/commands/scan_upstream.py
View File

@@ -4,7 +4,6 @@ import sys
import re
from StringIO import StringIO
from optparse import make_option
from collections import defaultdict
from django.utils import timezone
from django.db.transaction import commit_on_success
@@ -14,21 +13,17 @@ from djeuscan.models import Package, Version, EuscanResult, VersionLog
class ScanUpstream(object):
def __init__(self, options=None):
if options is None:
self.options = defaultdict(None)
else:
self.options = options
def __init__(self, quiet=False):
self.quiet = quiet
def run(self, packages=None):
for package in packages:
cmd = ['euscan', package]
def scan(self, package):
cmd = ['euscan', package]
fp = subprocess.Popen(cmd, stdout=subprocess.PIPE,
stderr=subprocess.PIPE)
output = StringIO(fp.communicate()[0])
fp = subprocess.Popen(cmd, stdout=subprocess.PIPE,
stderr=subprocess.PIPE)
output = StringIO(fp.communicate()[0])
self.parse_output(output)
self.parse_output(output)
def store_result(self, package, log):
# Remove previous logs
@@ -45,7 +40,7 @@ class ScanUpstream(object):
obj, created = Package.objects.get_or_create(category=cat, name=pkg)
if created and not self.options['quiet']:
if created and not self.quiet:
sys.stdout.write('+ [p] %s/%s\n' % (cat, pkg))
# Set all versions dead, then set found versions alive and
@@ -69,7 +64,7 @@ class ScanUpstream(object):
if not created:
return
if not self.options['quiet']:
if not self.quiet:
sys.stdout.write('+ [u] %s %s\n' % (obj, url))
VersionLog.objects.create(
@@ -125,7 +120,7 @@ class ScanUpstream(object):
@commit_on_success
def purge_versions(options):
def purge_versions(quiet=False):
# For each dead versions
for version in Version.objects.filter(packaged=False, alive=False):
VersionLog.objects.create(
@@ -140,7 +135,7 @@ def purge_versions(options):
version.package.n_versions -= 1
version.package.save()
if not options['quiet']:
if not quiet:
sys.stdout.write('- [u] %s %s\n' % (version, version.urls))
Version.objects.filter(packaged=False, alive=False).delete()
@@ -174,31 +169,29 @@ class Command(BaseCommand):
help = 'Scans metadata and fills database'
def handle(self, *args, **options):
scan_upstream = ScanUpstream(options)
scan_upstream = ScanUpstream(options["quiet"])
if options['feed']:
scan_upstream.parse_output(options, sys.stdin)
scan_upstream.parse_output(sys.stdin)
if options['purge-versions']:
purge_versions(options)
purge_versions(options["quiet"])
return
if not options['quiet']:
self.stdout.write('Scanning upstream...\n')
packages = []
if options['all']:
for pkg in Package.objects.all():
packages.append('%s/%s' % (pkg.category, pkg.name))
scan_upstream.scan('%s/%s' % (pkg.category, pkg.name))
elif args:
packages = list(args)
for arg in args:
scan_upstream.scan(arg)
else:
packages = [package[:-1] for package in sys.stdin.readlines()]
scan_upstream.run(packages)
for package in sys.stdin.readlines():
scan_upstream.scan(package[:-1])
if options['purge-versions']:
purge_versions(options)
purge_versions(options["quiet"])
if not options['quiet']:
self.stdout.write('Done.\n')