X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/a01c8d6aa976110336c8073e56faf3f16f272ed8..32ee10aaf4c035a199a96c06bd2506befed5e17f:/src/depot/publishers/woblink.py diff --git a/src/depot/publishers/woblink.py b/src/depot/publishers/woblink.py index e98ec585..3e1c78c8 100644 --- a/src/depot/publishers/woblink.py +++ b/src/depot/publishers/woblink.py @@ -20,8 +20,8 @@ class WoblinkError(ValueError): class NoPrice(WoblinkError): def as_html(self): return format_html( - 'Brak określonej ceny.', - price=self.args[0].id + 'Brak określonej ceny.', + site=self.args[0].id ) class NoIsbn(WoblinkError): @@ -187,6 +187,7 @@ class Woblink(BasePublisher): (self.ROLE_TRANSLATOR, meta.translators, False) ]: for person_literal in items: + if person_literal is None: continue if person_literal.lang != 'pl': if errors is not None: if obligatory: @@ -223,7 +224,7 @@ class Woblink(BasePublisher): thema_codes.extend( Audience.objects.filter(code__in=meta.audiences).exclude( - thema=None).values_list('thema', flat=True) + thema='').values_list('thema', flat=True) ) if not thema_codes: @@ -295,32 +296,36 @@ class Woblink(BasePublisher): def get_lang2code(self, meta, errors=None): return lang_code_3to2(meta.language) - def get_price(self, shop, wldoc, errors=None): + def get_price(self, site, wldoc, errors=None): try: stats = wldoc.get_statistics()['total'] except: if errors: - errors.append(NoPrice(shop)) + errors.append(NoPrice(site)) return 0 words = stats['words_with_fn'] pages = stats['chars_with_fn'] / 1800 - price = shop.get_price(words, pages) + price = site.get_price(words, pages) if price is None: if errors: - errors.append(NoPrice(shop)) + errors.append(NoPrice(site)) return 0 return price - def can_publish(self, shop, book): - wldoc = book.wldocument(librarian2=True) + def can_publish(self, site, book): d = { 'warnings': [], 'errors': [], 'info': [], } + try: + wldoc = book.wldocument(librarian2=True) + except: + d['errors'].append('Nieprawidłowy dokument.') + return d errors = [] - book_data = self.get_book_data(shop, wldoc, errors) + book_data = self.get_book_data(site, wldoc, errors) for error in errors: if not isinstance(error, Warning): errlist = d['errors'] @@ -328,6 +333,12 @@ class Woblink(BasePublisher): errlist = d['warnings'] errlist.append(error.as_html()) + if book_data.get('isbn'): + d['info'].append(format_html( + 'ISBN: {isbn}', + isbn=book_data['isbn'], + )) + if book_data.get('genres'): d['info'].append(format_html( 'W kategoriach: {cat} ({price} zł)', @@ -365,50 +376,53 @@ class Woblink(BasePublisher): if m is not None: return m.group(1) - def send_book(self, shop, book, changes=None): + def send_book(self, site_book_publish, changes=None): + site_book = site_book_publish.site_book + book = site_book.book + site = site_book.site wldoc = book.wldocument(librarian2=True, changes=changes, publishable=False) # TODO pub meta = wldoc.meta - book_data = self.get_book_data(shop, wldoc) + book_data = self.get_book_data(site, wldoc) - if not book.woblink_id: - #book.woblink_id = 2959868 + if not site_book.external_id: woblink_id = self.create_book(book_data['isbn']) assert woblink_id - book.woblink_id = woblink_id - book.save(update_fields=['woblink_id']) + site_book.external_id = woblink_id + site_book.save(update_fields=['external_id']) + woblink_id = site_book.external_id - self.edit_step1(book.woblink_id, book_data) - self.edit_step2(book.woblink_id, book_data) - self.edit_step3(book.woblink_id, book_data) - cover_id = self.send_cover(book.woblink_id, wldoc) + self.edit_step1(woblink_id, book_data) + self.edit_step2(woblink_id, book_data) + self.edit_step3(woblink_id, book_data) + cover_id = self.send_cover(woblink_id, wldoc) - texts = shop.get_texts() + texts = site.get_texts() epub_id, epub_demo = self.send_epub( - book.woblink_id, wldoc, book.gallery_path(), + woblink_id, wldoc, book.gallery_path(), fundraising=texts ) mobi_id, mobi_demo = self.send_mobi( - book.woblink_id, wldoc, book.gallery_path(), + woblink_id, wldoc, book.gallery_path(), fundraising=texts ) self.edit_step4( - book.woblink_id, book_data, + woblink_id, book_data, cover_id, epub_id, epub_demo, mobi_id, mobi_demo, ) - self.edit_step5(book.woblink_id, book_data) + self.edit_step5(woblink_id, book_data) - def get_book_data(self, shop, wldoc, errors=None): + def get_book_data(self, site, wldoc, errors=None): return { "title": wldoc.meta.title, "isbn": self.get_isbn(wldoc.meta, errors=errors), "authors": self.get_authors_data(wldoc.meta, errors=errors), "abstract": self.get_abstract( - wldoc, errors=errors, description_add=shop.description_add + wldoc, errors=errors, description_add=site.description_add ), "lang2code": self.get_lang2code(wldoc.meta, errors=errors), "genres": self.get_genres(wldoc.meta, errors=errors), - "price": self.get_price(shop, wldoc, errors=errors), + "price": self.get_price(site, wldoc, errors=errors), "series": self.get_series(wldoc.meta, errors=errors), } @@ -562,6 +576,12 @@ class Woblink(BasePublisher): ).json()['jobId'] try: file_id = self.wait_for_job(job_id) + if check: + self.wait_for_job( + self.session.get( + self.CHECK_DEMO_URL % (file_format, woblink_id) + ).json()['jobId'] + ) except AssertionError: if percent < 50: percent += 10 @@ -570,12 +590,6 @@ class Woblink(BasePublisher): else: break - if check: - self.wait_for_job( - self.session.get( - self.CHECK_DEMO_URL % (file_format, woblink_id) - ).json()['jobId'] - ) return file_id def send_epub(self, woblink_id, doc, gallery_path, fundraising=None):