Move changes tracking to separate file

trans/models/__init__.py

@@ -22,6 +22,6 @@ from trans.models.project import Project
 from trans.models.subproject import SubProject
 from trans.models.translation import Translation
 from trans.models.unit import Unit
-from trans.models.unitdata import Check, Suggestion, Comment, Change
-from trans.models.unitdata import IndexUpdate
+from trans.models.unitdata import Check, Suggestion, Comment, IndexUpdate
+from trans.models.changes import Change
 from trans.models.dictionary import Dictionary

trans/models/changes.py

+# -*- coding: utf-8 -*-
+#
+# Copyright © 2012 - 2013 Michal Čihař <michal@cihar.com>
+#
+# This file is part of Weblate <http://weblate.org/>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+from django.db import models
+from django.contrib.auth.models import User
+from django.db.models import Count
+from django.utils.translation import ugettext as _, ugettext_lazy
+from django.utils import timezone
+from lang.models import Language
+from trans.checks import CHECKS
+from trans.models.unit import Unit
+from trans.models.project import Project
+from trans.models.translation import Translation
+from trans.util import get_user_display
+
+
+class ChangeManager(models.Manager):
+    def content(self):
+        '''
+        Retuns queryset with content changes.
+        '''
+        return self.filter(
+            action__in=(Change.ACTION_CHANGE, Change.ACTION_NEW),
+            user__isnull=False,
+        )
+
+    def count_stats(self, days, step, dtstart, base):
+        '''
+        Counts number of changes in given dataset and period groupped by
+        step days.
+        '''
+
+        # Count number of changes
+        result = []
+        for dummy in xrange(0, days, step):
+            # Calculate interval
+            int_start = dtstart
+            int_end = int_start + timezone.timedelta(days=step)
+
+            # Count changes
+            int_base = base.filter(timestamp__range=(int_start, int_end))
+            count = int_base.aggregate(Count('id'))
+
+            # Append to result
+            result.append((int_start, count['id__count']))
+
+            # Advance to next interval
+            dtstart = int_end
+
+        return result
+
+    def base_stats(self, days, step,
+                   project=None, subproject=None, translation=None,
+                   language=None, user=None):
+        '''
+        Core of daily/weekly/monthly stats calculation.
+        '''
+
+        # Get range (actually start)
+        dtend = timezone.now().date()
+        dtstart = dtend - timezone.timedelta(days=days)
+
+        # Base for filtering
+        base = self.all()
+
+        # Filter by translation/project
+        if translation is not None:
+            base = base.filter(translation=translation)
+        elif subproject is not None:
+            base = base.filter(translation__subproject=subproject)
+        elif project is not None:
+            base = base.filter(translation__subproject__project=project)
+
+        # Filter by language
+        if language is not None:
+            base = base.filter(translation__language=language)
+
+        # Filter by language
+        if user is not None:
+            base = base.filter(user=user)
+
+        return self.count_stats(days, step, dtstart, base)
+
+    def month_stats(self, *args, **kwargs):
+        '''
+        Reports daily stats for changes.
+        '''
+        return self.base_stats(30, 1, *args, **kwargs)
+
+    def year_stats(self, *args, **kwargs):
+        '''
+        Reports monthly stats for changes.
+        '''
+        return self.base_stats(365, 7, *args, **kwargs)
+
+
+class Change(models.Model):
+    ACTION_UPDATE = 0
+    ACTION_COMPLETE = 1
+    ACTION_CHANGE = 2
+    ACTION_COMMENT = 3
+    ACTION_SUGGESTION = 4
+    ACTION_NEW = 5
+    ACTION_AUTO = 6
+
+    ACTION_CHOICES = (
+        (ACTION_UPDATE, ugettext_lazy('Resource update')),
+        (ACTION_COMPLETE, ugettext_lazy('Translation completed')),
+        (ACTION_CHANGE, ugettext_lazy('Translation changed')),
+        (ACTION_NEW, ugettext_lazy('New translation')),
+        (ACTION_COMMENT, ugettext_lazy('Comment added')),
+        (ACTION_SUGGESTION, ugettext_lazy('Suggestion added')),
+        (ACTION_AUTO, ugettext_lazy('Automatic translation')),
+    )
+
+    unit = models.ForeignKey(Unit, null=True)
+    translation = models.ForeignKey(Translation)
+    user = models.ForeignKey(User, null=True)
+    timestamp = models.DateTimeField(auto_now_add=True, db_index=True)
+    action = models.IntegerField(
+        choices=ACTION_CHOICES,
+        default=ACTION_CHANGE
+    )
+
+    objects = ChangeManager()
+
+    class Meta:
+        ordering = ['-timestamp']
+        app_label = 'trans'
+
+    def __unicode__(self):
+        return _('%(action)s at %(time)s on %(translation)s by %(user)s') % {
+            'action': self.get_action_display(),
+            'time': self.timestamp,
+            'translation': self.translation,
+            'user': self.get_user_display(False),
+        }
+
+    def get_user_display(self, icon=True):
+        return get_user_display(self.user, icon, link=True)
+
+    def get_absolute_url(self):
+        '''
+        Returns link either to unit or translation.
+        '''
+        if self.unit is not None:
+            return self.unit.get_absolute_url()
+        else:
+            return self.translation.get_absolute_url()

