Use audience->thema in legimi too.

[redakcja.git] / src / depot / publishers / woblink.py

diff --git a/src/depot/publishers/woblink.py b/src/depot/publishers/woblink.py
index 96971c2..e98ec58 100644 (file)
--- a/src/depot/publishers/woblink.py
+++ b/src/depot/publishers/woblink.py
@@ -124,6 +124,8 @@ class Woblink(BasePublisher):
     STEP1_URL = BASE_URL + 'catalog/edit/%s'
     STEP2_URL = BASE_URL + 'catalog/edit/%s/2'
     STEP3_URL = BASE_URL + 'catalog/edit/%s/3'
     STEP1_URL = BASE_URL + 'catalog/edit/%s'
     STEP2_URL = BASE_URL + 'catalog/edit/%s/2'
     STEP3_URL = BASE_URL + 'catalog/edit/%s/3'

+    STEP4_URL = BASE_URL + 'catalog/edit/%s/4'
+    STEP5_URL = BASE_URL + 'catalog/edit/%s/5'

     UPLOAD_URL = BASE_URL + 'file/upload-%s'
     JOB_STATUS_URL = BASE_URL + 'task/status'
     GENERATE_DEMO_URL = BASE_URL + 'task/run/generate-%s-demo/%s/%d'
     UPLOAD_URL = BASE_URL + 'file/upload-%s'
     JOB_STATUS_URL = BASE_URL + 'task/status'
     GENERATE_DEMO_URL = BASE_URL + 'task/run/generate-%s-demo/%s/%d'


@@ -218,6 +220,12 @@ class Woblink(BasePublisher):
             if errors is not None:
                 errors.append(NoMainThemaWarning())
         thema_codes.extend(meta.thema)
             if errors is not None:
                 errors.append(NoMainThemaWarning())
         thema_codes.extend(meta.thema)

+
+        thema_codes.extend(
+            Audience.objects.filter(code__in=meta.audiences).exclude(
+                thema=None).values_list('thema', flat=True)
+        )
+

         if not thema_codes:
             if errors is not None:
                 errors.append(NoThema())
         if not thema_codes:
             if errors is not None:
                 errors.append(NoThema())


@@ -249,17 +257,17 @@ class Woblink(BasePublisher):
     def get_abstract(self, wldoc, errors=None, description_add=None):
         description = self.get_description(wldoc, description_add)
         parts = description.split('\n', 1)
     def get_abstract(self, wldoc, errors=None, description_add=None):
         description = self.get_description(wldoc, description_add)
         parts = description.split('\n', 1)

-        if len(parts) == 1 or len(parts[0]) > 200:
+        if len(parts) == 1 or len(parts[0]) > 240:

             # No newline found here.
             # Try to find last sentence end..
             # No newline found here.
             # Try to find last sentence end..

-            parts = re.split(r' \.', description[200::-1], 1)
+            parts = re.split(r' \.', description[240::-1], 1)

             if len(parts) == 2:
                 p1 = parts[1][::-1] + '.'
                 p2 = description[len(p1) + 1:]
             else:
                 # No sentence end found.
                 # Just find a space.
             if len(parts) == 2:
                 p1 = parts[1][::-1] + '.'
                 p2 = description[len(p1) + 1:]
             else:
                 # No sentence end found.
                 # Just find a space.

-                p1 = description[:200].rsplit(' ', 1)[0]
+                p1 = description[:240].rsplit(' ', 1)[0]

                 p2 = description[len(p1) + 1:]
                 p1 += '…'
                 p2 = '…' + p2
                 p2 = description[len(p1) + 1:]
                 p1 += '…'
                 p2 = '…' + p2


@@ -267,11 +275,11 @@ class Woblink(BasePublisher):
 
         m = re.search(r'<[^>]+$', parts[0])
         if m is not None:
 
         m = re.search(r'<[^>]+$', parts[0])
         if m is not None:

-            parts[0] = parts[:-len(m.group(0))]
+            parts[0] = parts[0][:-len(m.group(0))]

             parts[1] = m.group(0) + parts[1]
 
         opened = []
             parts[1] = m.group(0) + parts[1]
 
         opened = []

-        for tag in re.findall(r'<[^>]+[^/>]>', parts[0]):
+        for tag in re.findall(r'<[^>]*[^/>]>', parts[0]):

             if tag[1] == '/':
                 opened.pop()
             else:
             if tag[1] == '/':
                 opened.pop()
             else:


@@ -288,7 +296,12 @@ class Woblink(BasePublisher):
         return lang_code_3to2(meta.language)
 
     def get_price(self, shop, wldoc, errors=None):
         return lang_code_3to2(meta.language)
 
     def get_price(self, shop, wldoc, errors=None):

-        stats = wldoc.get_statistics()['total']
+        try:
+            stats = wldoc.get_statistics()['total']
+        except:
+            if errors:
+                errors.append(NoPrice(shop))
+            return 0

         words = stats['words_with_fn']
         pages = stats['chars_with_fn'] / 1800
         price = shop.get_price(words, pages)
         words = stats['words_with_fn']
         pages = stats['chars_with_fn'] / 1800
         price = shop.get_price(words, pages)


