Update Legimi panel

diff --git a/src/catalogue/models.py b/src/catalogue/models.py
index bd95913..8c3d4cd 100644 (file)
--- a/src/catalogue/models.py
+++ b/src/catalogue/models.py
@@ -666,6 +666,9 @@ class Thema(models.Model):
         ordering = ('code',)
         verbose_name_plural = 'Thema'
 
         ordering = ('code',)
         verbose_name_plural = 'Thema'
 

+    @staticmethod
+    def standardize(code):
+        return code.split('.')[0]

 
 class Audience(models.Model):
     code = models.CharField(
 
 class Audience(models.Model):
     code = models.CharField(

diff --git a/src/depot/models.py b/src/depot/models.py
index 41a6bdf..62a360a 100644 (file)
--- a/src/depot/models.py
+++ b/src/depot/models.py
@@ -174,9 +174,9 @@ class SiteBookPublish(models.Model):
 
             self.site_book.site.publish(self, changes=changes)
 
 
             self.site_book.site.publish(self, changes=changes)
 

-        except Exception:
+        except Exception as e:

             self.status = 110
             self.status = 110

-            self.error = traceback.format_exc()
+            self.error = str(e) + '\n\n' + traceback.format_exc()

         else:
             self.status = 100
             self.error = ''
         else:
             self.status = 100
             self.error = ''

diff --git a/src/depot/publishers/legimi.py b/src/depot/publishers/legimi.py
index da22245..11a1c03 100644 (file)
--- a/src/depot/publishers/legimi.py
+++ b/src/depot/publishers/legimi.py
@@ -1,19 +1,20 @@
 from datetime import date
 import re
 from datetime import date
 import re

+from urllib.parse import urljoin

 from django.conf import settings
 from django.utils.html import escape
 from django.utils.safestring import mark_safe
 from librarian.functions import lang_code_3to2
 from librarian.builders import EpubBuilder, MobiBuilder
 from librarian.covers.marquise import MarquiseCover, LabelMarquiseCover
 from django.conf import settings
 from django.utils.html import escape
 from django.utils.safestring import mark_safe
 from librarian.functions import lang_code_3to2
 from librarian.builders import EpubBuilder, MobiBuilder
 from librarian.covers.marquise import MarquiseCover, LabelMarquiseCover

-from catalogue.models import Audience
+from lxml import html
+from catalogue.models import Audience, Thema

 from .base import BasePublisher
 
 
 class Legimi(BasePublisher):
 from .base import BasePublisher
 
 
 class Legimi(BasePublisher):

-    BASE_URL = 'https://panel.legimi.pl'
-    LOGIN_URL = BASE_URL + '/publishers/membership'
-    UPLOAD_URL = BASE_URL + '/administration/upload/start'
+    BASE_URL = 'https://wydawca.legimi.pl'
+    UPLOAD_URL = BASE_URL + '/upload/start'

     CREATE_URL = BASE_URL + '/publishers/publications/create'
     EDIT_URL = BASE_URL + '/publishers/publications/edit/%s'
     EDIT_FILES_URL = BASE_URL + '/publishers/publications/editfiles/%s'
     CREATE_URL = BASE_URL + '/publishers/publications/create'
     EDIT_URL = BASE_URL + '/publishers/publications/edit/%s'
     EDIT_FILES_URL = BASE_URL + '/publishers/publications/editfiles/%s'


@@ -121,13 +122,14 @@ class Legimi(BasePublisher):
     }
 
     def login(self):
     }
 
     def login(self):

-        self._session.post(
-            self.LOGIN_URL,
-            data={
-                'ValidationTrue': 'true',
-                'UserName': self.username,
-                'Password': self.password,
-            })
+        r = self._session.get(self.BASE_URL)
+        h = html.fromstring(r.text)
+        form = h.findall('.//form')[0]
+        login_url = urljoin(r.url, form.action)
+        data = {e.name: e.value for e in form.findall('.//input')}
+        data['Login'] = self.username
+        data['Password'] = self.password
+        self._session.post(login_url, data=data)

 
     def can_publish(self, site, book):
         d = {
 
     def can_publish(self, site, book):
         d = {


@@ -180,6 +182,7 @@ class Legimi(BasePublisher):
             Audience.objects.filter(code__in=meta.audiences).exclude(
                 thema=None).values_list('thema', flat=True)
         )
             Audience.objects.filter(code__in=meta.audiences).exclude(
                 thema=None).values_list('thema', flat=True)
         )

+        thema = [Thema.standardize(t) for t in thema]

         return thema
 
     def send_book(self, site_book_publish, changes=None):
         return thema
 
     def send_book(self, site_book_publish, changes=None):


@@ -315,8 +318,8 @@ class Legimi(BasePublisher):
 
         response = self.session.post(self.CREATE_URL, data=data)
         m = re.search(r'/(\d+)$', response.url)
 
         response = self.session.post(self.CREATE_URL, data=data)
         m = re.search(r'/(\d+)$', response.url)

-        if m is not None:
-            return m.group(1)
+        assert m is not None, 'Legimi.create_book: ' + response.text
+        return m.group(1)

 
     def edit(self, legimi_id, data):
         current = {
 
     def edit(self, legimi_id, data):
         current = {