trans/models/project.py

@@ -387,7 +387,7 @@ class Project(models.Model, PercentMixin, URLMixin):
         '''
         Returns date of last change done in Weblate.
         '''
-        from trans.models.unitdata import Change
+        from trans.models.changes import Change
         try:
             change = Change.objects.content().filter(
                 translation__subproject__project=self

trans/models/subproject.py

@@ -964,7 +964,7 @@ class SubProject(models.Model, PercentMixin, URLMixin):
         '''
         Returns date of last change done in Weblate.
         '''
-        from trans.models.unitdata import Change
+        from trans.models.changes import Change
         try:
             change = Change.objects.content().filter(
                 translation__subproject=self

trans/models/translation.py

@@ -466,7 +466,7 @@ class Translation(models.Model, URLMixin):
         Updates translation data from blob.
         '''
         from trans.models.unit import Unit
-        from trans.models.unitdata import Change
+        from trans.models.changes import Change
 
         # Check if we're not already up to date
         if self.revision != self.get_git_blob_hash():
@@ -638,7 +638,7 @@ class Translation(models.Model, URLMixin):
         '''
         Returns last autor of change done in Weblate.
         '''
-        from trans.models.unitdata import Change
+        from trans.models.changes import Change
         try:
             change = Change.objects.content().filter(translation=self)[0]
             return self.get_author_name(change.user, email)
@@ -649,7 +649,7 @@ class Translation(models.Model, URLMixin):
         '''
         Returns date of last change done in Weblate.
         '''
-        from trans.models.unitdata import Change
+        from trans.models.changes import Change
         try:
             change = Change.objects.content().filter(translation=self)[0]
             return change.timestamp

trans/models/unit.py

@@ -186,7 +186,7 @@ class UnitManager(models.Manager):
         '''
         if user.is_anonymous():
             return self.none()
-        from trans.models.unitdata import Change
+        from trans.models.changes import Change
         sample = self.all()[0]
         changes = Change.objects.filter(
             translation=sample.translation,
@@ -580,7 +580,7 @@ class Unit(models.Model):
         Stores unit to backend.
         '''
         from accounts.models import Profile
-        from trans.models.unitdata import Change
+        from trans.models.changes import Change
 
         # Update lock timestamp
         self.translation.update_lock(request)
@@ -997,7 +997,8 @@ class Unit(models.Model):
         '''
         Creates new suggestion for this unit.
         '''
-        from trans.models.unitdata import Suggestion, Change
+        from trans.models.unitdata import Suggestion
+        from trans.models.changes import Change
         from accounts.models import Profile
 
         if not user.is_authenticated():
@@ -1047,7 +1048,8 @@ class Unit(models.Model):
         '''
         Adds comment to this unit.
         '''
-        from trans.models.unitdata import Comment, Change
+        from trans.models.unitdata import Comment
+        from trans.models.changes import Change
         from accounts.models import Profile
 
         new_comment = Comment.objects.create(

trans/models/unitdata.py

@@ -171,141 +171,6 @@ class Check(models.Model, RelatedUnitMixin):
             unit.update_has_failing_check()
 
 
-class ChangeManager(models.Manager):
-    def content(self):
-        '''
-        Retuns queryset with content changes.
-        '''
-        return self.filter(
-            action__in=(Change.ACTION_CHANGE, Change.ACTION_NEW),
-            user__isnull=False,
-        )
-
-    def count_stats(self, days, step, dtstart, base):
-        '''
-        Counts number of changes in given dataset and period groupped by
-        step days.
-        '''
-
-        # Count number of changes
-        result = []
-        for dummy in xrange(0, days, step):
-            # Calculate interval
-            int_start = dtstart
-            int_end = int_start + timezone.timedelta(days=step)
-
-            # Count changes
-            int_base = base.filter(timestamp__range=(int_start, int_end))
-            count = int_base.aggregate(Count('id'))
-
-            # Append to result
-            result.append((int_start, count['id__count']))
-
-            # Advance to next interval
-            dtstart = int_end
-
-        return result
-
-    def base_stats(self, days, step,
-                   project=None, subproject=None, translation=None,
-                   language=None, user=None):
-        '''
-        Core of daily/weekly/monthly stats calculation.
-        '''
-
-        # Get range (actually start)
-        dtend = timezone.now().date()
-        dtstart = dtend - timezone.timedelta(days=days)
-
-        # Base for filtering
-        base = self.all()
-
-        # Filter by translation/project
-        if translation is not None:
-            base = base.filter(translation=translation)
-        elif subproject is not None:
-            base = base.filter(translation__subproject=subproject)
-        elif project is not None:
-            base = base.filter(translation__subproject__project=project)
-
-        # Filter by language
-        if language is not None:
-            base = base.filter(translation__language=language)
-
-        # Filter by language
-        if user is not None:
-            base = base.filter(user=user)
-
-        return self.count_stats(days, step, dtstart, base)
-
-    def month_stats(self, *args, **kwargs):
-        '''
-        Reports daily stats for changes.
-        '''
-        return self.base_stats(30, 1, *args, **kwargs)
-
-    def year_stats(self, *args, **kwargs):
-        '''
-        Reports monthly stats for changes.
-        '''
-        return self.base_stats(365, 7, *args, **kwargs)
-
-
-class Change(models.Model):
-    ACTION_UPDATE = 0
-    ACTION_COMPLETE = 1
-    ACTION_CHANGE = 2
-    ACTION_COMMENT = 3
-    ACTION_SUGGESTION = 4
-    ACTION_NEW = 5
-    ACTION_AUTO = 6
-
-    ACTION_CHOICES = (
-        (ACTION_UPDATE, ugettext_lazy('Resource update')),
-        (ACTION_COMPLETE, ugettext_lazy('Translation completed')),
-        (ACTION_CHANGE, ugettext_lazy('Translation changed')),
-        (ACTION_NEW, ugettext_lazy('New translation')),
-        (ACTION_COMMENT, ugettext_lazy('Comment added')),
-        (ACTION_SUGGESTION, ugettext_lazy('Suggestion added')),
-        (ACTION_AUTO, ugettext_lazy('Automatic translation')),
-    )
-
-    unit = models.ForeignKey(Unit, null=True)
-    translation = models.ForeignKey(Translation)
-    user = models.ForeignKey(User, null=True)
-    timestamp = models.DateTimeField(auto_now_add=True, db_index=True)
-    action = models.IntegerField(
-        choices=ACTION_CHOICES,
-        default=ACTION_CHANGE
-    )
-
-    objects = ChangeManager()
-
-    class Meta:
-        ordering = ['-timestamp']
-        app_label = 'trans'
-
-    def __unicode__(self):
-        return _('%(action)s at %(time)s on %(translation)s by %(user)s') % {
-            'action': self.get_action_display(),
-            'time': self.timestamp,
-            'translation': self.translation,
-            'user': self.get_user_display(False),
-        }
-
-    def get_user_display(self, icon=True):
-        return get_user_display(self.user, icon, link=True)
-
-    def get_absolute_url(self):
-        '''
-        Returns link either to unit or translation.
-        '''
-        if self.unit is not None:
-            return self.unit.get_absolute_url()
-        else:
-            return self.translation.get_absolute_url()
-
-
 class IndexUpdate(models.Model):
     unit = models.ForeignKey(Unit)
     source = models.BooleanField(default=True)