@@ -304,6 +317,7 @@ class Woblink(BasePublisher):
         d = {
             'warnings': [],
             'errors': [],
         d = {
             'warnings': [],
             'errors': [],

+            'info': [],

         }
         errors = []
         book_data = self.get_book_data(shop, wldoc, errors)
         }
         errors = []
         book_data = self.get_book_data(shop, wldoc, errors)


@@ -315,11 +329,15 @@ class Woblink(BasePublisher):
             errlist.append(error.as_html())
 
         if book_data.get('genres'):
             errlist.append(error.as_html())
 
         if book_data.get('genres'):

-            d['comment'] = format_html(
+            d['info'].append(format_html(

                 'W kategoriach: {cat} ({price} zł)',
                 cat=', '.join(self.describe_category(g) for g in book_data['genres']),
                 'W kategoriach: {cat} ({price} zł)',
                 cat=', '.join(self.describe_category(g) for g in book_data['genres']),

-                price=book_data['price']
-            )
+                price=book_data['price'],
+            ))
+        d['info'].append(mark_safe(
+            '<strong>' + book_data['abstract']['header'] +
+            '</strong><br/>' + book_data['abstract']['rest']
+        ))

 
         return d
 
 
         return d
 


@@ -363,16 +381,22 @@ class Woblink(BasePublisher):
         self.edit_step1(book.woblink_id, book_data)
         self.edit_step2(book.woblink_id, book_data)
         self.edit_step3(book.woblink_id, book_data)
         self.edit_step1(book.woblink_id, book_data)
         self.edit_step2(book.woblink_id, book_data)
         self.edit_step3(book.woblink_id, book_data)

-        self.send_cover(book.woblink_id, wldoc)
+        cover_id = self.send_cover(book.woblink_id, wldoc)
+

         texts = shop.get_texts()
         texts = shop.get_texts()

-        self.send_epub(
+        epub_id, epub_demo = self.send_epub(

             book.woblink_id, wldoc, book.gallery_path(),
             fundraising=texts
         )
             book.woblink_id, wldoc, book.gallery_path(),
             fundraising=texts
         )

-        self.send_mobi(
+        mobi_id, mobi_demo = self.send_mobi(

             book.woblink_id, wldoc, book.gallery_path(),
             fundraising=texts
         )
             book.woblink_id, wldoc, book.gallery_path(),
             fundraising=texts
         )

+        self.edit_step4(
+            book.woblink_id, book_data,
+            cover_id, epub_id, epub_demo, mobi_id, mobi_demo,
+        )
+        self.edit_step5(book.woblink_id, book_data)

 
     def get_book_data(self, shop, wldoc, errors=None):
         return {
 
     def get_book_data(self, shop, wldoc, errors=None):
         return {


@@ -470,10 +494,30 @@ class Woblink(BasePublisher):
             'pubFileFormat': 'epub+mobi',
             'pubIsAcs': '0',
             'pubPublisherIndex': '',
             'pubFileFormat': 'epub+mobi',
             'pubIsAcs': '0',
             'pubPublisherIndex': '',

+            'save_and_continue': '',

         }
         d = self.with_form_name(d, 'EditPublicationStep3')
         return self.session.post(self.STEP3_URL % woblink_id, data=d)
 
         }
         d = self.with_form_name(d, 'EditPublicationStep3')
         return self.session.post(self.STEP3_URL % woblink_id, data=d)
 

+    def edit_step4(self, woblink_id, book_data, cover_id, epub_id, epub_demo, mobi_id, mobi_demo):
+        d = {
+            'pubCoverResId': cover_id,
+            'pubEpubResId': epub_id,
+            'pubEpubDemoResId': epub_demo,
+            'pubMobiResId': mobi_id,
+            'pubMobiDemoResId': mobi_demo,
+            'pubFileFormat': 'epub+mobi',
+            'pubId': woblink_id,
+            'save_and_continue': '',
+        }
+        d = self.with_form_name(d, 'EditPublicationStep4')
+        return self.session.post(self.STEP4_URL % woblink_id, data=d)
+
+    def edit_step5(self, woblink_id, book_data):
+        d = {'save': ''}
+        d = self.with_form_name(d, 'EditPublicationStep5')
+        return self.session.post(self.STEP5_URL % woblink_id, data=d)
+

     def wait_for_job(self, job_id):
         while True:
             response = self.session.post(
     def wait_for_job(self, job_id):
         while True:
             response = self.session.post(


@@ -483,16 +527,21 @@ class Woblink(BasePublisher):
             data = response.json()[job_id]
             if data['ready']:
                 assert data['successful']
             data = response.json()[job_id]
             if data['ready']:
                 assert data['successful']

-                return
+                return data.get('returnValue')

             sleep(2)
 
             sleep(2)
 

-    def upload_file(self, woblink_id, filename, content, form_name, field_name, mime_type):
+    def upload_file(self, woblink_id, filename, content, field_name, mime_type):
+        form_name = f'Upload{field_name}'
+        id_field = f'pub{field_name}ResId'
+        field_name = field_name.lower()
+

         data = {
             'pubId': woblink_id,
         }
         files = {
             field_name: (filename, content, mime_type)
         }
         data = {
             'pubId': woblink_id,
         }
         files = {
             field_name: (filename, content, mime_type)
         }

+        

         response = self.session.post(
             self.UPLOAD_URL % field_name,
             data=self.with_form_name(data, form_name),
         response = self.session.post(
             self.UPLOAD_URL % field_name,
             data=self.with_form_name(data, form_name),


@@ -500,8 +549,10 @@ class Woblink(BasePublisher):
         )
         resp_data = response.json()
         assert resp_data['success'] is True
         )
         resp_data = response.json()
         assert resp_data['success'] is True

+        file_id = resp_data[id_field]

         if 'jobId' in resp_data:
             self.wait_for_job(resp_data['jobId'])
         if 'jobId' in resp_data:
             self.wait_for_job(resp_data['jobId'])

+        return file_id

 
     def generate_demo(self, woblink_id, file_format, check=True):
         percent = 10
 
     def generate_demo(self, woblink_id, file_format, check=True):
         percent = 10


@@ -510,7 +561,7 @@ class Woblink(BasePublisher):
                 self.GENERATE_DEMO_URL % (file_format, woblink_id, percent),
             ).json()['jobId']
             try:
                 self.GENERATE_DEMO_URL % (file_format, woblink_id, percent),
             ).json()['jobId']
             try:

