Commit ddae787b177460dce22cb3671e99067b6e21cac0
Exists in
master
and in
39 other branches
Merge branch 'master' of github.com:TracyWebTech/colab
Showing
6 changed files
with
347 additions
and
49 deletions
Show diff stats
src/super_archives/decorators.py
... | ... | @@ -1,24 +0,0 @@ |
1 | - | |
2 | -from django.core.cache import cache | |
3 | - | |
4 | -from super_archives.models import PageHit | |
5 | - | |
6 | - | |
7 | -def count_hit(view): | |
8 | - def wrapper(request, *args, **kwargs): | |
9 | - # Here we cache the user's IP to ensure that the same | |
10 | - # IP won't hit the same page again for while | |
11 | - ip_addr = request.META.get('REMOTE_ADDR') | |
12 | - cache_key = u'page_hits-{}-{}'.format(request.path_info, ip_addr) | |
13 | - duplicate = cache.get(cache_key) | |
14 | - if duplicate: | |
15 | - return view(request, *args, **kwargs) | |
16 | - cache.set(cache_key, True) | |
17 | - | |
18 | - # Everything ok, so just increment the page count | |
19 | - page_hit = PageHit.objects.get_or_create(url_path=request.path_info)[0] | |
20 | - page_hit.hit_count += 1 | |
21 | - page_hit.save() | |
22 | - | |
23 | - return view(request, *args, **kwargs) | |
24 | - return wrapper |
src/super_archives/migrations/0020_pagehit_to_hitcounter.py
0 → 100644
... | ... | @@ -0,0 +1,190 @@ |
1 | +# -*- coding: utf-8 -*- | |
2 | + | |
3 | +import datetime | |
4 | + | |
5 | +from south.db import db | |
6 | +from south.logger import _logger | |
7 | +from south.v2 import DataMigration | |
8 | +from django.core.urlresolvers import resolve | |
9 | +from django.db import models | |
10 | + | |
11 | + | |
12 | +class Migration(DataMigration): | |
13 | + | |
14 | + def forwards(self, orm): | |
15 | + """Migrate all data from the PageHit model to the given object with | |
16 | + the HitCounterMixin.""" | |
17 | + | |
18 | + content_type = orm['contenttypes.ContentType'].objects.get( | |
19 | + model='thread', | |
20 | + app_label='super_archives' | |
21 | + ) | |
22 | + | |
23 | + for obj in orm.PageHit.objects.all(): | |
24 | + view = resolve(obj.url_path) | |
25 | + | |
26 | + try: | |
27 | + thread = orm.Thread.objects.get( | |
28 | + subject_token=view.kwargs.get('thread_token'), | |
29 | + mailinglist__name=view.kwargs.get('mailinglist'), | |
30 | + ) | |
31 | + except orm.Thread.DoesNotExist: | |
32 | + continue | |
33 | + | |
34 | + hit_obj, created = orm['hitcounter.Hit'].objects.get_or_create( | |
35 | + content_type=content_type, | |
36 | + object_pk=thread.pk, | |
37 | + defaults={'hits': obj.hit_count}, | |
38 | + ) | |
39 | + | |
40 | + if not created: | |
41 | + hit_obj.hits = obj.hit_count | |
42 | + hit_obj.save() | |
43 | + | |
44 | + def backwards(self, orm): | |
45 | + _logger.warning(u"This backwards don't get the data of PageHit back.") | |
46 | + | |
47 | + models = { | |
48 | + u'accounts.user': { | |
49 | + 'Meta': {'object_name': 'User'}, | |
50 | + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), | |
51 | + 'email': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75', 'blank': 'True'}), | |
52 | + 'facebook': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}), | |
53 | + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), | |
54 | + 'google_talk': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}), | |
55 | + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}), | |
56 | + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | |
57 | + 'institution': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}), | |
58 | + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), | |
59 | + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | |
60 | + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | |
61 | + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), | |
62 | + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), | |
63 | + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), | |
64 | + 'role': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}), | |
65 | + 'twitter': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}), | |
66 | + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}), | |
67 | + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}), | |
68 | + 'verification_hash': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | |
69 | + 'webpage': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True', 'blank': 'True'}) | |
70 | + }, | |
71 | + u'auth.group': { | |
72 | + 'Meta': {'object_name': 'Group'}, | |
73 | + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | |
74 | + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), | |
75 | + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) | |
76 | + }, | |
77 | + u'auth.permission': { | |
78 | + 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, | |
79 | + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | |
80 | + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), | |
81 | + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | |
82 | + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) | |
83 | + }, | |
84 | + u'contenttypes.contenttype': { | |
85 | + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, | |
86 | + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | |
87 | + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | |
88 | + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | |
89 | + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) | |
90 | + }, | |
91 | + u'hitcounter.hit': { | |
92 | + 'Meta': {'unique_together': "(('content_type', 'object_pk'),)", 'object_name': 'Hit'}, | |
93 | + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), | |
94 | + 'created': ('django.db.models.fields.DateField', [], {'auto_now_add': 'True', 'db_index': 'True', 'blank': 'True'}), | |
95 | + 'hits': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}), | |
96 | + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | |
97 | + 'object_pk': ('django.db.models.fields.CharField', [], {'max_length': '256'}), | |
98 | + 'updated': ('django.db.models.fields.DateField', [], {'auto_now': 'True', 'db_index': 'True', 'blank': 'True'}) | |
99 | + }, | |
100 | + u'super_archives.emailaddress': { | |
101 | + 'Meta': {'ordering': "('id',)", 'object_name': 'EmailAddress'}, | |
102 | + 'address': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75'}), | |
103 | + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | |
104 | + 'md5': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True'}), | |
105 | + 'real_name': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '64', 'blank': 'True'}), | |
106 | + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emails'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': u"orm['accounts.User']"}) | |
107 | + }, | |
108 | + u'super_archives.emailaddressvalidation': { | |
109 | + 'Meta': {'unique_together': "(('user', 'address'),)", 'object_name': 'EmailAddressValidation'}, | |
110 | + 'address': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75'}), | |
111 | + 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), | |
112 | + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | |
113 | + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emails_not_validated'", 'null': 'True', 'to': u"orm['accounts.User']"}), | |
114 | + 'validation_key': ('django.db.models.fields.CharField', [], {'default': "'60d2bcbd9d924d9f8139c2d1227223ed'", 'max_length': '32', 'null': 'True'}) | |
115 | + }, | |
116 | + u'super_archives.keyword': { | |
117 | + 'Meta': {'ordering': "('?',)", 'object_name': 'Keyword'}, | |
118 | + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | |
119 | + 'keyword': ('django.db.models.fields.CharField', [], {'max_length': "'128'"}), | |
120 | + 'thread': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.Thread']"}), | |
121 | + 'weight': ('django.db.models.fields.IntegerField', [], {'default': '0'}) | |
122 | + }, | |
123 | + u'super_archives.mailinglist': { | |
124 | + 'Meta': {'object_name': 'MailingList'}, | |
125 | + 'description': ('django.db.models.fields.TextField', [], {}), | |
126 | + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}), | |
127 | + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | |
128 | + 'last_imported_index': ('django.db.models.fields.IntegerField', [], {'default': '0'}), | |
129 | + 'logo': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}), | |
130 | + 'name': ('django.db.models.fields.CharField', [], {'max_length': '80'}) | |
131 | + }, | |
132 | + u'super_archives.mailinglistmembership': { | |
133 | + 'Meta': {'object_name': 'MailingListMembership'}, | |
134 | + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | |
135 | + 'mailinglist': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.MailingList']"}), | |
136 | + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['accounts.User']"}) | |
137 | + }, | |
138 | + u'super_archives.message': { | |
139 | + 'Meta': {'ordering': "('received_time',)", 'unique_together': "(('thread', 'message_id'),)", 'object_name': 'Message'}, | |
140 | + 'body': ('django.db.models.fields.TextField', [], {'default': "''"}), | |
141 | + 'from_address': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.EmailAddress']"}), | |
142 | + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | |
143 | + 'message_id': ('django.db.models.fields.CharField', [], {'max_length': '512'}), | |
144 | + 'received_time': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}), | |
145 | + 'spam': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | |
146 | + 'subject': ('django.db.models.fields.CharField', [], {'max_length': '512', 'db_index': 'True'}), | |
147 | + 'subject_clean': ('django.db.models.fields.CharField', [], {'max_length': '512', 'db_index': 'True'}), | |
148 | + 'thread': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.Thread']", 'null': 'True'}) | |
149 | + }, | |
150 | + u'super_archives.messageblock': { | |
151 | + 'Meta': {'ordering': "('order',)", 'object_name': 'MessageBlock'}, | |
152 | + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | |
153 | + 'is_reply': ('django.db.models.fields.BooleanField', [], {}), | |
154 | + 'message': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'blocks'", 'to': u"orm['super_archives.Message']"}), | |
155 | + 'order': ('django.db.models.fields.IntegerField', [], {}), | |
156 | + 'text': ('django.db.models.fields.TextField', [], {}) | |
157 | + }, | |
158 | + u'super_archives.messagemetadata': { | |
159 | + 'Message': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.Message']"}), | |
160 | + 'Meta': {'object_name': 'MessageMetadata'}, | |
161 | + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | |
162 | + 'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}), | |
163 | + 'value': ('django.db.models.fields.TextField', [], {}) | |
164 | + }, | |
165 | + u'super_archives.pagehit': { | |
166 | + 'Meta': {'object_name': 'PageHit'}, | |
167 | + 'hit_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}), | |
168 | + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | |
169 | + 'url_path': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '2048', 'db_index': 'True'}) | |
170 | + }, | |
171 | + u'super_archives.thread': { | |
172 | + 'Meta': {'unique_together': "(('subject_token', 'mailinglist'),)", 'object_name': 'Thread'}, | |
173 | + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | |
174 | + 'latest_message': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'+'", 'unique': 'True', 'null': 'True', 'to': u"orm['super_archives.Message']"}), | |
175 | + 'mailinglist': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.MailingList']"}), | |
176 | + 'score': ('django.db.models.fields.IntegerField', [], {'default': '0'}), | |
177 | + 'spam': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | |
178 | + 'subject_token': ('django.db.models.fields.CharField', [], {'max_length': '512'}) | |
179 | + }, | |
180 | + u'super_archives.vote': { | |
181 | + 'Meta': {'unique_together': "(('user', 'message'),)", 'object_name': 'Vote'}, | |
182 | + 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), | |
183 | + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | |
184 | + 'message': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.Message']"}), | |
185 | + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['accounts.User']"}) | |
186 | + } | |
187 | + } | |
188 | + | |
189 | + complete_apps = ['hitcounter', 'super_archives'] | |
190 | + symmetrical = True | ... | ... |
... | ... | @@ -0,0 +1,152 @@ |
1 | +# -*- coding: utf-8 -*- | |
2 | +import datetime | |
3 | +from south.db import db | |
4 | +from south.v2 import SchemaMigration | |
5 | +from django.db import models | |
6 | + | |
7 | + | |
8 | +class Migration(SchemaMigration): | |
9 | + | |
10 | + def forwards(self, orm): | |
11 | + # Deleting model 'PageHit' | |
12 | + db.delete_table(u'super_archives_pagehit') | |
13 | + | |
14 | + | |
15 | + def backwards(self, orm): | |
16 | + # Adding model 'PageHit' | |
17 | + db.create_table(u'super_archives_pagehit', ( | |
18 | + (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), | |
19 | + ('hit_count', self.gf('django.db.models.fields.IntegerField')(default=0)), | |
20 | + ('url_path', self.gf('django.db.models.fields.CharField')(max_length=2048, unique=True, db_index=True)), | |
21 | + )) | |
22 | + db.send_create_signal(u'super_archives', ['PageHit']) | |
23 | + | |
24 | + | |
25 | + models = { | |
26 | + u'accounts.user': { | |
27 | + 'Meta': {'object_name': 'User'}, | |
28 | + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), | |
29 | + 'email': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75', 'blank': 'True'}), | |
30 | + 'facebook': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}), | |
31 | + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), | |
32 | + 'google_talk': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}), | |
33 | + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}), | |
34 | + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | |
35 | + 'institution': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}), | |
36 | + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), | |
37 | + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | |
38 | + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | |
39 | + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), | |
40 | + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), | |
41 | + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), | |
42 | + 'role': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}), | |
43 | + 'twitter': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}), | |
44 | + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}), | |
45 | + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}), | |
46 | + 'verification_hash': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | |
47 | + 'webpage': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True', 'blank': 'True'}) | |
48 | + }, | |
49 | + u'auth.group': { | |
50 | + 'Meta': {'object_name': 'Group'}, | |
51 | + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | |
52 | + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), | |
53 | + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) | |
54 | + }, | |
55 | + u'auth.permission': { | |
56 | + 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, | |
57 | + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | |
58 | + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), | |
59 | + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | |
60 | + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) | |
61 | + }, | |
62 | + u'contenttypes.contenttype': { | |
63 | + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, | |
64 | + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | |
65 | + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | |
66 | + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | |
67 | + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) | |
68 | + }, | |
69 | + u'super_archives.emailaddress': { | |
70 | + 'Meta': {'ordering': "('id',)", 'object_name': 'EmailAddress'}, | |
71 | + 'address': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75'}), | |
72 | + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | |
73 | + 'md5': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True'}), | |
74 | + 'real_name': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '64', 'blank': 'True'}), | |
75 | + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emails'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': u"orm['accounts.User']"}) | |
76 | + }, | |
77 | + u'super_archives.emailaddressvalidation': { | |
78 | + 'Meta': {'unique_together': "(('user', 'address'),)", 'object_name': 'EmailAddressValidation'}, | |
79 | + 'address': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75'}), | |
80 | + 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), | |
81 | + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | |
82 | + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emails_not_validated'", 'null': 'True', 'to': u"orm['accounts.User']"}), | |
83 | + 'validation_key': ('django.db.models.fields.CharField', [], {'default': "'dabb0135cf6c436da11caf5dac7e8c10'", 'max_length': '32', 'null': 'True'}) | |
84 | + }, | |
85 | + u'super_archives.keyword': { | |
86 | + 'Meta': {'ordering': "('?',)", 'object_name': 'Keyword'}, | |
87 | + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | |
88 | + 'keyword': ('django.db.models.fields.CharField', [], {'max_length': "'128'"}), | |
89 | + 'thread': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.Thread']"}), | |
90 | + 'weight': ('django.db.models.fields.IntegerField', [], {'default': '0'}) | |
91 | + }, | |
92 | + u'super_archives.mailinglist': { | |
93 | + 'Meta': {'object_name': 'MailingList'}, | |
94 | + 'description': ('django.db.models.fields.TextField', [], {}), | |
95 | + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}), | |
96 | + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | |
97 | + 'last_imported_index': ('django.db.models.fields.IntegerField', [], {'default': '0'}), | |
98 | + 'logo': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}), | |
99 | + 'name': ('django.db.models.fields.CharField', [], {'max_length': '80'}) | |
100 | + }, | |
101 | + u'super_archives.mailinglistmembership': { | |
102 | + 'Meta': {'object_name': 'MailingListMembership'}, | |
103 | + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | |
104 | + 'mailinglist': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.MailingList']"}), | |
105 | + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['accounts.User']"}) | |
106 | + }, | |
107 | + u'super_archives.message': { | |
108 | + 'Meta': {'ordering': "('received_time',)", 'unique_together': "(('thread', 'message_id'),)", 'object_name': 'Message'}, | |
109 | + 'body': ('django.db.models.fields.TextField', [], {'default': "''"}), | |
110 | + 'from_address': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.EmailAddress']"}), | |
111 | + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | |
112 | + 'message_id': ('django.db.models.fields.CharField', [], {'max_length': '512'}), | |
113 | + 'received_time': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}), | |
114 | + 'spam': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | |
115 | + 'subject': ('django.db.models.fields.CharField', [], {'max_length': '512', 'db_index': 'True'}), | |
116 | + 'subject_clean': ('django.db.models.fields.CharField', [], {'max_length': '512', 'db_index': 'True'}), | |
117 | + 'thread': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.Thread']", 'null': 'True'}) | |
118 | + }, | |
119 | + u'super_archives.messageblock': { | |
120 | + 'Meta': {'ordering': "('order',)", 'object_name': 'MessageBlock'}, | |
121 | + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | |
122 | + 'is_reply': ('django.db.models.fields.BooleanField', [], {}), | |
123 | + 'message': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'blocks'", 'to': u"orm['super_archives.Message']"}), | |
124 | + 'order': ('django.db.models.fields.IntegerField', [], {}), | |
125 | + 'text': ('django.db.models.fields.TextField', [], {}) | |
126 | + }, | |
127 | + u'super_archives.messagemetadata': { | |
128 | + 'Message': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.Message']"}), | |
129 | + 'Meta': {'object_name': 'MessageMetadata'}, | |
130 | + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | |
131 | + 'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}), | |
132 | + 'value': ('django.db.models.fields.TextField', [], {}) | |
133 | + }, | |
134 | + u'super_archives.thread': { | |
135 | + 'Meta': {'unique_together': "(('subject_token', 'mailinglist'),)", 'object_name': 'Thread'}, | |
136 | + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | |
137 | + 'latest_message': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'+'", 'unique': 'True', 'null': 'True', 'to': u"orm['super_archives.Message']"}), | |
138 | + 'mailinglist': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.MailingList']"}), | |
139 | + 'score': ('django.db.models.fields.IntegerField', [], {'default': '0'}), | |
140 | + 'spam': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | |
141 | + 'subject_token': ('django.db.models.fields.CharField', [], {'max_length': '512'}) | |
142 | + }, | |
143 | + u'super_archives.vote': { | |
144 | + 'Meta': {'unique_together': "(('user', 'message'),)", 'object_name': 'Vote'}, | |
145 | + 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), | |
146 | + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | |
147 | + 'message': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.Message']"}), | |
148 | + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['accounts.User']"}) | |
149 | + } | |
150 | + } | |
151 | + | |
152 | + complete_apps = ['super_archives'] | |
0 | 153 | \ No newline at end of file | ... | ... |
src/super_archives/models.py
... | ... | @@ -30,11 +30,6 @@ class NotSpamManager(models.Manager): |
30 | 30 | return super(NotSpamManager, self).get_query_set().exclude(spam=True) |
31 | 31 | |
32 | 32 | |
33 | -class PageHit(models.Model): | |
34 | - url_path = models.CharField(max_length=2048, unique=True, db_index=True) | |
35 | - hit_count = models.IntegerField(default=0) | |
36 | - | |
37 | - | |
38 | 33 | class EmailAddressValidation(models.Model): |
39 | 34 | address = models.EmailField(unique=True) |
40 | 35 | user = models.ForeignKey(User, null=True, |
... | ... | @@ -217,13 +212,7 @@ class Thread(models.Model, HitCounterModelMixin): |
217 | 212 | vote_score += get_score(100, vote.created) |
218 | 213 | |
219 | 214 | # Calculate page_view_score |
220 | - try: | |
221 | - url = reverse('thread_view', args=[self.mailinglist.name, | |
222 | - self.subject_token]) | |
223 | - pagehit = PageHit.objects.get(url_path=url) | |
224 | - page_view_score = pagehit.hit_count * 10 | |
225 | - except (NoReverseMatch, PageHit.DoesNotExist): | |
226 | - page_view_score = 0 | |
215 | + page_view_score = self.hits * 10 | |
227 | 216 | |
228 | 217 | self.score = (page_view_score + vote_score + replies_score) // 10 |
229 | 218 | self.save() | ... | ... |
src/super_archives/queries.py
1 | 1 | |
2 | 2 | from django.core.exceptions import ObjectDoesNotExist |
3 | -from .models import Thread, Vote, Message, PageHit | |
3 | +from .models import Thread, Vote, Message | |
4 | 4 | |
5 | 5 | |
6 | 6 | def get_messages_by_date(): |
... | ... | @@ -10,9 +10,9 @@ def get_messages_by_date(): |
10 | 10 | def get_messages_by_voted(): |
11 | 11 | """Query for the most voted messages sorting by the sum of |
12 | 12 | voted and after by date.""" |
13 | - | |
13 | + | |
14 | 14 | sql = """ |
15 | - SELECT | |
15 | + SELECT | |
16 | 16 | count(sav.id) |
17 | 17 | FROM |
18 | 18 | super_archives_vote AS sav |
... | ... | @@ -43,12 +43,3 @@ def get_latest_threads(): |
43 | 43 | |
44 | 44 | def get_hottest_threads(): |
45 | 45 | return Thread.objects.order_by('-score', '-latest_message__received_time') |
46 | - | |
47 | - | |
48 | -def get_page_hits(path_info): | |
49 | - pagehit = PageHit.objects.filter(url_path=path_info) | |
50 | - | |
51 | - if pagehit: | |
52 | - return pagehit[0].hit_count | |
53 | - return 0 | |
54 | - | ... | ... |
src/super_archives/views.py
... | ... | @@ -63,7 +63,7 @@ def thread_get(request, mailinglist, thread_token): |
63 | 63 | context = { |
64 | 64 | 'first_msg': first_message, |
65 | 65 | 'emails': [first_message] + list(emails), |
66 | - 'pagehits': queries.get_page_hits(request.path_info), | |
66 | + 'pagehits': thread.hits, | |
67 | 67 | 'total_votes': total_votes, |
68 | 68 | 'thread': thread, |
69 | 69 | } | ... | ... |