X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/8a9843b112f8a3f72603afc9fb5d15ddcbd77559..1c9e2865ce8c6ab51b2fa3e43d3661089e7b7eb8:/src/stats/models.py?ds=sidebyside

diff --git a/src/stats/models.py b/src/stats/models.py
index 0bd391a55..ca0b55dab 100644
--- a/src/stats/models.py
+++ b/src/stats/models.py
@@ -5,35 +5,49 @@ from django.conf import settings
 from django.db import models
 
 
-class Visits(models.Model):
+class VisitsBase(models.Model):
     book = models.ForeignKey('catalogue.Book', models.CASCADE)
-    year = models.PositiveSmallIntegerField()
-    month = models.PositiveSmallIntegerField()
+    date = models.DateField()
     views = models.IntegerField()
     unique_views = models.IntegerField()
 
+    class Meta:
+        abstract = True
+
     @classmethod
-    def build_month(cls, year, month):
+    def build_for_date(cls, date, period):
         Book = apps.get_model('catalogue', 'Book')
-        ### TODO: Delete existing?
 
-        date = f'{year}-{month:02d}'
-        url = f'{settings.PIWIK_URL}?date={date}&filter_limit=-1&format=CSV&idSite={settings.PIWIK_SITE_ID}&language=pl&method=Actions.getPageUrls&module=API&period=month&segment=&token_auth={settings.PIWIK_TOKEN}&flat=1'
+        date = date.isoformat()
+        url = f'{settings.PIWIK_URL}?date={date}&filter_limit=-1&format=CSV&idSite={settings.PIWIK_SITE_ID}&language=pl&method=Actions.getPageUrls&module=API&period={period}&segment=&token_auth={settings.PIWIK_TOKEN}&flat=1'
         data = urlopen(url).read().decode('utf-16')
         lines = data.split('\n')[1:]
         for line in lines:
             m = re.match('^/katalog/lektura/([^,]+)\.html,', line)
             if m is not None:
                 slug = m.group(1)
-                _url, uviews, views = line.split(',', 3)
+                _url, uviews, views, _rest = line.split(',', 3)
                 uviews = int(uviews)
                 views = int(views)
                 try:
                     book = Book.objects.get(slug=slug)
-                except Book.DoesNotExists:
+                except Book.DoesNotExist:
                     continue
                 else:
-                    cls.objects.create(
-                        book=book, year=year, month=month,
-                        views=views, uviews=uviews
+                    cls.objects.update_or_create(
+                        book=book, date=date,
+                        defaults={'views': views, 'unique_views': uviews}
                     )
+
+
+class Visits(VisitsBase):
+    @classmethod
+    def build_month(cls, date):
+        cls.build_for_date(date.replace(day=1), 'month')
+
+
+class DayVisits(VisitsBase):
+    @classmethod
+    def build_day(cls, date):
+        cls.build_for_date(date, 'day')
+