-                self.wait_for_job(job_id)
+                file_id = self.wait_for_job(job_id)

             except AssertionError:
                 if percent < 50:
                     percent += 10
             except AssertionError:
                 if percent < 50:
                     percent += 10


@@ -525,6 +576,7 @@ class Woblink(BasePublisher):
                     self.CHECK_DEMO_URL % (file_format, woblink_id)
                 ).json()['jobId']
             )
                     self.CHECK_DEMO_URL % (file_format, woblink_id)
                 ).json()['jobId']
             )

+        return file_id

 
     def send_epub(self, woblink_id, doc, gallery_path, fundraising=None):
         from librarian.builders import EpubBuilder
 
     def send_epub(self, woblink_id, doc, gallery_path, fundraising=None):
         from librarian.builders import EpubBuilder


@@ -532,15 +584,15 @@ class Woblink(BasePublisher):
             base_url='file://' + gallery_path + '/',
             fundraising=fundraising or [],
         ).build(doc).get_file()
             base_url='file://' + gallery_path + '/',
             fundraising=fundraising or [],
         ).build(doc).get_file()

-        self.upload_file(
+        file_id = self.upload_file(

             woblink_id,
             doc.meta.url.slug + '.epub',
             content,
             woblink_id,
             doc.meta.url.slug + '.epub',
             content,

-            'UploadEpub',
-            'epub',
+            'Epub',

             'application/epub+zip'
         )
             'application/epub+zip'
         )

-        self.generate_demo(woblink_id, 'epub')
+        demo_id = self.generate_demo(woblink_id, 'epub')
+        return file_id, demo_id

 
     def send_mobi(self, woblink_id, doc, gallery_path, fundraising=None):
         from librarian.builders import MobiBuilder
 
     def send_mobi(self, woblink_id, doc, gallery_path, fundraising=None):
         from librarian.builders import MobiBuilder


@@ -548,15 +600,15 @@ class Woblink(BasePublisher):
             base_url='file://' + gallery_path + '/',
             fundraising=fundraising or [],
         ).build(doc).get_file()
             base_url='file://' + gallery_path + '/',
             fundraising=fundraising or [],
         ).build(doc).get_file()

-        self.upload_file(
+        file_id = self.upload_file(

             woblink_id,
             doc.meta.url.slug + '.mobi',
             content,
             woblink_id,
             doc.meta.url.slug + '.mobi',
             content,

-            'UploadMobi',
-            'mobi',
+            'Mobi',

             'application/x-mobipocket-ebook'
         )
             'application/x-mobipocket-ebook'
         )

-        self.generate_demo(woblink_id, 'mobi', check=False)
+        demo_id = self.generate_demo(woblink_id, 'mobi', check=False)
+        return file_id, demo_id

 
     def send_cover(self, woblink_id, doc):
         from librarian.cover import make_cover
 
     def send_cover(self, woblink_id, doc):
         from librarian.cover import make_cover


@@ -566,11 +618,11 @@ class Woblink(BasePublisher):
         content = io.BytesIO()
         cover.final_image().save(content, cover.format)
         content.seek(0)
         content = io.BytesIO()
         cover.final_image().save(content, cover.format)
         content.seek(0)

-        self.upload_file(
+        file_id = self.upload_file(

             woblink_id,
             doc.meta.url.slug + '.jpeg',
             content,
             woblink_id,
             doc.meta.url.slug + '.jpeg',
             content,

-            'UploadCover',
-            'cover',
+            'Cover',

             cover.mime_type()
         )
             cover.mime_type()
         )

+        return file_id