diff --git a/euscanwww/djeuscan/migrations/0026_auto__add_field_category_description__add_field_overlay_description__a.py b/euscanwww/djeuscan/migrations/0026_auto__add_field_category_description__add_field_overlay_description__a.py
new file mode 100644
index 0000000..7100301
--- /dev/null
+++ b/euscanwww/djeuscan/migrations/0026_auto__add_field_category_description__add_field_overlay_description__a.py
@@ -0,0 +1,201 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+ def forwards(self, orm):
+ # Adding field 'Category.description'
+ db.add_column('djeuscan_category', 'description',
+ self.gf('django.db.models.fields.TextField')(default='', blank=True),
+ keep_default=False)
+
+ # Adding field 'Overlay.description'
+ db.add_column('djeuscan_overlay', 'description',
+ self.gf('django.db.models.fields.TextField')(default='', blank=True),
+ keep_default=False)
+
+ # Adding field 'Overlay.homepage'
+ db.add_column('djeuscan_overlay', 'homepage',
+ self.gf('django.db.models.fields.TextField')(default='', blank=True),
+ keep_default=False)
+
+ def backwards(self, orm):
+ # Deleting field 'Category.description'
+ db.delete_column('djeuscan_category', 'description')
+
+ # Deleting field 'Overlay.description'
+ db.delete_column('djeuscan_overlay', 'description')
+
+ # Deleting field 'Overlay.homepage'
+ db.delete_column('djeuscan_overlay', 'homepage')
+
+ models = {
+ 'auth.group': {
+ 'Meta': {'object_name': 'Group'},
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+ 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+ },
+ 'auth.permission': {
+ 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+ 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+ },
+ 'auth.user': {
+ 'Meta': {'object_name': 'User'},
+ 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+ 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+ 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+ 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+ 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+ 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+ 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+ 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+ },
+ 'contenttypes.contenttype': {
+ 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+ 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+ },
+ 'djeuscan.category': {
+ 'Meta': {'object_name': 'Category'},
+ 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '128'})
+ },
+ 'djeuscan.categorylog': {
+ 'Meta': {'object_name': 'CategoryLog', '_ormbases': ['djeuscan.Log']},
+ 'category': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+ 'log_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['djeuscan.Log']", 'unique': 'True', 'primary_key': 'True'})
+ },
+ 'djeuscan.euscanresult': {
+ 'Meta': {'object_name': 'EuscanResult'},
+ 'datetime': ('django.db.models.fields.DateTimeField', [], {}),
+ 'ebuild': ('django.db.models.fields.CharField', [], {'max_length': '256', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'package': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['djeuscan.Package']"}),
+ 'result': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'scan_time': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'})
+ },
+ 'djeuscan.herd': {
+ 'Meta': {'object_name': 'Herd'},
+ 'email': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
+ 'herd': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '128'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'maintainers': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['djeuscan.Maintainer']", 'symmetrical': 'False'})
+ },
+ 'djeuscan.herdlog': {
+ 'Meta': {'object_name': 'HerdLog', '_ormbases': ['djeuscan.Log']},
+ 'herd': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['djeuscan.Herd']"}),
+ 'log_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['djeuscan.Log']", 'unique': 'True', 'primary_key': 'True'})
+ },
+ 'djeuscan.log': {
+ 'Meta': {'object_name': 'Log'},
+ 'datetime': ('django.db.models.fields.DateTimeField', [], {}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'n_packages_gentoo': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+ 'n_packages_outdated': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+ 'n_packages_overlay': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+ 'n_versions_gentoo': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+ 'n_versions_overlay': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+ 'n_versions_upstream': ('django.db.models.fields.IntegerField', [], {'default': '0'})
+ },
+ 'djeuscan.maintainer': {
+ 'Meta': {'object_name': 'Maintainer'},
+ 'email': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '128'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '128'})
+ },
+ 'djeuscan.maintainerlog': {
+ 'Meta': {'object_name': 'MaintainerLog', '_ormbases': ['djeuscan.Log']},
+ 'log_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['djeuscan.Log']", 'unique': 'True', 'primary_key': 'True'}),
+ 'maintainer': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['djeuscan.Maintainer']"})
+ },
+ 'djeuscan.overlay': {
+ 'Meta': {'object_name': 'Overlay'},
+ 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'homepage': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '128'})
+ },
+ 'djeuscan.package': {
+ 'Meta': {'unique_together': "(['category', 'name'],)", 'object_name': 'Package'},
+ 'category': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+ 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'herds': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['djeuscan.Herd']", 'symmetrical': 'False', 'blank': 'True'}),
+ 'homepage': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'last_version_gentoo': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'last_version_gentoo'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['djeuscan.Version']"}),
+ 'last_version_overlay': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'last_version_overlay'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['djeuscan.Version']"}),
+ 'last_version_upstream': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'last_version_upstream'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['djeuscan.Version']"}),
+ 'maintainers': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['djeuscan.Maintainer']", 'symmetrical': 'False', 'blank': 'True'}),
+ 'n_overlay': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+ 'n_packaged': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+ 'n_versions': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '128'})
+ },
+ 'djeuscan.problemreport': {
+ 'Meta': {'object_name': 'ProblemReport'},
+ 'datetime': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'message': ('django.db.models.fields.TextField', [], {}),
+ 'package': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['djeuscan.Package']"}),
+ 'subject': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+ 'version': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['djeuscan.Version']", 'null': 'True', 'blank': 'True'})
+ },
+ 'djeuscan.refreshpackagequery': {
+ 'Meta': {'object_name': 'RefreshPackageQuery'},
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'package': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['djeuscan.Package']"}),
+ 'priority': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+ 'users': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.User']", 'symmetrical': 'False'})
+ },
+ 'djeuscan.version': {
+ 'Meta': {'unique_together': "(['package', 'revision', 'version', 'overlay'],)", 'object_name': 'Version'},
+ 'confidence': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+ 'ebuild_path': ('django.db.models.fields.CharField', [], {'max_length': '256', 'blank': 'True'}),
+ 'handler': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '128', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'metadata_path': ('django.db.models.fields.CharField', [], {'max_length': '256', 'blank': 'True'}),
+ 'overlay': ('django.db.models.fields.CharField', [], {'default': "'gentoo'", 'max_length': '128', 'db_index': 'True', 'blank': 'True'}),
+ 'package': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['djeuscan.Package']"}),
+ 'packaged': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'revision': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+ 'slot': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '128', 'blank': 'True'}),
+ 'urls': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'version': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+ 'vtype': ('django.db.models.fields.CharField', [], {'max_length': '128', 'blank': 'True'})
+ },
+ 'djeuscan.versionlog': {
+ 'Meta': {'object_name': 'VersionLog'},
+ 'action': ('django.db.models.fields.IntegerField', [], {}),
+ 'datetime': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'overlay': ('django.db.models.fields.CharField', [], {'default': "'gentoo'", 'max_length': '128', 'blank': 'True'}),
+ 'package': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['djeuscan.Package']"}),
+ 'packaged': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'revision': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+ 'slot': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '128', 'blank': 'True'}),
+ 'version': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+ 'vtype': ('django.db.models.fields.CharField', [], {'max_length': '128', 'blank': 'True'})
+ },
+ 'djeuscan.worldlog': {
+ 'Meta': {'object_name': 'WorldLog', '_ormbases': ['djeuscan.Log']},
+ 'log_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['djeuscan.Log']", 'unique': 'True', 'primary_key': 'True'})
+ }
+ }
+
+ complete_apps = ['djeuscan']
\ No newline at end of file
diff --git a/euscanwww/djeuscan/migrations/0027_auto__add_field_overlay_overlay_path.py b/euscanwww/djeuscan/migrations/0027_auto__add_field_overlay_overlay_path.py
new file mode 100644
index 0000000..e3d83aa
--- /dev/null
+++ b/euscanwww/djeuscan/migrations/0027_auto__add_field_overlay_overlay_path.py
@@ -0,0 +1,186 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+ def forwards(self, orm):
+ # Adding field 'Overlay.overlay_path'
+ db.add_column('djeuscan_overlay', 'overlay_path',
+ self.gf('django.db.models.fields.CharField')(default='', max_length=256, blank=True),
+ keep_default=False)
+
+ def backwards(self, orm):
+ # Deleting field 'Overlay.overlay_path'
+ db.delete_column('djeuscan_overlay', 'overlay_path')
+
+ models = {
+ 'auth.group': {
+ 'Meta': {'object_name': 'Group'},
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+ 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+ },
+ 'auth.permission': {
+ 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+ 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+ },
+ 'auth.user': {
+ 'Meta': {'object_name': 'User'},
+ 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+ 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+ 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+ 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+ 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+ 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+ 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+ 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+ },
+ 'contenttypes.contenttype': {
+ 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+ 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+ },
+ 'djeuscan.category': {
+ 'Meta': {'object_name': 'Category'},
+ 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '128'})
+ },
+ 'djeuscan.categorylog': {
+ 'Meta': {'object_name': 'CategoryLog', '_ormbases': ['djeuscan.Log']},
+ 'category': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+ 'log_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['djeuscan.Log']", 'unique': 'True', 'primary_key': 'True'})
+ },
+ 'djeuscan.euscanresult': {
+ 'Meta': {'object_name': 'EuscanResult'},
+ 'datetime': ('django.db.models.fields.DateTimeField', [], {}),
+ 'ebuild': ('django.db.models.fields.CharField', [], {'max_length': '256', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'package': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['djeuscan.Package']"}),
+ 'result': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'scan_time': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'})
+ },
+ 'djeuscan.herd': {
+ 'Meta': {'object_name': 'Herd'},
+ 'email': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
+ 'herd': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '128'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'maintainers': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['djeuscan.Maintainer']", 'symmetrical': 'False'})
+ },
+ 'djeuscan.herdlog': {
+ 'Meta': {'object_name': 'HerdLog', '_ormbases': ['djeuscan.Log']},
+ 'herd': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['djeuscan.Herd']"}),
+ 'log_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['djeuscan.Log']", 'unique': 'True', 'primary_key': 'True'})
+ },
+ 'djeuscan.log': {
+ 'Meta': {'object_name': 'Log'},
+ 'datetime': ('django.db.models.fields.DateTimeField', [], {}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'n_packages_gentoo': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+ 'n_packages_outdated': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+ 'n_packages_overlay': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+ 'n_versions_gentoo': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+ 'n_versions_overlay': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+ 'n_versions_upstream': ('django.db.models.fields.IntegerField', [], {'default': '0'})
+ },
+ 'djeuscan.maintainer': {
+ 'Meta': {'object_name': 'Maintainer'},
+ 'email': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '128'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '128'})
+ },
+ 'djeuscan.maintainerlog': {
+ 'Meta': {'object_name': 'MaintainerLog', '_ormbases': ['djeuscan.Log']},
+ 'log_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['djeuscan.Log']", 'unique': 'True', 'primary_key': 'True'}),
+ 'maintainer': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['djeuscan.Maintainer']"})
+ },
+ 'djeuscan.overlay': {
+ 'Meta': {'object_name': 'Overlay'},
+ 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'homepage': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '128'}),
+ 'overlay_path': ('django.db.models.fields.CharField', [], {'max_length': '256', 'blank': 'True'})
+ },
+ 'djeuscan.package': {
+ 'Meta': {'unique_together': "(['category', 'name'],)", 'object_name': 'Package'},
+ 'category': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+ 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'herds': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['djeuscan.Herd']", 'symmetrical': 'False', 'blank': 'True'}),
+ 'homepage': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'last_version_gentoo': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'last_version_gentoo'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['djeuscan.Version']"}),
+ 'last_version_overlay': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'last_version_overlay'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['djeuscan.Version']"}),
+ 'last_version_upstream': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'last_version_upstream'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['djeuscan.Version']"}),
+ 'maintainers': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['djeuscan.Maintainer']", 'symmetrical': 'False', 'blank': 'True'}),
+ 'n_overlay': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+ 'n_packaged': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+ 'n_versions': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '128'})
+ },
+ 'djeuscan.problemreport': {
+ 'Meta': {'object_name': 'ProblemReport'},
+ 'datetime': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'message': ('django.db.models.fields.TextField', [], {}),
+ 'package': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['djeuscan.Package']"}),
+ 'subject': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+ 'version': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['djeuscan.Version']", 'null': 'True', 'blank': 'True'})
+ },
+ 'djeuscan.refreshpackagequery': {
+ 'Meta': {'object_name': 'RefreshPackageQuery'},
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'package': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['djeuscan.Package']"}),
+ 'priority': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+ 'users': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.User']", 'symmetrical': 'False'})
+ },
+ 'djeuscan.version': {
+ 'Meta': {'unique_together': "(['package', 'revision', 'version', 'overlay'],)", 'object_name': 'Version'},
+ 'confidence': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+ 'ebuild_path': ('django.db.models.fields.CharField', [], {'max_length': '256', 'blank': 'True'}),
+ 'handler': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '128', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'metadata_path': ('django.db.models.fields.CharField', [], {'max_length': '256', 'blank': 'True'}),
+ 'overlay': ('django.db.models.fields.CharField', [], {'default': "'gentoo'", 'max_length': '128', 'db_index': 'True', 'blank': 'True'}),
+ 'package': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['djeuscan.Package']"}),
+ 'packaged': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'revision': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+ 'slot': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '128', 'blank': 'True'}),
+ 'urls': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'version': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+ 'vtype': ('django.db.models.fields.CharField', [], {'max_length': '128', 'blank': 'True'})
+ },
+ 'djeuscan.versionlog': {
+ 'Meta': {'object_name': 'VersionLog'},
+ 'action': ('django.db.models.fields.IntegerField', [], {}),
+ 'datetime': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'overlay': ('django.db.models.fields.CharField', [], {'default': "'gentoo'", 'max_length': '128', 'blank': 'True'}),
+ 'package': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['djeuscan.Package']"}),
+ 'packaged': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'revision': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+ 'slot': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '128', 'blank': 'True'}),
+ 'version': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+ 'vtype': ('django.db.models.fields.CharField', [], {'max_length': '128', 'blank': 'True'})
+ },
+ 'djeuscan.worldlog': {
+ 'Meta': {'object_name': 'WorldLog', '_ormbases': ['djeuscan.Log']},
+ 'log_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['djeuscan.Log']", 'unique': 'True', 'primary_key': 'True'})
+ }
+ }
+
+ complete_apps = ['djeuscan']
\ No newline at end of file
diff --git a/euscanwww/djeuscan/models.py b/euscanwww/djeuscan/models.py
index 1b75495..feb7598 100644
--- a/euscanwww/djeuscan/models.py
+++ b/euscanwww/djeuscan/models.py
@@ -269,6 +269,10 @@ class EuscanResult(models.Model):
class Category(models.Model):
name = models.CharField(max_length=128, validators=[validate_category],
unique=True)
+ description = models.TextField(blank=True)
+
+ class Meta:
+ verbose_name_plural = "categories"
def __unicode__(self):
return self.name
@@ -277,6 +281,9 @@ class Category(models.Model):
class Overlay(models.Model):
name = models.CharField(max_length=128, validators=[validate_name],
unique=True)
+ description = models.TextField(blank=True)
+ homepage = models.TextField(blank=True)
+ overlay_path = models.CharField(blank=True, max_length=256)
def __unicode__(self):
return self.name
diff --git a/euscanwww/djeuscan/processing/scan/scan_portage.py b/euscanwww/djeuscan/processing/scan/scan_portage.py
index 24542b0..9efc8c2 100644
--- a/euscanwww/djeuscan/processing/scan/scan_portage.py
+++ b/euscanwww/djeuscan/processing/scan/scan_portage.py
@@ -2,14 +2,20 @@ import subprocess
import os
from os.path import join
+import sys
import portage
+from gentoolkit.metadata import MetaData
+
+from layman import Layman
+
from xml.etree.ElementTree import iterparse, ParseError
from django.db.transaction import commit_on_success
from django.db import models
from django.core.management.color import color_style
+from django.conf import settings
from euscan.version import get_version_type
@@ -365,23 +371,36 @@ class ScanPortage(object):
def populate_categories(logger):
- # Populate Category and Overlay
- # TODO: - use portage.settings.categories()
- # - read metadata.xml to add description
- for cat in Package.objects.values('category').distinct():
- obj, created = Category.objects.get_or_create(name=cat["category"])
+ portdir = portage.settings["PORTDIR"]
+ for cat in portage.settings.categories:
+ try:
+ meta = MetaData(join(portdir, cat, "metadata.xml"))
+ desc = meta.descriptions()[0]
+ except (IOError, IndexError):
+ desc = ""
+ obj, created = Category.objects.get_or_create(name=cat)
+ obj.description = desc.strip()
+ obj.save()
if created:
- logger.info("+ [c] %s", cat["category"])
+ logger.info("+ [c] %s", cat)
def populate_overlays(logger):
- # TODO: - get informations from layman and portage (path, url)
- for overlay in Version.objects.values('overlay').distinct():
- if not overlay["overlay"]:
+ l = Layman(stderr=sys.__stderr__, stdin=sys.__stdin__,
+ stdout=sys.__stdout__, config=settings.LAYMAN_CONFIG, root="/")
+ installed_overlays = l.get_installed()
+ info = l.get_all_info(installed_overlays)
+ for overlay in installed_overlays:
+ if not overlay:
continue
- obj, created = Overlay.objects.get_or_create(name=overlay["overlay"])
+ obj, created = Overlay.objects.get_or_create(name=overlay)
+ if overlay in info:
+ obj.description = info[overlay]["description"]
+ obj.homepage = info[overlay]["homepage"]
+ obj.overlay_path = join(l.config['storage'], overlay)
+ obj.save()
if created:
- logger.info("+ [o] %s", overlay["overlay"])
+ logger.info("+ [o] %s", overlay)
@commit_on_success
diff --git a/euscanwww/djeuscan/templates/euscan/category.html b/euscanwww/djeuscan/templates/euscan/category.html
index 55d82c6..22a8cec 100644
--- a/euscanwww/djeuscan/templates/euscan/category.html
+++ b/euscanwww/djeuscan/templates/euscan/category.html
@@ -29,6 +29,8 @@
{% endif %}
+{{ category.description }}
+
{% packages packages %}
Statistics
diff --git a/euscanwww/djeuscan/templates/euscan/overlay.html b/euscanwww/djeuscan/templates/euscan/overlay.html
index cf67f4d..394729f 100644
--- a/euscanwww/djeuscan/templates/euscan/overlay.html
+++ b/euscanwww/djeuscan/templates/euscan/overlay.html
@@ -19,6 +19,9 @@
+{{ overlay.description }}
+Homepage
+
{% packages packages %}
diff --git a/euscanwww/djeuscan/tests/euscan_factory.py b/euscanwww/djeuscan/tests/euscan_factory.py
index db53a32..0a90874 100644
--- a/euscanwww/djeuscan/tests/euscan_factory.py
+++ b/euscanwww/djeuscan/tests/euscan_factory.py
@@ -81,7 +81,6 @@ class VersionFactory(factory.Factory):
packaged = True
overlay = "gentoo"
urls = "http://packageurl.com"
- alive = True
@classmethod
def _prepare(cls, create, **kwargs):