Collection link on main and slight funding wording change.

[wolnelektury.git] / src / stats / models.py

diff --git a/src/stats/models.py b/src/stats/models.py
index ea1a790..e95e759 100644 (file)
--- a/src/stats/models.py
+++ b/src/stats/models.py
@@ -1,20 +1,21 @@
 import re
 import re

+from urllib.request import urlopen
+from django.apps import apps

 from django.conf import settings
 from django.db import models
 
 
 class Visits(models.Model):
     book = models.ForeignKey('catalogue.Book', models.CASCADE)
 from django.conf import settings
 from django.db import models
 
 
 class Visits(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()
 
     @classmethod
     def build_month(cls, year, month):
     views = models.IntegerField()
     unique_views = models.IntegerField()
 
     @classmethod
     def build_month(cls, year, month):

-        ### TODO: Delete existing?
+        Book = apps.get_model('catalogue', 'Book')

 
 

-        date = f'{year}-{month:02d}'
+        date = f'{year}-{month:02d}-01'

         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'
         data = urlopen(url).read().decode('utf-16')
         lines = data.split('\n')[1:]
         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'
         data = urlopen(url).read().decode('utf-16')
         lines = data.split('\n')[1:]


@@ -22,15 +23,15 @@ class Visits(models.Model):
             m = re.match('^/katalog/lektura/([^,]+)\.html,', line)
             if m is not None:
                 slug = m.group(1)
             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)
                 uviews = int(uviews)
                 views = int(views)
                 try:
                     book = Book.objects.get(slug=slug)

-                except Book.DoesNotExists:
+                except Book.DoesNotExist:

                     continue
                 else:
                     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}

                     )
                     )