diff --git a/recipes/abc_au.recipe b/recipes/abc_au.recipe index 82591d1357..82662f0351 100644 --- a/recipes/abc_au.recipe +++ b/recipes/abc_au.recipe @@ -38,9 +38,9 @@ class ABCNews(BasicNewsRecipe): if d and isinstance(d, str): self.oldest_article = float(d) -# auto_cleanup = True # enable this as a backup option if recipe stops working + # auto_cleanup = True # enable this as a backup option if recipe stops working -# use_embedded_content = False # if set to true will assume that all the article content is within the feed (i.e. won't try to fetch more data) + # use_embedded_content = False # if set to true will assume that all the article content is within the feed (i.e. won't try to fetch more data) no_stylesheets = True remove_javascript = True @@ -57,7 +57,7 @@ class ABCNews(BasicNewsRecipe): # Clear out all the unwanted html tags: # ************************************ remove_tags = [ -# dict(name='aside', attrs={'name': re.compile(aside_reg_exp, re.IGNORECASE)}) + # dict(name='aside', attrs={'name': re.compile(aside_reg_exp, re.IGNORECASE)}) { 'name': ['meta', 'link', 'noscript', 'aside'] }, @@ -98,12 +98,12 @@ class ABCNews(BasicNewsRecipe): ('Health', 'https://www.abc.net.au/news/feed/9167762/rss.xml'), ('Arts and Entertainment', 'https://www.abc.net.au/news/feed/472/rss.xml'), ('Fact Check', 'https://www.abc.net.au/news/feed/5306468/rss.xml'), -# ('Adelaide', 'https://www.abc.net.au/news/feed/8057540/rss.xml'), #enable by removing # at start of line -# ('Brisbane', 'https://www.abc.net.au/news/feed/8053540/rss.xml'), #enable by removing # at start of line -# ('Canberra', 'https://www.abc.net.au/news/feed/8057234/rss.xml'), #enable by removing # at start of line -# ('Darwin', 'https://www.abc.net.au/news/feed/8057648/rss.xml'), #enable by removing # at start of line -# ('Hobart', 'https://www.abc.net.au/news/feed/8054562/rss.xml'), #enable by removing # at start of line -# ('Melbourne', 'https://www.abc.net.au/news/feed/8057136/rss.xml'), #enable by removing # at start of line -# ('Perth', 'https://www.abc.net.au/news/feed/8057096/rss.xml'), #enable by removing # at start of line -# ('Sydney', 'https://www.abc.net.au/news/feed/8055316/rss.xml'), #enable by removing # at start of line + # ('Adelaide', 'https://www.abc.net.au/news/feed/8057540/rss.xml'), #enable by removing # at start of line + # ('Brisbane', 'https://www.abc.net.au/news/feed/8053540/rss.xml'), #enable by removing # at start of line + # ('Canberra', 'https://www.abc.net.au/news/feed/8057234/rss.xml'), #enable by removing # at start of line + # ('Darwin', 'https://www.abc.net.au/news/feed/8057648/rss.xml'), #enable by removing # at start of line + # ('Hobart', 'https://www.abc.net.au/news/feed/8054562/rss.xml'), #enable by removing # at start of line + # ('Melbourne', 'https://www.abc.net.au/news/feed/8057136/rss.xml'), #enable by removing # at start of line + # ('Perth', 'https://www.abc.net.au/news/feed/8057096/rss.xml'), #enable by removing # at start of line + # ('Sydney', 'https://www.abc.net.au/news/feed/8055316/rss.xml'), #enable by removing # at start of line ] diff --git a/recipes/am730.recipe b/recipes/am730.recipe index 80d52c1c43..bf8b3c1ded 100644 --- a/recipes/am730.recipe +++ b/recipes/am730.recipe @@ -96,5 +96,5 @@ class AM730(BasicNewsRecipe): print(title) print(url) SectionsArticles.append(self.getAMSectionArticles(title,url)) -# feeds.append(articles[0]['url']) + # feeds.append(articles[0]['url']) return SectionsArticles diff --git a/recipes/before_we_go.recipe b/recipes/before_we_go.recipe index aec5763d24..8423a69af2 100644 --- a/recipes/before_we_go.recipe +++ b/recipes/before_we_go.recipe @@ -12,7 +12,7 @@ class BeforeWeGo(BasicNewsRecipe): description = 'Before We Go Blog is a collective of Fantasy, Sci-Fi and Graphic Novel fans from around the world, passionate about providing awesome, enjoyable reviews for anyone who loves a good book!' # noqa: E501 publisher = 'BEFOREWEGOBLOG' category = 'blog' -# cover_url = u'https://i0.wp.com/beforewegoblog.com/wp-content/uploads/2021/09/beth-with-long-hair.jpeg' + # cover_url = u'https://i0.wp.com/beforewegoblog.com/wp-content/uploads/2021/09/beth-with-long-hair.jpeg' cover_url = u'https://i0.wp.com/beforewegoblog.com/wp-content/uploads/2021/01/before-we-go-blog-1.png' language = 'en' no_stylesheets = True @@ -24,7 +24,7 @@ class BeforeWeGo(BasicNewsRecipe): remove_tags_before = dict(name='h1', attrs={'class': 'entry-title'}) remove_tags_after = dict(name='div', attrs={'id': 'author-bio'}) -# remove_tags_after = dict(name='article') + # remove_tags_after = dict(name='article') remove_tags = [ dict(name='div', attrs={'class': 'nectar-scrolling-text font_size_10vh custom_color has-custom-divider'}), diff --git a/recipes/calgary_herald.recipe b/recipes/calgary_herald.recipe index 062e1b2531..9d68987bf7 100644 --- a/recipes/calgary_herald.recipe +++ b/recipes/calgary_herald.recipe @@ -60,20 +60,20 @@ class CanWestPaper(BasicNewsRecipe): ] # un-comment the following six lines for the Vancouver Province - # title = u'Vancouver Province' - # url_prefix = 'http://www.theprovince.com' - # description = u'News from Vancouver, BC' - # std_logo_url = 'http://www.theprovince.com/images/logo_theprovince.jpg' - # logo_url = 'vplogo.jpg' - # fp_tag = 'CAN_TP' + # # title = u'Vancouver Province' + # # url_prefix = 'http://www.theprovince.com' + # # description = u'News from Vancouver, BC' + # # std_logo_url = 'http://www.theprovince.com/images/logo_theprovince.jpg' + # # logo_url = 'vplogo.jpg' + # # fp_tag = 'CAN_TP' # un-comment the following six lines for the Vancouver Sun - # title = u'Vancouver Sun' - # url_prefix = 'http://www.vancouversun.com' - # description = u'News from Vancouver, BC' - # std_logo_url = 'http://www.vancouversun.com/images/logo_vancouversun.jpg' - # logo_url = 'vslogo.jpg' - # fp_tag = 'CAN_VS' + # # title = u'Vancouver Sun' + # # url_prefix = 'http://www.vancouversun.com' + # # description = u'News from Vancouver, BC' + # # std_logo_url = 'http://www.vancouversun.com/images/logo_vancouversun.jpg' + # # logo_url = 'vslogo.jpg' + # # fp_tag = 'CAN_VS' # un-comment the following six lines for the Calgary Herald title = u'Calgary Herald' @@ -90,7 +90,7 @@ class CanWestPaper(BasicNewsRecipe): # # std_logo_url = 'http://www.edmontonjournal.com/images/logo_edmontonjournal.jpg' # # logo_url = 'ejlogo.jpg' # # fp_tag = 'CAN_EJ' - # + # un-comment the following six lines for the Ottawa Citizen # # title = u'Ottawa Citizen' # # url_prefix = 'http://www.ottawacitizen.com' @@ -98,7 +98,7 @@ class CanWestPaper(BasicNewsRecipe): # # std_logo_url = 'http://www.ottawacitizen.com/images/logo_ottawacitizen.jpg' # # logo_url = 'oclogo.jpg' # # fp_tag = 'CAN_OC' - # + # un-comment the following six lines for the Montreal Gazette # # title = u'Montreal Gazette' # # url_prefix = 'http://www.montrealgazette.com' diff --git a/recipes/cicero.recipe b/recipes/cicero.recipe index 94d713820b..61dc3e6b71 100644 --- a/recipes/cicero.recipe +++ b/recipes/cicero.recipe @@ -15,7 +15,7 @@ class BasicUserRecipe1316245412(BasicNewsRecipe): no_stylesheets = True auto_cleanup = False -# remove_javascript = True + # remove_javascript = True remove_tags = [ dict(name='div', attrs={'id': ['header', 'navigation', 'skip-link', @@ -51,6 +51,6 @@ class BasicUserRecipe1316245412(BasicNewsRecipe): def print_version(self, url): return url + '?print' -# def get_cover_url(self): -# return 'http://www.cicero.de/sites/all/themes/cicero/logo.png' # need to -# find a good logo on their home page! + # def get_cover_url(self): + # return 'http://www.cicero.de/sites/all/themes/cicero/logo.png' # need to + # find a good logo on their home page! diff --git a/recipes/edmonton_journal.recipe b/recipes/edmonton_journal.recipe index 9ea93456f1..27da4b0155 100644 --- a/recipes/edmonton_journal.recipe +++ b/recipes/edmonton_journal.recipe @@ -60,28 +60,28 @@ class CanWestPaper(BasicNewsRecipe): ] # un-comment the following six lines for the Vancouver Province - # title = u'Vancouver Province' - # url_prefix = 'http://www.theprovince.com' - # description = u'News from Vancouver, BC' - # std_logo_url = 'http://www.theprovince.com/images/logo_theprovince.jpg' - # logo_url = 'vplogo.jpg' - # fp_tag = 'CAN_TP' + # # title = u'Vancouver Province' + # # url_prefix = 'http://www.theprovince.com' + # # description = u'News from Vancouver, BC' + # # std_logo_url = 'http://www.theprovince.com/images/logo_theprovince.jpg' + # # logo_url = 'vplogo.jpg' + # # fp_tag = 'CAN_TP' # un-comment the following six lines for the Vancouver Sun - # title = u'Vancouver Sun' - # url_prefix = 'http://www.vancouversun.com' - # description = u'News from Vancouver, BC' - # std_logo_url = 'http://www.vancouversun.com/images/logo_vancouversun.jpg' - # logo_url = 'vslogo.jpg' - # fp_tag = 'CAN_VS' + # # title = u'Vancouver Sun' + # # url_prefix = 'http://www.vancouversun.com' + # # description = u'News from Vancouver, BC' + # # std_logo_url = 'http://www.vancouversun.com/images/logo_vancouversun.jpg' + # # logo_url = 'vslogo.jpg' + # # fp_tag = 'CAN_VS' # un-comment the following six lines for the Calgary Herald - # title = u'Calgary Herald' - # url_prefix = 'http://www.calgaryherald.com' - # description = u'News from Calgary, AB' - # std_logo_url = 'http://www.calgaryherald.com/images/logo_calgaryherald.jpg' - # logo_url = 'chlogo.jpg' - # fp_tag = 'CAN_CH' + # # title = u'Calgary Herald' + # # url_prefix = 'http://www.calgaryherald.com' + # # description = u'News from Calgary, AB' + # # std_logo_url = 'http://www.calgaryherald.com/images/logo_calgaryherald.jpg' + # # logo_url = 'chlogo.jpg' + # # fp_tag = 'CAN_CH' # un-comment the following six lines for the Edmonton Journal title = u'Edmonton Journal' @@ -92,20 +92,20 @@ class CanWestPaper(BasicNewsRecipe): fp_tag = 'CAN_EJ' # un-comment the following six lines for the Ottawa Citizen -# title = u'Ottawa Citizen' -# url_prefix = 'http://www.ottawacitizen.com' -# description = u'News from Ottawa, ON' -# std_logo_url = 'http://www.ottawacitizen.com/images/logo_ottawacitizen.jpg' -# logo_url = 'oclogo.jpg' -# fp_tag = 'CAN_OC' + # # title = u'Ottawa Citizen' + # # url_prefix = 'http://www.ottawacitizen.com' + # # description = u'News from Ottawa, ON' + # # std_logo_url = 'http://www.ottawacitizen.com/images/logo_ottawacitizen.jpg' + # # logo_url = 'oclogo.jpg' + # # fp_tag = 'CAN_OC' # un-comment the following six lines for the Montreal Gazette -# title = u'Montreal Gazette' -# url_prefix = 'http://www.montrealgazette.com' -# description = u'News from Montreal, QC' -# std_logo_url = 'http://www.montrealgazette.com/images/logo_montrealgazette.jpg' -# logo_url = 'mglogo.jpg' -# fp_tag = 'CAN_MG' + # # title = u'Montreal Gazette' + # # url_prefix = 'http://www.montrealgazette.com' + # # description = u'News from Montreal, QC' + # # std_logo_url = 'http://www.montrealgazette.com/images/logo_montrealgazette.jpg' + # # logo_url = 'mglogo.jpg' + # # fp_tag = 'CAN_MG' Kindle_Fire = False masthead_url = std_logo_url diff --git a/recipes/faz_net.recipe b/recipes/faz_net.recipe index ae43ced01f..c90eda7651 100644 --- a/recipes/faz_net.recipe +++ b/recipes/faz_net.recipe @@ -143,7 +143,7 @@ class FazNet(BasicNewsRecipe): 'tik4-sharing','tik4-load-more-bottom', 'tik4-by','header-detail__image','mm-adbox','upper-toolbar content-container' ]}), - # dict(name ='script'), + # dict(name ='script'), dict(name = 'style'), dict(name='svg'), dict(name='div', attrs={'data-module':'teaser'}), @@ -240,11 +240,11 @@ class FazNet(BasicNewsRecipe): if tag.contents[0] and 'F.A.Z.-Newsletter' in tag.contents[0]: tag.extract() -# format liveblog + # format liveblog if soup.find(attrs={'class':'tik4-live__container'}): format_tickaroo_liveblog(soup) -# remove sizes and calc attributes in images + # remove sizes and calc attributes in images for tag in soup.findAll('img'): if tag.has_attr('src'): new_img = soup.new_tag('img') diff --git a/recipes/gagadget_de.recipe b/recipes/gagadget_de.recipe index cd8a3cd9f2..0fdc24ee06 100644 --- a/recipes/gagadget_de.recipe +++ b/recipes/gagadget_de.recipe @@ -12,15 +12,15 @@ class Gagadget(BasicNewsRecipe): publication_type = 'news' oldest_article = 7 max_articles_per_feed = 100 -# language = 'ru_UK' -# language = 'uk' -# language = 'en_UK' + # language = 'ru_UK' + # language = 'uk' + # language = 'en_UK' language = 'de' -# language = 'nb' -# language = 'nl' -# language = 'es' -# language = 'it' -# language = 'fr' + # language = 'nb' + # language = 'nl' + # language = 'es' + # language = 'it' + # language = 'fr' cover_url = 'https://gagadget.com/static/img/gagadget.jpg' auto_cleanup = False no_stylesheets = False @@ -28,77 +28,65 @@ class Gagadget(BasicNewsRecipe): remove_tags_before = dict(name='h1') remove_tags_after = dict(name='div', attrs={'class': 'l-inner l-inner_high'}) -# -# Ukrainian version only -# -# remove_tags_after = dict(name='div', attrs={'class': 'top20 bottom20 post-links'}) -# -# remove_tags = [ -# dict(name='div', attrs={'class': 'footer-content'}), -# ] + + # Ukrainian version only + # remove_tags_after = dict(name='div', attrs={'class': 'top20 bottom20 post-links'}) + + # remove_tags = [ + # dict(name='div', attrs={'class': 'footer-content'}), + # ] feeds = [ -# -# Russian -# -# ('\u0412\u0441\u0435 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u044B', 'https://gagadget.com/rss/'), -# ('\u041D\u043E\u0432\u043E\u0441\u0442\u0438', 'https://gagadget.com/rss/news/'), -# ('\u0421\u0442\u0430\u0442\u044C\u0438', 'https://gagadget.com/rss/articles/'), -# ('\u041E\u0431\u0437\u043E\u0440\u044B', 'https://gagadget.com/rss/reviews/'), -# ('\u0421\u043F\u0435\u0446\u043F\u0440\u043E\u0435\u043A\u0442\u044B', 'https://gagadget.com/rss/specials/'), -# -# Ukrainian -# -# ('\u0423\u0441\u0456 \u043C\u0430\u0442\u0435\u0440\u0456\u0430\u043B\u0438', 'https://gagadget.com/uk/rss/'), -# ('\u041D\u043E\u0432\u0438\u043D\u0438', 'https://gagadget.com/uk/rss/news/'), -# ('\u0421\u0442\u0430\u0442\u0442\u0456', 'https://gagadget.com/uk/rss/articles/'), -# ('\u041E\u0433\u043B\u044F\u0434\u0438', 'https://gagadget.com/uk/rss/reviews/'), -# -# English -# -# ('Gagadget', 'https://gagadget.com/en/rss/'), -# ('News', 'https://gagadget.com/en/rss/news/'), -# -# German -# - ('Gagadget', 'https://gagadget.com/de/rss/'), - ('Nachrichten', 'https://gagadget.com/de/rss/news/'), - ('Tests', 'https://gagadget.com/de/rss/reviews/'), - ('Artikel', 'https://gagadget.com/de/rss/articles/'), -# -# Norwegian -# -# ('Gagadget', 'https://gagadget.com/nb/rss/'), -# ('Nyheter', 'https://gagadget.com/nb/rss/news/'), -# ('Anmeldelser', 'https://gagadget.com/nb/rss/reviews/'), -# ('Artikler', 'https://gagadget.com/nb/rss/articles/'), -# -# Dutch -# -# ('Gagadget', 'https://gagadget.com/nl/rss/'), -# ('Nieuws', 'https://gagadget.com/nl/rss/news/'), -# ('Recensies', 'https://gagadget.com/nl/rss/reviews/'), -# ('Artikelen', 'https://gagadget.com/nl/rss/articles/'), -# -# Spanish -# -# ('Gagadget', 'https://gagadget.com/es/rss/'), -# ('Noticias', 'https://gagadget.com/es/rss/news/'), -# ('Rese\u00F1as', 'https://gagadget.com/es/rss/reviews/'), -# ('Art\u00EDculos', 'https://gagadget.com/es/rss/articles/'), -# -# Italian -# -# ('Gagadget', 'https://gagadget.com/it/rss/'), -# ('Notizia', 'https://gagadget.com/it/rss/news/'), -# ('Recensioni', 'https://gagadget.com/it/rss/reviews/'), -# ('Articoli', 'https://gagadget.com/it/rss/articles/'), -# -# French -# -# ('Gagadget', 'https://gagadget.com/fr/rss/'), -# ('Nouvelles', 'https://gagadget.com/fr/rss/news/'), -# ('Commentaires', 'https://gagadget.com/fr/rss/reviews/'), -# ('Des articles', 'https://gagadget.com/fr/rss/articles/'), -# - ] + # Russian + # ('\u0412\u0441\u0435 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u044B', 'https://gagadget.com/rss/'), + # ('\u041D\u043E\u0432\u043E\u0441\u0442\u0438', 'https://gagadget.com/rss/news/'), + # ('\u0421\u0442\u0430\u0442\u044C\u0438', 'https://gagadget.com/rss/articles/'), + # ('\u041E\u0431\u0437\u043E\u0440\u044B', 'https://gagadget.com/rss/reviews/'), + # ('\u0421\u043F\u0435\u0446\u043F\u0440\u043E\u0435\u043A\u0442\u044B', 'https://gagadget.com/rss/specials/'), + + # Ukrainian + # ('\u0423\u0441\u0456 \u043C\u0430\u0442\u0435\u0440\u0456\u0430\u043B\u0438', 'https://gagadget.com/uk/rss/'), + # ('\u041D\u043E\u0432\u0438\u043D\u0438', 'https://gagadget.com/uk/rss/news/'), + # ('\u0421\u0442\u0430\u0442\u0442\u0456', 'https://gagadget.com/uk/rss/articles/'), + # ('\u041E\u0433\u043B\u044F\u0434\u0438', 'https://gagadget.com/uk/rss/reviews/'), + + # English + # ('Gagadget', 'https://gagadget.com/en/rss/'), + # ('News', 'https://gagadget.com/en/rss/news/'), + + # German + ('Gagadget', 'https://gagadget.com/de/rss/'), + ('Nachrichten', 'https://gagadget.com/de/rss/news/'), + ('Tests', 'https://gagadget.com/de/rss/reviews/'), + ('Artikel', 'https://gagadget.com/de/rss/articles/'), + + # Norwegian + # ('Gagadget', 'https://gagadget.com/nb/rss/'), + # ('Nyheter', 'https://gagadget.com/nb/rss/news/'), + # ('Anmeldelser', 'https://gagadget.com/nb/rss/reviews/'), + # ('Artikler', 'https://gagadget.com/nb/rss/articles/'), + + # Dutch + # ('Gagadget', 'https://gagadget.com/nl/rss/'), + # ('Nieuws', 'https://gagadget.com/nl/rss/news/'), + # ('Recensies', 'https://gagadget.com/nl/rss/reviews/'), + # ('Artikelen', 'https://gagadget.com/nl/rss/articles/'), + + # Spanish + # ('Gagadget', 'https://gagadget.com/es/rss/'), + # ('Noticias', 'https://gagadget.com/es/rss/news/'), + # ('Rese\u00F1as', 'https://gagadget.com/es/rss/reviews/'), + # ('Art\u00EDculos', 'https://gagadget.com/es/rss/articles/'), + + # Italian + # ('Gagadget', 'https://gagadget.com/it/rss/'), + # ('Notizia', 'https://gagadget.com/it/rss/news/'), + # ('Recensioni', 'https://gagadget.com/it/rss/reviews/'), + # ('Articoli', 'https://gagadget.com/it/rss/articles/'), + + # French + # ('Gagadget', 'https://gagadget.com/fr/rss/'), + # ('Nouvelles', 'https://gagadget.com/fr/rss/news/'), + # ('Commentaires', 'https://gagadget.com/fr/rss/reviews/'), + # ('Des articles', 'https://gagadget.com/fr/rss/articles/'), + ] diff --git a/recipes/gagadget_en.recipe b/recipes/gagadget_en.recipe index c2fb0074d1..7ae5110f9f 100644 --- a/recipes/gagadget_en.recipe +++ b/recipes/gagadget_en.recipe @@ -12,15 +12,15 @@ class Gagadget(BasicNewsRecipe): publication_type = 'news' oldest_article = 7 max_articles_per_feed = 100 -# language = 'ru_UK' -# language = 'uk' + # language = 'ru_UK' + # language = 'uk' language = 'en_UK' -# language = 'de' -# language = 'nb' -# language = 'nl' -# language = 'es' -# language = 'it' -# language = 'fr' + # language = 'de' + # language = 'nb' + # language = 'nl' + # language = 'es' + # language = 'it' + # language = 'fr' cover_url = 'https://gagadget.com/static/img/gagadget.jpg' auto_cleanup = False no_stylesheets = False @@ -28,77 +28,65 @@ class Gagadget(BasicNewsRecipe): remove_tags_before = dict(name='h1') remove_tags_after = dict(name='div', attrs={'class': 'l-inner l-inner_high'}) -# -# Ukrainian version only -# -# remove_tags_after = dict(name='div', attrs={'class': 'top20 bottom20 post-links'}) -# -# remove_tags = [ -# dict(name='div', attrs={'class': 'footer-content'}), -# ] + + # Ukrainian version only + # remove_tags_after = dict(name='div', attrs={'class': 'top20 bottom20 post-links'}) + + # remove_tags = [ + # dict(name='div', attrs={'class': 'footer-content'}), + # ] feeds = [ -# -# Russian -# -# ('\u0412\u0441\u0435 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u044B', 'https://gagadget.com/rss/'), -# ('\u041D\u043E\u0432\u043E\u0441\u0442\u0438', 'https://gagadget.com/rss/news/'), -# ('\u0421\u0442\u0430\u0442\u044C\u0438', 'https://gagadget.com/rss/articles/'), -# ('\u041E\u0431\u0437\u043E\u0440\u044B', 'https://gagadget.com/rss/reviews/'), -# ('\u0421\u043F\u0435\u0446\u043F\u0440\u043E\u0435\u043A\u0442\u044B', 'https://gagadget.com/rss/specials/'), -# -# Ukrainian -# -# ('\u0423\u0441\u0456 \u043C\u0430\u0442\u0435\u0440\u0456\u0430\u043B\u0438', 'https://gagadget.com/uk/rss/'), -# ('\u041D\u043E\u0432\u0438\u043D\u0438', 'https://gagadget.com/uk/rss/news/'), -# ('\u0421\u0442\u0430\u0442\u0442\u0456', 'https://gagadget.com/uk/rss/articles/'), -# ('\u041E\u0433\u043B\u044F\u0434\u0438', 'https://gagadget.com/uk/rss/reviews/'), -# -# English -# - ('Gagadget', 'https://gagadget.com/en/rss/'), - ('News', 'https://gagadget.com/en/rss/news/'), -# -# German -# -# ('Gagadget', 'https://gagadget.com/de/rss/'), -# ('Nachrichten', 'https://gagadget.com/de/rss/news/'), -# ('Tests', 'https://gagadget.com/de/rss/reviews/'), -# ('Artikel', 'https://gagadget.com/de/rss/articles/'), -# -# Norwegian -# -# ('Gagadget', 'https://gagadget.com/nb/rss/'), -# ('Nyheter', 'https://gagadget.com/nb/rss/news/'), -# ('Anmeldelser', 'https://gagadget.com/nb/rss/reviews/'), -# ('Artikler', 'https://gagadget.com/nb/rss/articles/'), -# -# Dutch -# -# ('Gagadget', 'https://gagadget.com/nl/rss/'), -# ('Nieuws', 'https://gagadget.com/nl/rss/news/'), -# ('Recensies', 'https://gagadget.com/nl/rss/reviews/'), -# ('Artikelen', 'https://gagadget.com/nl/rss/articles/'), -# -# Spanish -# -# ('Gagadget', 'https://gagadget.com/es/rss/'), -# ('Noticias', 'https://gagadget.com/es/rss/news/'), -# ('Rese\u00F1as', 'https://gagadget.com/es/rss/reviews/'), -# ('Art\u00EDculos', 'https://gagadget.com/es/rss/articles/'), -# -# Italian -# -# ('Gagadget', 'https://gagadget.com/it/rss/'), -# ('Notizia', 'https://gagadget.com/it/rss/news/'), -# ('Recensioni', 'https://gagadget.com/it/rss/reviews/'), -# ('Articoli', 'https://gagadget.com/it/rss/articles/'), -# -# French -# -# ('Gagadget', 'https://gagadget.com/fr/rss/'), -# ('Nouvelles', 'https://gagadget.com/fr/rss/news/'), -# ('Commentaires', 'https://gagadget.com/fr/rss/reviews/'), -# ('Des articles', 'https://gagadget.com/fr/rss/articles/'), -# - ] + # Russian + # ('\u0412\u0441\u0435 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u044B', 'https://gagadget.com/rss/'), + # ('\u041D\u043E\u0432\u043E\u0441\u0442\u0438', 'https://gagadget.com/rss/news/'), + # ('\u0421\u0442\u0430\u0442\u044C\u0438', 'https://gagadget.com/rss/articles/'), + # ('\u041E\u0431\u0437\u043E\u0440\u044B', 'https://gagadget.com/rss/reviews/'), + # ('\u0421\u043F\u0435\u0446\u043F\u0440\u043E\u0435\u043A\u0442\u044B', 'https://gagadget.com/rss/specials/'), + + # Ukrainian + # ('\u0423\u0441\u0456 \u043C\u0430\u0442\u0435\u0440\u0456\u0430\u043B\u0438', 'https://gagadget.com/uk/rss/'), + # ('\u041D\u043E\u0432\u0438\u043D\u0438', 'https://gagadget.com/uk/rss/news/'), + # ('\u0421\u0442\u0430\u0442\u0442\u0456', 'https://gagadget.com/uk/rss/articles/'), + # ('\u041E\u0433\u043B\u044F\u0434\u0438', 'https://gagadget.com/uk/rss/reviews/'), + + # English + ('Gagadget', 'https://gagadget.com/en/rss/'), + ('News', 'https://gagadget.com/en/rss/news/'), + + # German + # ('Gagadget', 'https://gagadget.com/de/rss/'), + # ('Nachrichten', 'https://gagadget.com/de/rss/news/'), + # ('Tests', 'https://gagadget.com/de/rss/reviews/'), + # ('Artikel', 'https://gagadget.com/de/rss/articles/'), + + # Norwegian + # ('Gagadget', 'https://gagadget.com/nb/rss/'), + # ('Nyheter', 'https://gagadget.com/nb/rss/news/'), + # ('Anmeldelser', 'https://gagadget.com/nb/rss/reviews/'), + # ('Artikler', 'https://gagadget.com/nb/rss/articles/'), + + # Dutch + # ('Gagadget', 'https://gagadget.com/nl/rss/'), + # ('Nieuws', 'https://gagadget.com/nl/rss/news/'), + # ('Recensies', 'https://gagadget.com/nl/rss/reviews/'), + # ('Artikelen', 'https://gagadget.com/nl/rss/articles/'), + + # Spanish + # ('Gagadget', 'https://gagadget.com/es/rss/'), + # ('Noticias', 'https://gagadget.com/es/rss/news/'), + # ('Rese\u00F1as', 'https://gagadget.com/es/rss/reviews/'), + # ('Art\u00EDculos', 'https://gagadget.com/es/rss/articles/'), + + # Italian + # ('Gagadget', 'https://gagadget.com/it/rss/'), + # ('Notizia', 'https://gagadget.com/it/rss/news/'), + # ('Recensioni', 'https://gagadget.com/it/rss/reviews/'), + # ('Articoli', 'https://gagadget.com/it/rss/articles/'), + + # French + # ('Gagadget', 'https://gagadget.com/fr/rss/'), + # ('Nouvelles', 'https://gagadget.com/fr/rss/news/'), + # ('Commentaires', 'https://gagadget.com/fr/rss/reviews/'), + # ('Des articles', 'https://gagadget.com/fr/rss/articles/'), + ] diff --git a/recipes/gagadget_es.recipe b/recipes/gagadget_es.recipe index eaf0dd5f4d..47a16ce9c2 100644 --- a/recipes/gagadget_es.recipe +++ b/recipes/gagadget_es.recipe @@ -12,15 +12,15 @@ class Gagadget(BasicNewsRecipe): publication_type = 'news' oldest_article = 7 max_articles_per_feed = 100 -# language = 'ru_UK' -# language = 'uk' -# language = 'en_UK' -# language = 'de' -# language = 'nb' -# language = 'nl' + # language = 'ru_UK' + # language = 'uk' + # language = 'en_UK' + # language = 'de' + # language = 'nb' + # language = 'nl' language = 'es' -# language = 'it' -# language = 'fr' + # language = 'it' + # language = 'fr' cover_url = 'https://gagadget.com/static/img/gagadget.jpg' auto_cleanup = False no_stylesheets = False @@ -28,77 +28,65 @@ class Gagadget(BasicNewsRecipe): remove_tags_before = dict(name='h1') remove_tags_after = dict(name='div', attrs={'class': 'l-inner l-inner_high'}) -# -# Ukrainian version only -# -# remove_tags_after = dict(name='div', attrs={'class': 'top20 bottom20 post-links'}) -# -# remove_tags = [ -# dict(name='div', attrs={'class': 'footer-content'}), -# ] + + # Ukrainian version only + # remove_tags_after = dict(name='div', attrs={'class': 'top20 bottom20 post-links'}) + + # remove_tags = [ + # dict(name='div', attrs={'class': 'footer-content'}), + # ] feeds = [ -# -# Russian -# -# ('\u0412\u0441\u0435 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u044B', 'https://gagadget.com/rss/'), -# ('\u041D\u043E\u0432\u043E\u0441\u0442\u0438', 'https://gagadget.com/rss/news/'), -# ('\u0421\u0442\u0430\u0442\u044C\u0438', 'https://gagadget.com/rss/articles/'), -# ('\u041E\u0431\u0437\u043E\u0440\u044B', 'https://gagadget.com/rss/reviews/'), -# ('\u0421\u043F\u0435\u0446\u043F\u0440\u043E\u0435\u043A\u0442\u044B', 'https://gagadget.com/rss/specials/'), -# -# Ukrainian -# -# ('\u0423\u0441\u0456 \u043C\u0430\u0442\u0435\u0440\u0456\u0430\u043B\u0438', 'https://gagadget.com/uk/rss/'), -# ('\u041D\u043E\u0432\u0438\u043D\u0438', 'https://gagadget.com/uk/rss/news/'), -# ('\u0421\u0442\u0430\u0442\u0442\u0456', 'https://gagadget.com/uk/rss/articles/'), -# ('\u041E\u0433\u043B\u044F\u0434\u0438', 'https://gagadget.com/uk/rss/reviews/'), -# -# English -# -# ('Gagadget', 'https://gagadget.com/en/rss/'), -# ('News', 'https://gagadget.com/en/rss/news/'), -# -# German -# -# ('Gagadget', 'https://gagadget.com/de/rss/'), -# ('Nachrichten', 'https://gagadget.com/de/rss/news/'), -# ('Tests', 'https://gagadget.com/de/rss/reviews/'), -# ('Artikel', 'https://gagadget.com/de/rss/articles/'), -# -# Norwegian -# -# ('Gagadget', 'https://gagadget.com/nb/rss/'), -# ('Nyheter', 'https://gagadget.com/nb/rss/news/'), -# ('Anmeldelser', 'https://gagadget.com/nb/rss/reviews/'), -# ('Artikler', 'https://gagadget.com/nb/rss/articles/'), -# -# Dutch -# -# ('Gagadget', 'https://gagadget.com/nl/rss/'), -# ('Nieuws', 'https://gagadget.com/nl/rss/news/'), -# ('Recensies', 'https://gagadget.com/nl/rss/reviews/'), -# ('Artikelen', 'https://gagadget.com/nl/rss/articles/'), -# -# Spanish -# - ('Gagadget', 'https://gagadget.com/es/rss/'), - ('Noticias', 'https://gagadget.com/es/rss/news/'), - ('Rese\u00F1as', 'https://gagadget.com/es/rss/reviews/'), - ('Art\u00EDculos', 'https://gagadget.com/es/rss/articles/'), -# -# Italian -# -# ('Gagadget', 'https://gagadget.com/it/rss/'), -# ('Notizia', 'https://gagadget.com/it/rss/news/'), -# ('Recensioni', 'https://gagadget.com/it/rss/reviews/'), -# ('Articoli', 'https://gagadget.com/it/rss/articles/'), -# -# French -# -# ('Gagadget', 'https://gagadget.com/fr/rss/'), -# ('Nouvelles', 'https://gagadget.com/fr/rss/news/'), -# ('Commentaires', 'https://gagadget.com/fr/rss/reviews/'), -# ('Des articles', 'https://gagadget.com/fr/rss/articles/'), -# - ] + # Russian + # ('\u0412\u0441\u0435 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u044B', 'https://gagadget.com/rss/'), + # ('\u041D\u043E\u0432\u043E\u0441\u0442\u0438', 'https://gagadget.com/rss/news/'), + # ('\u0421\u0442\u0430\u0442\u044C\u0438', 'https://gagadget.com/rss/articles/'), + # ('\u041E\u0431\u0437\u043E\u0440\u044B', 'https://gagadget.com/rss/reviews/'), + # ('\u0421\u043F\u0435\u0446\u043F\u0440\u043E\u0435\u043A\u0442\u044B', 'https://gagadget.com/rss/specials/'), + + # Ukrainian + # ('\u0423\u0441\u0456 \u043C\u0430\u0442\u0435\u0440\u0456\u0430\u043B\u0438', 'https://gagadget.com/uk/rss/'), + # ('\u041D\u043E\u0432\u0438\u043D\u0438', 'https://gagadget.com/uk/rss/news/'), + # ('\u0421\u0442\u0430\u0442\u0442\u0456', 'https://gagadget.com/uk/rss/articles/'), + # ('\u041E\u0433\u043B\u044F\u0434\u0438', 'https://gagadget.com/uk/rss/reviews/'), + + # English + # ('Gagadget', 'https://gagadget.com/en/rss/'), + # ('News', 'https://gagadget.com/en/rss/news/'), + + # German + # ('Gagadget', 'https://gagadget.com/de/rss/'), + # ('Nachrichten', 'https://gagadget.com/de/rss/news/'), + # ('Tests', 'https://gagadget.com/de/rss/reviews/'), + # ('Artikel', 'https://gagadget.com/de/rss/articles/'), + + # Norwegian + # ('Gagadget', 'https://gagadget.com/nb/rss/'), + # ('Nyheter', 'https://gagadget.com/nb/rss/news/'), + # ('Anmeldelser', 'https://gagadget.com/nb/rss/reviews/'), + # ('Artikler', 'https://gagadget.com/nb/rss/articles/'), + + # Dutch + # ('Gagadget', 'https://gagadget.com/nl/rss/'), + # ('Nieuws', 'https://gagadget.com/nl/rss/news/'), + # ('Recensies', 'https://gagadget.com/nl/rss/reviews/'), + # ('Artikelen', 'https://gagadget.com/nl/rss/articles/'), + + # Spanish + ('Gagadget', 'https://gagadget.com/es/rss/'), + ('Noticias', 'https://gagadget.com/es/rss/news/'), + ('Rese\u00F1as', 'https://gagadget.com/es/rss/reviews/'), + ('Art\u00EDculos', 'https://gagadget.com/es/rss/articles/'), + + # Italian + # ('Gagadget', 'https://gagadget.com/it/rss/'), + # ('Notizia', 'https://gagadget.com/it/rss/news/'), + # ('Recensioni', 'https://gagadget.com/it/rss/reviews/'), + # ('Articoli', 'https://gagadget.com/it/rss/articles/'), + + # French + # ('Gagadget', 'https://gagadget.com/fr/rss/'), + # ('Nouvelles', 'https://gagadget.com/fr/rss/news/'), + # ('Commentaires', 'https://gagadget.com/fr/rss/reviews/'), + # ('Des articles', 'https://gagadget.com/fr/rss/articles/'), + ] diff --git a/recipes/gagadget_fr.recipe b/recipes/gagadget_fr.recipe index 4fe185e2bf..535d5b2cff 100644 --- a/recipes/gagadget_fr.recipe +++ b/recipes/gagadget_fr.recipe @@ -12,14 +12,14 @@ class Gagadget(BasicNewsRecipe): publication_type = 'news' oldest_article = 7 max_articles_per_feed = 100 -# language = 'ru_UK' -# language = 'uk' -# language = 'en_UK' -# language = 'de' -# language = 'nb' -# language = 'nl' -# language = 'es' -# language = 'it' + # language = 'ru_UK' + # language = 'uk' + # language = 'en_UK' + # language = 'de' + # language = 'nb' + # language = 'nl' + # language = 'es' + # language = 'it' language = 'fr' cover_url = 'https://gagadget.com/static/img/gagadget.jpg' auto_cleanup = False @@ -28,77 +28,65 @@ class Gagadget(BasicNewsRecipe): remove_tags_before = dict(name='h1') remove_tags_after = dict(name='div', attrs={'class': 'l-inner l-inner_high'}) -# -# Ukrainian version only -# -# remove_tags_after = dict(name='div', attrs={'class': 'top20 bottom20 post-links'}) -# -# remove_tags = [ -# dict(name='div', attrs={'class': 'footer-content'}), -# ] + + # Ukrainian version only + # remove_tags_after = dict(name='div', attrs={'class': 'top20 bottom20 post-links'}) + + # remove_tags = [ + # dict(name='div', attrs={'class': 'footer-content'}), + # ] feeds = [ -# -# Russian -# -# ('\u0412\u0441\u0435 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u044B', 'https://gagadget.com/rss/'), -# ('\u041D\u043E\u0432\u043E\u0441\u0442\u0438', 'https://gagadget.com/rss/news/'), -# ('\u0421\u0442\u0430\u0442\u044C\u0438', 'https://gagadget.com/rss/articles/'), -# ('\u041E\u0431\u0437\u043E\u0440\u044B', 'https://gagadget.com/rss/reviews/'), -# ('\u0421\u043F\u0435\u0446\u043F\u0440\u043E\u0435\u043A\u0442\u044B', 'https://gagadget.com/rss/specials/'), -# -# Ukrainian -# -# ('\u0423\u0441\u0456 \u043C\u0430\u0442\u0435\u0440\u0456\u0430\u043B\u0438', 'https://gagadget.com/uk/rss/'), -# ('\u041D\u043E\u0432\u0438\u043D\u0438', 'https://gagadget.com/uk/rss/news/'), -# ('\u0421\u0442\u0430\u0442\u0442\u0456', 'https://gagadget.com/uk/rss/articles/'), -# ('\u041E\u0433\u043B\u044F\u0434\u0438', 'https://gagadget.com/uk/rss/reviews/'), -# -# English -# -# ('Gagadget', 'https://gagadget.com/en/rss/'), -# ('News', 'https://gagadget.com/en/rss/news/'), -# -# German -# -# ('Gagadget', 'https://gagadget.com/de/rss/'), -# ('Nachrichten', 'https://gagadget.com/de/rss/news/'), -# ('Tests', 'https://gagadget.com/de/rss/reviews/'), -# ('Artikel', 'https://gagadget.com/de/rss/articles/'), -# -# Norwegian -# -# ('Gagadget', 'https://gagadget.com/nb/rss/'), -# ('Nyheter', 'https://gagadget.com/nb/rss/news/'), -# ('Anmeldelser', 'https://gagadget.com/nb/rss/reviews/'), -# ('Artikler', 'https://gagadget.com/nb/rss/articles/'), -# -# Dutch -# -# ('Gagadget', 'https://gagadget.com/nl/rss/'), -# ('Nieuws', 'https://gagadget.com/nl/rss/news/'), -# ('Recensies', 'https://gagadget.com/nl/rss/reviews/'), -# ('Artikelen', 'https://gagadget.com/nl/rss/articles/'), -# -# Spanish -# -# ('Gagadget', 'https://gagadget.com/es/rss/'), -# ('Noticias', 'https://gagadget.com/es/rss/news/'), -# ('Rese\u00F1as', 'https://gagadget.com/es/rss/reviews/'), -# ('Art\u00EDculos', 'https://gagadget.com/es/rss/articles/'), -# -# Italian -# -# ('Gagadget', 'https://gagadget.com/it/rss/'), -# ('Notizia', 'https://gagadget.com/it/rss/news/'), -# ('Recensioni', 'https://gagadget.com/it/rss/reviews/'), -# ('Articoli', 'https://gagadget.com/it/rss/articles/'), -# -# French -# - ('Gagadget', 'https://gagadget.com/fr/rss/'), - ('Nouvelles', 'https://gagadget.com/fr/rss/news/'), - ('Commentaires', 'https://gagadget.com/fr/rss/reviews/'), - ('Des articles', 'https://gagadget.com/fr/rss/articles/'), -# - ] + # Russian + # ('\u0412\u0441\u0435 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u044B', 'https://gagadget.com/rss/'), + # ('\u041D\u043E\u0432\u043E\u0441\u0442\u0438', 'https://gagadget.com/rss/news/'), + # ('\u0421\u0442\u0430\u0442\u044C\u0438', 'https://gagadget.com/rss/articles/'), + # ('\u041E\u0431\u0437\u043E\u0440\u044B', 'https://gagadget.com/rss/reviews/'), + # ('\u0421\u043F\u0435\u0446\u043F\u0440\u043E\u0435\u043A\u0442\u044B', 'https://gagadget.com/rss/specials/'), + + # Ukrainian + # ('\u0423\u0441\u0456 \u043C\u0430\u0442\u0435\u0440\u0456\u0430\u043B\u0438', 'https://gagadget.com/uk/rss/'), + # ('\u041D\u043E\u0432\u0438\u043D\u0438', 'https://gagadget.com/uk/rss/news/'), + # ('\u0421\u0442\u0430\u0442\u0442\u0456', 'https://gagadget.com/uk/rss/articles/'), + # ('\u041E\u0433\u043B\u044F\u0434\u0438', 'https://gagadget.com/uk/rss/reviews/'), + + # English + # ('Gagadget', 'https://gagadget.com/en/rss/'), + # ('News', 'https://gagadget.com/en/rss/news/'), + + # German + # ('Gagadget', 'https://gagadget.com/de/rss/'), + # ('Nachrichten', 'https://gagadget.com/de/rss/news/'), + # ('Tests', 'https://gagadget.com/de/rss/reviews/'), + # ('Artikel', 'https://gagadget.com/de/rss/articles/'), + + # Norwegian + # ('Gagadget', 'https://gagadget.com/nb/rss/'), + # ('Nyheter', 'https://gagadget.com/nb/rss/news/'), + # ('Anmeldelser', 'https://gagadget.com/nb/rss/reviews/'), + # ('Artikler', 'https://gagadget.com/nb/rss/articles/'), + + # Dutch + # ('Gagadget', 'https://gagadget.com/nl/rss/'), + # ('Nieuws', 'https://gagadget.com/nl/rss/news/'), + # ('Recensies', 'https://gagadget.com/nl/rss/reviews/'), + # ('Artikelen', 'https://gagadget.com/nl/rss/articles/'), + + # Spanish + # ('Gagadget', 'https://gagadget.com/es/rss/'), + # ('Noticias', 'https://gagadget.com/es/rss/news/'), + # ('Rese\u00F1as', 'https://gagadget.com/es/rss/reviews/'), + # ('Art\u00EDculos', 'https://gagadget.com/es/rss/articles/'), + + # Italian + # ('Gagadget', 'https://gagadget.com/it/rss/'), + # ('Notizia', 'https://gagadget.com/it/rss/news/'), + # ('Recensioni', 'https://gagadget.com/it/rss/reviews/'), + # ('Articoli', 'https://gagadget.com/it/rss/articles/'), + + # French + ('Gagadget', 'https://gagadget.com/fr/rss/'), + ('Nouvelles', 'https://gagadget.com/fr/rss/news/'), + ('Commentaires', 'https://gagadget.com/fr/rss/reviews/'), + ('Des articles', 'https://gagadget.com/fr/rss/articles/'), + ] diff --git a/recipes/gagadget_it.recipe b/recipes/gagadget_it.recipe index 340f0956db..45c001e9c0 100644 --- a/recipes/gagadget_it.recipe +++ b/recipes/gagadget_it.recipe @@ -12,15 +12,15 @@ class Gagadget(BasicNewsRecipe): publication_type = 'news' oldest_article = 7 max_articles_per_feed = 100 -# language = 'ru_UK' -# language = 'uk' -# language = 'en_UK' -# language = 'de' -# language = 'nb' -# language = 'nl' -# language = 'es' + # language = 'ru_UK' + # language = 'uk' + # language = 'en_UK' + # language = 'de' + # language = 'nb' + # language = 'nl' + # language = 'es' language = 'it' -# language = 'fr' + # language = 'fr' cover_url = 'https://gagadget.com/static/img/gagadget.jpg' auto_cleanup = False no_stylesheets = False @@ -28,77 +28,65 @@ class Gagadget(BasicNewsRecipe): remove_tags_before = dict(name='h1') remove_tags_after = dict(name='div', attrs={'class': 'l-inner l-inner_high'}) -# -# Ukrainian version only -# -# remove_tags_after = dict(name='div', attrs={'class': 'top20 bottom20 post-links'}) -# -# remove_tags = [ -# dict(name='div', attrs={'class': 'footer-content'}), -# ] + + # Ukrainian version only + # remove_tags_after = dict(name='div', attrs={'class': 'top20 bottom20 post-links'}) + + # remove_tags = [ + # dict(name='div', attrs={'class': 'footer-content'}), + # ] feeds = [ -# -# Russian -# -# ('\u0412\u0441\u0435 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u044B', 'https://gagadget.com/rss/'), -# ('\u041D\u043E\u0432\u043E\u0441\u0442\u0438', 'https://gagadget.com/rss/news/'), -# ('\u0421\u0442\u0430\u0442\u044C\u0438', 'https://gagadget.com/rss/articles/'), -# ('\u041E\u0431\u0437\u043E\u0440\u044B', 'https://gagadget.com/rss/reviews/'), -# ('\u0421\u043F\u0435\u0446\u043F\u0440\u043E\u0435\u043A\u0442\u044B', 'https://gagadget.com/rss/specials/'), -# -# Ukrainian -# -# ('\u0423\u0441\u0456 \u043C\u0430\u0442\u0435\u0440\u0456\u0430\u043B\u0438', 'https://gagadget.com/uk/rss/'), -# ('\u041D\u043E\u0432\u0438\u043D\u0438', 'https://gagadget.com/uk/rss/news/'), -# ('\u0421\u0442\u0430\u0442\u0442\u0456', 'https://gagadget.com/uk/rss/articles/'), -# ('\u041E\u0433\u043B\u044F\u0434\u0438', 'https://gagadget.com/uk/rss/reviews/'), -# -# English -# -# ('Gagadget', 'https://gagadget.com/en/rss/'), -# ('News', 'https://gagadget.com/en/rss/news/'), -# -# German -# -# ('Gagadget', 'https://gagadget.com/de/rss/'), -# ('Nachrichten', 'https://gagadget.com/de/rss/news/'), -# ('Tests', 'https://gagadget.com/de/rss/reviews/'), -# ('Artikel', 'https://gagadget.com/de/rss/articles/'), -# -# Norwegian -# -# ('Gagadget', 'https://gagadget.com/nb/rss/'), -# ('Nyheter', 'https://gagadget.com/nb/rss/news/'), -# ('Anmeldelser', 'https://gagadget.com/nb/rss/reviews/'), -# ('Artikler', 'https://gagadget.com/nb/rss/articles/'), -# -# Dutch -# -# ('Gagadget', 'https://gagadget.com/nl/rss/'), -# ('Nieuws', 'https://gagadget.com/nl/rss/news/'), -# ('Recensies', 'https://gagadget.com/nl/rss/reviews/'), -# ('Artikelen', 'https://gagadget.com/nl/rss/articles/'), -# -# Spanish -# -# ('Gagadget', 'https://gagadget.com/es/rss/'), -# ('Noticias', 'https://gagadget.com/es/rss/news/'), -# ('Rese\u00F1as', 'https://gagadget.com/es/rss/reviews/'), -# ('Art\u00EDculos', 'https://gagadget.com/es/rss/articles/'), -# -# Italian -# - ('Gagadget', 'https://gagadget.com/it/rss/'), - ('Notizia', 'https://gagadget.com/it/rss/news/'), - ('Recensioni', 'https://gagadget.com/it/rss/reviews/'), - ('Articoli', 'https://gagadget.com/it/rss/articles/'), -# -# French -# -# ('Gagadget', 'https://gagadget.com/fr/rss/'), -# ('Nouvelles', 'https://gagadget.com/fr/rss/news/'), -# ('Commentaires', 'https://gagadget.com/fr/rss/reviews/'), -# ('Des articles', 'https://gagadget.com/fr/rss/articles/'), -# - ] + # Russian + # ('\u0412\u0441\u0435 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u044B', 'https://gagadget.com/rss/'), + # ('\u041D\u043E\u0432\u043E\u0441\u0442\u0438', 'https://gagadget.com/rss/news/'), + # ('\u0421\u0442\u0430\u0442\u044C\u0438', 'https://gagadget.com/rss/articles/'), + # ('\u041E\u0431\u0437\u043E\u0440\u044B', 'https://gagadget.com/rss/reviews/'), + # ('\u0421\u043F\u0435\u0446\u043F\u0440\u043E\u0435\u043A\u0442\u044B', 'https://gagadget.com/rss/specials/'), + + # Ukrainian + # ('\u0423\u0441\u0456 \u043C\u0430\u0442\u0435\u0440\u0456\u0430\u043B\u0438', 'https://gagadget.com/uk/rss/'), + # ('\u041D\u043E\u0432\u0438\u043D\u0438', 'https://gagadget.com/uk/rss/news/'), + # ('\u0421\u0442\u0430\u0442\u0442\u0456', 'https://gagadget.com/uk/rss/articles/'), + # ('\u041E\u0433\u043B\u044F\u0434\u0438', 'https://gagadget.com/uk/rss/reviews/'), + + # English + # ('Gagadget', 'https://gagadget.com/en/rss/'), + # ('News', 'https://gagadget.com/en/rss/news/'), + + # German + # ('Gagadget', 'https://gagadget.com/de/rss/'), + # ('Nachrichten', 'https://gagadget.com/de/rss/news/'), + # ('Tests', 'https://gagadget.com/de/rss/reviews/'), + # ('Artikel', 'https://gagadget.com/de/rss/articles/'), + + # Norwegian + # ('Gagadget', 'https://gagadget.com/nb/rss/'), + # ('Nyheter', 'https://gagadget.com/nb/rss/news/'), + # ('Anmeldelser', 'https://gagadget.com/nb/rss/reviews/'), + # ('Artikler', 'https://gagadget.com/nb/rss/articles/'), + + # Dutch + # ('Gagadget', 'https://gagadget.com/nl/rss/'), + # ('Nieuws', 'https://gagadget.com/nl/rss/news/'), + # ('Recensies', 'https://gagadget.com/nl/rss/reviews/'), + # ('Artikelen', 'https://gagadget.com/nl/rss/articles/'), + + # Spanish + # ('Gagadget', 'https://gagadget.com/es/rss/'), + # ('Noticias', 'https://gagadget.com/es/rss/news/'), + # ('Rese\u00F1as', 'https://gagadget.com/es/rss/reviews/'), + # ('Art\u00EDculos', 'https://gagadget.com/es/rss/articles/'), + + # Italian + ('Gagadget', 'https://gagadget.com/it/rss/'), + ('Notizia', 'https://gagadget.com/it/rss/news/'), + ('Recensioni', 'https://gagadget.com/it/rss/reviews/'), + ('Articoli', 'https://gagadget.com/it/rss/articles/'), + + # French + # ('Gagadget', 'https://gagadget.com/fr/rss/'), + # ('Nouvelles', 'https://gagadget.com/fr/rss/news/'), + # ('Commentaires', 'https://gagadget.com/fr/rss/reviews/'), + # ('Des articles', 'https://gagadget.com/fr/rss/articles/'), + ] diff --git a/recipes/gagadget_nb.recipe b/recipes/gagadget_nb.recipe index af1548f1f4..19dc15a06c 100644 --- a/recipes/gagadget_nb.recipe +++ b/recipes/gagadget_nb.recipe @@ -12,15 +12,15 @@ class Gagadget(BasicNewsRecipe): publication_type = 'news' oldest_article = 7 max_articles_per_feed = 100 -# language = 'ru_UK' -# language = 'uk' -# language = 'en_UK' -# language = 'de' + # language = 'ru_UK' + # language = 'uk' + # language = 'en_UK' + # language = 'de' language = 'nb' -# language = 'nl' -# language = 'es' -# language = 'it' -# language = 'fr' + # language = 'nl' + # language = 'es' + # language = 'it' + # language = 'fr' cover_url = 'https://gagadget.com/static/img/gagadget.jpg' auto_cleanup = False no_stylesheets = False @@ -28,77 +28,65 @@ class Gagadget(BasicNewsRecipe): remove_tags_before = dict(name='h1') remove_tags_after = dict(name='div', attrs={'class': 'l-inner l-inner_high'}) -# -# Ukrainian version only -# -# remove_tags_after = dict(name='div', attrs={'class': 'top20 bottom20 post-links'}) -# -# remove_tags = [ -# dict(name='div', attrs={'class': 'footer-content'}), -# ] + + # Ukrainian version only + # remove_tags_after = dict(name='div', attrs={'class': 'top20 bottom20 post-links'}) + + # remove_tags = [ + # dict(name='div', attrs={'class': 'footer-content'}), + # ] feeds = [ -# -# Russian -# -# ('\u0412\u0441\u0435 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u044B', 'https://gagadget.com/rss/'), -# ('\u041D\u043E\u0432\u043E\u0441\u0442\u0438', 'https://gagadget.com/rss/news/'), -# ('\u0421\u0442\u0430\u0442\u044C\u0438', 'https://gagadget.com/rss/articles/'), -# ('\u041E\u0431\u0437\u043E\u0440\u044B', 'https://gagadget.com/rss/reviews/'), -# ('\u0421\u043F\u0435\u0446\u043F\u0440\u043E\u0435\u043A\u0442\u044B', 'https://gagadget.com/rss/specials/'), -# -# Ukrainian -# -# ('\u0423\u0441\u0456 \u043C\u0430\u0442\u0435\u0440\u0456\u0430\u043B\u0438', 'https://gagadget.com/uk/rss/'), -# ('\u041D\u043E\u0432\u0438\u043D\u0438', 'https://gagadget.com/uk/rss/news/'), -# ('\u0421\u0442\u0430\u0442\u0442\u0456', 'https://gagadget.com/uk/rss/articles/'), -# ('\u041E\u0433\u043B\u044F\u0434\u0438', 'https://gagadget.com/uk/rss/reviews/'), -# -# English -# -# ('Gagadget', 'https://gagadget.com/en/rss/'), -# ('News', 'https://gagadget.com/en/rss/news/'), -# -# German -# -# ('Gagadget', 'https://gagadget.com/de/rss/'), -# ('Nachrichten', 'https://gagadget.com/de/rss/news/'), -# ('Tests', 'https://gagadget.com/de/rss/reviews/'), -# ('Artikel', 'https://gagadget.com/de/rss/articles/'), -# -# Norwegian -# - ('Gagadget', 'https://gagadget.com/nb/rss/'), - ('Nyheter', 'https://gagadget.com/nb/rss/news/'), - ('Anmeldelser', 'https://gagadget.com/nb/rss/reviews/'), - ('Artikler', 'https://gagadget.com/nb/rss/articles/'), -# -# Dutch -# -# ('Gagadget', 'https://gagadget.com/nl/rss/'), -# ('Nieuws', 'https://gagadget.com/nl/rss/news/'), -# ('Recensies', 'https://gagadget.com/nl/rss/reviews/'), -# ('Artikelen', 'https://gagadget.com/nl/rss/articles/'), -# -# Spanish -# -# ('Gagadget', 'https://gagadget.com/es/rss/'), -# ('Noticias', 'https://gagadget.com/es/rss/news/'), -# ('Rese\u00F1as', 'https://gagadget.com/es/rss/reviews/'), -# ('Art\u00EDculos', 'https://gagadget.com/es/rss/articles/'), -# -# Italian -# -# ('Gagadget', 'https://gagadget.com/it/rss/'), -# ('Notizia', 'https://gagadget.com/it/rss/news/'), -# ('Recensioni', 'https://gagadget.com/it/rss/reviews/'), -# ('Articoli', 'https://gagadget.com/it/rss/articles/'), -# -# French -# -# ('Gagadget', 'https://gagadget.com/fr/rss/'), -# ('Nouvelles', 'https://gagadget.com/fr/rss/news/'), -# ('Commentaires', 'https://gagadget.com/fr/rss/reviews/'), -# ('Des articles', 'https://gagadget.com/fr/rss/articles/'), -# - ] + # Russian + # ('\u0412\u0441\u0435 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u044B', 'https://gagadget.com/rss/'), + # ('\u041D\u043E\u0432\u043E\u0441\u0442\u0438', 'https://gagadget.com/rss/news/'), + # ('\u0421\u0442\u0430\u0442\u044C\u0438', 'https://gagadget.com/rss/articles/'), + # ('\u041E\u0431\u0437\u043E\u0440\u044B', 'https://gagadget.com/rss/reviews/'), + # ('\u0421\u043F\u0435\u0446\u043F\u0440\u043E\u0435\u043A\u0442\u044B', 'https://gagadget.com/rss/specials/'), + + # Ukrainian + # ('\u0423\u0441\u0456 \u043C\u0430\u0442\u0435\u0440\u0456\u0430\u043B\u0438', 'https://gagadget.com/uk/rss/'), + # ('\u041D\u043E\u0432\u0438\u043D\u0438', 'https://gagadget.com/uk/rss/news/'), + # ('\u0421\u0442\u0430\u0442\u0442\u0456', 'https://gagadget.com/uk/rss/articles/'), + # ('\u041E\u0433\u043B\u044F\u0434\u0438', 'https://gagadget.com/uk/rss/reviews/'), + + # English + # ('Gagadget', 'https://gagadget.com/en/rss/'), + # ('News', 'https://gagadget.com/en/rss/news/'), + + # German + # ('Gagadget', 'https://gagadget.com/de/rss/'), + # ('Nachrichten', 'https://gagadget.com/de/rss/news/'), + # ('Tests', 'https://gagadget.com/de/rss/reviews/'), + # ('Artikel', 'https://gagadget.com/de/rss/articles/'), + + # Norwegian + ('Gagadget', 'https://gagadget.com/nb/rss/'), + ('Nyheter', 'https://gagadget.com/nb/rss/news/'), + ('Anmeldelser', 'https://gagadget.com/nb/rss/reviews/'), + ('Artikler', 'https://gagadget.com/nb/rss/articles/'), + + # Dutch + # ('Gagadget', 'https://gagadget.com/nl/rss/'), + # ('Nieuws', 'https://gagadget.com/nl/rss/news/'), + # ('Recensies', 'https://gagadget.com/nl/rss/reviews/'), + # ('Artikelen', 'https://gagadget.com/nl/rss/articles/'), + + # Spanish + # ('Gagadget', 'https://gagadget.com/es/rss/'), + # ('Noticias', 'https://gagadget.com/es/rss/news/'), + # ('Rese\u00F1as', 'https://gagadget.com/es/rss/reviews/'), + # ('Art\u00EDculos', 'https://gagadget.com/es/rss/articles/'), + + # Italian + # ('Gagadget', 'https://gagadget.com/it/rss/'), + # ('Notizia', 'https://gagadget.com/it/rss/news/'), + # ('Recensioni', 'https://gagadget.com/it/rss/reviews/'), + # ('Articoli', 'https://gagadget.com/it/rss/articles/'), + + # French + # ('Gagadget', 'https://gagadget.com/fr/rss/'), + # ('Nouvelles', 'https://gagadget.com/fr/rss/news/'), + # ('Commentaires', 'https://gagadget.com/fr/rss/reviews/'), + # ('Des articles', 'https://gagadget.com/fr/rss/articles/'), + ] diff --git a/recipes/gagadget_nl.recipe b/recipes/gagadget_nl.recipe index a4d8e9ccfe..73709506dc 100644 --- a/recipes/gagadget_nl.recipe +++ b/recipes/gagadget_nl.recipe @@ -12,15 +12,15 @@ class Gagadget(BasicNewsRecipe): publication_type = 'news' oldest_article = 7 max_articles_per_feed = 100 -# language = 'ru_UK' -# language = 'uk' -# language = 'en_UK' -# language = 'de' -# language = 'nb' + # language = 'ru_UK' + # language = 'uk' + # language = 'en_UK' + # language = 'de' + # language = 'nb' language = 'nl' -# language = 'es' -# language = 'it' -# language = 'fr' + # language = 'es' + # language = 'it' + # language = 'fr' cover_url = 'https://gagadget.com/static/img/gagadget.jpg' auto_cleanup = False no_stylesheets = False @@ -28,77 +28,65 @@ class Gagadget(BasicNewsRecipe): remove_tags_before = dict(name='h1') remove_tags_after = dict(name='div', attrs={'class': 'l-inner l-inner_high'}) -# -# Ukrainian version only -# -# remove_tags_after = dict(name='div', attrs={'class': 'top20 bottom20 post-links'}) -# -# remove_tags = [ -# dict(name='div', attrs={'class': 'footer-content'}), -# ] + + # Ukrainian version only + # remove_tags_after = dict(name='div', attrs={'class': 'top20 bottom20 post-links'}) + + # remove_tags = [ + # dict(name='div', attrs={'class': 'footer-content'}), + # ] feeds = [ -# -# Russian -# -# ('\u0412\u0441\u0435 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u044B', 'https://gagadget.com/rss/'), -# ('\u041D\u043E\u0432\u043E\u0441\u0442\u0438', 'https://gagadget.com/rss/news/'), -# ('\u0421\u0442\u0430\u0442\u044C\u0438', 'https://gagadget.com/rss/articles/'), -# ('\u041E\u0431\u0437\u043E\u0440\u044B', 'https://gagadget.com/rss/reviews/'), -# ('\u0421\u043F\u0435\u0446\u043F\u0440\u043E\u0435\u043A\u0442\u044B', 'https://gagadget.com/rss/specials/'), -# -# Ukrainian -# -# ('\u0423\u0441\u0456 \u043C\u0430\u0442\u0435\u0440\u0456\u0430\u043B\u0438', 'https://gagadget.com/uk/rss/'), -# ('\u041D\u043E\u0432\u0438\u043D\u0438', 'https://gagadget.com/uk/rss/news/'), -# ('\u0421\u0442\u0430\u0442\u0442\u0456', 'https://gagadget.com/uk/rss/articles/'), -# ('\u041E\u0433\u043B\u044F\u0434\u0438', 'https://gagadget.com/uk/rss/reviews/'), -# -# English -# -# ('Gagadget', 'https://gagadget.com/en/rss/'), -# ('News', 'https://gagadget.com/en/rss/news/'), -# -# German -# -# ('Gagadget', 'https://gagadget.com/de/rss/'), -# ('Nachrichten', 'https://gagadget.com/de/rss/news/'), -# ('Tests', 'https://gagadget.com/de/rss/reviews/'), -# ('Artikel', 'https://gagadget.com/de/rss/articles/'), -# -# Norwegian -# -# ('Gagadget', 'https://gagadget.com/nb/rss/'), -# ('Nyheter', 'https://gagadget.com/nb/rss/news/'), -# ('Anmeldelser', 'https://gagadget.com/nb/rss/reviews/'), -# ('Artikler', 'https://gagadget.com/nb/rss/articles/'), -# -# Dutch -# - ('Gagadget', 'https://gagadget.com/nl/rss/'), - ('Nieuws', 'https://gagadget.com/nl/rss/news/'), - ('Recensies', 'https://gagadget.com/nl/rss/reviews/'), - ('Artikelen', 'https://gagadget.com/nl/rss/articles/'), -# -# Spanish -# -# ('Gagadget', 'https://gagadget.com/es/rss/'), -# ('Noticias', 'https://gagadget.com/es/rss/news/'), -# ('Rese\u00F1as', 'https://gagadget.com/es/rss/reviews/'), -# ('Art\u00EDculos', 'https://gagadget.com/es/rss/articles/'), -# -# Italian -# -# ('Gagadget', 'https://gagadget.com/it/rss/'), -# ('Notizia', 'https://gagadget.com/it/rss/news/'), -# ('Recensioni', 'https://gagadget.com/it/rss/reviews/'), -# ('Articoli', 'https://gagadget.com/it/rss/articles/'), -# -# French -# -# ('Gagadget', 'https://gagadget.com/fr/rss/'), -# ('Nouvelles', 'https://gagadget.com/fr/rss/news/'), -# ('Commentaires', 'https://gagadget.com/fr/rss/reviews/'), -# ('Des articles', 'https://gagadget.com/fr/rss/articles/'), -# - ] + # Russian + # ('\u0412\u0441\u0435 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u044B', 'https://gagadget.com/rss/'), + # ('\u041D\u043E\u0432\u043E\u0441\u0442\u0438', 'https://gagadget.com/rss/news/'), + # ('\u0421\u0442\u0430\u0442\u044C\u0438', 'https://gagadget.com/rss/articles/'), + # ('\u041E\u0431\u0437\u043E\u0440\u044B', 'https://gagadget.com/rss/reviews/'), + # ('\u0421\u043F\u0435\u0446\u043F\u0440\u043E\u0435\u043A\u0442\u044B', 'https://gagadget.com/rss/specials/'), + + # Ukrainian + # ('\u0423\u0441\u0456 \u043C\u0430\u0442\u0435\u0440\u0456\u0430\u043B\u0438', 'https://gagadget.com/uk/rss/'), + # ('\u041D\u043E\u0432\u0438\u043D\u0438', 'https://gagadget.com/uk/rss/news/'), + # ('\u0421\u0442\u0430\u0442\u0442\u0456', 'https://gagadget.com/uk/rss/articles/'), + # ('\u041E\u0433\u043B\u044F\u0434\u0438', 'https://gagadget.com/uk/rss/reviews/'), + + # English + # ('Gagadget', 'https://gagadget.com/en/rss/'), + # ('News', 'https://gagadget.com/en/rss/news/'), + + # German + # ('Gagadget', 'https://gagadget.com/de/rss/'), + # ('Nachrichten', 'https://gagadget.com/de/rss/news/'), + # ('Tests', 'https://gagadget.com/de/rss/reviews/'), + # ('Artikel', 'https://gagadget.com/de/rss/articles/'), + + # Norwegian + # ('Gagadget', 'https://gagadget.com/nb/rss/'), + # ('Nyheter', 'https://gagadget.com/nb/rss/news/'), + # ('Anmeldelser', 'https://gagadget.com/nb/rss/reviews/'), + # ('Artikler', 'https://gagadget.com/nb/rss/articles/'), + + # Dutch + ('Gagadget', 'https://gagadget.com/nl/rss/'), + ('Nieuws', 'https://gagadget.com/nl/rss/news/'), + ('Recensies', 'https://gagadget.com/nl/rss/reviews/'), + ('Artikelen', 'https://gagadget.com/nl/rss/articles/'), + + # Spanish + # ('Gagadget', 'https://gagadget.com/es/rss/'), + # ('Noticias', 'https://gagadget.com/es/rss/news/'), + # ('Rese\u00F1as', 'https://gagadget.com/es/rss/reviews/'), + # ('Art\u00EDculos', 'https://gagadget.com/es/rss/articles/'), + + # Italian + # ('Gagadget', 'https://gagadget.com/it/rss/'), + # ('Notizia', 'https://gagadget.com/it/rss/news/'), + # ('Recensioni', 'https://gagadget.com/it/rss/reviews/'), + # ('Articoli', 'https://gagadget.com/it/rss/articles/'), + + # French + # ('Gagadget', 'https://gagadget.com/fr/rss/'), + # ('Nouvelles', 'https://gagadget.com/fr/rss/news/'), + # ('Commentaires', 'https://gagadget.com/fr/rss/reviews/'), + # ('Des articles', 'https://gagadget.com/fr/rss/articles/'), + ] diff --git a/recipes/gagadget_ru.recipe b/recipes/gagadget_ru.recipe index ac42220456..74405b3672 100644 --- a/recipes/gagadget_ru.recipe +++ b/recipes/gagadget_ru.recipe @@ -14,14 +14,14 @@ class Gagadget(BasicNewsRecipe): oldest_article = 7 max_articles_per_feed = 100 language = 'ru_UK' -# language = 'uk' -# language = 'en_UK' -# language = 'de' -# language = 'nb' -# language = 'nl' -# language = 'es' -# language = 'it' -# language = 'fr' + # language = 'uk' + # language = 'en_UK' + # language = 'de' + # language = 'nb' + # language = 'nl' + # language = 'es' + # language = 'it' + # language = 'fr' cover_url = 'https://gagadget.com/static/img/gagadget.jpg' auto_cleanup = False no_stylesheets = False @@ -29,77 +29,65 @@ class Gagadget(BasicNewsRecipe): remove_tags_before = dict(name='h1') remove_tags_after = dict(name='div', attrs={'class': 'l-inner l-inner_high'}) -# -# Ukrainian version only -# -# remove_tags_after = dict(name='div', attrs={'class': 'top20 bottom20 post-links'}) -# -# remove_tags = [ -# dict(name='div', attrs={'class': 'footer-content'}), -# ] + + # Ukrainian version only + # remove_tags_after = dict(name='div', attrs={'class': 'top20 bottom20 post-links'}) + + # remove_tags = [ + # dict(name='div', attrs={'class': 'footer-content'}), + # ] feeds = [ -# -# Russian -# - ('\u0412\u0441\u0435 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u044B', 'https://gagadget.com/rss/'), - ('\u041D\u043E\u0432\u043E\u0441\u0442\u0438', 'https://gagadget.com/rss/news/'), - ('\u0421\u0442\u0430\u0442\u044C\u0438', 'https://gagadget.com/rss/articles/'), - ('\u041E\u0431\u0437\u043E\u0440\u044B', 'https://gagadget.com/rss/reviews/'), -# ('\u0421\u043F\u0435\u0446\u043F\u0440\u043E\u0435\u043A\u0442\u044B', 'https://gagadget.com/rss/specials/'), -# -# Ukrainian -# -# ('\u0423\u0441\u0456 \u043C\u0430\u0442\u0435\u0440\u0456\u0430\u043B\u0438', 'https://gagadget.com/uk/rss/'), -# ('\u041D\u043E\u0432\u0438\u043D\u0438', 'https://gagadget.com/uk/rss/news/'), -# ('\u0421\u0442\u0430\u0442\u0442\u0456', 'https://gagadget.com/uk/rss/articles/'), -# ('\u041E\u0433\u043B\u044F\u0434\u0438', 'https://gagadget.com/uk/rss/reviews/'), -# -# English -# -# ('Gagadget', 'https://gagadget.com/en/rss/'), -# ('News', 'https://gagadget.com/en/rss/news/'), -# -# German -# -# ('Gagadget', 'https://gagadget.com/de/rss/'), -# ('Nachrichten', 'https://gagadget.com/de/rss/news/'), -# ('Tests', 'https://gagadget.com/de/rss/reviews/'), -# ('Artikel', 'https://gagadget.com/de/rss/articles/'), -# -# Norwegian -# -# ('Gagadget', 'https://gagadget.com/nb/rss/'), -# ('Nyheter', 'https://gagadget.com/nb/rss/news/'), -# ('Anmeldelser', 'https://gagadget.com/nb/rss/reviews/'), -# ('Artikler', 'https://gagadget.com/nb/rss/articles/'), -# -# Dutch -# -# ('Gagadget', 'https://gagadget.com/nl/rss/'), -# ('Nieuws', 'https://gagadget.com/nl/rss/news/'), -# ('Recensies', 'https://gagadget.com/nl/rss/reviews/'), -# ('Artikelen', 'https://gagadget.com/nl/rss/articles/'), -# -# Spanish -# -# ('Gagadget', 'https://gagadget.com/es/rss/'), -# ('Noticias', 'https://gagadget.com/es/rss/news/'), -# ('Rese\u00F1as', 'https://gagadget.com/es/rss/reviews/'), -# ('Art\u00EDculos', 'https://gagadget.com/es/rss/articles/'), -# -# Italian -# -# ('Gagadget', 'https://gagadget.com/it/rss/'), -# ('Notizia', 'https://gagadget.com/it/rss/news/'), -# ('Recensioni', 'https://gagadget.com/it/rss/reviews/'), -# ('Articoli', 'https://gagadget.com/it/rss/articles/'), -# -# French -# -# ('Gagadget', 'https://gagadget.com/fr/rss/'), -# ('Nouvelles', 'https://gagadget.com/fr/rss/news/'), -# ('Commentaires', 'https://gagadget.com/fr/rss/reviews/'), -# ('Des articles', 'https://gagadget.com/fr/rss/articles/'), -# - ] + # Russian + ('\u0412\u0441\u0435 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u044B', 'https://gagadget.com/rss/'), + ('\u041D\u043E\u0432\u043E\u0441\u0442\u0438', 'https://gagadget.com/rss/news/'), + ('\u0421\u0442\u0430\u0442\u044C\u0438', 'https://gagadget.com/rss/articles/'), + ('\u041E\u0431\u0437\u043E\u0440\u044B', 'https://gagadget.com/rss/reviews/'), + # ('\u0421\u043F\u0435\u0446\u043F\u0440\u043E\u0435\u043A\u0442\u044B', 'https://gagadget.com/rss/specials/'), + + # Ukrainian + # ('\u0423\u0441\u0456 \u043C\u0430\u0442\u0435\u0440\u0456\u0430\u043B\u0438', 'https://gagadget.com/uk/rss/'), + # ('\u041D\u043E\u0432\u0438\u043D\u0438', 'https://gagadget.com/uk/rss/news/'), + # ('\u0421\u0442\u0430\u0442\u0442\u0456', 'https://gagadget.com/uk/rss/articles/'), + # ('\u041E\u0433\u043B\u044F\u0434\u0438', 'https://gagadget.com/uk/rss/reviews/'), + + # English + # ('Gagadget', 'https://gagadget.com/en/rss/'), + # ('News', 'https://gagadget.com/en/rss/news/'), + + # German + # ('Gagadget', 'https://gagadget.com/de/rss/'), + # ('Nachrichten', 'https://gagadget.com/de/rss/news/'), + # ('Tests', 'https://gagadget.com/de/rss/reviews/'), + # ('Artikel', 'https://gagadget.com/de/rss/articles/'), + + # Norwegian + # ('Gagadget', 'https://gagadget.com/nb/rss/'), + # ('Nyheter', 'https://gagadget.com/nb/rss/news/'), + # ('Anmeldelser', 'https://gagadget.com/nb/rss/reviews/'), + # ('Artikler', 'https://gagadget.com/nb/rss/articles/'), + + # Dutch + # ('Gagadget', 'https://gagadget.com/nl/rss/'), + # ('Nieuws', 'https://gagadget.com/nl/rss/news/'), + # ('Recensies', 'https://gagadget.com/nl/rss/reviews/'), + # ('Artikelen', 'https://gagadget.com/nl/rss/articles/'), + + # Spanish + # ('Gagadget', 'https://gagadget.com/es/rss/'), + # ('Noticias', 'https://gagadget.com/es/rss/news/'), + # ('Rese\u00F1as', 'https://gagadget.com/es/rss/reviews/'), + # ('Art\u00EDculos', 'https://gagadget.com/es/rss/articles/'), + + # Italian + # ('Gagadget', 'https://gagadget.com/it/rss/'), + # ('Notizia', 'https://gagadget.com/it/rss/news/'), + # ('Recensioni', 'https://gagadget.com/it/rss/reviews/'), + # ('Articoli', 'https://gagadget.com/it/rss/articles/'), + + # French + # ('Gagadget', 'https://gagadget.com/fr/rss/'), + # ('Nouvelles', 'https://gagadget.com/fr/rss/news/'), + # ('Commentaires', 'https://gagadget.com/fr/rss/reviews/'), + # ('Des articles', 'https://gagadget.com/fr/rss/articles/'), + ] diff --git a/recipes/gagadget_ua.recipe b/recipes/gagadget_ua.recipe index 41509af5ce..06858d7454 100644 --- a/recipes/gagadget_ua.recipe +++ b/recipes/gagadget_ua.recipe @@ -12,93 +12,81 @@ class Gagadget(BasicNewsRecipe): publication_type = 'news' oldest_article = 7 max_articles_per_feed = 100 -# language = 'ru_UK' + # language = 'ru_UK' language = 'uk' -# language = 'en_UK' -# language = 'de' -# language = 'nb' -# language = 'nl' -# language = 'es' -# language = 'it' -# language = 'fr' + # language = 'en_UK' + # language = 'de' + # language = 'nb' + # language = 'nl' + # language = 'es' + # language = 'it' + # language = 'fr' cover_url = 'https://gagadget.com/static/img/gagadget.jpg' auto_cleanup = False no_stylesheets = False remove_tags_before = dict(name='h1') -# remove_tags_after = dict(name='div', attrs={'class': 'l-inner l-inner_high'}) -# -# Ukrainian version only -# + # remove_tags_after = dict(name='div', attrs={'class': 'l-inner l-inner_high'}) + + # Ukrainian version only remove_tags_after = dict(name='div', attrs={'class': 'top20 bottom20 post-links'}) remove_tags = [ dict(name='div', attrs={'class': 'footer-content'}), - ] + ] feeds = [ -# -# Russian -# -# ('\u0412\u0441\u0435 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u044B', 'https://gagadget.com/rss/'), -# ('\u041D\u043E\u0432\u043E\u0441\u0442\u0438', 'https://gagadget.com/rss/news/'), -# ('\u0421\u0442\u0430\u0442\u044C\u0438', 'https://gagadget.com/rss/articles/'), -# ('\u041E\u0431\u0437\u043E\u0440\u044B', 'https://gagadget.com/rss/reviews/'), -# ('\u0421\u043F\u0435\u0446\u043F\u0440\u043E\u0435\u043A\u0442\u044B', 'https://gagadget.com/rss/specials/'), -# -# Ukrainian -# - ('\u0423\u0441\u0456 \u043C\u0430\u0442\u0435\u0440\u0456\u0430\u043B\u0438', 'https://gagadget.com/uk/rss/'), - ('\u041D\u043E\u0432\u0438\u043D\u0438', 'https://gagadget.com/uk/rss/news/'), - ('\u0421\u0442\u0430\u0442\u0442\u0456', 'https://gagadget.com/uk/rss/articles/'), - ('\u041E\u0433\u043B\u044F\u0434\u0438', 'https://gagadget.com/uk/rss/reviews/'), -# -# English -# -# ('Gagadget', 'https://gagadget.com/en/rss/'), -# ('News', 'https://gagadget.com/en/rss/news/'), -# -# German -# -# ('Gagadget', 'https://gagadget.com/de/rss/'), -# ('Nachrichten', 'https://gagadget.com/de/rss/news/'), -# ('Tests', 'https://gagadget.com/de/rss/reviews/'), -# ('Artikel', 'https://gagadget.com/de/rss/articles/'), -# -# Norwegian -# -# ('Gagadget', 'https://gagadget.com/nb/rss/'), -# ('Nyheter', 'https://gagadget.com/nb/rss/news/'), -# ('Anmeldelser', 'https://gagadget.com/nb/rss/reviews/'), -# ('Artikler', 'https://gagadget.com/nb/rss/articles/'), -# -# Dutch -# -# ('Gagadget', 'https://gagadget.com/nl/rss/'), -# ('Nieuws', 'https://gagadget.com/nl/rss/news/'), -# ('Recensies', 'https://gagadget.com/nl/rss/reviews/'), -# ('Artikelen', 'https://gagadget.com/nl/rss/articles/'), -# -# Spanish -# -# ('Gagadget', 'https://gagadget.com/es/rss/'), -# ('Noticias', 'https://gagadget.com/es/rss/news/'), -# ('Rese\u00F1as', 'https://gagadget.com/es/rss/reviews/'), -# ('Art\u00EDculos', 'https://gagadget.com/es/rss/articles/'), -# -# Italian -# -# ('Gagadget', 'https://gagadget.com/it/rss/'), -# ('Notizia', 'https://gagadget.com/it/rss/news/'), -# ('Recensioni', 'https://gagadget.com/it/rss/reviews/'), -# ('Articoli', 'https://gagadget.com/it/rss/articles/'), -# -# French -# -# ('Gagadget', 'https://gagadget.com/fr/rss/'), -# ('Nouvelles', 'https://gagadget.com/fr/rss/news/'), -# ('Commentaires', 'https://gagadget.com/fr/rss/reviews/'), -# ('Des articles', 'https://gagadget.com/fr/rss/articles/'), -# - ] + # Russian + # ('\u0412\u0441\u0435 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u044B', 'https://gagadget.com/rss/'), + # ('\u041D\u043E\u0432\u043E\u0441\u0442\u0438', 'https://gagadget.com/rss/news/'), + # ('\u0421\u0442\u0430\u0442\u044C\u0438', 'https://gagadget.com/rss/articles/'), + # ('\u041E\u0431\u0437\u043E\u0440\u044B', 'https://gagadget.com/rss/reviews/'), + # ('\u0421\u043F\u0435\u0446\u043F\u0440\u043E\u0435\u043A\u0442\u044B', 'https://gagadget.com/rss/specials/'), + + # Ukrainian + ('\u0423\u0441\u0456 \u043C\u0430\u0442\u0435\u0440\u0456\u0430\u043B\u0438', 'https://gagadget.com/uk/rss/'), + ('\u041D\u043E\u0432\u0438\u043D\u0438', 'https://gagadget.com/uk/rss/news/'), + ('\u0421\u0442\u0430\u0442\u0442\u0456', 'https://gagadget.com/uk/rss/articles/'), + ('\u041E\u0433\u043B\u044F\u0434\u0438', 'https://gagadget.com/uk/rss/reviews/'), + + # English + # ('Gagadget', 'https://gagadget.com/en/rss/'), + # ('News', 'https://gagadget.com/en/rss/news/'), + + # German + # ('Gagadget', 'https://gagadget.com/de/rss/'), + # ('Nachrichten', 'https://gagadget.com/de/rss/news/'), + # ('Tests', 'https://gagadget.com/de/rss/reviews/'), + # ('Artikel', 'https://gagadget.com/de/rss/articles/'), + + # Norwegian + # ('Gagadget', 'https://gagadget.com/nb/rss/'), + # ('Nyheter', 'https://gagadget.com/nb/rss/news/'), + # ('Anmeldelser', 'https://gagadget.com/nb/rss/reviews/'), + # ('Artikler', 'https://gagadget.com/nb/rss/articles/'), + + # Dutch + # ('Gagadget', 'https://gagadget.com/nl/rss/'), + # ('Nieuws', 'https://gagadget.com/nl/rss/news/'), + # ('Recensies', 'https://gagadget.com/nl/rss/reviews/'), + # ('Artikelen', 'https://gagadget.com/nl/rss/articles/'), + + # Spanish + # ('Gagadget', 'https://gagadget.com/es/rss/'), + # ('Noticias', 'https://gagadget.com/es/rss/news/'), + # ('Rese\u00F1as', 'https://gagadget.com/es/rss/reviews/'), + # ('Art\u00EDculos', 'https://gagadget.com/es/rss/articles/'), + + # Italian + # ('Gagadget', 'https://gagadget.com/it/rss/'), + # ('Notizia', 'https://gagadget.com/it/rss/news/'), + # ('Recensioni', 'https://gagadget.com/it/rss/reviews/'), + # ('Articoli', 'https://gagadget.com/it/rss/articles/'), + + # French + # ('Gagadget', 'https://gagadget.com/fr/rss/'), + # ('Nouvelles', 'https://gagadget.com/fr/rss/news/'), + # ('Commentaires', 'https://gagadget.com/fr/rss/reviews/'), + # ('Des articles', 'https://gagadget.com/fr/rss/articles/'), + ] diff --git a/recipes/granta.recipe b/recipes/granta.recipe index a0597bdc4e..3b84de65a6 100644 --- a/recipes/granta.recipe +++ b/recipes/granta.recipe @@ -47,7 +47,7 @@ def multiply_with_unknown_component(first_comp, second_comp, result): def solve_captcha(captcha): - # # Convert from a word problem into a numeric problem + # Convert from a word problem into a numeric problem numeric_problem = '' for part in captcha.split(' '): numeric_problem = numeric_problem + str(text2num(part)) diff --git a/recipes/hackernews.recipe b/recipes/hackernews.recipe index a2eaa62457..6efaa787d5 100644 --- a/recipes/hackernews.recipe +++ b/recipes/hackernews.recipe @@ -136,7 +136,7 @@ class HNWithCommentsLink(BasicNewsRecipe): article.text_summary = self.prettyify_url(article.url) article.summary = article.text_summary -# def parse_index(self): -# feeds = [] -# feeds.append((u'Hacker News',[{'title': 'Testing', 'url': 'https://news.ycombinator.com/item?id=2935944'}])) -# return feeds + # def parse_index(self): + # feeds = [] + # feeds.append((u'Hacker News',[{'title': 'Testing', 'url': 'https://news.ycombinator.com/item?id=2935944'}])) + # return feeds diff --git a/recipes/il_messaggero.recipe b/recipes/il_messaggero.recipe index 0743007cdf..43b67cf76a 100644 --- a/recipes/il_messaggero.recipe +++ b/recipes/il_messaggero.recipe @@ -16,7 +16,7 @@ class IlMessaggero(BasicNewsRecipe): __author__ = 'Gabriele Marini' description = 'Italian News' -# cover_url = 'http://www.ilmessaggero.it/img_tst/logomsgr.gif' + # cover_url = 'http://www.ilmessaggero.it/img_tst/logomsgr.gif' title = u'Il Messaggero' publisher = 'Caltagirone Editore' category = 'News, politics, culture, economy, general interest' diff --git a/recipes/in_gr.recipe b/recipes/in_gr.recipe index e9de1d44a8..2d76098fc4 100644 --- a/recipes/in_gr.recipe +++ b/recipes/in_gr.recipe @@ -5,7 +5,7 @@ class ingr(BasicNewsRecipe): title = 'in.gr' __author__ = 'Stelios' description = 'News from Greece' -# max_articles_per_feed = 100 + # max_articles_per_feed = 100 oldest_article = 4 publisher = 'in.gr' category = 'news, GR' diff --git a/recipes/leggo_it.recipe b/recipes/leggo_it.recipe index bb8a6176a9..3a5393c192 100644 --- a/recipes/leggo_it.recipe +++ b/recipes/leggo_it.recipe @@ -16,7 +16,7 @@ class LeggoIT(BasicNewsRecipe): __author__ = 'Gabriele Marini' description = 'Italian Free daily newspaper' -# cover_url = 'http://www.leggo.it/img/logo-leggo2.gif' + # cover_url = 'http://www.leggo.it/img/logo-leggo2.gif' title = u'Leggo.it' publisher = 'Ced Caltagirone Editore S.p.A.' category = 'News, politics, culture, economy, general interest' diff --git a/recipes/montreal_gazette.recipe b/recipes/montreal_gazette.recipe index 20eca5fda4..de0c5f0d9a 100644 --- a/recipes/montreal_gazette.recipe +++ b/recipes/montreal_gazette.recipe @@ -60,44 +60,44 @@ class CanWestPaper(BasicNewsRecipe): ] # un-comment the following six lines for the Vancouver Province - # title = u'Vancouver Province' - # url_prefix = 'http://www.theprovince.com' - # description = u'News from Vancouver, BC' - # std_logo_url = 'http://www.theprovince.com/images/logo_theprovince.jpg' - # logo_url = 'vplogo.jpg' - # fp_tag = 'CAN_TP' + # # title = u'Vancouver Province' + # # url_prefix = 'http://www.theprovince.com' + # # description = u'News from Vancouver, BC' + # # std_logo_url = 'http://www.theprovince.com/images/logo_theprovince.jpg' + # # logo_url = 'vplogo.jpg' + # # fp_tag = 'CAN_TP' # un-comment the following six lines for the Vancouver Sun - # title = u'Vancouver Sun' - # url_prefix = 'http://www.vancouversun.com' - # description = u'News from Vancouver, BC' - # std_logo_url = 'http://www.vancouversun.com/images/logo_vancouversun.jpg' - # logo_url = 'vslogo.jpg' - # fp_tag = 'CAN_VS' + # # title = u'Vancouver Sun' + # # url_prefix = 'http://www.vancouversun.com' + # # description = u'News from Vancouver, BC' + # # std_logo_url = 'http://www.vancouversun.com/images/logo_vancouversun.jpg' + # # logo_url = 'vslogo.jpg' + # # fp_tag = 'CAN_VS' # un-comment the following six lines for the Calgary Herald - # title = u'Calgary Herald' - # url_prefix = 'http://www.calgaryherald.com' - # description = u'News from Calgary, AB' - # std_logo_url = 'http://www.calgaryherald.com/images/logo_calgaryherald.jpg' - # logo_url = 'chlogo.jpg' - # fp_tag = 'CAN_CH' + # # title = u'Calgary Herald' + # # url_prefix = 'http://www.calgaryherald.com' + # # description = u'News from Calgary, AB' + # # std_logo_url = 'http://www.calgaryherald.com/images/logo_calgaryherald.jpg' + # # logo_url = 'chlogo.jpg' + # # fp_tag = 'CAN_CH' # un-comment the following six lines for the Edmonton Journal - # title = u'Edmonton Journal' - # url_prefix = 'http://www.edmontonjournal.com' - # description = u'News from Edmonton, AB' - # std_logo_url = 'http://www.edmontonjournal.com/images/logo_edmontonjournal.jpg' - # logo_url = 'ejlogo.jpg' - # fp_tag = 'CAN_EJ' + # # title = u'Edmonton Journal' + # # url_prefix = 'http://www.edmontonjournal.com' + # # description = u'News from Edmonton, AB' + # # std_logo_url = 'http://www.edmontonjournal.com/images/logo_edmontonjournal.jpg' + # # logo_url = 'ejlogo.jpg' + # # fp_tag = 'CAN_EJ' # un-comment the following six lines for the Ottawa Citizen - # title = u'Ottawa Citizen' - # url_prefix = 'http://www.ottawacitizen.com' - # description = u'News from Ottawa, ON' - # std_logo_url = 'http://www.ottawacitizen.com/images/logo_ottawacitizen.jpg' - # logo_url = 'oclogo.jpg' - # fp_tag = 'CAN_OC' + # # title = u'Ottawa Citizen' + # # url_prefix = 'http://www.ottawacitizen.com' + # # description = u'News from Ottawa, ON' + # # std_logo_url = 'http://www.ottawacitizen.com/images/logo_ottawacitizen.jpg' + # # logo_url = 'oclogo.jpg' + # # fp_tag = 'CAN_OC' # un-comment the following six lines for the Montreal Gazette title = u'Montreal Gazette' diff --git a/recipes/ottawa_citizen.recipe b/recipes/ottawa_citizen.recipe index a635c4b0a2..074913c484 100644 --- a/recipes/ottawa_citizen.recipe +++ b/recipes/ottawa_citizen.recipe @@ -60,36 +60,36 @@ class CanWestPaper(BasicNewsRecipe): ] # un-comment the following six lines for the Vancouver Province - # title = u'Vancouver Province' - # url_prefix = 'http://www.theprovince.com' - # description = u'News from Vancouver, BC' - # std_logo_url = 'http://www.theprovince.com/images/logo_theprovince.jpg' - # logo_url = 'vplogo.jpg' - # fp_tag = 'CAN_TP' + # # title = u'Vancouver Province' + # # url_prefix = 'http://www.theprovince.com' + # # description = u'News from Vancouver, BC' + # # std_logo_url = 'http://www.theprovince.com/images/logo_theprovince.jpg' + # # logo_url = 'vplogo.jpg' + # # fp_tag = 'CAN_TP' # un-comment the following six lines for the Vancouver Sun - # title = u'Vancouver Sun' - # url_prefix = 'http://www.vancouversun.com' - # description = u'News from Vancouver, BC' - # std_logo_url = 'http://www.vancouversun.com/images/logo_vancouversun.jpg' - # logo_url = 'vslogo.jpg' - # fp_tag = 'CAN_VS' + # # title = u'Vancouver Sun' + # # url_prefix = 'http://www.vancouversun.com' + # # description = u'News from Vancouver, BC' + # # std_logo_url = 'http://www.vancouversun.com/images/logo_vancouversun.jpg' + # # logo_url = 'vslogo.jpg' + # # fp_tag = 'CAN_VS' # un-comment the following six lines for the Calgary Herald - # title = u'Calgary Herald' - # url_prefix = 'http://www.calgaryherald.com' - # description = u'News from Calgary, AB' - # std_logo_url = 'http://www.calgaryherald.com/images/logo_calgaryherald.jpg' - # logo_url = 'chlogo.jpg' - # fp_tag = 'CAN_CH' + # # title = u'Calgary Herald' + # # url_prefix = 'http://www.calgaryherald.com' + # # description = u'News from Calgary, AB' + # # std_logo_url = 'http://www.calgaryherald.com/images/logo_calgaryherald.jpg' + # # logo_url = 'chlogo.jpg' + # # fp_tag = 'CAN_CH' # un-comment the following six lines for the Edmonton Journal - # title = u'Edmonton Journal' - # url_prefix = 'http://www.edmontonjournal.com' - # description = u'News from Edmonton, AB' - # std_logo_url = 'http://www.edmontonjournal.com/images/logo_edmontonjournal.jpg' - # logo_url = 'ejlogo.jpg' - # fp_tag = 'CAN_EJ' + # # title = u'Edmonton Journal' + # # url_prefix = 'http://www.edmontonjournal.com' + # # description = u'News from Edmonton, AB' + # # std_logo_url = 'http://www.edmontonjournal.com/images/logo_edmontonjournal.jpg' + # # logo_url = 'ejlogo.jpg' + # # fp_tag = 'CAN_EJ' # un-comment the following six lines for the Ottawa Citizen title = u'Ottawa Citizen' @@ -100,12 +100,12 @@ class CanWestPaper(BasicNewsRecipe): fp_tag = 'CAN_OC' # un-comment the following six lines for the Montreal Gazette -# title = u'Montreal Gazette' -# url_prefix = 'http://www.montrealgazette.com' -# description = u'News from Montreal, QC' -# std_logo_url = 'http://www.montrealgazette.com/images/logo_montrealgazette.jpg' -# logo_url = 'mglogo.jpg' -# fp_tag = 'CAN_MG' + # # title = u'Montreal Gazette' + # # url_prefix = 'http://www.montrealgazette.com' + # # description = u'News from Montreal, QC' + # # std_logo_url = 'http://www.montrealgazette.com/images/logo_montrealgazette.jpg' + # # logo_url = 'mglogo.jpg' + # # fp_tag = 'CAN_MG' Kindle_Fire = False masthead_url = std_logo_url diff --git a/recipes/pro_physik.recipe b/recipes/pro_physik.recipe index bf5848ae69..2cdf2e5fac 100644 --- a/recipes/pro_physik.recipe +++ b/recipes/pro_physik.recipe @@ -50,5 +50,5 @@ class AdvancedUserRecipe1303841067(BasicNewsRecipe): feeds = [ (u'Nachrichten', u'https://pro-physik.de/rss/news/'), -# (u'Veranstaltungen', u'https://pro-physik.de/rss/events/'), # AGe 2024-02-11 + # (u'Veranstaltungen', u'https://pro-physik.de/rss/events/'), # AGe 2024-02-11 ] diff --git a/recipes/prosleduet.recipe b/recipes/prosleduet.recipe index e7ed9666b8..896c69b37b 100644 --- a/recipes/prosleduet.recipe +++ b/recipes/prosleduet.recipe @@ -31,7 +31,7 @@ class ProSleduet(BasicNewsRecipe): ] feeds = [ -# ('\u041F\u0440\u043E\u0434\u043E\u043B\u0436\u0435\u043D\u0438\u0435 \u0441\u043B\u0435\u0434\u0443\u0435\u0442', 'https://prosleduet.media/feed/'), + # ('\u041F\u0440\u043E\u0434\u043E\u043B\u0436\u0435\u043D\u0438\u0435 \u0441\u043B\u0435\u0434\u0443\u0435\u0442', 'https://prosleduet.media/feed/'), ('\u041D\u043E\u0432\u043E\u0441\u0442\u0438', 'https://prosleduet.media/category/news/feed/'), ('\u041B\u044E\u0434\u0438', 'https://prosleduet.media/category/people/feed/'), ('\u0421\u044E\u0436\u0435\u0442\u044B', 'https://prosleduet.media/category/syuzhety/feed/'), diff --git a/recipes/regina_leader_post.recipe b/recipes/regina_leader_post.recipe index c3bb4625a2..f959ca1e55 100644 --- a/recipes/regina_leader_post.recipe +++ b/recipes/regina_leader_post.recipe @@ -19,61 +19,61 @@ class CanWestPaper(BasicNewsRecipe): # # url_prefix = 'http://www.timescolonist.com' # # description = u'News from Victoria, BC' # # fp_tag = 'CAN_TC' - # + # un-comment the following four lines for the Vancouver Province # # title = u'Vancouver Province' # # url_prefix = 'http://www.theprovince.com' # # description = u'News from Vancouver, BC' # # fp_tag = 'CAN_VP' - # + # un-comment the following four lines for the Vancouver Sun # # title = u'Vancouver Sun' # # url_prefix = 'http://www.vancouversun.com' # # description = u'News from Vancouver, BC' # # fp_tag = 'CAN_VS' - # + # un-comment the following four lines for the Edmonton Journal # # title = u'Edmonton Journal' # # url_prefix = 'http://www.edmontonjournal.com' # # description = u'News from Edmonton, AB' # # fp_tag = 'CAN_EJ' - # + # un-comment the following four lines for the Calgary Herald # # title = u'Calgary Herald' # # url_prefix = 'http://www.calgaryherald.com' # # description = u'News from Calgary, AB' # # fp_tag = 'CAN_CH' - # + # un-comment the following four lines for the Regina Leader-Post title = u'Regina Leader-Post' url_prefix = 'http://www.leaderpost.com' description = u'News from Regina, SK' fp_tag = '' -# un-comment the following four lines for the Saskatoon Star-Phoenix -# # title = u'Saskatoon Star-Phoenix' -# # url_prefix = 'http://www.thestarphoenix.com' -# # description = u'News from Saskatoon, SK' -# # fp_tag = '' -# -# un-comment the following four lines for the Windsor Star -# # title = u'Windsor Star' -# # url_prefix = 'http://www.windsorstar.com' -# # description = u'News from Windsor, ON' -# # fp_tag = 'CAN_' -# -# un-comment the following four lines for the Ottawa Citizen -# # title = u'Ottawa Citizen' -# # url_prefix = 'http://www.ottawacitizen.com' -# # description = u'News from Ottawa, ON' -# # fp_tag = 'CAN_OC' -# -# un-comment the following four lines for the Montreal Gazette -# # title = u'Montreal Gazette' -# # url_prefix = 'http://www.montrealgazette.com' -# # description = u'News from Montreal, QC' -# # fp_tag = 'CAN_MG' -# + # un-comment the following four lines for the Saskatoon Star-Phoenix + # # title = u'Saskatoon Star-Phoenix' + # # url_prefix = 'http://www.thestarphoenix.com' + # # description = u'News from Saskatoon, SK' + # # fp_tag = '' + + # un-comment the following four lines for the Windsor Star + # # title = u'Windsor Star' + # # url_prefix = 'http://www.windsorstar.com' + # # description = u'News from Windsor, ON' + # # fp_tag = 'CAN_' + + # un-comment the following four lines for the Ottawa Citizen + # # title = u'Ottawa Citizen' + # # url_prefix = 'http://www.ottawacitizen.com' + # # description = u'News from Ottawa, ON' + # # fp_tag = 'CAN_OC' + + # un-comment the following four lines for the Montreal Gazette + # # title = u'Montreal Gazette' + # # url_prefix = 'http://www.montrealgazette.com' + # # description = u'News from Montreal, QC' + # # fp_tag = 'CAN_MG' + language = 'en_CA' __author__ = 'Nick Redding' no_stylesheets = True diff --git a/recipes/salon.recipe b/recipes/salon.recipe index f72c628c3a..d8e8fe2f84 100644 --- a/recipes/salon.recipe +++ b/recipes/salon.recipe @@ -48,7 +48,7 @@ class Salon_com(BasicNewsRecipe): # ('Sustainability', 'http://www.salon.com/category/sustainability/feed/rss/'), # ('Entertainment', 'http://www.salon.com/category/entertainment/feed/rss/'), # ('Life', 'http://www.salon.com/category/life/feed/rss/'), - # + ('News and Politics', 'https://www.salon.com/category/news-and-politics/feed'), ('Culture', 'http://www.salon.com/category/culture/feed/'), ('Science & Health', 'https://www.salon.com/category/science-and-health/feed/'), diff --git a/recipes/saskatoon_star_phoenix.recipe b/recipes/saskatoon_star_phoenix.recipe index b6e94ace43..b32bad8a68 100644 --- a/recipes/saskatoon_star_phoenix.recipe +++ b/recipes/saskatoon_star_phoenix.recipe @@ -19,60 +19,60 @@ class CanWestPaper(BasicNewsRecipe): # # url_prefix = 'http://www.timescolonist.com' # # description = u'News from Victoria, BC' # # fp_tag = 'CAN_TC' - # + # un-comment the following four lines for the Vancouver Province # # title = u'Vancouver Province' # # url_prefix = 'http://www.theprovince.com' # # description = u'News from Vancouver, BC' # # fp_tag = 'CAN_VP' - # + # un-comment the following four lines for the Vancouver Sun # # title = u'Vancouver Sun' # # url_prefix = 'http://www.vancouversun.com' # # description = u'News from Vancouver, BC' # # fp_tag = 'CAN_VS' - # + # un-comment the following four lines for the Edmonton Journal # # title = u'Edmonton Journal' # # url_prefix = 'http://www.edmontonjournal.com' # # description = u'News from Edmonton, AB' # # fp_tag = 'CAN_EJ' - # + # un-comment the following four lines for the Calgary Herald # # title = u'Calgary Herald' # # url_prefix = 'http://www.calgaryherald.com' # # description = u'News from Calgary, AB' # # fp_tag = 'CAN_CH' - # + # un-comment the following four lines for the Regina Leader-Post # # title = u'Regina Leader-Post' # # url_prefix = 'http://www.leaderpost.com' # # description = u'News from Regina, SK' # # fp_tag = '' - # + # un-comment the following four lines for the Saskatoon Star-Phoenix title = u'Saskatoon Star-Phoenix' url_prefix = 'http://www.thestarphoenix.com' description = u'News from Saskatoon, SK' fp_tag = '' -# un-comment the following four lines for the Windsor Star -# # title = u'Windsor Star' -# # url_prefix = 'http://www.windsorstar.com' -# # description = u'News from Windsor, ON' -# # fp_tag = 'CAN_' -# -# un-comment the following four lines for the Ottawa Citizen -# # title = u'Ottawa Citizen' -# # url_prefix = 'http://www.ottawacitizen.com' -# # description = u'News from Ottawa, ON' -# # fp_tag = 'CAN_OC' -# -# un-comment the following four lines for the Montreal Gazette -# # title = u'Montreal Gazette' -# # url_prefix = 'http://www.montrealgazette.com' -# # description = u'News from Montreal, QC' -# # fp_tag = 'CAN_MG' + # un-comment the following four lines for the Windsor Star + # # title = u'Windsor Star' + # # url_prefix = 'http://www.windsorstar.com' + # # description = u'News from Windsor, ON' + # # fp_tag = 'CAN_' + + # un-comment the following four lines for the Ottawa Citizen + # # title = u'Ottawa Citizen' + # # url_prefix = 'http://www.ottawacitizen.com' + # # description = u'News from Ottawa, ON' + # # fp_tag = 'CAN_OC' + + # un-comment the following four lines for the Montreal Gazette + # # title = u'Montreal Gazette' + # # url_prefix = 'http://www.montrealgazette.com' + # # description = u'News from Montreal, QC' + # # fp_tag = 'CAN_MG' language = 'en_CA' __author__ = 'Nick Redding' diff --git a/recipes/t_invariant_en.recipe b/recipes/t_invariant_en.recipe index 3b18ce373f..2b640ac77d 100644 --- a/recipes/t_invariant_en.recipe +++ b/recipes/t_invariant_en.recipe @@ -13,12 +13,12 @@ class TInvariant(BasicNewsRecipe): publisher = '\u0422-\u0438\u043D\u0432\u0430\u0440\u0438\u0430\u043D\u0442 / T-invariant' category = 'news' cover_url = u'https://t-invariant.org/wp-content/uploads/2023/02/logo-s.png' -# cover_url = u'https://tinyurl.com/t-invariant/wp-content/uploads/2023/02/logo-s.png' -# language = 'ru' + # cover_url = u'https://tinyurl.com/t-invariant/wp-content/uploads/2023/02/logo-s.png' + # language = 'ru' language = 'en_RU' -# language = 'uk' -# language = 'de' -# language = 'he' + # language = 'uk' + # language = 'de' + # language = 'he' no_stylesheets = False remove_javascript = False auto_cleanup = False @@ -38,134 +38,117 @@ class TInvariant(BasicNewsRecipe): ] feeds = [ -# Russian version -# -# Direct links -# -# ('\u0412\u0441\u0435 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u044B', ‘https://www.t-invariant.org/feed/'), -# ('\u0410\u0440\u0445\u0438\u0432', ‘https://www.t-invariant.org/category/online/feed/'), -# ('\u0410\u0441\u0442\u0440\u043E\u043D\u043E\u043C\u0438\u044F', ‘https://www.t-invariant.org/category/astronomy/feed/'), -# ('\u0411\u0438\u043E\u043B\u043E\u0433\u0438\u044F', ‘https://www.t-invariant.org/category/biologiya/feed/'), -# ('\u0412\u043E\u0439\u043D\u0430', ‘https://www.t-invariant.org/category/war/feed/'), -# ('\u0412\u0441\u0451 \u0441\u043B\u043E\u0436\u043D\u043E', ‘https://www.t-invariant.org/category/vsyo-slozhno/feed/'), -# ('\u0414\u0432\u0430 \u0433\u043E\u0434\u0430 \u0432\u043E\u0439\u043D\u0435', ‘https://www.t-invariant.org/category/dva-goda-vojne/feed/'), -# ('\u0414\u0432\u0435 \u0441\u0442\u043E\u0440\u043E\u043D\u044B \u043E\u0434\u043D\u043E\u0439 \u043D\u0430\u0443\u043A\u0438', ‘https://www.t-invariant.org/category/dve-storony-odnoj-nauki/feed/'), -# ('\u0414\u0438\u0441\u043A\u0443\u0441\u0441\u0438\u0438', ‘https://www.t-invariant.org/category/discussion/feed/'), -# ('\u0414\u0438\u0441\u0441\u0435\u0440\u043D\u0435\u0442', ‘https://www.t-invariant.org/category/dissernet/feed/'), -# ('\u0418\u0418', ‘https://www.t-invariant.org/category/ai/feed/'), -# ('\u0418\u043D\u0444\u043E\u0440\u043C\u0430\u0442\u0438\u043A\u0430', ‘https://www.t-invariant.org/category/computer-science/feed/'), -# ('\u0418\u0441\u0442\u043E\u0440\u0438\u044F', ‘https://www.t-invariant.org/category/history/feed/'), -# ('\u041A\u043B\u0438\u043C\u0430\u0442', ‘https://www.t-invariant.org/category/climate-ru/feed/'), -# ('\u041A\u043E\u043D\u0442\u0440\u044D\u0432\u043E\u043B\u044E\u0446\u0438\u044F', ‘https://www.t-invariant.org/category/kontrevolyutsiya/feed/'), -# ('\u041A\u043E\u0440\u0440\u0443\u043F\u0446\u0438\u044F', ‘https://www.t-invariant.org/category/korruptsiya/feed/'), -# ('\u041B\u0436\u0435\u043D\u0430\u0443\u043A\u0430', ‘https://www.t-invariant.org/category/pseudoscience/feed/'), -# ('\u041C\u0430\u0442\u0435\u043C\u0430\u0442\u0438\u043A\u0430', ‘https://www.t-invariant.org/category/mathematics/feed/'), -# ('\u041C\u043E\u0437\u0433', ‘https://www.t-invariant.org/category/brain/feed/'), -# ('\u041D\u0430\u0443\u043A\u0430 \u0432 \u0423\u043A\u0440\u0430\u0438\u043D\u0435', ‘https://www.t-invariant.org/category/ukrainian-science/feed/'), -# ('\u041D\u0430\u0443\u0447\u043D\u0430\u044F \u043F\u043E\u043B\u0438\u0442\u0438\u043A\u0430', ‘https://www.t-invariant.org/category/science-policy-ru/feed/'), -# ('\u041D\u043E\u0432\u043E\u0441\u0442\u0438', ‘https://www.t-invariant.org/category/news/feed/'), -# ('\u041E\u043F\u0440\u043E\u0441', ‘https://www.t-invariant.org/category/survey-ru/feed/'), -# ('\u041F\u043E\u0437\u0438\u0446\u0438\u044F', ‘https://www.t-invariant.org/category/standpiont/feed/'), -# ('\u041F\u043E\u043B\u0438\u0442\u043E\u043B\u043E\u0433\u0438\u044F', ‘https://www.t-invariant.org/category/political-science/feed/'), -# ('\u041F\u043E\u043F\u0443\u043B\u044F\u0440\u0438\u0437\u0430\u0446\u0438\u044F \u043D\u0430\u0443\u043A\u0438', ‘https://www.t-invariant.org/category/popular-science/feed/'), -# ('\u041F\u0440\u0430\u0432\u043E', ‘https://www.t-invariant.org/category/pravo/feed/'), -# ('\u041F\u0440\u043E\u0433\u0440\u0435\u0441\u0441', ‘https://www.t-invariant.org/category/progress/feed/'), -# ('\u041F\u0441\u0438\u0445\u043E\u043B\u043E\u0433\u0438\u044F', ‘https://www.t-invariant.org/category/psihologiya/feed/'), -# ('\u0420\u0410\u041D', ‘https://www.t-invariant.org/category/ras/feed/'), -# ('\u0420\u0435\u043B\u0438\u0433\u0438\u044F', ‘https://www.t-invariant.org/category/religion/feed/'), -# ('\u0420\u0435\u043B\u043E\u043A\u0430\u0446\u0438\u044F', ‘https://www.t-invariant.org/category/relocation/feed/'), -# ('\u0420\u0435\u043F\u0440\u0435\u0441\u0441\u0438\u0438', ‘https://www.t-invariant.org/category/repression/feed/'), -# ('\u0420\u0443\u0441\u0441\u043A\u0438\u0439 \u044F\u0437\u044B\u043A', ‘https://www.t-invariant.org/category/russian-language/feed/'), -# ('\u0421\u0430\u043D\u043A\u0446\u0438\u0438', ‘https://www.t-invariant.org/category/sanctions/feed/'), -# ('\u0421\u043E\u0437\u0434\u0430\u0442\u0435\u043B\u0438', ‘https://www.t-invariant.org/category/creators/feed/'), -# ('\u0421\u043E\u0446\u0438\u043E\u043B\u043E\u0433\u0438\u044F', ‘https://www.t-invariant.org/category/sociology/feed/'), -# ('\u0422\u0435\u0440\u0440\u043E\u0440\u0438\u0437\u043C', ‘https://www.t-invariant.org/category/terrorizm/feed/'), -# ('\u0423\u043D\u0438\u0432\u0435\u0440\u0441\u0438\u0442\u0435\u0442\u044B', ‘https://www.t-invariant.org/category/universities/feed/'), -# ('\u0424\u0438\u0437\u0438\u043A\u0430', ‘https://www.t-invariant.org/category/physics/feed/'), -# ('\u0424\u0438\u043B\u043E\u0441\u043E\u0444\u0438\u044F', ‘https://www.t-invariant.org/category/philosophy/feed/'), -# ('\u0428\u043A\u043E\u043B\u0430', ‘https://www.t-invariant.org/category/shkola/feed/'), -# ('\u042D\u043A\u0441\u043F\u0435\u0440\u0442\u0438\u0437\u0430 \u043D\u0430\u0443\u043A\u0438', ‘https://www.t-invariant.org/category/science-assessment/feed/'), -# ('\u042D\u043D\u0435\u0440\u0433\u0435\u0442\u0438\u043A\u0430', ‘https://www.t-invariant.org/category/energy/feed/'), -# ('\u042D\u0442\u0438\u043A\u0430', ‘https://www.t-invariant.org/category/ethics/feed/'), -# -# Censorship bypass -# -# ('\u0412\u0441\u0435 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u044B', 'https://tinyurl.com/t-invariant/feed/'), -# ('\u0410\u0440\u0445\u0438\u0432', 'https://tinyurl.com/t-invariant/category/online/feed/'), -# ('\u0410\u0441\u0442\u0440\u043E\u043D\u043E\u043C\u0438\u044F', 'https://tinyurl.com/t-invariant/category/astronomy/feed/'), -# ('\u0411\u0438\u043E\u043B\u043E\u0433\u0438\u044F', 'https://tinyurl.com/t-invariant/category/biologiya/feed/'), -# ('\u0412\u043E\u0439\u043D\u0430', 'https://tinyurl.com/t-invariant/category/war/feed/'), -# ('\u0412\u0441\u0451 \u0441\u043B\u043E\u0436\u043D\u043E', 'https://tinyurl.com/t-invariant/category/vsyo-slozhno/feed/'), -# ('\u0414\u0432\u0430 \u0433\u043E\u0434\u0430 \u0432\u043E\u0439\u043D\u0435', 'https://tinyurl.com/t-invariant/category/dva-goda-vojne/feed/'), -# ('\u0414\u0432\u0435 \u0441\u0442\u043E\u0440\u043E\u043D\u044B \u043E\u0434\u043D\u043E\u0439 \u043D\u0430\u0443\u043A\u0438', 'https://tinyurl.com/t-invariant/category/dve-storony-odnoj-nauki/feed/'), -# ('\u0414\u0438\u0441\u043A\u0443\u0441\u0441\u0438\u0438', 'https://tinyurl.com/t-invariant/category/discussion/feed/'), -# ('\u0414\u0438\u0441\u0441\u0435\u0440\u043D\u0435\u0442', 'https://tinyurl.com/t-invariant/category/dissernet/feed/'), -# ('\u0418\u0418', 'https://tinyurl.com/t-invariant/category/ai/feed/'), -# ('\u0418\u043D\u0444\u043E\u0440\u043C\u0430\u0442\u0438\u043A\u0430', 'https://tinyurl.com/t-invariant/category/computer-science/feed/'), -# ('\u0418\u0441\u0442\u043E\u0440\u0438\u044F', 'https://tinyurl.com/t-invariant/category/history/feed/'), -# ('\u041A\u043B\u0438\u043C\u0430\u0442', 'https://tinyurl.com/t-invariant/category/climate-ru/feed/'), -# ('\u041A\u043E\u043D\u0442\u0440\u044D\u0432\u043E\u043B\u044E\u0446\u0438\u044F', 'https://tinyurl.com/t-invariant/category/kontrevolyutsiya/feed/'), -# ('\u041A\u043E\u0440\u0440\u0443\u043F\u0446\u0438\u044F', 'https://tinyurl.com/t-invariant/category/korruptsiya/feed/'), -# ('\u041B\u0436\u0435\u043D\u0430\u0443\u043A\u0430', 'https://tinyurl.com/t-invariant/category/pseudoscience/feed/'), -# ('\u041C\u0430\u0442\u0435\u043C\u0430\u0442\u0438\u043A\u0430', 'https://tinyurl.com/t-invariant/category/mathematics/feed/'), -# ('\u041C\u043E\u0437\u0433', 'https://tinyurl.com/t-invariant/category/brain/feed/'), -# ('\u041D\u0430\u0443\u043A\u0430 \u0432 \u0423\u043A\u0440\u0430\u0438\u043D\u0435', 'https://tinyurl.com/t-invariant/category/ukrainian-science/feed/'), -# ('\u041D\u0430\u0443\u0447\u043D\u0430\u044F \u043F\u043E\u043B\u0438\u0442\u0438\u043A\u0430', 'https://tinyurl.com/t-invariant/category/science-policy-ru/feed/'), -# ('\u041D\u043E\u0432\u043E\u0441\u0442\u0438', 'https://tinyurl.com/t-invariant/category/news/feed/'), -# ('\u041E\u043F\u0440\u043E\u0441', 'https://tinyurl.com/t-invariant/category/survey-ru/feed/'), -# ('\u041F\u043E\u0437\u0438\u0446\u0438\u044F', 'https://tinyurl.com/t-invariant/category/standpiont/feed/'), -# ('\u041F\u043E\u043B\u0438\u0442\u043E\u043B\u043E\u0433\u0438\u044F', 'https://tinyurl.com/t-invariant/category/political-science/feed/'), -# ('\u041F\u043E\u043F\u0443\u043B\u044F\u0440\u0438\u0437\u0430\u0446\u0438\u044F \u043D\u0430\u0443\u043A\u0438', 'https://tinyurl.com/t-invariant/category/popular-science/feed/'), -# ('\u041F\u0440\u0430\u0432\u043E', 'https://tinyurl.com/t-invariant/category/pravo/feed/'), -# ('\u041F\u0440\u043E\u0433\u0440\u0435\u0441\u0441', 'https://tinyurl.com/t-invariant/category/progress/feed/'), -# ('\u041F\u0441\u0438\u0445\u043E\u043B\u043E\u0433\u0438\u044F', 'https://tinyurl.com/t-invariant/category/psihologiya/feed/'), -# ('\u0420\u0410\u041D', 'https://tinyurl.com/t-invariant/category/ras/feed/'), -# ('\u0420\u0435\u043B\u0438\u0433\u0438\u044F', 'https://tinyurl.com/t-invariant/category/religion/feed/'), -# ('\u0420\u0435\u043B\u043E\u043A\u0430\u0446\u0438\u044F', 'https://tinyurl.com/t-invariant/category/relocation/feed/'), -# ('\u0420\u0435\u043F\u0440\u0435\u0441\u0441\u0438\u0438', 'https://tinyurl.com/t-invariant/category/repression/feed/'), -# ('\u0420\u0443\u0441\u0441\u043A\u0438\u0439 \u044F\u0437\u044B\u043A', 'https://tinyurl.com/t-invariant/category/russian-language/feed/'), -# ('\u0421\u0430\u043D\u043A\u0446\u0438\u0438', 'https://tinyurl.com/t-invariant/category/sanctions/feed/'), -# ('\u0421\u043E\u0437\u0434\u0430\u0442\u0435\u043B\u0438', 'https://tinyurl.com/t-invariant/category/creators/feed/'), -# ('\u0421\u043E\u0446\u0438\u043E\u043B\u043E\u0433\u0438\u044F', 'https://tinyurl.com/t-invariant/category/sociology/feed/'), -# ('\u0422\u0435\u0440\u0440\u043E\u0440\u0438\u0437\u043C', 'https://tinyurl.com/t-invariant/category/terrorizm/feed/'), -# ('\u0423\u043D\u0438\u0432\u0435\u0440\u0441\u0438\u0442\u0435\u0442\u044B', 'https://tinyurl.com/t-invariant/category/universities/feed/'), -# ('\u0424\u0438\u0437\u0438\u043A\u0430', 'https://tinyurl.com/t-invariant/category/physics/feed/'), -# ('\u0424\u0438\u043B\u043E\u0441\u043E\u0444\u0438\u044F', 'https://tinyurl.com/t-invariant/category/philosophy/feed/'), -# ('\u0428\u043A\u043E\u043B\u0430', 'https://tinyurl.com/t-invariant/category/shkola/feed/'), -# ('\u042D\u043A\u0441\u043F\u0435\u0440\u0442\u0438\u0437\u0430 \u043D\u0430\u0443\u043A\u0438', 'https://tinyurl.com/t-invariant/category/science-assessment/feed/'), -# ('\u042D\u043D\u0435\u0440\u0433\u0435\u0442\u0438\u043A\u0430', 'https://tinyurl.com/t-invariant/category/energy/feed/'), -# ('\u042D\u0442\u0438\u043A\u0430', 'https://tinyurl.com/t-invariant/category/ethics/feed/'), -# -# English version -# -# ('T-invariant (English)', 'https://www.t-invariant.org/en/feed/'), -# -# Censorship bypass -# + # Russian version + # Direct links + # ('\u0412\u0441\u0435 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u044B', ‘https://www.t-invariant.org/feed/'), + # ('\u0410\u0440\u0445\u0438\u0432', ‘https://www.t-invariant.org/category/online/feed/'), + # ('\u0410\u0441\u0442\u0440\u043E\u043D\u043E\u043C\u0438\u044F', ‘https://www.t-invariant.org/category/astronomy/feed/'), + # ('\u0411\u0438\u043E\u043B\u043E\u0433\u0438\u044F', ‘https://www.t-invariant.org/category/biologiya/feed/'), + # ('\u0412\u043E\u0439\u043D\u0430', ‘https://www.t-invariant.org/category/war/feed/'), + # ('\u0412\u0441\u0451 \u0441\u043B\u043E\u0436\u043D\u043E', ‘https://www.t-invariant.org/category/vsyo-slozhno/feed/'), + # ('\u0414\u0432\u0430 \u0433\u043E\u0434\u0430 \u0432\u043E\u0439\u043D\u0435', ‘https://www.t-invariant.org/category/dva-goda-vojne/feed/'), + # ('\u0414\u0432\u0435 \u0441\u0442\u043E\u0440\u043E\u043D\u044B \u043E\u0434\u043D\u043E\u0439 \u043D\u0430\u0443\u043A\u0438', ‘https://www.t-invariant.org/category/dve-storony-odnoj-nauki/feed/'), + # ('\u0414\u0438\u0441\u043A\u0443\u0441\u0441\u0438\u0438', ‘https://www.t-invariant.org/category/discussion/feed/'), + # ('\u0414\u0438\u0441\u0441\u0435\u0440\u043D\u0435\u0442', ‘https://www.t-invariant.org/category/dissernet/feed/'), + # ('\u0418\u0418', ‘https://www.t-invariant.org/category/ai/feed/'), + # ('\u0418\u043D\u0444\u043E\u0440\u043C\u0430\u0442\u0438\u043A\u0430', ‘https://www.t-invariant.org/category/computer-science/feed/'), + # ('\u0418\u0441\u0442\u043E\u0440\u0438\u044F', ‘https://www.t-invariant.org/category/history/feed/'), + # ('\u041A\u043B\u0438\u043C\u0430\u0442', ‘https://www.t-invariant.org/category/climate-ru/feed/'), + # ('\u041A\u043E\u043D\u0442\u0440\u044D\u0432\u043E\u043B\u044E\u0446\u0438\u044F', ‘https://www.t-invariant.org/category/kontrevolyutsiya/feed/'), + # ('\u041A\u043E\u0440\u0440\u0443\u043F\u0446\u0438\u044F', ‘https://www.t-invariant.org/category/korruptsiya/feed/'), + # ('\u041B\u0436\u0435\u043D\u0430\u0443\u043A\u0430', ‘https://www.t-invariant.org/category/pseudoscience/feed/'), + # ('\u041C\u0430\u0442\u0435\u043C\u0430\u0442\u0438\u043A\u0430', ‘https://www.t-invariant.org/category/mathematics/feed/'), + # ('\u041C\u043E\u0437\u0433', ‘https://www.t-invariant.org/category/brain/feed/'), + # ('\u041D\u0430\u0443\u043A\u0430 \u0432 \u0423\u043A\u0440\u0430\u0438\u043D\u0435', ‘https://www.t-invariant.org/category/ukrainian-science/feed/'), + # ('\u041D\u0430\u0443\u0447\u043D\u0430\u044F \u043F\u043E\u043B\u0438\u0442\u0438\u043A\u0430', ‘https://www.t-invariant.org/category/science-policy-ru/feed/'), + # ('\u041D\u043E\u0432\u043E\u0441\u0442\u0438', ‘https://www.t-invariant.org/category/news/feed/'), + # ('\u041E\u043F\u0440\u043E\u0441', ‘https://www.t-invariant.org/category/survey-ru/feed/'), + # ('\u041F\u043E\u0437\u0438\u0446\u0438\u044F', ‘https://www.t-invariant.org/category/standpiont/feed/'), + # ('\u041F\u043E\u043B\u0438\u0442\u043E\u043B\u043E\u0433\u0438\u044F', ‘https://www.t-invariant.org/category/political-science/feed/'), + # ('\u041F\u043E\u043F\u0443\u043B\u044F\u0440\u0438\u0437\u0430\u0446\u0438\u044F \u043D\u0430\u0443\u043A\u0438', ‘https://www.t-invariant.org/category/popular-science/feed/'), + # ('\u041F\u0440\u0430\u0432\u043E', ‘https://www.t-invariant.org/category/pravo/feed/'), + # ('\u041F\u0440\u043E\u0433\u0440\u0435\u0441\u0441', ‘https://www.t-invariant.org/category/progress/feed/'), + # ('\u041F\u0441\u0438\u0445\u043E\u043B\u043E\u0433\u0438\u044F', ‘https://www.t-invariant.org/category/psihologiya/feed/'), + # ('\u0420\u0410\u041D', ‘https://www.t-invariant.org/category/ras/feed/'), + # ('\u0420\u0435\u043B\u0438\u0433\u0438\u044F', ‘https://www.t-invariant.org/category/religion/feed/'), + # ('\u0420\u0435\u043B\u043E\u043A\u0430\u0446\u0438\u044F', ‘https://www.t-invariant.org/category/relocation/feed/'), + # ('\u0420\u0435\u043F\u0440\u0435\u0441\u0441\u0438\u0438', ‘https://www.t-invariant.org/category/repression/feed/'), + # ('\u0420\u0443\u0441\u0441\u043A\u0438\u0439 \u044F\u0437\u044B\u043A', ‘https://www.t-invariant.org/category/russian-language/feed/'), + # ('\u0421\u0430\u043D\u043A\u0446\u0438\u0438', ‘https://www.t-invariant.org/category/sanctions/feed/'), + # ('\u0421\u043E\u0437\u0434\u0430\u0442\u0435\u043B\u0438', ‘https://www.t-invariant.org/category/creators/feed/'), + # ('\u0421\u043E\u0446\u0438\u043E\u043B\u043E\u0433\u0438\u044F', ‘https://www.t-invariant.org/category/sociology/feed/'), + # ('\u0422\u0435\u0440\u0440\u043E\u0440\u0438\u0437\u043C', ‘https://www.t-invariant.org/category/terrorizm/feed/'), + # ('\u0423\u043D\u0438\u0432\u0435\u0440\u0441\u0438\u0442\u0435\u0442\u044B', ‘https://www.t-invariant.org/category/universities/feed/'), + # ('\u0424\u0438\u0437\u0438\u043A\u0430', ‘https://www.t-invariant.org/category/physics/feed/'), + # ('\u0424\u0438\u043B\u043E\u0441\u043E\u0444\u0438\u044F', ‘https://www.t-invariant.org/category/philosophy/feed/'), + # ('\u0428\u043A\u043E\u043B\u0430', ‘https://www.t-invariant.org/category/shkola/feed/'), + # ('\u042D\u043A\u0441\u043F\u0435\u0440\u0442\u0438\u0437\u0430 \u043D\u0430\u0443\u043A\u0438', ‘https://www.t-invariant.org/category/science-assessment/feed/'), + # ('\u042D\u043D\u0435\u0440\u0433\u0435\u0442\u0438\u043A\u0430', ‘https://www.t-invariant.org/category/energy/feed/'), + # ('\u042D\u0442\u0438\u043A\u0430', ‘https://www.t-invariant.org/category/ethics/feed/'), + # Censorship bypass + # ('\u0412\u0441\u0435 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u044B', 'https://tinyurl.com/t-invariant/feed/'), + # ('\u0410\u0440\u0445\u0438\u0432', 'https://tinyurl.com/t-invariant/category/online/feed/'), + # ('\u0410\u0441\u0442\u0440\u043E\u043D\u043E\u043C\u0438\u044F', 'https://tinyurl.com/t-invariant/category/astronomy/feed/'), + # ('\u0411\u0438\u043E\u043B\u043E\u0433\u0438\u044F', 'https://tinyurl.com/t-invariant/category/biologiya/feed/'), + # ('\u0412\u043E\u0439\u043D\u0430', 'https://tinyurl.com/t-invariant/category/war/feed/'), + # ('\u0412\u0441\u0451 \u0441\u043B\u043E\u0436\u043D\u043E', 'https://tinyurl.com/t-invariant/category/vsyo-slozhno/feed/'), + # ('\u0414\u0432\u0430 \u0433\u043E\u0434\u0430 \u0432\u043E\u0439\u043D\u0435', 'https://tinyurl.com/t-invariant/category/dva-goda-vojne/feed/'), + # ('\u0414\u0432\u0435 \u0441\u0442\u043E\u0440\u043E\u043D\u044B \u043E\u0434\u043D\u043E\u0439 \u043D\u0430\u0443\u043A\u0438', 'https://tinyurl.com/t-invariant/category/dve-storony-odnoj-nauki/feed/'), + # ('\u0414\u0438\u0441\u043A\u0443\u0441\u0441\u0438\u0438', 'https://tinyurl.com/t-invariant/category/discussion/feed/'), + # ('\u0414\u0438\u0441\u0441\u0435\u0440\u043D\u0435\u0442', 'https://tinyurl.com/t-invariant/category/dissernet/feed/'), + # ('\u0418\u0418', 'https://tinyurl.com/t-invariant/category/ai/feed/'), + # ('\u0418\u043D\u0444\u043E\u0440\u043C\u0430\u0442\u0438\u043A\u0430', 'https://tinyurl.com/t-invariant/category/computer-science/feed/'), + # ('\u0418\u0441\u0442\u043E\u0440\u0438\u044F', 'https://tinyurl.com/t-invariant/category/history/feed/'), + # ('\u041A\u043B\u0438\u043C\u0430\u0442', 'https://tinyurl.com/t-invariant/category/climate-ru/feed/'), + # ('\u041A\u043E\u043D\u0442\u0440\u044D\u0432\u043E\u043B\u044E\u0446\u0438\u044F', 'https://tinyurl.com/t-invariant/category/kontrevolyutsiya/feed/'), + # ('\u041A\u043E\u0440\u0440\u0443\u043F\u0446\u0438\u044F', 'https://tinyurl.com/t-invariant/category/korruptsiya/feed/'), + # ('\u041B\u0436\u0435\u043D\u0430\u0443\u043A\u0430', 'https://tinyurl.com/t-invariant/category/pseudoscience/feed/'), + # ('\u041C\u0430\u0442\u0435\u043C\u0430\u0442\u0438\u043A\u0430', 'https://tinyurl.com/t-invariant/category/mathematics/feed/'), + # ('\u041C\u043E\u0437\u0433', 'https://tinyurl.com/t-invariant/category/brain/feed/'), + # ('\u041D\u0430\u0443\u043A\u0430 \u0432 \u0423\u043A\u0440\u0430\u0438\u043D\u0435', 'https://tinyurl.com/t-invariant/category/ukrainian-science/feed/'), + # ('\u041D\u0430\u0443\u0447\u043D\u0430\u044F \u043F\u043E\u043B\u0438\u0442\u0438\u043A\u0430', 'https://tinyurl.com/t-invariant/category/science-policy-ru/feed/'), + # ('\u041D\u043E\u0432\u043E\u0441\u0442\u0438', 'https://tinyurl.com/t-invariant/category/news/feed/'), + # ('\u041E\u043F\u0440\u043E\u0441', 'https://tinyurl.com/t-invariant/category/survey-ru/feed/'), + # ('\u041F\u043E\u0437\u0438\u0446\u0438\u044F', 'https://tinyurl.com/t-invariant/category/standpiont/feed/'), + # ('\u041F\u043E\u043B\u0438\u0442\u043E\u043B\u043E\u0433\u0438\u044F', 'https://tinyurl.com/t-invariant/category/political-science/feed/'), + # ('\u041F\u043E\u043F\u0443\u043B\u044F\u0440\u0438\u0437\u0430\u0446\u0438\u044F \u043D\u0430\u0443\u043A\u0438', 'https://tinyurl.com/t-invariant/category/popular-science/feed/'), + # ('\u041F\u0440\u0430\u0432\u043E', 'https://tinyurl.com/t-invariant/category/pravo/feed/'), + # ('\u041F\u0440\u043E\u0433\u0440\u0435\u0441\u0441', 'https://tinyurl.com/t-invariant/category/progress/feed/'), + # ('\u041F\u0441\u0438\u0445\u043E\u043B\u043E\u0433\u0438\u044F', 'https://tinyurl.com/t-invariant/category/psihologiya/feed/'), + # ('\u0420\u0410\u041D', 'https://tinyurl.com/t-invariant/category/ras/feed/'), + # ('\u0420\u0435\u043B\u0438\u0433\u0438\u044F', 'https://tinyurl.com/t-invariant/category/religion/feed/'), + # ('\u0420\u0435\u043B\u043E\u043A\u0430\u0446\u0438\u044F', 'https://tinyurl.com/t-invariant/category/relocation/feed/'), + # ('\u0420\u0435\u043F\u0440\u0435\u0441\u0441\u0438\u0438', 'https://tinyurl.com/t-invariant/category/repression/feed/'), + # ('\u0420\u0443\u0441\u0441\u043A\u0438\u0439 \u044F\u0437\u044B\u043A', 'https://tinyurl.com/t-invariant/category/russian-language/feed/'), + # ('\u0421\u0430\u043D\u043A\u0446\u0438\u0438', 'https://tinyurl.com/t-invariant/category/sanctions/feed/'), + # ('\u0421\u043E\u0437\u0434\u0430\u0442\u0435\u043B\u0438', 'https://tinyurl.com/t-invariant/category/creators/feed/'), + # ('\u0421\u043E\u0446\u0438\u043E\u043B\u043E\u0433\u0438\u044F', 'https://tinyurl.com/t-invariant/category/sociology/feed/'), + # ('\u0422\u0435\u0440\u0440\u043E\u0440\u0438\u0437\u043C', 'https://tinyurl.com/t-invariant/category/terrorizm/feed/'), + # ('\u0423\u043D\u0438\u0432\u0435\u0440\u0441\u0438\u0442\u0435\u0442\u044B', 'https://tinyurl.com/t-invariant/category/universities/feed/'), + # ('\u0424\u0438\u0437\u0438\u043A\u0430', 'https://tinyurl.com/t-invariant/category/physics/feed/'), + # ('\u0424\u0438\u043B\u043E\u0441\u043E\u0444\u0438\u044F', 'https://tinyurl.com/t-invariant/category/philosophy/feed/'), + # ('\u0428\u043A\u043E\u043B\u0430', 'https://tinyurl.com/t-invariant/category/shkola/feed/'), + # ('\u042D\u043A\u0441\u043F\u0435\u0440\u0442\u0438\u0437\u0430 \u043D\u0430\u0443\u043A\u0438', 'https://tinyurl.com/t-invariant/category/science-assessment/feed/'), + # ('\u042D\u043D\u0435\u0440\u0433\u0435\u0442\u0438\u043A\u0430', 'https://tinyurl.com/t-invariant/category/energy/feed/'), + # ('\u042D\u0442\u0438\u043A\u0430', 'https://tinyurl.com/t-invariant/category/ethics/feed/'), + + # English version + # ('T-invariant (English)', 'https://www.t-invariant.org/en/feed/'), + # Censorship bypass ('T-invariant (English)', 'https://tinyurl.com/t-invariant/en/feed/'), -# -# Ukrainian version -# -# ('T-invariant (\u0423\u043A\u0440\u0430\u0457\u043D\u0441\u044C\u043A\u0430)', 'https://www.t-invariant.org/uk/feed/'), -# -# Censorship bypass -# -# ('T-invariant (\u0423\u043A\u0440\u0430\u0457\u043D\u0441\u044C\u043A\u0430)', 'https://tinyurl.com/t-invariant/uk/feed/'), -# -# German version -# -# ('T-invariant (Deutsch)', 'https://www.t-invariant.org/de/feed/'), -# -# Censorship bypass -# -# ('T-invariant (Deutsch)', 'https://tinyurl.com/t-invariant/de/feed/'), -# -# Hebrew version -# -# ('T-invariant (\u05E2\u05D1\u05E8\u05D9\u05EA)', 'https://www.t-invariant.org/he/feed/'), -# -# Censorship bypass -# -# ('T-invariant (\u05E2\u05D1\u05E8\u05D9\u05EA)', 'https://tinyurl.com/t-invariant/he/feed/'), -# + + # Ukrainian version + # ('T-invariant (\u0423\u043A\u0440\u0430\u0457\u043D\u0441\u044C\u043A\u0430)', 'https://www.t-invariant.org/uk/feed/'), + # Censorship bypass + # ('T-invariant (\u0423\u043A\u0440\u0430\u0457\u043D\u0441\u044C\u043A\u0430)', 'https://tinyurl.com/t-invariant/uk/feed/'), + + # German version + # ('T-invariant (Deutsch)', 'https://www.t-invariant.org/de/feed/'), + # Censorship bypass + # ('T-invariant (Deutsch)', 'https://tinyurl.com/t-invariant/de/feed/'), + + # Hebrew version + # ('T-invariant (\u05E2\u05D1\u05E8\u05D9\u05EA)', 'https://www.t-invariant.org/he/feed/'), + # Censorship bypass + # ('T-invariant (\u05E2\u05D1\u05E8\u05D9\u05EA)', 'https://tinyurl.com/t-invariant/he/feed/'), ] diff --git a/recipes/t_invariant_ru.recipe b/recipes/t_invariant_ru.recipe index a8a002fd15..9320f176ee 100644 --- a/recipes/t_invariant_ru.recipe +++ b/recipes/t_invariant_ru.recipe @@ -12,13 +12,13 @@ class TInvariant(BasicNewsRecipe): description = '\u041C\u0443\u043B\u044C\u0442\u0438\u043C\u0435\u0434\u0438\u0439\u043D\u044B\u0439 \u043F\u0440\u043E\u0435\u043A\u0442 \u0443\u0447\u0435\u043D\u044B\u0445 \u0438 \u043D\u0430\u0443\u0447\u043D\u044B\u0445 \u0436\u0443\u0440\u043D\u0430\u043B\u0438\u0441\u0442\u043E\u0432.' # noqa: E501 publisher = '\u0422-\u0438\u043D\u0432\u0430\u0440\u0438\u0430\u043D\u0442 / T-invariant' category = 'news' -# cover_url = u'https://t-invariant.org/wp-content/uploads/2023/02/logo-s.png' + # cover_url = u'https://t-invariant.org/wp-content/uploads/2023/02/logo-s.png' cover_url = u'https://tinyurl.com/t-invariant/wp-content/uploads/2023/02/logo-s.png' language = 'ru' -# language = 'en_RU' -# language = 'uk' -# language = 'de' -# language = 'he' + # language = 'en_RU' + # language = 'uk' + # language = 'de' + # language = 'he' no_stylesheets = False remove_javascript = False auto_cleanup = False @@ -38,59 +38,55 @@ class TInvariant(BasicNewsRecipe): ] feeds = [ -# Russian version -# -# Direct links -# -# ('\u0412\u0441\u0435 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u044B', ‘https://www.t-invariant.org/feed/'), -# ('\u0410\u0440\u0445\u0438\u0432', ‘https://www.t-invariant.org/category/online/feed/'), -# ('\u0410\u0441\u0442\u0440\u043E\u043D\u043E\u043C\u0438\u044F', ‘https://www.t-invariant.org/category/astronomy/feed/'), -# ('\u0411\u0438\u043E\u043B\u043E\u0433\u0438\u044F', ‘https://www.t-invariant.org/category/biologiya/feed/'), -# ('\u0412\u043E\u0439\u043D\u0430', ‘https://www.t-invariant.org/category/war/feed/'), -# ('\u0412\u0441\u0451 \u0441\u043B\u043E\u0436\u043D\u043E', ‘https://www.t-invariant.org/category/vsyo-slozhno/feed/'), -# ('\u0414\u0432\u0430 \u0433\u043E\u0434\u0430 \u0432\u043E\u0439\u043D\u0435', ‘https://www.t-invariant.org/category/dva-goda-vojne/feed/'), -# ('\u0414\u0432\u0435 \u0441\u0442\u043E\u0440\u043E\u043D\u044B \u043E\u0434\u043D\u043E\u0439 \u043D\u0430\u0443\u043A\u0438', ‘https://www.t-invariant.org/category/dve-storony-odnoj-nauki/feed/'), -# ('\u0414\u0438\u0441\u043A\u0443\u0441\u0441\u0438\u0438', ‘https://www.t-invariant.org/category/discussion/feed/'), -# ('\u0414\u0438\u0441\u0441\u0435\u0440\u043D\u0435\u0442', ‘https://www.t-invariant.org/category/dissernet/feed/'), -# ('\u0418\u0418', ‘https://www.t-invariant.org/category/ai/feed/'), -# ('\u0418\u043D\u0444\u043E\u0440\u043C\u0430\u0442\u0438\u043A\u0430', ‘https://www.t-invariant.org/category/computer-science/feed/'), -# ('\u0418\u0441\u0442\u043E\u0440\u0438\u044F', ‘https://www.t-invariant.org/category/history/feed/'), -# ('\u041A\u043B\u0438\u043C\u0430\u0442', ‘https://www.t-invariant.org/category/climate-ru/feed/'), -# ('\u041A\u043E\u043D\u0442\u0440\u044D\u0432\u043E\u043B\u044E\u0446\u0438\u044F', ‘https://www.t-invariant.org/category/kontrevolyutsiya/feed/'), -# ('\u041A\u043E\u0440\u0440\u0443\u043F\u0446\u0438\u044F', ‘https://www.t-invariant.org/category/korruptsiya/feed/'), -# ('\u041B\u0436\u0435\u043D\u0430\u0443\u043A\u0430', ‘https://www.t-invariant.org/category/pseudoscience/feed/'), -# ('\u041C\u0430\u0442\u0435\u043C\u0430\u0442\u0438\u043A\u0430', ‘https://www.t-invariant.org/category/mathematics/feed/'), -# ('\u041C\u043E\u0437\u0433', ‘https://www.t-invariant.org/category/brain/feed/'), -# ('\u041D\u0430\u0443\u043A\u0430 \u0432 \u0423\u043A\u0440\u0430\u0438\u043D\u0435', ‘https://www.t-invariant.org/category/ukrainian-science/feed/'), -# ('\u041D\u0430\u0443\u0447\u043D\u0430\u044F \u043F\u043E\u043B\u0438\u0442\u0438\u043A\u0430', ‘https://www.t-invariant.org/category/science-policy-ru/feed/'), -# ('\u041D\u043E\u0432\u043E\u0441\u0442\u0438', ‘https://www.t-invariant.org/category/news/feed/'), -# ('\u041E\u043F\u0440\u043E\u0441', ‘https://www.t-invariant.org/category/survey-ru/feed/'), -# ('\u041F\u043E\u0437\u0438\u0446\u0438\u044F', ‘https://www.t-invariant.org/category/standpiont/feed/'), -# ('\u041F\u043E\u043B\u0438\u0442\u043E\u043B\u043E\u0433\u0438\u044F', ‘https://www.t-invariant.org/category/political-science/feed/'), -# ('\u041F\u043E\u043F\u0443\u043B\u044F\u0440\u0438\u0437\u0430\u0446\u0438\u044F \u043D\u0430\u0443\u043A\u0438', ‘https://www.t-invariant.org/category/popular-science/feed/'), -# ('\u041F\u0440\u0430\u0432\u043E', ‘https://www.t-invariant.org/category/pravo/feed/'), -# ('\u041F\u0440\u043E\u0433\u0440\u0435\u0441\u0441', ‘https://www.t-invariant.org/category/progress/feed/'), -# ('\u041F\u0441\u0438\u0445\u043E\u043B\u043E\u0433\u0438\u044F', ‘https://www.t-invariant.org/category/psihologiya/feed/'), -# ('\u0420\u0410\u041D', ‘https://www.t-invariant.org/category/ras/feed/'), -# ('\u0420\u0435\u043B\u0438\u0433\u0438\u044F', ‘https://www.t-invariant.org/category/religion/feed/'), -# ('\u0420\u0435\u043B\u043E\u043A\u0430\u0446\u0438\u044F', ‘https://www.t-invariant.org/category/relocation/feed/'), -# ('\u0420\u0435\u043F\u0440\u0435\u0441\u0441\u0438\u0438', ‘https://www.t-invariant.org/category/repression/feed/'), -# ('\u0420\u0443\u0441\u0441\u043A\u0438\u0439 \u044F\u0437\u044B\u043A', ‘https://www.t-invariant.org/category/russian-language/feed/'), -# ('\u0421\u0430\u043D\u043A\u0446\u0438\u0438', ‘https://www.t-invariant.org/category/sanctions/feed/'), -# ('\u0421\u043E\u0437\u0434\u0430\u0442\u0435\u043B\u0438', ‘https://www.t-invariant.org/category/creators/feed/'), -# ('\u0421\u043E\u0446\u0438\u043E\u043B\u043E\u0433\u0438\u044F', ‘https://www.t-invariant.org/category/sociology/feed/'), -# ('\u0422\u0435\u0440\u0440\u043E\u0440\u0438\u0437\u043C', ‘https://www.t-invariant.org/category/terrorizm/feed/'), -# ('\u0423\u043D\u0438\u0432\u0435\u0440\u0441\u0438\u0442\u0435\u0442\u044B', ‘https://www.t-invariant.org/category/universities/feed/'), -# ('\u0424\u0438\u0437\u0438\u043A\u0430', ‘https://www.t-invariant.org/category/physics/feed/'), -# ('\u0424\u0438\u043B\u043E\u0441\u043E\u0444\u0438\u044F', ‘https://www.t-invariant.org/category/philosophy/feed/'), -# ('\u0428\u043A\u043E\u043B\u0430', ‘https://www.t-invariant.org/category/shkola/feed/'), -# ('\u042D\u043A\u0441\u043F\u0435\u0440\u0442\u0438\u0437\u0430 \u043D\u0430\u0443\u043A\u0438', ‘https://www.t-invariant.org/category/science-assessment/feed/'), -# ('\u042D\u043D\u0435\u0440\u0433\u0435\u0442\u0438\u043A\u0430', ‘https://www.t-invariant.org/category/energy/feed/'), -# ('\u042D\u0442\u0438\u043A\u0430', ‘https://www.t-invariant.org/category/ethics/feed/'), -# -# Censorship bypass -# -# ('\u0412\u0441\u0435 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u044B', 'https://tinyurl.com/t-invariant/feed/'), + # Russian version + # Direct links + # ('\u0412\u0441\u0435 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u044B', ‘https://www.t-invariant.org/feed/'), + # ('\u0410\u0440\u0445\u0438\u0432', ‘https://www.t-invariant.org/category/online/feed/'), + # ('\u0410\u0441\u0442\u0440\u043E\u043D\u043E\u043C\u0438\u044F', ‘https://www.t-invariant.org/category/astronomy/feed/'), + # ('\u0411\u0438\u043E\u043B\u043E\u0433\u0438\u044F', ‘https://www.t-invariant.org/category/biologiya/feed/'), + # ('\u0412\u043E\u0439\u043D\u0430', ‘https://www.t-invariant.org/category/war/feed/'), + # ('\u0412\u0441\u0451 \u0441\u043B\u043E\u0436\u043D\u043E', ‘https://www.t-invariant.org/category/vsyo-slozhno/feed/'), + # ('\u0414\u0432\u0430 \u0433\u043E\u0434\u0430 \u0432\u043E\u0439\u043D\u0435', ‘https://www.t-invariant.org/category/dva-goda-vojne/feed/'), + # ('\u0414\u0432\u0435 \u0441\u0442\u043E\u0440\u043E\u043D\u044B \u043E\u0434\u043D\u043E\u0439 \u043D\u0430\u0443\u043A\u0438', ‘https://www.t-invariant.org/category/dve-storony-odnoj-nauki/feed/'), + # ('\u0414\u0438\u0441\u043A\u0443\u0441\u0441\u0438\u0438', ‘https://www.t-invariant.org/category/discussion/feed/'), + # ('\u0414\u0438\u0441\u0441\u0435\u0440\u043D\u0435\u0442', ‘https://www.t-invariant.org/category/dissernet/feed/'), + # ('\u0418\u0418', ‘https://www.t-invariant.org/category/ai/feed/'), + # ('\u0418\u043D\u0444\u043E\u0440\u043C\u0430\u0442\u0438\u043A\u0430', ‘https://www.t-invariant.org/category/computer-science/feed/'), + # ('\u0418\u0441\u0442\u043E\u0440\u0438\u044F', ‘https://www.t-invariant.org/category/history/feed/'), + # ('\u041A\u043B\u0438\u043C\u0430\u0442', ‘https://www.t-invariant.org/category/climate-ru/feed/'), + # ('\u041A\u043E\u043D\u0442\u0440\u044D\u0432\u043E\u043B\u044E\u0446\u0438\u044F', ‘https://www.t-invariant.org/category/kontrevolyutsiya/feed/'), + # ('\u041A\u043E\u0440\u0440\u0443\u043F\u0446\u0438\u044F', ‘https://www.t-invariant.org/category/korruptsiya/feed/'), + # ('\u041B\u0436\u0435\u043D\u0430\u0443\u043A\u0430', ‘https://www.t-invariant.org/category/pseudoscience/feed/'), + # ('\u041C\u0430\u0442\u0435\u043C\u0430\u0442\u0438\u043A\u0430', ‘https://www.t-invariant.org/category/mathematics/feed/'), + # ('\u041C\u043E\u0437\u0433', ‘https://www.t-invariant.org/category/brain/feed/'), + # ('\u041D\u0430\u0443\u043A\u0430 \u0432 \u0423\u043A\u0440\u0430\u0438\u043D\u0435', ‘https://www.t-invariant.org/category/ukrainian-science/feed/'), + # ('\u041D\u0430\u0443\u0447\u043D\u0430\u044F \u043F\u043E\u043B\u0438\u0442\u0438\u043A\u0430', ‘https://www.t-invariant.org/category/science-policy-ru/feed/'), + # ('\u041D\u043E\u0432\u043E\u0441\u0442\u0438', ‘https://www.t-invariant.org/category/news/feed/'), + # ('\u041E\u043F\u0440\u043E\u0441', ‘https://www.t-invariant.org/category/survey-ru/feed/'), + # ('\u041F\u043E\u0437\u0438\u0446\u0438\u044F', ‘https://www.t-invariant.org/category/standpiont/feed/'), + # ('\u041F\u043E\u043B\u0438\u0442\u043E\u043B\u043E\u0433\u0438\u044F', ‘https://www.t-invariant.org/category/political-science/feed/'), + # ('\u041F\u043E\u043F\u0443\u043B\u044F\u0440\u0438\u0437\u0430\u0446\u0438\u044F \u043D\u0430\u0443\u043A\u0438', ‘https://www.t-invariant.org/category/popular-science/feed/'), + # ('\u041F\u0440\u0430\u0432\u043E', ‘https://www.t-invariant.org/category/pravo/feed/'), + # ('\u041F\u0440\u043E\u0433\u0440\u0435\u0441\u0441', ‘https://www.t-invariant.org/category/progress/feed/'), + # ('\u041F\u0441\u0438\u0445\u043E\u043B\u043E\u0433\u0438\u044F', ‘https://www.t-invariant.org/category/psihologiya/feed/'), + # ('\u0420\u0410\u041D', ‘https://www.t-invariant.org/category/ras/feed/'), + # ('\u0420\u0435\u043B\u0438\u0433\u0438\u044F', ‘https://www.t-invariant.org/category/religion/feed/'), + # ('\u0420\u0435\u043B\u043E\u043A\u0430\u0446\u0438\u044F', ‘https://www.t-invariant.org/category/relocation/feed/'), + # ('\u0420\u0435\u043F\u0440\u0435\u0441\u0441\u0438\u0438', ‘https://www.t-invariant.org/category/repression/feed/'), + # ('\u0420\u0443\u0441\u0441\u043A\u0438\u0439 \u044F\u0437\u044B\u043A', ‘https://www.t-invariant.org/category/russian-language/feed/'), + # ('\u0421\u0430\u043D\u043A\u0446\u0438\u0438', ‘https://www.t-invariant.org/category/sanctions/feed/'), + # ('\u0421\u043E\u0437\u0434\u0430\u0442\u0435\u043B\u0438', ‘https://www.t-invariant.org/category/creators/feed/'), + # ('\u0421\u043E\u0446\u0438\u043E\u043B\u043E\u0433\u0438\u044F', ‘https://www.t-invariant.org/category/sociology/feed/'), + # ('\u0422\u0435\u0440\u0440\u043E\u0440\u0438\u0437\u043C', ‘https://www.t-invariant.org/category/terrorizm/feed/'), + # ('\u0423\u043D\u0438\u0432\u0435\u0440\u0441\u0438\u0442\u0435\u0442\u044B', ‘https://www.t-invariant.org/category/universities/feed/'), + # ('\u0424\u0438\u0437\u0438\u043A\u0430', ‘https://www.t-invariant.org/category/physics/feed/'), + # ('\u0424\u0438\u043B\u043E\u0441\u043E\u0444\u0438\u044F', ‘https://www.t-invariant.org/category/philosophy/feed/'), + # ('\u0428\u043A\u043E\u043B\u0430', ‘https://www.t-invariant.org/category/shkola/feed/'), + # ('\u042D\u043A\u0441\u043F\u0435\u0440\u0442\u0438\u0437\u0430 \u043D\u0430\u0443\u043A\u0438', ‘https://www.t-invariant.org/category/science-assessment/feed/'), + # ('\u042D\u043D\u0435\u0440\u0433\u0435\u0442\u0438\u043A\u0430', ‘https://www.t-invariant.org/category/energy/feed/'), + # ('\u042D\u0442\u0438\u043A\u0430', ‘https://www.t-invariant.org/category/ethics/feed/'), + # Censorship bypass + # ('\u0412\u0441\u0435 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u044B', 'https://tinyurl.com/t-invariant/feed/'), ('\u0410\u0440\u0445\u0438\u0432', 'https://tinyurl.com/t-invariant/category/online/feed/'), ('\u0410\u0441\u0442\u0440\u043E\u043D\u043E\u043C\u0438\u044F', 'https://tinyurl.com/t-invariant/category/astronomy/feed/'), ('\u0411\u0438\u043E\u043B\u043E\u0433\u0438\u044F', 'https://tinyurl.com/t-invariant/category/biologiya/feed/'), @@ -137,37 +133,24 @@ class TInvariant(BasicNewsRecipe): ('\u042D\u043A\u0441\u043F\u0435\u0440\u0442\u0438\u0437\u0430 \u043D\u0430\u0443\u043A\u0438', 'https://tinyurl.com/t-invariant/category/science-assessment/feed/'), ('\u042D\u043D\u0435\u0440\u0433\u0435\u0442\u0438\u043A\u0430', 'https://tinyurl.com/t-invariant/category/energy/feed/'), ('\u042D\u0442\u0438\u043A\u0430', 'https://tinyurl.com/t-invariant/category/ethics/feed/'), -# -# English version -# -# ('T-invariant (English)', 'https://www.t-invariant.org/en/feed/'), -# -# Censorship bypass -# -# ('T-invariant (English)', 'https://tinyurl.com/t-invariant/en/feed/'), -# -# Ukrainian version -# -# ('T-invariant (\u0423\u043A\u0440\u0430\u0457\u043D\u0441\u044C\u043A\u0430)', 'https://www.t-invariant.org/uk/feed/'), -# -# Censorship bypass -# -# ('T-invariant (\u0423\u043A\u0440\u0430\u0457\u043D\u0441\u044C\u043A\u0430)', 'https://tinyurl.com/t-invariant/uk/feed/'), -# -# German version -# -# ('T-invariant (Deutsch)', 'https://www.t-invariant.org/de/feed/'), -# -# Censorship bypass -# -# ('T-invariant (Deutsch)', 'https://tinyurl.com/t-invariant/de/feed/'), -# -# Hebrew version -# -# ('T-invariant (\u05E2\u05D1\u05E8\u05D9\u05EA)', 'https://www.t-invariant.org/he/feed/'), -# -# Censorship bypass -# -# ('T-invariant (\u05E2\u05D1\u05E8\u05D9\u05EA)', 'https://tinyurl.com/t-invariant/he/feed/'), -# + + # English version + # ('T-invariant (English)', 'https://www.t-invariant.org/en/feed/'), + # Censorship bypass + # ('T-invariant (English)', 'https://tinyurl.com/t-invariant/en/feed/'), + + # Ukrainian version + # ('T-invariant (\u0423\u043A\u0440\u0430\u0457\u043D\u0441\u044C\u043A\u0430)', 'https://www.t-invariant.org/uk/feed/'), + # Censorship bypass + # ('T-invariant (\u0423\u043A\u0440\u0430\u0457\u043D\u0441\u044C\u043A\u0430)', 'https://tinyurl.com/t-invariant/uk/feed/'), + + # German version + # ('T-invariant (Deutsch)', 'https://www.t-invariant.org/de/feed/'), + # Censorship bypass + # ('T-invariant (Deutsch)', 'https://tinyurl.com/t-invariant/de/feed/'), + + # Hebrew version + # ('T-invariant (\u05E2\u05D1\u05E8\u05D9\u05EA)', 'https://www.t-invariant.org/he/feed/'), + # Censorship bypass + # ('T-invariant (\u05E2\u05D1\u05E8\u05D9\u05EA)', 'https://tinyurl.com/t-invariant/he/feed/'), ] diff --git a/recipes/t_invariant_ua.recipe b/recipes/t_invariant_ua.recipe index b9b80cb5a0..f7a69588de 100644 --- a/recipes/t_invariant_ua.recipe +++ b/recipes/t_invariant_ua.recipe @@ -13,12 +13,12 @@ class TInvariant(BasicNewsRecipe): publisher = '\u0422-\u0438\u043D\u0432\u0430\u0440\u0438\u0430\u043D\u0442 / T-invariant' category = 'news' cover_url = u'https://t-invariant.org/wp-content/uploads/2023/02/logo-s.png' -# cover_url = u'https://tinyurl.com/t-invariant/wp-content/uploads/2023/02/logo-s.png' -# language = 'ru' -# language = 'en_RU' + # cover_url = u'https://tinyurl.com/t-invariant/wp-content/uploads/2023/02/logo-s.png' + # language = 'ru' + # language = 'en_RU' language = 'uk' -# language = 'de' -# language = 'he' + # language = 'de' + # language = 'he' no_stylesheets = False remove_javascript = False auto_cleanup = False @@ -38,134 +38,117 @@ class TInvariant(BasicNewsRecipe): ] feeds = [ -# Russian version -# -# Direct links -# -# ('\u0412\u0441\u0435 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u044B', ‘https://www.t-invariant.org/feed/'), -# ('\u0410\u0440\u0445\u0438\u0432', ‘https://www.t-invariant.org/category/online/feed/'), -# ('\u0410\u0441\u0442\u0440\u043E\u043D\u043E\u043C\u0438\u044F', ‘https://www.t-invariant.org/category/astronomy/feed/'), -# ('\u0411\u0438\u043E\u043B\u043E\u0433\u0438\u044F', ‘https://www.t-invariant.org/category/biologiya/feed/'), -# ('\u0412\u043E\u0439\u043D\u0430', ‘https://www.t-invariant.org/category/war/feed/'), -# ('\u0412\u0441\u0451 \u0441\u043B\u043E\u0436\u043D\u043E', ‘https://www.t-invariant.org/category/vsyo-slozhno/feed/'), -# ('\u0414\u0432\u0430 \u0433\u043E\u0434\u0430 \u0432\u043E\u0439\u043D\u0435', ‘https://www.t-invariant.org/category/dva-goda-vojne/feed/'), -# ('\u0414\u0432\u0435 \u0441\u0442\u043E\u0440\u043E\u043D\u044B \u043E\u0434\u043D\u043E\u0439 \u043D\u0430\u0443\u043A\u0438', ‘https://www.t-invariant.org/category/dve-storony-odnoj-nauki/feed/'), -# ('\u0414\u0438\u0441\u043A\u0443\u0441\u0441\u0438\u0438', ‘https://www.t-invariant.org/category/discussion/feed/'), -# ('\u0414\u0438\u0441\u0441\u0435\u0440\u043D\u0435\u0442', ‘https://www.t-invariant.org/category/dissernet/feed/'), -# ('\u0418\u0418', ‘https://www.t-invariant.org/category/ai/feed/'), -# ('\u0418\u043D\u0444\u043E\u0440\u043C\u0430\u0442\u0438\u043A\u0430', ‘https://www.t-invariant.org/category/computer-science/feed/'), -# ('\u0418\u0441\u0442\u043E\u0440\u0438\u044F', ‘https://www.t-invariant.org/category/history/feed/'), -# ('\u041A\u043B\u0438\u043C\u0430\u0442', ‘https://www.t-invariant.org/category/climate-ru/feed/'), -# ('\u041A\u043E\u043D\u0442\u0440\u044D\u0432\u043E\u043B\u044E\u0446\u0438\u044F', ‘https://www.t-invariant.org/category/kontrevolyutsiya/feed/'), -# ('\u041A\u043E\u0440\u0440\u0443\u043F\u0446\u0438\u044F', ‘https://www.t-invariant.org/category/korruptsiya/feed/'), -# ('\u041B\u0436\u0435\u043D\u0430\u0443\u043A\u0430', ‘https://www.t-invariant.org/category/pseudoscience/feed/'), -# ('\u041C\u0430\u0442\u0435\u043C\u0430\u0442\u0438\u043A\u0430', ‘https://www.t-invariant.org/category/mathematics/feed/'), -# ('\u041C\u043E\u0437\u0433', ‘https://www.t-invariant.org/category/brain/feed/'), -# ('\u041D\u0430\u0443\u043A\u0430 \u0432 \u0423\u043A\u0440\u0430\u0438\u043D\u0435', ‘https://www.t-invariant.org/category/ukrainian-science/feed/'), -# ('\u041D\u0430\u0443\u0447\u043D\u0430\u044F \u043F\u043E\u043B\u0438\u0442\u0438\u043A\u0430', ‘https://www.t-invariant.org/category/science-policy-ru/feed/'), -# ('\u041D\u043E\u0432\u043E\u0441\u0442\u0438', ‘https://www.t-invariant.org/category/news/feed/'), -# ('\u041E\u043F\u0440\u043E\u0441', ‘https://www.t-invariant.org/category/survey-ru/feed/'), -# ('\u041F\u043E\u0437\u0438\u0446\u0438\u044F', ‘https://www.t-invariant.org/category/standpiont/feed/'), -# ('\u041F\u043E\u043B\u0438\u0442\u043E\u043B\u043E\u0433\u0438\u044F', ‘https://www.t-invariant.org/category/political-science/feed/'), -# ('\u041F\u043E\u043F\u0443\u043B\u044F\u0440\u0438\u0437\u0430\u0446\u0438\u044F \u043D\u0430\u0443\u043A\u0438', ‘https://www.t-invariant.org/category/popular-science/feed/'), -# ('\u041F\u0440\u0430\u0432\u043E', ‘https://www.t-invariant.org/category/pravo/feed/'), -# ('\u041F\u0440\u043E\u0433\u0440\u0435\u0441\u0441', ‘https://www.t-invariant.org/category/progress/feed/'), -# ('\u041F\u0441\u0438\u0445\u043E\u043B\u043E\u0433\u0438\u044F', ‘https://www.t-invariant.org/category/psihologiya/feed/'), -# ('\u0420\u0410\u041D', ‘https://www.t-invariant.org/category/ras/feed/'), -# ('\u0420\u0435\u043B\u0438\u0433\u0438\u044F', ‘https://www.t-invariant.org/category/religion/feed/'), -# ('\u0420\u0435\u043B\u043E\u043A\u0430\u0446\u0438\u044F', ‘https://www.t-invariant.org/category/relocation/feed/'), -# ('\u0420\u0435\u043F\u0440\u0435\u0441\u0441\u0438\u0438', ‘https://www.t-invariant.org/category/repression/feed/'), -# ('\u0420\u0443\u0441\u0441\u043A\u0438\u0439 \u044F\u0437\u044B\u043A', ‘https://www.t-invariant.org/category/russian-language/feed/'), -# ('\u0421\u0430\u043D\u043A\u0446\u0438\u0438', ‘https://www.t-invariant.org/category/sanctions/feed/'), -# ('\u0421\u043E\u0437\u0434\u0430\u0442\u0435\u043B\u0438', ‘https://www.t-invariant.org/category/creators/feed/'), -# ('\u0421\u043E\u0446\u0438\u043E\u043B\u043E\u0433\u0438\u044F', ‘https://www.t-invariant.org/category/sociology/feed/'), -# ('\u0422\u0435\u0440\u0440\u043E\u0440\u0438\u0437\u043C', ‘https://www.t-invariant.org/category/terrorizm/feed/'), -# ('\u0423\u043D\u0438\u0432\u0435\u0440\u0441\u0438\u0442\u0435\u0442\u044B', ‘https://www.t-invariant.org/category/universities/feed/'), -# ('\u0424\u0438\u0437\u0438\u043A\u0430', ‘https://www.t-invariant.org/category/physics/feed/'), -# ('\u0424\u0438\u043B\u043E\u0441\u043E\u0444\u0438\u044F', ‘https://www.t-invariant.org/category/philosophy/feed/'), -# ('\u0428\u043A\u043E\u043B\u0430', ‘https://www.t-invariant.org/category/shkola/feed/'), -# ('\u042D\u043A\u0441\u043F\u0435\u0440\u0442\u0438\u0437\u0430 \u043D\u0430\u0443\u043A\u0438', ‘https://www.t-invariant.org/category/science-assessment/feed/'), -# ('\u042D\u043D\u0435\u0440\u0433\u0435\u0442\u0438\u043A\u0430', ‘https://www.t-invariant.org/category/energy/feed/'), -# ('\u042D\u0442\u0438\u043A\u0430', ‘https://www.t-invariant.org/category/ethics/feed/'), -# -# Censorship bypass -# -# ('\u0412\u0441\u0435 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u044B', 'https://tinyurl.com/t-invariant/feed/'), -# ('\u0410\u0440\u0445\u0438\u0432', 'https://tinyurl.com/t-invariant/category/online/feed/'), -# ('\u0410\u0441\u0442\u0440\u043E\u043D\u043E\u043C\u0438\u044F', 'https://tinyurl.com/t-invariant/category/astronomy/feed/'), -# ('\u0411\u0438\u043E\u043B\u043E\u0433\u0438\u044F', 'https://tinyurl.com/t-invariant/category/biologiya/feed/'), -# ('\u0412\u043E\u0439\u043D\u0430', 'https://tinyurl.com/t-invariant/category/war/feed/'), -# ('\u0412\u0441\u0451 \u0441\u043B\u043E\u0436\u043D\u043E', 'https://tinyurl.com/t-invariant/category/vsyo-slozhno/feed/'), -# ('\u0414\u0432\u0430 \u0433\u043E\u0434\u0430 \u0432\u043E\u0439\u043D\u0435', 'https://tinyurl.com/t-invariant/category/dva-goda-vojne/feed/'), -# ('\u0414\u0432\u0435 \u0441\u0442\u043E\u0440\u043E\u043D\u044B \u043E\u0434\u043D\u043E\u0439 \u043D\u0430\u0443\u043A\u0438', 'https://tinyurl.com/t-invariant/category/dve-storony-odnoj-nauki/feed/'), -# ('\u0414\u0438\u0441\u043A\u0443\u0441\u0441\u0438\u0438', 'https://tinyurl.com/t-invariant/category/discussion/feed/'), -# ('\u0414\u0438\u0441\u0441\u0435\u0440\u043D\u0435\u0442', 'https://tinyurl.com/t-invariant/category/dissernet/feed/'), -# ('\u0418\u0418', 'https://tinyurl.com/t-invariant/category/ai/feed/'), -# ('\u0418\u043D\u0444\u043E\u0440\u043C\u0430\u0442\u0438\u043A\u0430', 'https://tinyurl.com/t-invariant/category/computer-science/feed/'), -# ('\u0418\u0441\u0442\u043E\u0440\u0438\u044F', 'https://tinyurl.com/t-invariant/category/history/feed/'), -# ('\u041A\u043B\u0438\u043C\u0430\u0442', 'https://tinyurl.com/t-invariant/category/climate-ru/feed/'), -# ('\u041A\u043E\u043D\u0442\u0440\u044D\u0432\u043E\u043B\u044E\u0446\u0438\u044F', 'https://tinyurl.com/t-invariant/category/kontrevolyutsiya/feed/'), -# ('\u041A\u043E\u0440\u0440\u0443\u043F\u0446\u0438\u044F', 'https://tinyurl.com/t-invariant/category/korruptsiya/feed/'), -# ('\u041B\u0436\u0435\u043D\u0430\u0443\u043A\u0430', 'https://tinyurl.com/t-invariant/category/pseudoscience/feed/'), -# ('\u041C\u0430\u0442\u0435\u043C\u0430\u0442\u0438\u043A\u0430', 'https://tinyurl.com/t-invariant/category/mathematics/feed/'), -# ('\u041C\u043E\u0437\u0433', 'https://tinyurl.com/t-invariant/category/brain/feed/'), -# ('\u041D\u0430\u0443\u043A\u0430 \u0432 \u0423\u043A\u0440\u0430\u0438\u043D\u0435', 'https://tinyurl.com/t-invariant/category/ukrainian-science/feed/'), -# ('\u041D\u0430\u0443\u0447\u043D\u0430\u044F \u043F\u043E\u043B\u0438\u0442\u0438\u043A\u0430', 'https://tinyurl.com/t-invariant/category/science-policy-ru/feed/'), -# ('\u041D\u043E\u0432\u043E\u0441\u0442\u0438', 'https://tinyurl.com/t-invariant/category/news/feed/'), -# ('\u041E\u043F\u0440\u043E\u0441', 'https://tinyurl.com/t-invariant/category/survey-ru/feed/'), -# ('\u041F\u043E\u0437\u0438\u0446\u0438\u044F', 'https://tinyurl.com/t-invariant/category/standpiont/feed/'), -# ('\u041F\u043E\u043B\u0438\u0442\u043E\u043B\u043E\u0433\u0438\u044F', 'https://tinyurl.com/t-invariant/category/political-science/feed/'), -# ('\u041F\u043E\u043F\u0443\u043B\u044F\u0440\u0438\u0437\u0430\u0446\u0438\u044F \u043D\u0430\u0443\u043A\u0438', 'https://tinyurl.com/t-invariant/category/popular-science/feed/'), -# ('\u041F\u0440\u0430\u0432\u043E', 'https://tinyurl.com/t-invariant/category/pravo/feed/'), -# ('\u041F\u0440\u043E\u0433\u0440\u0435\u0441\u0441', 'https://tinyurl.com/t-invariant/category/progress/feed/'), -# ('\u041F\u0441\u0438\u0445\u043E\u043B\u043E\u0433\u0438\u044F', 'https://tinyurl.com/t-invariant/category/psihologiya/feed/'), -# ('\u0420\u0410\u041D', 'https://tinyurl.com/t-invariant/category/ras/feed/'), -# ('\u0420\u0435\u043B\u0438\u0433\u0438\u044F', 'https://tinyurl.com/t-invariant/category/religion/feed/'), -# ('\u0420\u0435\u043B\u043E\u043A\u0430\u0446\u0438\u044F', 'https://tinyurl.com/t-invariant/category/relocation/feed/'), -# ('\u0420\u0435\u043F\u0440\u0435\u0441\u0441\u0438\u0438', 'https://tinyurl.com/t-invariant/category/repression/feed/'), -# ('\u0420\u0443\u0441\u0441\u043A\u0438\u0439 \u044F\u0437\u044B\u043A', 'https://tinyurl.com/t-invariant/category/russian-language/feed/'), -# ('\u0421\u0430\u043D\u043A\u0446\u0438\u0438', 'https://tinyurl.com/t-invariant/category/sanctions/feed/'), -# ('\u0421\u043E\u0437\u0434\u0430\u0442\u0435\u043B\u0438', 'https://tinyurl.com/t-invariant/category/creators/feed/'), -# ('\u0421\u043E\u0446\u0438\u043E\u043B\u043E\u0433\u0438\u044F', 'https://tinyurl.com/t-invariant/category/sociology/feed/'), -# ('\u0422\u0435\u0440\u0440\u043E\u0440\u0438\u0437\u043C', 'https://tinyurl.com/t-invariant/category/terrorizm/feed/'), -# ('\u0423\u043D\u0438\u0432\u0435\u0440\u0441\u0438\u0442\u0435\u0442\u044B', 'https://tinyurl.com/t-invariant/category/universities/feed/'), -# ('\u0424\u0438\u0437\u0438\u043A\u0430', 'https://tinyurl.com/t-invariant/category/physics/feed/'), -# ('\u0424\u0438\u043B\u043E\u0441\u043E\u0444\u0438\u044F', 'https://tinyurl.com/t-invariant/category/philosophy/feed/'), -# ('\u0428\u043A\u043E\u043B\u0430', 'https://tinyurl.com/t-invariant/category/shkola/feed/'), -# ('\u042D\u043A\u0441\u043F\u0435\u0440\u0442\u0438\u0437\u0430 \u043D\u0430\u0443\u043A\u0438', 'https://tinyurl.com/t-invariant/category/science-assessment/feed/'), -# ('\u042D\u043D\u0435\u0440\u0433\u0435\u0442\u0438\u043A\u0430', 'https://tinyurl.com/t-invariant/category/energy/feed/'), -# ('\u042D\u0442\u0438\u043A\u0430', 'https://tinyurl.com/t-invariant/category/ethics/feed/'), -# -# English version -# -# ('T-invariant (English)', 'https://www.t-invariant.org/en/feed/'), -# -# Censorship bypass -# -# ('T-invariant (English)', 'https://tinyurl.com/t-invariant/en/feed/'), -# -# Ukrainian version -# -# ('T-invariant (\u0423\u043A\u0440\u0430\u0457\u043D\u0441\u044C\u043A\u0430)', 'https://www.t-invariant.org/uk/feed/'), -# -# Censorship bypass -# + # Russian version + # Direct links + # ('\u0412\u0441\u0435 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u044B', ‘https://www.t-invariant.org/feed/'), + # ('\u0410\u0440\u0445\u0438\u0432', ‘https://www.t-invariant.org/category/online/feed/'), + # ('\u0410\u0441\u0442\u0440\u043E\u043D\u043E\u043C\u0438\u044F', ‘https://www.t-invariant.org/category/astronomy/feed/'), + # ('\u0411\u0438\u043E\u043B\u043E\u0433\u0438\u044F', ‘https://www.t-invariant.org/category/biologiya/feed/'), + # ('\u0412\u043E\u0439\u043D\u0430', ‘https://www.t-invariant.org/category/war/feed/'), + # ('\u0412\u0441\u0451 \u0441\u043B\u043E\u0436\u043D\u043E', ‘https://www.t-invariant.org/category/vsyo-slozhno/feed/'), + # ('\u0414\u0432\u0430 \u0433\u043E\u0434\u0430 \u0432\u043E\u0439\u043D\u0435', ‘https://www.t-invariant.org/category/dva-goda-vojne/feed/'), + # ('\u0414\u0432\u0435 \u0441\u0442\u043E\u0440\u043E\u043D\u044B \u043E\u0434\u043D\u043E\u0439 \u043D\u0430\u0443\u043A\u0438', ‘https://www.t-invariant.org/category/dve-storony-odnoj-nauki/feed/'), + # ('\u0414\u0438\u0441\u043A\u0443\u0441\u0441\u0438\u0438', ‘https://www.t-invariant.org/category/discussion/feed/'), + # ('\u0414\u0438\u0441\u0441\u0435\u0440\u043D\u0435\u0442', ‘https://www.t-invariant.org/category/dissernet/feed/'), + # ('\u0418\u0418', ‘https://www.t-invariant.org/category/ai/feed/'), + # ('\u0418\u043D\u0444\u043E\u0440\u043C\u0430\u0442\u0438\u043A\u0430', ‘https://www.t-invariant.org/category/computer-science/feed/'), + # ('\u0418\u0441\u0442\u043E\u0440\u0438\u044F', ‘https://www.t-invariant.org/category/history/feed/'), + # ('\u041A\u043B\u0438\u043C\u0430\u0442', ‘https://www.t-invariant.org/category/climate-ru/feed/'), + # ('\u041A\u043E\u043D\u0442\u0440\u044D\u0432\u043E\u043B\u044E\u0446\u0438\u044F', ‘https://www.t-invariant.org/category/kontrevolyutsiya/feed/'), + # ('\u041A\u043E\u0440\u0440\u0443\u043F\u0446\u0438\u044F', ‘https://www.t-invariant.org/category/korruptsiya/feed/'), + # ('\u041B\u0436\u0435\u043D\u0430\u0443\u043A\u0430', ‘https://www.t-invariant.org/category/pseudoscience/feed/'), + # ('\u041C\u0430\u0442\u0435\u043C\u0430\u0442\u0438\u043A\u0430', ‘https://www.t-invariant.org/category/mathematics/feed/'), + # ('\u041C\u043E\u0437\u0433', ‘https://www.t-invariant.org/category/brain/feed/'), + # ('\u041D\u0430\u0443\u043A\u0430 \u0432 \u0423\u043A\u0440\u0430\u0438\u043D\u0435', ‘https://www.t-invariant.org/category/ukrainian-science/feed/'), + # ('\u041D\u0430\u0443\u0447\u043D\u0430\u044F \u043F\u043E\u043B\u0438\u0442\u0438\u043A\u0430', ‘https://www.t-invariant.org/category/science-policy-ru/feed/'), + # ('\u041D\u043E\u0432\u043E\u0441\u0442\u0438', ‘https://www.t-invariant.org/category/news/feed/'), + # ('\u041E\u043F\u0440\u043E\u0441', ‘https://www.t-invariant.org/category/survey-ru/feed/'), + # ('\u041F\u043E\u0437\u0438\u0446\u0438\u044F', ‘https://www.t-invariant.org/category/standpiont/feed/'), + # ('\u041F\u043E\u043B\u0438\u0442\u043E\u043B\u043E\u0433\u0438\u044F', ‘https://www.t-invariant.org/category/political-science/feed/'), + # ('\u041F\u043E\u043F\u0443\u043B\u044F\u0440\u0438\u0437\u0430\u0446\u0438\u044F \u043D\u0430\u0443\u043A\u0438', ‘https://www.t-invariant.org/category/popular-science/feed/'), + # ('\u041F\u0440\u0430\u0432\u043E', ‘https://www.t-invariant.org/category/pravo/feed/'), + # ('\u041F\u0440\u043E\u0433\u0440\u0435\u0441\u0441', ‘https://www.t-invariant.org/category/progress/feed/'), + # ('\u041F\u0441\u0438\u0445\u043E\u043B\u043E\u0433\u0438\u044F', ‘https://www.t-invariant.org/category/psihologiya/feed/'), + # ('\u0420\u0410\u041D', ‘https://www.t-invariant.org/category/ras/feed/'), + # ('\u0420\u0435\u043B\u0438\u0433\u0438\u044F', ‘https://www.t-invariant.org/category/religion/feed/'), + # ('\u0420\u0435\u043B\u043E\u043A\u0430\u0446\u0438\u044F', ‘https://www.t-invariant.org/category/relocation/feed/'), + # ('\u0420\u0435\u043F\u0440\u0435\u0441\u0441\u0438\u0438', ‘https://www.t-invariant.org/category/repression/feed/'), + # ('\u0420\u0443\u0441\u0441\u043A\u0438\u0439 \u044F\u0437\u044B\u043A', ‘https://www.t-invariant.org/category/russian-language/feed/'), + # ('\u0421\u0430\u043D\u043A\u0446\u0438\u0438', ‘https://www.t-invariant.org/category/sanctions/feed/'), + # ('\u0421\u043E\u0437\u0434\u0430\u0442\u0435\u043B\u0438', ‘https://www.t-invariant.org/category/creators/feed/'), + # ('\u0421\u043E\u0446\u0438\u043E\u043B\u043E\u0433\u0438\u044F', ‘https://www.t-invariant.org/category/sociology/feed/'), + # ('\u0422\u0435\u0440\u0440\u043E\u0440\u0438\u0437\u043C', ‘https://www.t-invariant.org/category/terrorizm/feed/'), + # ('\u0423\u043D\u0438\u0432\u0435\u0440\u0441\u0438\u0442\u0435\u0442\u044B', ‘https://www.t-invariant.org/category/universities/feed/'), + # ('\u0424\u0438\u0437\u0438\u043A\u0430', ‘https://www.t-invariant.org/category/physics/feed/'), + # ('\u0424\u0438\u043B\u043E\u0441\u043E\u0444\u0438\u044F', ‘https://www.t-invariant.org/category/philosophy/feed/'), + # ('\u0428\u043A\u043E\u043B\u0430', ‘https://www.t-invariant.org/category/shkola/feed/'), + # ('\u042D\u043A\u0441\u043F\u0435\u0440\u0442\u0438\u0437\u0430 \u043D\u0430\u0443\u043A\u0438', ‘https://www.t-invariant.org/category/science-assessment/feed/'), + # ('\u042D\u043D\u0435\u0440\u0433\u0435\u0442\u0438\u043A\u0430', ‘https://www.t-invariant.org/category/energy/feed/'), + # ('\u042D\u0442\u0438\u043A\u0430', ‘https://www.t-invariant.org/category/ethics/feed/'), + # Censorship bypass + # ('\u0412\u0441\u0435 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u044B', 'https://tinyurl.com/t-invariant/feed/'), + # ('\u0410\u0440\u0445\u0438\u0432', 'https://tinyurl.com/t-invariant/category/online/feed/'), + # ('\u0410\u0441\u0442\u0440\u043E\u043D\u043E\u043C\u0438\u044F', 'https://tinyurl.com/t-invariant/category/astronomy/feed/'), + # ('\u0411\u0438\u043E\u043B\u043E\u0433\u0438\u044F', 'https://tinyurl.com/t-invariant/category/biologiya/feed/'), + # ('\u0412\u043E\u0439\u043D\u0430', 'https://tinyurl.com/t-invariant/category/war/feed/'), + # ('\u0412\u0441\u0451 \u0441\u043B\u043E\u0436\u043D\u043E', 'https://tinyurl.com/t-invariant/category/vsyo-slozhno/feed/'), + # ('\u0414\u0432\u0430 \u0433\u043E\u0434\u0430 \u0432\u043E\u0439\u043D\u0435', 'https://tinyurl.com/t-invariant/category/dva-goda-vojne/feed/'), + # ('\u0414\u0432\u0435 \u0441\u0442\u043E\u0440\u043E\u043D\u044B \u043E\u0434\u043D\u043E\u0439 \u043D\u0430\u0443\u043A\u0438', 'https://tinyurl.com/t-invariant/category/dve-storony-odnoj-nauki/feed/'), + # ('\u0414\u0438\u0441\u043A\u0443\u0441\u0441\u0438\u0438', 'https://tinyurl.com/t-invariant/category/discussion/feed/'), + # ('\u0414\u0438\u0441\u0441\u0435\u0440\u043D\u0435\u0442', 'https://tinyurl.com/t-invariant/category/dissernet/feed/'), + # ('\u0418\u0418', 'https://tinyurl.com/t-invariant/category/ai/feed/'), + # ('\u0418\u043D\u0444\u043E\u0440\u043C\u0430\u0442\u0438\u043A\u0430', 'https://tinyurl.com/t-invariant/category/computer-science/feed/'), + # ('\u0418\u0441\u0442\u043E\u0440\u0438\u044F', 'https://tinyurl.com/t-invariant/category/history/feed/'), + # ('\u041A\u043B\u0438\u043C\u0430\u0442', 'https://tinyurl.com/t-invariant/category/climate-ru/feed/'), + # ('\u041A\u043E\u043D\u0442\u0440\u044D\u0432\u043E\u043B\u044E\u0446\u0438\u044F', 'https://tinyurl.com/t-invariant/category/kontrevolyutsiya/feed/'), + # ('\u041A\u043E\u0440\u0440\u0443\u043F\u0446\u0438\u044F', 'https://tinyurl.com/t-invariant/category/korruptsiya/feed/'), + # ('\u041B\u0436\u0435\u043D\u0430\u0443\u043A\u0430', 'https://tinyurl.com/t-invariant/category/pseudoscience/feed/'), + # ('\u041C\u0430\u0442\u0435\u043C\u0430\u0442\u0438\u043A\u0430', 'https://tinyurl.com/t-invariant/category/mathematics/feed/'), + # ('\u041C\u043E\u0437\u0433', 'https://tinyurl.com/t-invariant/category/brain/feed/'), + # ('\u041D\u0430\u0443\u043A\u0430 \u0432 \u0423\u043A\u0440\u0430\u0438\u043D\u0435', 'https://tinyurl.com/t-invariant/category/ukrainian-science/feed/'), + # ('\u041D\u0430\u0443\u0447\u043D\u0430\u044F \u043F\u043E\u043B\u0438\u0442\u0438\u043A\u0430', 'https://tinyurl.com/t-invariant/category/science-policy-ru/feed/'), + # ('\u041D\u043E\u0432\u043E\u0441\u0442\u0438', 'https://tinyurl.com/t-invariant/category/news/feed/'), + # ('\u041E\u043F\u0440\u043E\u0441', 'https://tinyurl.com/t-invariant/category/survey-ru/feed/'), + # ('\u041F\u043E\u0437\u0438\u0446\u0438\u044F', 'https://tinyurl.com/t-invariant/category/standpiont/feed/'), + # ('\u041F\u043E\u043B\u0438\u0442\u043E\u043B\u043E\u0433\u0438\u044F', 'https://tinyurl.com/t-invariant/category/political-science/feed/'), + # ('\u041F\u043E\u043F\u0443\u043B\u044F\u0440\u0438\u0437\u0430\u0446\u0438\u044F \u043D\u0430\u0443\u043A\u0438', 'https://tinyurl.com/t-invariant/category/popular-science/feed/'), + # ('\u041F\u0440\u0430\u0432\u043E', 'https://tinyurl.com/t-invariant/category/pravo/feed/'), + # ('\u041F\u0440\u043E\u0433\u0440\u0435\u0441\u0441', 'https://tinyurl.com/t-invariant/category/progress/feed/'), + # ('\u041F\u0441\u0438\u0445\u043E\u043B\u043E\u0433\u0438\u044F', 'https://tinyurl.com/t-invariant/category/psihologiya/feed/'), + # ('\u0420\u0410\u041D', 'https://tinyurl.com/t-invariant/category/ras/feed/'), + # ('\u0420\u0435\u043B\u0438\u0433\u0438\u044F', 'https://tinyurl.com/t-invariant/category/religion/feed/'), + # ('\u0420\u0435\u043B\u043E\u043A\u0430\u0446\u0438\u044F', 'https://tinyurl.com/t-invariant/category/relocation/feed/'), + # ('\u0420\u0435\u043F\u0440\u0435\u0441\u0441\u0438\u0438', 'https://tinyurl.com/t-invariant/category/repression/feed/'), + # ('\u0420\u0443\u0441\u0441\u043A\u0438\u0439 \u044F\u0437\u044B\u043A', 'https://tinyurl.com/t-invariant/category/russian-language/feed/'), + # ('\u0421\u0430\u043D\u043A\u0446\u0438\u0438', 'https://tinyurl.com/t-invariant/category/sanctions/feed/'), + # ('\u0421\u043E\u0437\u0434\u0430\u0442\u0435\u043B\u0438', 'https://tinyurl.com/t-invariant/category/creators/feed/'), + # ('\u0421\u043E\u0446\u0438\u043E\u043B\u043E\u0433\u0438\u044F', 'https://tinyurl.com/t-invariant/category/sociology/feed/'), + # ('\u0422\u0435\u0440\u0440\u043E\u0440\u0438\u0437\u043C', 'https://tinyurl.com/t-invariant/category/terrorizm/feed/'), + # ('\u0423\u043D\u0438\u0432\u0435\u0440\u0441\u0438\u0442\u0435\u0442\u044B', 'https://tinyurl.com/t-invariant/category/universities/feed/'), + # ('\u0424\u0438\u0437\u0438\u043A\u0430', 'https://tinyurl.com/t-invariant/category/physics/feed/'), + # ('\u0424\u0438\u043B\u043E\u0441\u043E\u0444\u0438\u044F', 'https://tinyurl.com/t-invariant/category/philosophy/feed/'), + # ('\u0428\u043A\u043E\u043B\u0430', 'https://tinyurl.com/t-invariant/category/shkola/feed/'), + # ('\u042D\u043A\u0441\u043F\u0435\u0440\u0442\u0438\u0437\u0430 \u043D\u0430\u0443\u043A\u0438', 'https://tinyurl.com/t-invariant/category/science-assessment/feed/'), + # ('\u042D\u043D\u0435\u0440\u0433\u0435\u0442\u0438\u043A\u0430', 'https://tinyurl.com/t-invariant/category/energy/feed/'), + # ('\u042D\u0442\u0438\u043A\u0430', 'https://tinyurl.com/t-invariant/category/ethics/feed/'), + + # English version + # ('T-invariant (English)', 'https://www.t-invariant.org/en/feed/'), + # Censorship bypass + # ('T-invariant (English)', 'https://tinyurl.com/t-invariant/en/feed/'), + + # Ukrainian version + # ('T-invariant (\u0423\u043A\u0440\u0430\u0457\u043D\u0441\u044C\u043A\u0430)', 'https://www.t-invariant.org/uk/feed/'), + # Censorship bypass ('T-invariant (\u0423\u043A\u0440\u0430\u0457\u043D\u0441\u044C\u043A\u0430)', 'https://tinyurl.com/t-invariant/uk/feed/'), -# -# German version -# -# ('T-invariant (Deutsch)', 'https://www.t-invariant.org/de/feed/'), -# -# Censorship bypass -# -# ('T-invariant (Deutsch)', 'https://tinyurl.com/t-invariant/de/feed/'), -# -# Hebrew version -# -# ('T-invariant (\u05E2\u05D1\u05E8\u05D9\u05EA)', 'https://www.t-invariant.org/he/feed/'), -# -# Censorship bypass -# -# ('T-invariant (\u05E2\u05D1\u05E8\u05D9\u05EA)', 'https://tinyurl.com/t-invariant/he/feed/'), -# + + # German version + # ('T-invariant (Deutsch)', 'https://www.t-invariant.org/de/feed/'), + # Censorship bypass + # ('T-invariant (Deutsch)', 'https://tinyurl.com/t-invariant/de/feed/'), + + # Hebrew version + # ('T-invariant (\u05E2\u05D1\u05E8\u05D9\u05EA)', 'https://www.t-invariant.org/he/feed/'), + # Censorship bypass + # ('T-invariant (\u05E2\u05D1\u05E8\u05D9\u05EA)', 'https://tinyurl.com/t-invariant/he/feed/'), ] diff --git a/recipes/theoldie.recipe b/recipes/theoldie.recipe index a97eb8fd34..2f7c8e2431 100644 --- a/recipes/theoldie.recipe +++ b/recipes/theoldie.recipe @@ -90,7 +90,7 @@ class PrivateEyeRecipe(BasicNewsRecipe): # oldie links/headings often contain the author (in one of various formats # 1. Title. By author - # .2. Title by author: subtitle + # 2. Title by author: subtitle # 3. Title: author: subtitle title_author_re = re.compile(r'^(.*?)(?:(?: by )|(?:: ))(.*?): (.*?)$') diff --git a/recipes/ua_fooball.recipe b/recipes/ua_fooball.recipe index c5e48ef88d..91416aca86 100644 --- a/recipes/ua_fooball.recipe +++ b/recipes/ua_fooball.recipe @@ -40,14 +40,14 @@ class UAFootball(BasicNewsRecipe): remove_tags_after = dict(name='div', attrs={'class': 'show-post'}) remove_tags = [ - dict(name='form'), - dict(name='iframe'), - dict(name='div', attrs={'class': 'language'}), - dict(name='div', attrs={'class': 'article__read-also'}), - dict(name='div', attrs={'class': 'card-player'}), - dict(name='div', attrs={'class': 'show-post-socials'}) - ] + dict(name='form'), + dict(name='iframe'), + dict(name='div', attrs={'class': 'language'}), + dict(name='div', attrs={'class': 'article__read-also'}), + dict(name='div', attrs={'class': 'card-player'}), + dict(name='div', attrs={'class': 'show-post-socials'}) + ] -# Replacing articles in Ukraininan for RU-feed -# def print_version(self, url): -# return url.replace('ua-football.com/ua/', 'ua-football.com/') + # Replacing articles in Ukraininan for RU-feed + # def print_version(self, url): + # return url.replace('ua-football.com/ua/', 'ua-football.com/') diff --git a/recipes/vancouver_province.recipe b/recipes/vancouver_province.recipe index ef49d79e3e..40b848e848 100644 --- a/recipes/vancouver_province.recipe +++ b/recipes/vancouver_province.recipe @@ -68,44 +68,44 @@ class CanWestPaper(BasicNewsRecipe): fp_tag = 'CAN_TP' # un-comment the following six lines for the Vancouver Sun - # title = u'Vancouver Sun' - # url_prefix = 'http://www.vancouversun.com' - # description = u'News from Vancouver, BC' - # std_logo_url = 'http://www.vancouversun.com/images/logo_vancouversun.jpg' - # logo_url = 'vslogo.jpg' - # fp_tag = 'CAN_VS' + # # title = u'Vancouver Sun' + # # url_prefix = 'http://www.vancouversun.com' + # # description = u'News from Vancouver, BC' + # # std_logo_url = 'http://www.vancouversun.com/images/logo_vancouversun.jpg' + # # logo_url = 'vslogo.jpg' + # # fp_tag = 'CAN_VS' # un-comment the following six lines for the Calgary Herald -# # title = u'Calgary Herald' -# # url_prefix = 'http://www.calgaryherald.com' -# # description = u'News from Calgary, AB' -# # std_logo_url = 'http://www.calgaryherald.com/images/logo_calgaryherald.jpg' -# # logo_url = 'chlogo.jpg' -# # fp_tag = 'CAN_CH' -# -# un-comment the following six lines for the Edmonton Journal -# # title = u'Edmonton Journal' -# # url_prefix = 'http://www.edmontonjournal.com' -# # description = u'News from Edmonton, AB' -# # std_logo_url = 'http://www.edmontonjournal.com/images/logo_edmontonjournal.jpg' -# # logo_url = 'ejlogo.jpg' -# # fp_tag = 'CAN_EJ' -# -# un-comment the following six lines for the Ottawa Citizen -# # title = u'Ottawa Citizen' -# # url_prefix = 'http://www.ottawacitizen.com' -# # description = u'News from Ottawa, ON' -# # std_logo_url = 'http://www.ottawacitizen.com/images/logo_ottawacitizen.jpg' -# # logo_url = 'oclogo.jpg' -# # fp_tag = 'CAN_OC' -# -# un-comment the following six lines for the Montreal Gazette -# # title = u'Montreal Gazette' -# # url_prefix = 'http://www.montrealgazette.com' -# # description = u'News from Montreal, QC' -# # std_logo_url = 'http://www.montrealgazette.com/images/logo_montrealgazette.jpg' -# # logo_url = 'mglogo.jpg' -# # fp_tag = 'CAN_MG' + # # title = u'Calgary Herald' + # # url_prefix = 'http://www.calgaryherald.com' + # # description = u'News from Calgary, AB' + # # std_logo_url = 'http://www.calgaryherald.com/images/logo_calgaryherald.jpg' + # # logo_url = 'chlogo.jpg' + # # fp_tag = 'CAN_CH' + + # un-comment the following six lines for the Edmonton Journal + # # title = u'Edmonton Journal' + # # url_prefix = 'http://www.edmontonjournal.com' + # # description = u'News from Edmonton, AB' + # # std_logo_url = 'http://www.edmontonjournal.com/images/logo_edmontonjournal.jpg' + # # logo_url = 'ejlogo.jpg' + # # fp_tag = 'CAN_EJ' + + # un-comment the following six lines for the Ottawa Citizen + # # title = u'Ottawa Citizen' + # # url_prefix = 'http://www.ottawacitizen.com' + # # description = u'News from Ottawa, ON' + # # std_logo_url = 'http://www.ottawacitizen.com/images/logo_ottawacitizen.jpg' + # # logo_url = 'oclogo.jpg' + # # fp_tag = 'CAN_OC' + + # un-comment the following six lines for the Montreal Gazette + # # title = u'Montreal Gazette' + # # url_prefix = 'http://www.montrealgazette.com' + # # description = u'News from Montreal, QC' + # # std_logo_url = 'http://www.montrealgazette.com/images/logo_montrealgazette.jpg' + # # logo_url = 'mglogo.jpg' + # # fp_tag = 'CAN_MG' Kindle_Fire = False masthead_url = std_logo_url diff --git a/recipes/vancouver_sun.recipe b/recipes/vancouver_sun.recipe index 5b8ab19b78..e06a0a3492 100644 --- a/recipes/vancouver_sun.recipe +++ b/recipes/vancouver_sun.recipe @@ -61,12 +61,12 @@ class CanWestPaper(BasicNewsRecipe): ] # un-comment the following six lines for the Vancouver Province -# title = u'Vancouver Province' -# url_prefix = 'http://www.theprovince.com' -# description = u'News from Vancouver, BC' -# std_logo_url = 'http://www.theprovince.com/images/logo_theprovince.jpg' -# logo_url = 'vplogo.jpg' -# fp_tag = 'CAN_TP' + # # title = u'Vancouver Province' + # # url_prefix = 'http://www.theprovince.com' + # # description = u'News from Vancouver, BC' + # # std_logo_url = 'http://www.theprovince.com/images/logo_theprovince.jpg' + # # logo_url = 'vplogo.jpg' + # # fp_tag = 'CAN_TP' # un-comment the following six lines for the Vancouver Sun title = u'Vancouver Sun' @@ -77,36 +77,36 @@ class CanWestPaper(BasicNewsRecipe): fp_tag = 'CAN_VS' # un-comment the following six lines for the Calgary Herald -# title = u'Calgary Herald' -# url_prefix = 'http://www.calgaryherald.com' -# description = u'News from Calgary, AB' -# std_logo_url = 'http://www.calgaryherald.com/images/logo_calgaryherald.jpg' -# logo_url = 'chlogo.jpg' -# fp_tag = 'CAN_CH' + # # title = u'Calgary Herald' + # # url_prefix = 'http://www.calgaryherald.com' + # # description = u'News from Calgary, AB' + # # std_logo_url = 'http://www.calgaryherald.com/images/logo_calgaryherald.jpg' + # # logo_url = 'chlogo.jpg' + # # fp_tag = 'CAN_CH' # un-comment the following six lines for the Edmonton Journal -# title = u'Edmonton Journal' -# url_prefix = 'http://www.edmontonjournal.com' -# description = u'News from Edmonton, AB' -# std_logo_url = 'http://www.edmontonjournal.com/images/logo_edmontonjournal.jpg' -# logo_url = 'ejlogo.jpg' -# fp_tag = 'CAN_EJ' + # # title = u'Edmonton Journal' + # # url_prefix = 'http://www.edmontonjournal.com' + # # description = u'News from Edmonton, AB' + # # std_logo_url = 'http://www.edmontonjournal.com/images/logo_edmontonjournal.jpg' + # # logo_url = 'ejlogo.jpg' + # # fp_tag = 'CAN_EJ' # un-comment the following six lines for the Ottawa Citizen -# title = u'Ottawa Citizen' -# url_prefix = 'http://www.ottawacitizen.com' -# description = u'News from Ottawa, ON' -# std_logo_url = 'http://www.ottawacitizen.com/images/logo_ottawacitizen.jpg' -# logo_url = 'oclogo.jpg' -# fp_tag = 'CAN_OC' + # # title = u'Ottawa Citizen' + # # url_prefix = 'http://www.ottawacitizen.com' + # # description = u'News from Ottawa, ON' + # # std_logo_url = 'http://www.ottawacitizen.com/images/logo_ottawacitizen.jpg' + # # logo_url = 'oclogo.jpg' + # # fp_tag = 'CAN_OC' # un-comment the following six lines for the Montreal Gazette -# title = u'Montreal Gazette' -# url_prefix = 'http://www.montrealgazette.com' -# description = u'News from Montreal, QC' -# std_logo_url = 'http://www.montrealgazette.com/images/logo_montrealgazette.jpg' -# logo_url = 'mglogo.jpg' -# fp_tag = 'CAN_MG' + # # title = u'Montreal Gazette' + # # url_prefix = 'http://www.montrealgazette.com' + # # description = u'News from Montreal, QC' + # # std_logo_url = 'http://www.montrealgazette.com/images/logo_montrealgazette.jpg' + # # logo_url = 'mglogo.jpg' + # # fp_tag = 'CAN_MG' Kindle_Fire = False masthead_url = std_logo_url diff --git a/recipes/wicomix.recipe b/recipes/wicomix.recipe index 27e241f5a4..58d33f659c 100644 --- a/recipes/wicomix.recipe +++ b/recipes/wicomix.recipe @@ -25,12 +25,12 @@ class WiComix(BasicNewsRecipe): remove_tags_after = dict(name='article') remove_tags = [ -# dict(name='div', attrs={'class': 'author-meta'}), + # dict(name='div', attrs={'class': 'author-meta'}), dict(name='div', attrs={'id': 'jp-post-flair'}), dict(name='footer', attrs={'class': 'entry-meta'}) ] feeds = [ ('\u041F\u0443\u0431\u043B\u0438\u043A\u0430\u0446\u0438\u0438', 'https://wicomix.com/feed/') -# ('\u041A\u043E\u043C\u043C\u0435\u043D\u0442\u0430\u0440\u0438\u0438', 'https://wicomix.com/comments/feed/') + # ('\u041A\u043E\u043C\u043C\u0435\u043D\u0442\u0430\u0440\u0438\u0438', 'https://wicomix.com/comments/feed/') ] diff --git a/recipes/windows_star.recipe b/recipes/windows_star.recipe index 89fbc5347c..dd6547a4fb 100644 --- a/recipes/windows_star.recipe +++ b/recipes/windows_star.recipe @@ -17,14 +17,14 @@ class CanWestPaper(BasicNewsRecipe): description = u'News from Windsor, ON' # un-comment the following three lines for the Ottawa Citizen - # title = u'Ottawa Citizen' - # url_prefix = 'http://www.ottawacitizen.com' - # description = u'News from Ottawa, ON' - # + # # title = u'Ottawa Citizen' + # # url_prefix = 'http://www.ottawacitizen.com' + # # description = u'News from Ottawa, ON' + # un-comment the following three lines for the Montreal Gazette - # title = u'Montreal Gazette' - # url_prefix = 'http://www.montrealgazette.com' - # description = u'News from Montreal, QC' + # # title = u'Montreal Gazette' + # # url_prefix = 'http://www.montrealgazette.com' + # # description = u'News from Montreal, QC' language = 'en_CA' __author__ = 'Nick Redding' diff --git a/recipes/windsor_star.recipe b/recipes/windsor_star.recipe index db20312efe..a2d37565f7 100644 --- a/recipes/windsor_star.recipe +++ b/recipes/windsor_star.recipe @@ -15,46 +15,46 @@ from calibre.web.feeds.news import BasicNewsRecipe class CanWestPaper(BasicNewsRecipe): # un-comment the following four lines for the Victoria Times Colonist - # title = u'Victoria Times Colonist' - # url_prefix = 'http://www.timescolonist.com' - # description = u'News from Victoria, BC' - # fp_tag = 'CAN_TC' + # # title = u'Victoria Times Colonist' + # # url_prefix = 'http://www.timescolonist.com' + # # description = u'News from Victoria, BC' + # # fp_tag = 'CAN_TC' # un-comment the following four lines for the Vancouver Province - # title = u'Vancouver Province' - # url_prefix = 'http://www.theprovince.com' - # description = u'News from Vancouver, BC' - # fp_tag = 'CAN_VP' + # # title = u'Vancouver Province' + # # url_prefix = 'http://www.theprovince.com' + # # description = u'News from Vancouver, BC' + # # fp_tag = 'CAN_VP' # un-comment the following four lines for the Vancouver Sun - # title = u'Vancouver Sun' - # url_prefix = 'http://www.vancouversun.com' - # description = u'News from Vancouver, BC' - # fp_tag = 'CAN_VS' + # # title = u'Vancouver Sun' + # # url_prefix = 'http://www.vancouversun.com' + # # description = u'News from Vancouver, BC' + # # fp_tag = 'CAN_VS' # un-comment the following four lines for the Edmonton Journal - # title = u'Edmonton Journal' - # url_prefix = 'http://www.edmontonjournal.com' - # description = u'News from Edmonton, AB' - # fp_tag = 'CAN_EJ' + # # title = u'Edmonton Journal' + # # url_prefix = 'http://www.edmontonjournal.com' + # # description = u'News from Edmonton, AB' + # # fp_tag = 'CAN_EJ' # un-comment the following four lines for the Calgary Herald - # title = u'Calgary Herald' - # url_prefix = 'http://www.calgaryherald.com' - # description = u'News from Calgary, AB' - # fp_tag = 'CAN_CH' + # # title = u'Calgary Herald' + # # url_prefix = 'http://www.calgaryherald.com' + # # description = u'News from Calgary, AB' + # # fp_tag = 'CAN_CH' # un-comment the following four lines for the Regina Leader-Post - # title = u'Regina Leader-Post' - # url_prefix = 'http://www.leaderpost.com' - # description = u'News from Regina, SK' - # fp_tag = '' + # # title = u'Regina Leader-Post' + # # url_prefix = 'http://www.leaderpost.com' + # # description = u'News from Regina, SK' + # # fp_tag = '' # un-comment the following four lines for the Saskatoon Star-Phoenix - # title = u'Saskatoon Star-Phoenix' - # url_prefix = 'http://www.thestarphoenix.com' - # description = u'News from Saskatoon, SK' - # fp_tag = '' + # # title = u'Saskatoon Star-Phoenix' + # # url_prefix = 'http://www.thestarphoenix.com' + # # description = u'News from Saskatoon, SK' + # # fp_tag = '' # un-comment the following four lines for the Windsor Star title = u'Windsor Star' @@ -63,16 +63,16 @@ class CanWestPaper(BasicNewsRecipe): fp_tag = 'CAN_' # un-comment the following four lines for the Ottawa Citizen - # title = u'Ottawa Citizen' - # url_prefix = 'http://www.ottawacitizen.com' - # description = u'News from Ottawa, ON' - # fp_tag = 'CAN_OC' + # # title = u'Ottawa Citizen' + # # url_prefix = 'http://www.ottawacitizen.com' + # # description = u'News from Ottawa, ON' + # # fp_tag = 'CAN_OC' # un-comment the following four lines for the Montreal Gazette - # title = u'Montreal Gazette' - # url_prefix = 'http://www.montrealgazette.com' - # description = u'News from Montreal, QC' - # fp_tag = 'CAN_MG' + # # title = u'Montreal Gazette' + # # url_prefix = 'http://www.montrealgazette.com' + # # description = u'News from Montreal, QC' + # # fp_tag = 'CAN_MG' language = 'en_CA' __author__ = 'Nick Redding' diff --git a/recipes/zaobao.recipe b/recipes/zaobao.recipe index 83f1c855ca..a53e252c06 100644 --- a/recipes/zaobao.recipe +++ b/recipes/zaobao.recipe @@ -18,7 +18,7 @@ class ZAOBAO(BasicNewsRecipe): language = 'zh' encoding = 'gbk' masthead_url = 'http://www.zaobao.com/ssi/images1/zblogo_original.gif' -# multithreaded_fetch = True + # multithreaded_fetch = True keep_only_tags = [ dict(name='td', attrs={'class': 'text'}), diff --git a/recipes/zerkalo.recipe b/recipes/zerkalo.recipe index e1058f0914..d134147fc5 100644 --- a/recipes/zerkalo.recipe +++ b/recipes/zerkalo.recipe @@ -28,14 +28,10 @@ class Zerkalo(BasicNewsRecipe): ] feeds = [ -# -# Original feeds -# -# ('\u041D\u043E\u0432\u043E\u0441\u0442\u0438 \u0437\u0430 \u0434\u0435\u043D\u044C', 'https://news.zerkalo.io/rss/all.rss'), -# ('\u041D\u043E\u0432\u043E\u0441\u0442\u0438 \u043D\u0435\u0434\u0435\u043B\u0438', 'https://news.zerkalo.io/rss/index.rss'), -# -# Censorship bypass -# + # Original feeds + # ('\u041D\u043E\u0432\u043E\u0441\u0442\u0438 \u0437\u0430 \u0434\u0435\u043D\u044C', 'https://news.zerkalo.io/rss/all.rss'), + # ('\u041D\u043E\u0432\u043E\u0441\u0442\u0438 \u043D\u0435\u0434\u0435\u043B\u0438', 'https://news.zerkalo.io/rss/index.rss'), + # Censorship bypass ('\u041D\u043E\u0432\u043E\u0441\u0442\u0438 \u0437\u0430 \u0434\u0435\u043D\u044C', 'https://br0wse-zerkalo.site/news/rss/all.rss'), ('\u041D\u043E\u0432\u043E\u0441\u0442\u0438 \u043D\u0435\u0434\u0435\u043B\u0438', 'https://br0wse-zerkalo.site/news/rss/index.rss'), ] diff --git a/resources/default_tweaks.py b/resources/default_tweaks.py index f45e84de48..8c5a50e6d2 100644 --- a/resources/default_tweaks.py +++ b/resources/default_tweaks.py @@ -221,10 +221,10 @@ per_language_title_sort_articles = { 'epo': (r'La\s+', r"L'", 'L´'), # Spanish 'spa': (r'El\s+', r'La\s+', r'Lo\s+', r'Los\s+', r'Las\s+', r'Un\s+', - r'Una\s+', r'Unos\s+', r'Unas\s+'), + r'Una\s+', r'Unos\s+', r'Unas\s+'), # French 'fra': (r'Le\s+', r'La\s+', r"L'", r'L´', r'L’', r'Les\s+', r'Un\s+', r'Une\s+', - r'Des\s+', r'De\s+La\s+', r'De\s+', r"D'", r'D´', r'D’'), + r'Des\s+', r'De\s+La\s+', r'De\s+', r"D'", r'D´', r'D’'), # Polish 'pol': (), # Italian @@ -234,17 +234,17 @@ per_language_title_sort_articles = { r'Della\s+', r'Dello\s+', r"Dell'", r'Dell´'), # Portuguese 'por': (r'A\s+', r'O\s+', r'Os\s+', r'As\s+', r'Um\s+', r'Uns\s+', - r'Uma\s+', r'Umas\s+'), + r'Uma\s+', r'Umas\s+'), # Romanian 'ron': (r'Un\s+', r'O\s+', r'Nişte\s+'), # German 'deu': (r'Der\s+', r'Die\s+', r'Das\s+', r'Den\s+', r'Ein\s+', - r'Eine\s+', r'Einen\s+', r'Dem\s+', r'Des\s+', r'Einem\s+', - r'Eines\s+'), + r'Eine\s+', r'Einen\s+', r'Dem\s+', r'Des\s+', r'Einem\s+', + r'Eines\s+'), # Dutch 'nld': (r'De\s+', r'Het\s+', r'Een\s+', r"'n\s+", r"'s\s+", r'Ene\s+', - r'Ener\s+', r'Enes\s+', r'Den\s+', r'Der\s+', r'Des\s+', - r"'t\s+"), + r'Ener\s+', r'Enes\s+', r'Den\s+', r'Der\s+', r'Des\s+', + r"'t\s+"), # Swedish 'swe': (r'En\s+', r'Ett\s+', r'Det\s+', r'Den\s+', r'De\s+'), # Turkish @@ -253,7 +253,7 @@ per_language_title_sort_articles = { 'afr': (r"'n\s+", r'Die\s+'), # Greek 'ell': (r'O\s+', r'I\s+', r'To\s+', r'Ta\s+', r'Tus\s+', r'Tis\s+', - r"'Enas\s+", r"'Mia\s+", r"'Ena\s+", r"'Enan\s+"), + r"'Enas\s+", r"'Mia\s+", r"'Ena\s+", r"'Enan\s+"), # Hungarian 'hun': (r'A\s+', r'Az\s+', r'Egy\s+'), } diff --git a/src/calibre/db/locking.py b/src/calibre/db/locking.py index 9b61f2bb9d..579e890111 100644 --- a/src/calibre/db/locking.py +++ b/src/calibre/db/locking.py @@ -73,21 +73,21 @@ class SHLock: # {{{ def __init__(self): self._lock = Lock() - # When a shared lock is held, is_shared will give the cumulative - # number of locks and _shared_owners maps each owning thread to - # the number of locks is holds. + # When a shared lock is held, is_shared will give the cumulative + # number of locks and _shared_owners maps each owning thread to + # the number of locks is holds. self.is_shared = 0 self._shared_owners = {} - # When an exclusive lock is held, is_exclusive will give the number - # of locks held and _exclusive_owner will give the owning thread + # When an exclusive lock is held, is_exclusive will give the number + # of locks held and _exclusive_owner will give the owning thread self.is_exclusive = 0 self._exclusive_owner = None - # When someone is forced to wait for a lock, they add themselves - # to one of these queues along with a "waiter" condition that - # is used to wake them up. + # When someone is forced to wait for a lock, they add themselves + # to one of these queues along with a "waiter" condition that + # is used to wake them up. self._shared_queue = [] self._exclusive_queue = [] - # This is for recycling waiter objects. + # This is for recycling waiter objects. self._free_waiters = [] def acquire(self, blocking=True, shared=False): @@ -111,9 +111,9 @@ class SHLock: # {{{ def release(self): ''' Release the lock. ''' - # This decrements the appropriate lock counters, and if the lock - # becomes free, it looks for a queued thread to hand it off to. - # By doing the handoff here we ensure fairness. + # This decrements the appropriate lock counters, and if the lock + # becomes free, it looks for a queued thread to hand it off to. + # By doing the handoff here we ensure fairness. me = current_thread() with self._lock: if self.is_exclusive: @@ -122,16 +122,16 @@ class SHLock: # {{{ self.is_exclusive -= 1 if not self.is_exclusive: self._exclusive_owner = None - # If there are waiting shared locks, issue them - # all and them wake everyone up. + # If there are waiting shared locks, issue them + # all and them wake everyone up. if self._shared_queue: for (thread, waiter) in self._shared_queue: self.is_shared += 1 self._shared_owners[thread] = 1 waiter.notify() del self._shared_queue[:] - # Otherwise, if there are waiting exclusive locks, - # they get first dibbs on the lock. + # Otherwise, if there are waiting exclusive locks, + # they get first dibbs on the lock. elif self._exclusive_queue: (thread, waiter) = self._exclusive_queue.pop(0) self._exclusive_owner = thread @@ -146,8 +146,8 @@ class SHLock: # {{{ raise LockingError('release() called on unheld lock') self.is_shared -= 1 if not self.is_shared: - # If there are waiting exclusive locks, - # they get first dibbs on the lock. + # If there are waiting exclusive locks, + # they get first dibbs on the lock. if self._exclusive_queue: (thread, waiter) = self._exclusive_queue.pop(0) self._exclusive_owner = thread @@ -160,13 +160,13 @@ class SHLock: # {{{ def _acquire_shared(self, blocking=True): me = current_thread() - # Each case: acquiring a lock we already hold. + # Each case: acquiring a lock we already hold. if self.is_shared and me in self._shared_owners: self.is_shared += 1 self._shared_owners[me] += 1 return True - # If the lock is already spoken for by an exclusive, add us - # to the shared queue and it will give us the lock eventually. + # If the lock is already spoken for by an exclusive, add us + # to the shared queue and it will give us the lock eventually. if self.is_exclusive or self._exclusive_queue: if self._exclusive_owner is me: raise DowngradeLockError("can't downgrade SHLock object") @@ -186,7 +186,7 @@ class SHLock: # {{{ def _acquire_exclusive(self, blocking=True): me = current_thread() - # Each case: acquiring a lock we already hold. + # Each case: acquiring a lock we already hold. if self._exclusive_owner is me: assert self.is_exclusive self.is_exclusive += 1 @@ -194,8 +194,8 @@ class SHLock: # {{{ # Do not allow upgrade of lock if self.is_shared and me in self._shared_owners: raise LockingError("can't upgrade SHLock object") - # If the lock is already spoken for, add us to the exclusive queue. - # This will eventually give us the lock when it's our turn. + # If the lock is already spoken for, add us to the exclusive queue. + # This will eventually give us the lock when it's our turn. if self.is_shared or self.is_exclusive: if not blocking: return False diff --git a/src/calibre/devices/interface.py b/src/calibre/devices/interface.py index a4b4efb700..e8f69f575e 100644 --- a/src/calibre/devices/interface.py +++ b/src/calibre/devices/interface.py @@ -791,9 +791,9 @@ class CurrentlyConnectedDevice: # A device driver can check if a device is currently connected to calibre using # the following code:: -# from calibre.device.interface import currently_connected_device -# if currently_connected_device.device is None: -# # no device connected +# from calibre.device.interface import currently_connected_device +# if currently_connected_device.device is None: +# # no device connected # The device attribute will be either None or the device driver object # (DevicePlugin instance) for the currently connected device. currently_connected_device = CurrentlyConnectedDevice() diff --git a/src/calibre/devices/kobo/bookmark.py b/src/calibre/devices/kobo/bookmark.py index bf0e569416..4986509e77 100644 --- a/src/calibre/devices/kobo/bookmark.py +++ b/src/calibre/devices/kobo/bookmark.py @@ -90,8 +90,8 @@ class Bookmark: # {{{ debug_print(f"Kobo::Bookmark::get_bookmark_data - getting kepub: chapter opf_reference='{opf_reference}'") file_contentID_part = file_contentID_part[filename_index + 1:] debug_print(f"Kobo::Bookmark::get_bookmark_data - getting kepub: chapter file_contentID_part='{file_contentID_part}'") -# from urllib import quote -# file_contentID_part = quote(file_contentID_part) + # from urllib import quote + # file_contentID_part = quote(file_contentID_part) chapter_contentID = book_contentID_part + '!' + opf_reference + '!' + file_contentID_part debug_print(f"Kobo::Bookmark::get_bookmark_data - getting kepub chapter chapter_contentID='{chapter_contentID}'") kepub_chapter = kepub_chapters.get(chapter_contentID, None) @@ -152,7 +152,7 @@ class Bookmark: # {{{ # print(row[1]) cursor.close() -# self.last_read_location = self.last_read - self.pdf_page_offset + # self.last_read_location = self.last_read - self.pdf_page_offset self.user_notes = user_notes def get_book_length(self): diff --git a/src/calibre/devices/kobo/books.py b/src/calibre/devices/kobo/books.py index e8d62a67d2..c3f6b306f7 100644 --- a/src/calibre/devices/kobo/books.py +++ b/src/calibre/devices/kobo/books.py @@ -21,7 +21,7 @@ class Book(Book_): def __init__(self, prefix, lpath, title=None, authors=None, mime=None, date=None, ContentType=None, thumbnail_name=None, size=None, other=None): from calibre.utils.date import parse_date -# debug_print('Book::__init__ - title=', title) + # debug_print('Book::__init__ - title=', title) show_debug = title is not None and title.lower().find('xxxxx') >= 0 if other is not None: other.title = title @@ -308,9 +308,9 @@ class KTCollectionsBookList(CollectionsBookList): def is_debugging_title(self, title): if not DEBUG: return False -# debug_print("KTCollectionsBookList:is_debugging - title=", title, "self.debugging_title=", self.debugging_title) + # debug_print("KTCollectionsBookList:is_debugging - title=", title, "self.debugging_title=", self.debugging_title) is_debugging = self.debugging_title is not None and len(self.debugging_title) > 0 and title is not None and ( title.lower().find(self.debugging_title.lower()) >= 0 or len(title) == 0) -# debug_print("KTCollectionsBookList:is_debugging - is_debugging=", is_debugging) + # debug_print("KTCollectionsBookList:is_debugging - is_debugging=", is_debugging) return is_debugging diff --git a/src/calibre/devices/kobo/driver.py b/src/calibre/devices/kobo/driver.py index f9d53eaa4e..cf65ff326c 100644 --- a/src/calibre/devices/kobo/driver.py +++ b/src/calibre/devices/kobo/driver.py @@ -422,7 +422,7 @@ class KOBO(USBMS): changed = False for row in cursor: - # self.report_progress((i+1) / float(numrows), _('Getting list of books on device...')) + # self.report_progress((i+1) / float(numrows), _('Getting list of books on device...')) if not hasattr(row['ContentID'], 'startswith') or row['ContentID'].startswith('file:///usr/local/Kobo/help/'): # These are internal to the Kobo device and do not exist continue @@ -466,21 +466,21 @@ class KOBO(USBMS): return bl def filename_callback(self, path, mi): - # debug_print("Kobo:filename_callback:Path - {0}".format(path)) + # debug_print("Kobo:filename_callback:Path - {0}".format(path)) idx = path.rfind('.') ext = path[idx:] if ext == KEPUB_EXT: path = path + EPUB_EXT -# debug_print("Kobo:filename_callback:New path - {0}".format(path)) + # debug_print("Kobo:filename_callback:New path - {0}".format(path)) return path def delete_via_sql(self, ContentID, ContentType): # Delete Order: - # 1) shortcover_page - # 2) volume_shorcover - # 2) content + # 1) shortcover_page + # 2) volume_shorcover + # 2) content debug_print('delete_via_sql: ContentID: ', ContentID, 'ContentType: ', ContentType) with closing(self.device_database_connection()) as connection: @@ -915,14 +915,14 @@ class KOBO(USBMS): 'Preview':6, 'Recommendation':4, } -# debug_print('Starting update_device_database_collections', collections_attributes) + # debug_print('Starting update_device_database_collections', collections_attributes) # Force collections_attributes to be 'tags' as no other is currently supported -# debug_print('KOBO: overriding the provided collections_attributes:', collections_attributes) + # debug_print('KOBO: overriding the provided collections_attributes:', collections_attributes) collections_attributes = ['tags'] collections = booklists.get_collections(collections_attributes) -# debug_print('Kobo:update_device_database_collections - Collections:', collections) + # debug_print('Kobo:update_device_database_collections - Collections:', collections) # Create a connection to the sqlite database # Needs to be outside books collection as in the case of removing @@ -970,7 +970,7 @@ class KOBO(USBMS): debug_print('No Collections - resetting FavouritesIndex') self.reset_favouritesindex(connection, oncard) -# debug_print('Finished update_device_database_collections', collections_attributes) + # debug_print('Finished update_device_database_collections', collections_attributes) def get_collections_attributes(self): collections = [x.lower().strip() for x in self.collections_columns.split(',')] @@ -999,7 +999,7 @@ class KOBO(USBMS): def sync_booklists(self, booklists, end_session=True): debug_print('KOBO:sync_booklists - start') paths = self.get_device_paths() -# debug_print('KOBO:sync_booklists - booklists:', booklists) + # debug_print('KOBO:sync_booklists - booklists:', booklists) blists = {} for i in paths: @@ -1073,7 +1073,7 @@ class KOBO(USBMS): cursor.execute('select ImageId from Content where BookID is Null and ContentID = ?', t) try: result = next(cursor) -# debug_print("ImageId: ", result[0]) + # debug_print("ImageId: ", result[0]) ImageID = result[0] except StopIteration: debug_print('No rows exist in the database - cannot upload') @@ -1129,7 +1129,7 @@ class KOBO(USBMS): with closing(open(path, 'rb')) as r: tf = PersistentTemporaryFile(suffix='.epub') shutil.copyfileobj(r, tf) -# tf.write(r.read()) + # tf.write(r.read()) paths[idx] = tf.name return paths @@ -1385,8 +1385,8 @@ class KOBO(USBMS): # NOTE: As it is, this copied the book from the device back to the library. That meant it replaced the # existing file. Taking this out for that reason, but some books have a ANNOT file that could be # copied. -# db.add_format_with_hooks(db_id, bm.value.bookmark_extension, -# bm.value.path, index_is_id=True) + # db.add_format_with_hooks(db_id, bm.value.bookmark_extension, + # bm.value.path, index_is_id=True) class KOBOTOUCH(KOBO): @@ -1402,7 +1402,7 @@ class KOBOTOUCH(KOBO): ' as well as tolino shine 5, shine color and' ' vision color eReaders.' ' Based on the existing Kobo driver by %s.') % KOBO.author -# icon = 'devices/kobotouch.jpg' + # icon = 'devices/kobotouch.jpg' supported_dbversion = 190 min_supported_dbversion = 53 @@ -1586,14 +1586,14 @@ class KOBOTOUCH(KOBO): '': [(1264,1680), 0, 200,True,], } # Following are the sizes used with pre2.1.4 firmware -# COVER_FILE_ENDINGS = { -# ' - N3_LIBRARY_FULL.parsed':[(355,530),0, 99,], # Used for Details screen -# ' - N3_LIBRARY_FULL.parsed':[(600,800),0, 99,], -# ' - N3_LIBRARY_GRID.parsed':[(149,223),0, 99,], # Used for library lists -# ' - N3_LIBRARY_LIST.parsed':[(60,90),0, 53,], -# ' - N3_LIBRARY_SHELF.parsed': [(40,60),0, 52,], -# ' - N3_FULL.parsed':[(600,800),0, 99,], # Used for screensaver if "Full screen" is checked. -# } + # COVER_FILE_ENDINGS = { + # ' - N3_LIBRARY_FULL.parsed':[(355,530),0, 99,], # Used for Details screen + # ' - N3_LIBRARY_FULL.parsed':[(600,800),0, 99,], + # ' - N3_LIBRARY_GRID.parsed':[(149,223),0, 99,], # Used for library lists + # ' - N3_LIBRARY_LIST.parsed':[(60,90),0, 53,], + # ' - N3_LIBRARY_SHELF.parsed': [(40,60),0, 52,], + # ' - N3_FULL.parsed':[(600,800),0, 99,], # Used for screensaver if "Full screen" is checked. + # } def __init__(self, *args, **kwargs): KOBO.__init__(self, *args, **kwargs) @@ -1737,7 +1737,7 @@ class KOBOTOUCH(KOBO): userid, bookshelves, book_stats=None ): show_debug = self.is_debugging_title(title) -# show_debug = authors == 'L. Frank Baum' + # show_debug = authors == 'L. Frank Baum' if show_debug: debug_print("KoboTouch:update_booklist - title='%s'"%title, 'ContentType=%s'%ContentType, 'isdownloaded=', isdownloaded) debug_print( @@ -1749,7 +1749,7 @@ class KOBOTOUCH(KOBO): if lpath.startswith(os.sep): lpath = lpath[len(os.sep):] lpath = lpath.replace('\\', '/') -# debug_print("KoboTouch:update_booklist - LPATH: ", lpath, " - Title: " , title) + # debug_print("KoboTouch:update_booklist - LPATH: ", lpath, " - Title: " , title) playlist_map = {} @@ -1896,7 +1896,7 @@ class KOBOTOUCH(KOBO): if show_debug: debug_print('KoboTouch:update_booklist - updated bl[idx].device_collections=', bl[idx].device_collections) debug_print('KoboTouch:update_booklist - playlist_map=', playlist_map, 'changed=', changed) -# debug_print('KoboTouch:update_booklist - book=', bl[idx]) + # debug_print('KoboTouch:update_booklist - book=', bl[idx]) debug_print('KoboTouch:update_booklist - book class=%s'%bl[idx].__class__) debug_print('KoboTouch:update_booklist - book title=%s'%bl[idx].title) else: @@ -1921,7 +1921,7 @@ class KOBOTOUCH(KOBO): if show_debug: debug_print('KoboTouch:update_booklist - class:', book.__class__) -# debug_print(' resolution:', book.__class__.__mro__) + # debug_print(' resolution:', book.__class__.__mro__) debug_print(" contentid: '%s'"%book.contentID) debug_print(" title:'%s'"%book.title) debug_print(' the book:', book) @@ -1942,7 +1942,7 @@ class KOBOTOUCH(KOBO): book.kobo_subtitle = Subtitle book.kobo_bookstats = book_stats book.can_put_on_shelves = allow_shelves -# debug_print('KoboTouch:update_booklist - title=', title, 'book.device_collections', book.device_collections) + # debug_print('KoboTouch:update_booklist - title=', title, 'book.device_collections', book.device_collections) if not book.is_sideloaded and book.has_kobo_series and SeriesID is not None: if show_debug: @@ -1977,7 +1977,7 @@ class KOBOTOUCH(KOBO): bookshelves.append(row['ShelfName']) cursor.close() -# debug_print("KoboTouch:get_bookshelvesforbook - count bookshelves=" + str(count_bookshelves)) + # debug_print("KoboTouch:get_bookshelvesforbook - count bookshelves=" + str(count_bookshelves)) return bookshelves self.debug_index = 0 @@ -2090,7 +2090,7 @@ class KOBOTOUCH(KOBO): i = 0 for row in cursor: i += 1 -# self.report_progress((i) / float(books_on_device), _('Getting list of books on device...')) + # self.report_progress((i) / float(books_on_device), _('Getting list of books on device...')) show_debug = self.is_debugging_title(row['Title']) if show_debug: debug_print('KoboTouch:books - looping on database - row=%d' % i) @@ -2286,7 +2286,7 @@ class KOBOTOUCH(KOBO): self.report_progress(0, 'Working...') result = super().upload_books(files, names, on_card, end_session, metadata) -# debug_print('KoboTouch:upload_books - result=', result) + # debug_print('KoboTouch:upload_books - result=', result) if self.dbversion >= 53: try: @@ -2301,7 +2301,7 @@ class KOBOTOUCH(KOBO): debug_print('KoboTouch:upload_books: contentID=', contentID) cleanup_values = (contentID,) -# debug_print('KoboTouch:upload_books: Delete record left if deleted on Touch') + # debug_print('KoboTouch:upload_books: Delete record left if deleted on Touch') cursor.execute(cleanup_query, cleanup_values) if self.override_kobo_replace_existing: @@ -2565,7 +2565,7 @@ class KOBOTOUCH(KOBO): 'Preview':6, 'Recommendation':4, } -# debug_print('KoboTouch:update_device_database_collections - collections_attributes=', collections_attributes) + # debug_print('KoboTouch:update_device_database_collections - collections_attributes=', collections_attributes) create_collections = self.create_collections delete_empty_collections = self.delete_empty_collections @@ -2588,7 +2588,7 @@ class KOBOTOUCH(KOBO): 'dbversion': self.dbversion, } ) if have_bookshelf_attributes else None -# debug_print('KoboTouch:update_device_database_collections - Collections:', collections) + # debug_print('KoboTouch:update_device_database_collections - Collections:', collections) # Create a connection to the sqlite database # Needs to be outside books collection as in the case of removing @@ -2610,21 +2610,21 @@ class KOBOTOUCH(KOBO): debug_print('KoboTouch:update_device_database_collections - calling reset_favouritesindex') self.reset_favouritesindex(connection, oncard) -# debug_print("KoboTouch:update_device_database_collections - length collections=", len(collections)) -# debug_print("KoboTouch:update_device_database_collections - self.bookshelvelist=", self.bookshelvelist) + # debug_print("KoboTouch:update_device_database_collections - length collections=", len(collections)) + # debug_print("KoboTouch:update_device_database_collections - self.bookshelvelist=", self.bookshelvelist) # Process any collections that exist for category, books in collections.items(): debug_print("KoboTouch:update_device_database_collections - category='%s' books=%d"%(category, len(books))) if create_collections and not (category in supportedcategories or category in readstatuslist or category in accessibilitylist): self.check_for_bookshelf(connection, category) -# if category in self.bookshelvelist: -# debug_print("Category: ", category, " id = ", readstatuslist.get(category)) + # if category in self.bookshelvelist: + # debug_print("Category: ", category, " id = ", readstatuslist.get(category)) for book in books: # debug_print(' Title:', book.title, 'category: ', category) show_debug = self.is_debugging_title(book.title) if show_debug: debug_print(' Title="%s"'%book.title, 'category="%s"'%category) -# debug_print(book) + # debug_print(book) debug_print(' class=%s'%book.__class__) debug_print(' book.contentID="%s"'%book.contentID) debug_print(' book.application_id="%s"'%book.application_id) @@ -2761,7 +2761,7 @@ class KOBOTOUCH(KOBO): if self._card_a_prefix and os.path.abspath(path).startswith(os.path.abspath(self._card_a_prefix)) and not self.supports_covers_on_sdcard(): return -# debug_print('KoboTouch: uploading cover') + # debug_print('KoboTouch: uploading cover') try: self._upload_cover( path, filename, metadata, filepath, @@ -3058,7 +3058,7 @@ class KOBOTOUCH(KOBO): cursor.close() -# debug_print("KoboTouch:set_filesize_in_device_database - end") + # debug_print("KoboTouch:set_filesize_in_device_database - end") def delete_empty_bookshelves(self, connection): debug_print('KoboTouch:delete_empty_bookshelves - start') @@ -3114,7 +3114,7 @@ class KOBOTOUCH(KOBO): def get_bookshelflist(self, connection): # Retrieve the list of booksehelves - # debug_print('KoboTouch:get_bookshelflist') + # debug_print('KoboTouch:get_bookshelflist') bookshelves = [] if not self.supports_bookshelves: @@ -3123,13 +3123,13 @@ class KOBOTOUCH(KOBO): query = f'SELECT Name FROM Shelf WHERE _IsDeleted = {self.bool_for_query(False)}' cursor = connection.cursor() cursor.execute(query) -# count_bookshelves = 0 + # count_bookshelves = 0 for row in cursor: bookshelves.append(row['Name']) -# count_bookshelves = i + 1 + # count_bookshelves = i + 1 cursor.close() -# debug_print("KoboTouch:get_bookshelflist - count bookshelves=" + str(count_bookshelves)) + # debug_print("KoboTouch:get_bookshelflist - count bookshelves=" + str(count_bookshelves)) return bookshelves @@ -3170,7 +3170,7 @@ class KOBOTOUCH(KOBO): cursor.close() -# debug_print("KoboTouch:set_bookshelf - end") + # debug_print("KoboTouch:set_bookshelf - end") def check_for_bookshelf(self, connection, bookshelf_name): show_debug = self.is_debugging_title(bookshelf_name) @@ -3232,7 +3232,7 @@ class KOBOTOUCH(KOBO): # Update the bookshelf list. self.bookshelvelist = self.get_bookshelflist(connection) -# debug_print("KoboTouch:set_bookshelf - end") + # debug_print("KoboTouch:set_bookshelf - end") def remove_from_bookshelves(self, connection, oncard, ContentID=None, bookshelves=None): debug_print('KoboTouch:remove_from_bookshelf ContentID=', ContentID) @@ -3550,7 +3550,7 @@ class KOBOTOUCH(KOBO): ''' Get the setting named key. First looks for a device specific setting. If that is not found looks for a device default and if that is not found uses the global default.''' -# debug_print("KoboTouch::get_prefs - key=", key, "cls=", cls) + # debug_print("KoboTouch::get_prefs - key=", key, "cls=", cls) if not cls.opts: cls.opts = cls.settings() try: @@ -4199,7 +4199,7 @@ class KOBOTOUCH(KOBO): def is_debugging_title(self, title): if not DEBUG: return False -# debug_print("KoboTouch:is_debugging - title=", title) + # debug_print("KoboTouch:is_debugging - title=", title) if not self.debugging_title and not self.debugging_title == '': self.debugging_title = self.get_debugging_title() @@ -4263,16 +4263,16 @@ if __name__ == '__main__': scanner = DeviceScanner() scanner.scan() devs = scanner.devices -# debug_print("unit test: devs.__class__=", devs.__class__) -# debug_print("unit test: devs.__class__=", devs.__class__.__name__) + # debug_print("unit test: devs.__class__=", devs.__class__) + # debug_print("unit test: devs.__class__=", devs.__class__.__name__) debug_print('unit test: devs=', devs) debug_print('unit test: dev=', dev) - # cd = dev.detect_managed_devices(devs) - # if cd is None: - # raise ValueError('Failed to detect KOBOTOUCH device') + # cd = dev.detect_managed_devices(devs) + # if cd is None: + # raise ValueError('Failed to detect KOBOTOUCH device') dev.set_progress_reporter(prints) -# dev.open(cd, None) -# dev.filesystem_cache.dump() + # dev.open(cd, None) + # dev.filesystem_cache.dump() print('Prefix for main memory:', dev.dbversion) finally: dev.shutdown() diff --git a/src/calibre/devices/kobo/kobotouch_config.py b/src/calibre/devices/kobo/kobotouch_config.py index 179e2b18bd..f32773c6f5 100644 --- a/src/calibre/devices/kobo/kobotouch_config.py +++ b/src/calibre/devices/kobo/kobotouch_config.py @@ -515,7 +515,7 @@ class AdvancedGroupBox(DeviceOptionsGroupBox): def __init__(self, parent, device): super().__init__(parent, device, _('Advanced options')) -# self.setTitle(_("Advanced Options")) + # self.setTitle(_("Advanced Options")) self.options_layout = QGridLayout() self.options_layout.setObjectName('options_layout') @@ -844,9 +844,9 @@ if __name__ == '__main__': app = Application([]) debug_print('KOBOTOUCH:', KOBOTOUCH) dev = KOBOTOUCH(None) -# dev.startup() -# cd = dev.detect_managed_devices(s.devices) -# dev.open(cd, 'test') + # dev.startup() + # cd = dev.detect_managed_devices(s.devices) + # dev.open(cd, 'test') cw = dev.config_widget() d = QDialog() d.l = QVBoxLayout() diff --git a/src/calibre/devices/smart_device_app/driver.py b/src/calibre/devices/smart_device_app/driver.py index cae0266fe8..eb6aff4439 100644 --- a/src/calibre/devices/smart_device_app/driver.py +++ b/src/calibre/devices/smart_device_app/driver.py @@ -166,7 +166,7 @@ class ConnectionListener(Thread): self.driver._debug('unexpected socket exception', x.args[0]) self._close_socket(device_socket) device_socket = None -# raise + # raise class SDBook(Book): diff --git a/src/calibre/ebooks/conversion/preprocess.py b/src/calibre/ebooks/conversion/preprocess.py index 91d21d1ccf..89c66cb011 100644 --- a/src/calibre/ebooks/conversion/preprocess.py +++ b/src/calibre/ebooks/conversion/preprocess.py @@ -19,13 +19,13 @@ XLINK_NS = 'http://www.w3.org/1999/xlink' _span_pat = re.compile(r'', re.DOTALL|re.IGNORECASE) LIGATURES = { -# 'Æ': 'AE', -# 'æ': 'ae', -# 'Œ': 'OE', -# 'œ': 'oe', -# 'IJ': 'IJ', -# 'ij': 'ij', -# 'ᵫ': 'ue', + # 'Æ': 'AE', + # 'æ': 'ae', + # 'Œ': 'OE', + # 'œ': 'oe', + # 'IJ': 'IJ', + # 'ij': 'ij', + # 'ᵫ': 'ue', 'ff': 'ff', 'fi': 'fi', 'fl': 'fl', @@ -146,9 +146,9 @@ class DocAnalysis: # print('there are '+str(len(lines))+' lines') # max = 0 # for line in self.lines: - # l = len(line) - # if l > max: - # max = l + # l = len(line) + # if l > max: + # max = l # print('max line found is '+str(max)) # Build the line length histogram hRaw = [0 for i in range(0,buckets)] diff --git a/src/calibre/ebooks/conversion/utils.py b/src/calibre/ebooks/conversion/utils.py index 102749d4ad..e8101532fc 100644 --- a/src/calibre/ebooks/conversion/utils.py +++ b/src/calibre/ebooks/conversion/utils.py @@ -115,7 +115,7 @@ class HeuristicProcessor: tot_htm_ends = len(htm_end) tot_ln_fds = len(line_end) # self.log.debug("There are " + str(tot_ln_fds) + " total Line feeds, and " + - # str(tot_htm_ends) + " marked up endings") + # str(tot_htm_ends) + " marked up endings") if percent > 1: percent = 1 diff --git a/src/calibre/ebooks/lrf/input.py b/src/calibre/ebooks/lrf/input.py index 1d64e14f08..4d035b3e82 100644 --- a/src/calibre/ebooks/lrf/input.py +++ b/src/calibre/ebooks/lrf/input.py @@ -177,7 +177,7 @@ class TextBlock(etree.XSLTExtension): self.log.warn('Found deeply nested spans. Flattening.') # with open('/t/before.xml', 'wb') as f: - # f.write(etree.tostring(node, method='xml')) + # f.write(etree.tostring(node, method='xml')) spans = [(depth(span), span) for span in node.xpath('descendant::Span')] spans.sort(key=operator.itemgetter(0), reverse=True) @@ -206,7 +206,7 @@ class TextBlock(etree.XSLTExtension): gp.insert(pidx+1, child) # with open('/t/after.xml', 'wb') as f: - # f.write(etree.tostring(node, method='xml')) + # f.write(etree.tostring(node, method='xml')) def add_text(self, text): if text: @@ -377,8 +377,8 @@ class Styles(etree.XSLTExtension): ans['font-weight'] = ('bold' if fw >= 700 else 'normal') # fn = getattr(obj, 'fontfacename', None) # if fn is not None: - # fn = cls.FONT_MAP[fn] - # item('font-family: %s;'%fn) + # fn = cls.FONT_MAP[fn] + # item('font-family: %s;'%fn) fg = self.color(node.get('textcolor', None)) if fg is not None: ans['color'] = fg @@ -391,7 +391,7 @@ class Styles(etree.XSLTExtension): ans['text-align'] = all.get(al, 'left') # lh = self.to_num(node.get('linespace', None), 0.1) # if lh is not None: - # ans['line-height'] = '%fpt'%lh + # ans['line-height'] = '%fpt'%lh pi = self.to_num(node.get('parindent', None), 0.1) if pi is not None: ans['text-indent'] = '%fpt'%pi diff --git a/src/calibre/ebooks/metadata/pdf.py b/src/calibre/ebooks/metadata/pdf.py index e8897e3d8a..98dfdd4ae1 100644 --- a/src/calibre/ebooks/metadata/pdf.py +++ b/src/calibre/ebooks/metadata/pdf.py @@ -138,7 +138,7 @@ def get_metadata(stream, cover=True): au = string_to_authors(au) mi = MetaInformation(title, au) # if isbn is not None: - # mi.isbn = isbn + # mi.isbn = isbn creator = info.get('Creator', None) if creator: diff --git a/src/calibre/ebooks/metadata/sources/amazon.py b/src/calibre/ebooks/metadata/sources/amazon.py index da6fa769b0..c2308ef88b 100644 --- a/src/calibre/ebooks/metadata/sources/amazon.py +++ b/src/calibre/ebooks/metadata/sources/amazon.py @@ -1775,7 +1775,7 @@ def manual_tests(domain, **kw): # {{{ from calibre.ebooks.metadata.sources.test import authors_test, comments_test, isbn_test, series_test, test_identify_plugin, title_test all_tests = {} all_tests['com'] = [ # {{{ - ( # # in title + ( # in title {'title': 'Expert C# 2008 Business Objects', 'authors': ['Lhotka']}, [title_test('Expert C#'), @@ -1970,7 +1970,7 @@ def manual_tests(domain, **kw): # {{{ [title_test('Parting Shot', exact=True), authors_test(['Mary Calmes'])] ), - ( # # in title + ( # in title {'title': 'Expert C# 2008 Business Objects', 'authors': ['Lhotka']}, [title_test('Expert C# 2008 Business Objects'), diff --git a/src/calibre/ebooks/mobi/reader/headers.py b/src/calibre/ebooks/mobi/reader/headers.py index 1499dc8acb..561998fba1 100644 --- a/src/calibre/ebooks/mobi/reader/headers.py +++ b/src/calibre/ebooks/mobi/reader/headers.py @@ -108,7 +108,7 @@ class EXTHHeader: # {{{ except Exception: pass # else: - # print('unknown record', idx, repr(content)) + # print('unknown record', idx, repr(content)) if title: self.mi.title = replace_entities(clean_xml_chars(clean_ascii_chars(title))) @@ -184,7 +184,7 @@ class EXTHHeader: # {{{ if self.kf8_header == NULL_INDEX: self.kf8_header = None # else: - # print('unhandled metadata record', idx, repr(content)) + # print('unhandled metadata record', idx, repr(content)) # }}} diff --git a/src/calibre/ebooks/oeb/transforms/cover.py b/src/calibre/ebooks/oeb/transforms/cover.py index 54ea9260d7..25571fd539 100644 --- a/src/calibre/ebooks/oeb/transforms/cover.py +++ b/src/calibre/ebooks/oeb/transforms/cover.py @@ -140,7 +140,7 @@ class CoverManager: self.log.warning('Failed to read cover dimensions') width, height = 600, 800 # if self.preserve_aspect_ratio: - # width, height = 600, 800 + # width, height = 600, 800 self.svg_template = self.svg_template.replace('__viewbox__', '0 0 %d %d'%(width, height)) self.svg_template = self.svg_template.replace('__width__', diff --git a/src/calibre/ebooks/pdf/reflow.py b/src/calibre/ebooks/pdf/reflow.py index 5080fe997e..d26a8620bb 100644 --- a/src/calibre/ebooks/pdf/reflow.py +++ b/src/calibre/ebooks/pdf/reflow.py @@ -199,7 +199,7 @@ class Text(Element): self.font = {} self.font_size = 0.0 self.font_size_em = 0.0 - # self.color = 0 + # self.color = 0 text.tail = '' self.text_as_string = etree.tostring(text, method='text', encoding='unicode') @@ -373,9 +373,9 @@ class Text(Element): self.raw = matchObj.group(1)+matchObj.group(3)+m2+matchObj.group(4)+m5+matchObj.group(6) # This needs more work # if sub_super < 0: - # other.raw = '' + other.raw + '' + # other.raw = '' + other.raw + '' # elif sub_super > 0: - # other.raw = '' + other.raw + '' + # other.raw = '' + other.raw + '' if has_float: self.raw += has_float @@ -413,7 +413,7 @@ class Paragraph(Text): else: self.font = {} self.font_size = 0 - # self.color = 0 + # self.color = 0 text.tail = '' self.text_as_string = etree.tostring(text, method='text', @@ -1106,8 +1106,8 @@ class Page: t = self.texts[0] # match = self.find_match(t) # while match is not None: - # self.texts.remove(match) - # match = self.find_match(t) + # self.texts.remove(match) + # match = self.find_match(t) self.texts.remove(t) if len(opts.pdf_footer_regex) > 0 \ @@ -1121,8 +1121,8 @@ class Page: t = self.texts[-1] # match = self.find_match(t) # while match is not None: - # self.texts.remove(match) - # match = self.find_match(t) + # self.texts.remove(match) + # match = self.find_match(t) self.texts.remove(t) def create_page_format(self, stats, opts): @@ -1343,7 +1343,7 @@ class Page: # self.elements = list(self.texts) # for img in page.xpath('descendant::img'): - # self.elements.append(Image(img, self.opts, self.log, idc)) + # self.elements.append(Image(img, self.opts, self.log, idc)) # self.elements.sort(cmp=lambda x,y:cmp(x.top, y.top)) return @@ -1802,7 +1802,7 @@ class PDFDocument: break # Short page t = page.texts[head_ind].text_as_string # if len(page.texts) > 1 and page.texts[0].top == page.texts[1].top: - # t += ' ' + page.texts[1].text_as_string + # t += ' ' + page.texts[1].text_as_string if len(head_text[head_ind]) == 0: head_text[head_ind] = t else: @@ -1835,7 +1835,7 @@ class PDFDocument: break # Short page t = page.texts[-foot_ind-1].text_as_string # if len(page.texts) > 1 and page.texts[-1].top == page.texts[-2].top: - # t += ' ' + page.texts[-2].text_as_string + # t += ' ' + page.texts[-2].text_as_string if len(foot_text[foot_ind]) == 0: foot_text[foot_ind] = t else: diff --git a/src/calibre/ebooks/pml/pmlml.py b/src/calibre/ebooks/pml/pmlml.py index 37bda0735a..7e18a64fe7 100644 --- a/src/calibre/ebooks/pml/pmlml.py +++ b/src/calibre/ebooks/pml/pmlml.py @@ -356,7 +356,7 @@ class PMLMLizer: text += self.close_tags(tags) # if tag in SEPARATE_TAGS: - # text.append('\n\n') + # text.append('\n\n') if style['page-break-after'] == 'always': text.append(r'\p') diff --git a/src/calibre/ebooks/readability/readability.py b/src/calibre/ebooks/readability/readability.py index cad2a50c42..9fd448bf5c 100644 --- a/src/calibre/ebooks/readability/readability.py +++ b/src/calibre/ebooks/readability/readability.py @@ -188,7 +188,7 @@ class Document: if append: parent.append(sibling) # if output is not None: - # output.append(best_elem) + # output.append(best_elem) return output.find('body') def select_best_candidate(self, candidates): @@ -208,7 +208,7 @@ class Document: for i in elem.findall('.//a'): link_length += text_length(i) # if len(elem.findall(".//div") or elem.findall(".//p")): - # link_length = link_length + # link_length = link_length total_length = text_length(elem) return float(link_length) / max(total_length, 1) @@ -243,7 +243,7 @@ class Document: content_score += len(inner_text.split(',')) content_score += min((inner_text_len / 100), 3) # if elem not in candidates: - # candidates[elem] = self.score_node(elem) + # candidates[elem] = self.score_node(elem) # WTF? candidates[elem]['content_score'] += content_score candidates[parent_node]['content_score'] += content_score @@ -384,16 +384,16 @@ class Document: else: content_score = 0 # if parent_node is not None: - # pweight = self.class_weight(parent_node) + content_score - # pname = describe(parent_node) + # pweight = self.class_weight(parent_node) + content_score + # pname = describe(parent_node) # else: - # pweight = 0 - # pname = "no parent" + # pweight = 0 + # pname = "no parent" to_remove = False reason = '' # if el.tag == 'div' and counts["img"] >= 1: - # continue + # continue if counts['p'] and counts['img'] > counts['p']: reason = 'too many images (%s)' % counts['img'] to_remove = True @@ -415,24 +415,24 @@ class Document: elif (counts['embed'] == 1 and content_length < 75) or counts['embed'] > 1: reason = 's with too short content length, or too many s' to_remove = True -# if el.tag == 'div' and counts['img'] >= 1 and to_remove: -# imgs = el.findall('.//img') -# valid_img = False -# self.debug(tounicode(el)) -# for img in imgs: -# -# height = img.get('height') -# text_length = img.get('text_length') -# self.debug ("height %s text_length %s" %(repr(height), repr(text_length))) -# if to_int(height) >= 100 or to_int(text_length) >= 100: -# valid_img = True -# self.debug("valid image" + tounicode(img)) -# break -# if valid_img: -# to_remove = False -# self.debug("Allowing %s" %el.text_content()) -# for desnode in self.tags(el, "table", "ul", "div"): -# allowed[desnode] = True + # if el.tag == 'div' and counts['img'] >= 1 and to_remove: + # imgs = el.findall('.//img') + # valid_img = False + # self.debug(tounicode(el)) + # for img in imgs: + # + # height = img.get('height') + # text_length = img.get('text_length') + # self.debug ("height %s text_length %s" %(repr(height), repr(text_length))) + # if to_int(height) >= 100 or to_int(text_length) >= 100: + # valid_img = True + # self.debug("valid image" + tounicode(img)) + # break + # if valid_img: + # to_remove = False + # self.debug("Allowing %s" %el.text_content()) + # for desnode in self.tags(el, "table", "ul", "div"): + # allowed[desnode] = True # find x non empty preceding and succeeding siblings i, j = 0, 0 diff --git a/src/calibre/ebooks/rtf2xml/hex_2_utf8.py b/src/calibre/ebooks/rtf2xml/hex_2_utf8.py index 87aba7072c..28416ac91d 100644 --- a/src/calibre/ebooks/rtf2xml/hex_2_utf8.py +++ b/src/calibre/ebooks/rtf2xml/hex_2_utf8.py @@ -188,7 +188,7 @@ class Hex2Utf8: self.__dingbats_dict.update(ms_dingbats_dict) # load dictionary for caps, and make a string for the replacement self.__caps_uni_dict = char_map_obj.get_char_map(map='caps_uni') - # # print(self.__caps_uni_dict) + # print(self.__caps_uni_dict) # don't think I'll need this # keys = self.__caps_uni_dict.keys() # self.__caps_uni_replace = '|'.join(keys) diff --git a/src/calibre/ebooks/rtf2xml/make_lists.py b/src/calibre/ebooks/rtf2xml/make_lists.py index ae2cc3a6c0..53a3f4220f 100644 --- a/src/calibre/ebooks/rtf2xml/make_lists.py +++ b/src/calibre/ebooks/rtf2xml/make_lists.py @@ -371,9 +371,9 @@ class MakeLists: % (id) ) # sys.stderr.write(repr(self.__list_of_lists)) -# if self.__run_level > 3: -# msg = 'level is "%s"\n' % self.__run_level -# self.__bug_handler + # if self.__run_level > 3: + # msg = 'level is "%s"\n' % self.__run_level + # self.__bug_handler def __write_start_item(self): self.__write_obj.write('mi{self.__section_values[key]}' my_string += '\n' my_string += self.__mark_end - # # my_string += line + # my_string += line if self.__state == 'body': self.__write_obj.write(my_string) elif self.__state == 'sec_in_field': diff --git a/src/calibre/ebooks/snb/snbfile.py b/src/calibre/ebooks/snb/snbfile.py index 6044728894..6dea6a9abf 100644 --- a/src/calibre/ebooks/snb/snbfile.py +++ b/src/calibre/ebooks/snb/snbfile.py @@ -127,8 +127,8 @@ class SNBFile: return False if self.rev80 != SNBFile.REV80: return False -# if self.revA3 != SNBFile.REVA3: -# return False + # if self.revA3 != SNBFile.REVA3: + # return False if self.revZ1 != SNBFile.REVZ1: return False if self.revZ2 != SNBFile.REVZ2: diff --git a/src/calibre/ebooks/snb/snbml.py b/src/calibre/ebooks/snb/snbml.py index 81faa5b02d..758b110814 100644 --- a/src/calibre/ebooks/snb/snbml.py +++ b/src/calibre/ebooks/snb/snbml.py @@ -57,7 +57,7 @@ CALIBRE_SNB_PRE_TAG = '<$$calibre_snb_pre_tag$$>' class SNBMLizer: curSubItem = '' -# curText = [ ] + # curText = [ ] def __init__(self, log): self.log = log @@ -86,7 +86,7 @@ class SNBMLizer: output = [''] stylizer = Stylizer(self.item.data, self.item.href, self.oeb_book, self.opts, self.opts.output_profile) content = etree.tostring(self.item.data.find(XHTML('body')), encoding='unicode') -# content = self.remove_newlines(content) + # content = self.remove_newlines(content) trees = {} for subitem, subtitle in self.subitems: snbcTree = etree.Element('snbc') diff --git a/src/calibre/gui2/comments_editor.py b/src/calibre/gui2/comments_editor.py index 58d994da82..d85ce9d6b7 100644 --- a/src/calibre/gui2/comments_editor.py +++ b/src/calibre/gui2/comments_editor.py @@ -1521,8 +1521,7 @@ class Editor(QWidget): # {{{ self.editor.html = v def change_tab(self, index): - # print('reloading:', (index and self.wyswyg_dirty) or (not index and - # self.source_dirty)) + # print('reloading:', (index and self.wyswyg_dirty) or (not index and self.source_dirty)) if index == 1: # changing to code view if self.wyswyg_dirty: self.code_edit.setPlainText(self.editor.html) diff --git a/src/calibre/gui2/device_drivers/tabbed_device_config.py b/src/calibre/gui2/device_drivers/tabbed_device_config.py index 76c7cacc5c..990b3ac5f4 100644 --- a/src/calibre/gui2/device_drivers/tabbed_device_config.py +++ b/src/calibre/gui2/device_drivers/tabbed_device_config.py @@ -89,7 +89,7 @@ class TabbedDeviceConfig(QTabWidget): self.all_formats = set(self.all_formats) | set(BOOK_EXTENSIONS) self.base = QWidget(self) -# self.insertTab(0, self.base, _('Configure %s') % self.device.current_friendly_name) + # self.insertTab(0, self.base, _('Configure %s') % self.device.current_friendly_name) self.insertTab(0, self.base, _('File formats')) l = self.base.l = QGridLayout(self.base) self.base.setLayout(l) @@ -392,9 +392,9 @@ if __name__ == '__main__': app = Application([]) dev = KOBO(None) debug_print('KOBO:', KOBO) -# dev.startup() -# cd = dev.detect_managed_devices(s.devices) -# dev.open(cd, 'test') + # dev.startup() + # cd = dev.detect_managed_devices(s.devices) + # dev.open(cd, 'test') cw = dev.config_widget() d = QDialog() d.l = QVBoxLayout() diff --git a/src/calibre/gui2/library/models.py b/src/calibre/gui2/library/models.py index 89827a156e..d1bbcf5cea 100644 --- a/src/calibre/gui2/library/models.py +++ b/src/calibre/gui2/library/models.py @@ -1127,8 +1127,8 @@ class BooksModel(QAbstractTableModel): # {{{ cname = self.column_map[index.column()] return self.styled_columns.get(cname) # elif role == Qt.ItemDataRole.ToolTipRole and index.isValid(): - # if self.column_map[index.column()] in self.editable_cols: - # return (_("Double click to edit me

")) + # if self.column_map[index.column()] in self.editable_cols: + # return (_("Double click to edit me

")) return None def headerData(self, section, orientation, role): diff --git a/src/calibre/gui2/store/stores/beam_ebooks_de_plugin.py b/src/calibre/gui2/store/stores/beam_ebooks_de_plugin.py index a296fb361b..064340c7dc 100644 --- a/src/calibre/gui2/store/stores/beam_ebooks_de_plugin.py +++ b/src/calibre/gui2/store/stores/beam_ebooks_de_plugin.py @@ -71,5 +71,5 @@ class BeamEBooksDEStore(BasicStoreConfig, StorePlugin): s.price = price s.drm = SearchResult.DRM_UNLOCKED s.detail_item = id_ -# s.formats = None + # s.formats = None yield s diff --git a/src/calibre/gui2/store/stores/empik_plugin.py b/src/calibre/gui2/store/stores/empik_plugin.py index 153b8af529..a39a8447d9 100644 --- a/src/calibre/gui2/store/stores/empik_plugin.py +++ b/src/calibre/gui2/store/stores/empik_plugin.py @@ -78,9 +78,9 @@ class EmpikStore(BasicStoreConfig, StorePlugin): price = ''.join(data.xpath('.//div[@class="price ta-price-tile "]/text()')) # with closing(br.open('https://empik.com' + id.strip(), timeout=timeout/4)) as nf: - # idata = html.fromstring(nf.read()) - # crawled = idata.xpath('.//a[(@class="chosen hrefstyle") or (@class="connectionsLink hrefstyle")]/text()') - # formats = ','.join([re.sub(r'ebook, ','', x.strip()) for x in crawled if 'ebook' in x]) + # idata = html.fromstring(nf.read()) + # crawled = idata.xpath('.//a[(@class="chosen hrefstyle") or (@class="connectionsLink hrefstyle")]/text()') + # formats = ','.join([re.sub(r'ebook, ','', x.strip()) for x in crawled if 'ebook' in x]) counter -= 1 diff --git a/src/calibre/gui2/tools.py b/src/calibre/gui2/tools.py index 153b4cd275..9cb6730c2c 100644 --- a/src/calibre/gui2/tools.py +++ b/src/calibre/gui2/tools.py @@ -56,7 +56,7 @@ def convert_single_ebook(parent, db, book_ids, auto_conversion=False, # {{{ if result == QDialog.DialogCode.Accepted: # if not convert_existing(parent, db, [book_id], d.output_format): - # continue + # continue mi = db.get_metadata(book_id, True) in_file = PersistentTemporaryFile('.'+d.input_format) diff --git a/src/calibre/library/database.py b/src/calibre/library/database.py index 4fe0d807c9..5f93aaf2ea 100644 --- a/src/calibre/library/database.py +++ b/src/calibre/library/database.py @@ -822,10 +822,10 @@ ALTER TABLE books ADD COLUMN isbn TEXT DEFAULT "" COLLATE NOCASE; func(self.conn) def close(self): - # global _lock_file - # _lock_file.close() - # os.unlink(_lock_file.name) - # _lock_file = None + # global _lock_file + # _lock_file.close() + # os.unlink(_lock_file.name) + # _lock_file = None self.conn.close() @property diff --git a/src/calibre/translations/msgfmt.py b/src/calibre/translations/msgfmt.py index eaa1fd86d0..232da8ca15 100644 --- a/src/calibre/translations/msgfmt.py +++ b/src/calibre/translations/msgfmt.py @@ -99,7 +99,7 @@ def generate(): output = struct.pack('Iiiiiii', 0x950412de, # Magic 0, # Version - len(keys), # # of entries + len(keys), # of entries 7*4, # start of key index 7*4+len(keys)*8, # start of value index 0, 0) # size and offset of hash table diff --git a/src/calibre/utils/mdns.py b/src/calibre/utils/mdns.py index 5a70e9c871..ebf8f1cb9c 100644 --- a/src/calibre/utils/mdns.py +++ b/src/calibre/utils/mdns.py @@ -38,9 +38,9 @@ class AllIpAddressesGetter(Thread): def run(self): global _all_ip_addresses -# print('sleeping') -# time.sleep(15) -# print('slept') + # print('sleeping') + # time.sleep(15) + # print('slept') _all_ip_addresses = self.get_all_ips() diff --git a/src/calibre/utils/search_query_parser.py b/src/calibre/utils/search_query_parser.py index e55efebf76..a88dce170f 100644 --- a/src/calibre/utils/search_query_parser.py +++ b/src/calibre/utils/search_query_parser.py @@ -424,8 +424,8 @@ class SearchQueryParser: # return self.universal_set().difference(self.evaluate(argument[0])) return candidates.difference(self.evaluate(argument[0], candidates)) -# def evaluate_parenthesis(self, argument, candidates): -# return self.evaluate(argument[0], candidates) + # def evaluate_parenthesis(self, argument, candidates): + # return self.evaluate(argument[0], candidates) def _check_saved_search_recursion(self, query): if query.startswith('='): diff --git a/src/calibre/utils/zipfile.py b/src/calibre/utils/zipfile.py index 4ee2bac1cf..a7ed737fa8 100644 --- a/src/calibre/utils/zipfile.py +++ b/src/calibre/utils/zipfile.py @@ -1068,10 +1068,10 @@ class ZipFile: zd = _ZipDecrypter(pwd) # The first 12 bytes in the cypher stream is an encryption header - # used to strengthen the algorithm. The first 11 bytes are - # completely random, while the 12th contains the MSB of the CRC, - # or the MSB of the file time depending on the header type - # and is used to check the correctness of the password. + # used to strengthen the algorithm. The first 11 bytes are + # completely random, while the 12th contains the MSB of the CRC, + # or the MSB of the file time depending on the header type + # and is used to check the correctness of the password. byts = zef_file.read(12) h = list(map(zd, bytearray(byts[0:12]))) if zinfo.flag_bits & 0x8: diff --git a/src/calibre/web/feeds/__init__.py b/src/calibre/web/feeds/__init__.py index 51d59995a8..085e074445 100644 --- a/src/calibre/web/feeds/__init__.py +++ b/src/calibre/web/feeds/__init__.py @@ -104,7 +104,7 @@ Has content : %s def is_same_as(self, other_article): # if self.title != getattr(other_article, 'title', False): - # return False + # return False if self.url: return self.url == getattr(other_article, 'url', False) return self.content == getattr(other_article, 'content', False) diff --git a/src/odf/dc.py b/src/odf/dc.py index 55fdc5f9ac..261b531c7f 100644 --- a/src/odf/dc.py +++ b/src/odf/dc.py @@ -52,28 +52,28 @@ def Title(**args): # these elements # def Contributor(**args): -# return Element(qname = (DCNS,'contributor'), **args) +# return Element(qname = (DCNS,'contributor'), **args) # def Coverage(**args): -# return Element(qname = (DCNS,'coverage'), **args) +# return Element(qname = (DCNS,'coverage'), **args) # def Format(**args): -# return Element(qname = (DCNS,'format'), **args) +# return Element(qname = (DCNS,'format'), **args) # def Identifier(**args): -# return Element(qname = (DCNS,'identifier'), **args) +# return Element(qname = (DCNS,'identifier'), **args) # def Publisher(**args): -# return Element(qname = (DCNS,'publisher'), **args) +# return Element(qname = (DCNS,'publisher'), **args) # def Relation(**args): -# return Element(qname = (DCNS,'relation'), **args) +# return Element(qname = (DCNS,'relation'), **args) # def Rights(**args): -# return Element(qname = (DCNS,'rights'), **args) +# return Element(qname = (DCNS,'rights'), **args) # def Source(**args): -# return Element(qname = (DCNS,'source'), **args) +# return Element(qname = (DCNS,'source'), **args) # def Type(**args): -# return Element(qname = (DCNS,'type'), **args) +# return Element(qname = (DCNS,'type'), **args) diff --git a/src/odf/grammar.py b/src/odf/grammar.py index 2db6b3abad..a124304b16 100644 --- a/src/odf/grammar.py +++ b/src/odf/grammar.py @@ -86,7 +86,7 @@ allowed_children = { ), (DCNS,'title') : ( ), -# Completes Dublin Core start + # Completes Dublin Core start # (DCNS,'contributor') : ( # ), # (DCNS,'coverage') : ( @@ -105,7 +105,7 @@ allowed_children = { # ), # (DCNS,'type') : ( # ), -# Completes Dublin Core end + # Completes Dublin Core end (MATHNS,'math') : None, (XFORMSNS,'model') : None, @@ -123,7 +123,7 @@ allowed_children = { (ANIMNS,'command') : ( (ANIMNS,'param'), ), -# allowed_children + # allowed_children (ANIMNS,'iterate') : ( (ANIMNS,'animate'), (ANIMNS,'animateColor'), @@ -150,7 +150,7 @@ allowed_children = { (ANIMNS,'set'), (ANIMNS,'transitionFilter'), ), -# allowed_children + # allowed_children (ANIMNS,'param') : ( ), (ANIMNS,'seq') : ( @@ -175,7 +175,7 @@ allowed_children = { (CHARTNS,'grid'), (CHARTNS,'title'), ), -# allowed_children + # allowed_children (CHARTNS,'categories') : ( ), (CHARTNS,'chart') : ( @@ -201,7 +201,7 @@ allowed_children = { ), (CHARTNS,'legend') : ( ), -# allowed_children + # allowed_children (CHARTNS,'mean-value') : ( ), (CHARTNS,'plot-area') : ( @@ -227,7 +227,7 @@ allowed_children = { ), (CHARTNS,'stock-loss-marker') : ( ), -# allowed_children + # allowed_children (CHARTNS,'stock-range-line') : ( ), (CHARTNS,'subtitle') : ( @@ -254,7 +254,7 @@ allowed_children = { (CONFIGNS,'config-item-map-named') : ( (CONFIGNS,'config-item-map-entry'), ), -# allowed_children + # allowed_children (CONFIGNS,'config-item-set') : ( (CONFIGNS,'config-item'), (CONFIGNS,'config-item-map-indexed'), @@ -279,7 +279,7 @@ allowed_children = { ), (NUMBERNS,'boolean') : ( ), -# allowed_children + # allowed_children (NUMBERNS,'boolean-style') : ( (NUMBERNS,'boolean'), (NUMBERNS,'text'), @@ -311,7 +311,7 @@ allowed_children = { (STYLENS,'map'), (STYLENS,'text-properties'), ), -# allowed_children + # allowed_children (NUMBERNS,'day') : ( ), (NUMBERNS,'day-of-week') : ( @@ -339,7 +339,7 @@ allowed_children = { (STYLENS,'map'), (STYLENS,'text-properties'), ), -# allowed_children + # allowed_children (NUMBERNS,'percentage-style') : ( (NUMBERNS,'number'), (NUMBERNS,'text'), @@ -362,7 +362,7 @@ allowed_children = { (STYLENS,'map'), (STYLENS,'text-properties'), ), -# allowed_children + # allowed_children (NUMBERNS,'time-style') : ( (NUMBERNS,'am-pm'), (NUMBERNS,'hours'), @@ -372,7 +372,7 @@ allowed_children = { (STYLENS,'map'), (STYLENS,'text-properties'), ), -# allowed_children + # allowed_children (NUMBERNS,'week-of-year') : ( ), (NUMBERNS,'year') : ( @@ -400,7 +400,7 @@ allowed_children = { (DRAWNS,'a') : ( (DRAWNS,'frame'), ), -# allowed_children + # allowed_children (DRAWNS,'applet') : ( (DRAWNS,'param'), ), @@ -435,7 +435,7 @@ allowed_children = { (TEXTNS,'list'), (TEXTNS,'p'), ), -# allowed_children + # allowed_children (DRAWNS,'connector') : ( (DRAWNS,'glue-point'), (OFFICENS,'event-listeners'), @@ -462,7 +462,7 @@ allowed_children = { (TEXTNS,'list'), (TEXTNS,'p'), ), -# allowed_children + # allowed_children (DRAWNS,'ellipse') : ( (DRAWNS,'glue-point'), (OFFICENS,'event-listeners'), @@ -477,7 +477,7 @@ allowed_children = { ), (DRAWNS,'equation') : ( ), -# allowed_children + # allowed_children (DRAWNS,'fill-image') : ( ), (DRAWNS,'floating-frame') : ( @@ -498,7 +498,7 @@ allowed_children = { (SVGNS,'desc'), (SVGNS,'title'), ), -# allowed_children + # allowed_children (DRAWNS,'g') : ( (DR3DNS,'scene'), (DRAWNS,'caption'), @@ -530,7 +530,7 @@ allowed_children = { ), (DRAWNS,'hatch') : ( ), -# allowed_children + # allowed_children (DRAWNS,'image') : ( (OFFICENS,'binary-data'), (TEXTNS,'list'), @@ -570,7 +570,7 @@ allowed_children = { (MATHNS,'math'), (OFFICENS,'document'), ), -# allowed_children + # allowed_children (DRAWNS,'object-ole') : ( (OFFICENS,'binary-data'), ), @@ -609,7 +609,7 @@ allowed_children = { (PRESENTATIONNS,'animations'), (PRESENTATIONNS,'notes'), ), -# allowed_children + # allowed_children (DRAWNS,'page-thumbnail') : ( (SVGNS,'desc'), (SVGNS,'title'), @@ -643,7 +643,7 @@ allowed_children = { (TEXTNS,'list'), (TEXTNS,'p'), ), -# allowed_children + # allowed_children (DRAWNS,'rect') : ( (DRAWNS,'glue-point'), (OFFICENS,'event-listeners'), @@ -699,7 +699,7 @@ allowed_children = { (TEXTNS,'table-of-content'), (TEXTNS,'user-index'), ), -# allowed_children + # allowed_children (FORMNS,'button') : ( (FORMNS,'properties'), (OFFICENS,'event-listeners'), @@ -737,7 +737,7 @@ allowed_children = { (FORMNS,'properties'), (OFFICENS,'event-listeners'), ), -# allowed_children + # allowed_children (FORMNS,'form') : ( (FORMNS,'button'), (FORMNS,'checkbox'), @@ -790,7 +790,7 @@ allowed_children = { (FORMNS,'properties'), (OFFICENS,'event-listeners'), ), -# allowed_children + # allowed_children (FORMNS,'image-frame') : ( (FORMNS,'properties'), (OFFICENS,'event-listeners'), @@ -878,7 +878,7 @@ allowed_children = { ), (METANS,'user-defined') : ( ), -# allowed_children + # allowed_children (OFFICENS,'annotation') : ( (DCNS,'creator'), (DCNS,'date'), @@ -982,7 +982,7 @@ allowed_children = { (OFFICENS,'font-face-decls') : ( (STYLENS,'font-face'), ), -# allowed_children + # allowed_children (OFFICENS,'forms') : ( (XFORMSNS,'model'), (FORMNS,'form'), @@ -1003,17 +1003,17 @@ allowed_children = { (DCNS,'language'), (DCNS,'subject'), (DCNS,'title'), -# Completes Dublin Core start -# (DCNS,'contributor'), -# (DCNS,'coverage'), -# (DCNS,'format'), -# (DCNS,'identifier'), -# (DCNS,'publisher'), -# (DCNS,'relation'), -# (DCNS,'rights'), -# (DCNS,'source'), -# (DCNS,'type'), -# Completes Dublin Core end + # Completes Dublin Core start + # (DCNS,'contributor'), + # (DCNS,'coverage'), + # (DCNS,'format'), + # (DCNS,'identifier'), + # (DCNS,'publisher'), + # (DCNS,'relation'), + # (DCNS,'rights'), + # (DCNS,'source'), + # (DCNS,'type'), + # Completes Dublin Core end (METANS,'auto-reload'), (METANS,'creation-date'), (METANS,'document-statistic'), @@ -1048,7 +1048,7 @@ allowed_children = { (TEXTNS,'user-field-decls'), (TEXTNS,'variable-decls'), ), -# allowed_children + # allowed_children (OFFICENS,'script') : None, (OFFICENS,'scripts') : ( @@ -1194,7 +1194,7 @@ allowed_children = { (PRESENTATIONNS,'hide-text') : ( (PRESENTATIONNS,'sound'), ), -# allowed_children + # allowed_children (PRESENTATIONNS,'notes') : ( (DR3DNS,'scene'), (DRAWNS,'caption'), @@ -1297,7 +1297,7 @@ allowed_children = { (TEXTNS,'user-index'), (TEXTNS,'variable-decls'), ), -# allowed_children + # allowed_children (STYLENS,'footer-left') : ( (STYLENS,'region-center'), (STYLENS,'region-left'), @@ -1335,7 +1335,7 @@ allowed_children = { (STYLENS,'columns'), (TEXTNS,'list-style'), ), -# allowed_children + # allowed_children (STYLENS,'handout-master') : ( (DR3DNS,'scene'), (DRAWNS,'caption'), @@ -1382,7 +1382,7 @@ allowed_children = { (TEXTNS,'user-index'), (TEXTNS,'variable-decls'), ), -# allowed_children + # allowed_children (STYLENS,'header-footer-properties') : ( (STYLENS,'background-image'), ), @@ -1456,7 +1456,7 @@ allowed_children = { (STYLENS,'columns'), (STYLENS,'footnote-sep'), ), -# allowed_children + # allowed_children (STYLENS,'paragraph-properties') : ( (STYLENS,'background-image'), (STYLENS,'drop-cap'), @@ -1500,7 +1500,7 @@ allowed_children = { (STYLENS,'tab-stops') : ( (STYLENS,'tab-stop'), ), -# allowed_children + # allowed_children (STYLENS,'table-cell-properties') : ( (STYLENS,'background-image'), ), @@ -1545,7 +1545,7 @@ allowed_children = { (TABLENS,'iteration'), (TABLENS,'null-date'), ), -# allowed_children + # allowed_children (TABLENS,'cell-address') : ( ), (TABLENS,'cell-content-change') : ( @@ -1574,7 +1574,7 @@ allowed_children = { (TABLENS,'error-message'), (TABLENS,'help-message'), ), -# allowed_children + # allowed_children (TABLENS,'content-validations') : ( (TABLENS,'content-validation'), ), @@ -1618,7 +1618,7 @@ allowed_children = { (TEXTNS,'table-of-content'), (TEXTNS,'user-index'), ), -# allowed_children + # allowed_children (TABLENS,'cut-offs') : ( (TABLENS,'insertion-cut-off'), (TABLENS,'movement-cut-off'), @@ -1661,7 +1661,7 @@ allowed_children = { (TABLENS,'data-pilot-subtotals') : ( (TABLENS,'data-pilot-subtotal'), ), -# allowed_children + # allowed_children (TABLENS,'data-pilot-table') : ( (TABLENS,'data-pilot-field'), (TABLENS,'database-source-query'), @@ -1690,7 +1690,7 @@ allowed_children = { ), (TABLENS,'database-source-table') : ( ), -# allowed_children + # allowed_children (TABLENS,'dde-link') : ( (OFFICENS,'dde-source'), (TABLENS,'table'), @@ -1717,7 +1717,7 @@ allowed_children = { (TABLENS,'highlighted-range'), (TABLENS,'operation'), ), -# allowed_children + # allowed_children (TABLENS,'error-macro') : ( ), (TABLENS,'error-message') : ( @@ -1742,7 +1742,7 @@ allowed_children = { (TABLENS,'filter-and'), (TABLENS,'filter-condition'), ), -# allowed_children + # allowed_children (TABLENS,'first-column') : ( ), (TABLENS,'first-row') : ( @@ -1785,7 +1785,7 @@ allowed_children = { (TABLENS,'named-expression'), (TABLENS,'named-range'), ), -# allowed_children + # allowed_children (TABLENS,'named-range') : ( ), (TABLENS,'null-date') : ( @@ -1820,7 +1820,7 @@ allowed_children = { (DRAWNS,'rect'), (DRAWNS,'regular-polygon'), ), -# allowed_children + # allowed_children (TABLENS,'sort') : ( (TABLENS,'sort-by'), ), @@ -1844,7 +1844,7 @@ allowed_children = { (TABLENS,'sort-groups'), (TABLENS,'subtotal-rule'), ), -# allowed_children + # allowed_children (TABLENS,'table') : ( (OFFICENS,'dde-source'), (OFFICENS,'forms'), @@ -1901,7 +1901,7 @@ allowed_children = { (TEXTNS,'table-of-content'), (TEXTNS,'user-index'), ), -# allowed_children + # allowed_children (TABLENS,'table-column') : ( ), (TABLENS,'table-column-group') : ( @@ -1935,7 +1935,7 @@ allowed_children = { (TABLENS,'table-row'), (TEXTNS,'soft-page-break'), ), -# allowed_children + # allowed_children (TABLENS,'table-source') : ( ), (TABLENS,'table-template') : ( @@ -1957,7 +1957,7 @@ allowed_children = { (TABLENS,'insertion'), (TABLENS,'movement'), ), -# allowed_children + # allowed_children (TEXTNS,'a') : ( (DR3DNS,'scene'), (DRAWNS,'a'), @@ -2086,7 +2086,7 @@ allowed_children = { (TEXTNS,'variable-input'), (TEXTNS,'variable-set'), ), -# allowed_children + # allowed_children (TEXTNS,'alphabetical-index') : ( (TEXTNS,'alphabetical-index-source'), (TEXTNS,'index-body'), @@ -2126,7 +2126,7 @@ allowed_children = { (TEXTNS,'index-entry-span'), (TEXTNS,'index-entry-tab-stop'), ), -# allowed_children + # allowed_children (TEXTNS,'bibliography-mark') : ( ), (TEXTNS,'bibliography-source') : ( @@ -2188,7 +2188,7 @@ allowed_children = { (TEXTNS,'dde-connection-decls') : ( (TEXTNS,'dde-connection-decl'), ), -# allowed_children + # allowed_children (TEXTNS,'deletion') : ( (DR3DNS,'scene'), (DRAWNS,'a'), @@ -2243,7 +2243,7 @@ allowed_children = { (TEXTNS,'format-change') : ( (OFFICENS,'change-info'), ), -# allowed_children + # allowed_children (TEXTNS,'h') : ( (DR3DNS,'scene'), (DRAWNS,'a'), @@ -2372,7 +2372,7 @@ allowed_children = { (TEXTNS,'variable-input'), (TEXTNS,'variable-set'), ), -# allowed_children + # allowed_children (TEXTNS,'hidden-paragraph') : ( ), (TEXTNS,'hidden-text') : ( @@ -2393,7 +2393,7 @@ allowed_children = { ), (TEXTNS,'image-count') : ( ), -# allowed_children + # allowed_children (TEXTNS,'index-body') : ( (DR3DNS,'scene'), (DRAWNS,'a'), @@ -2453,7 +2453,7 @@ allowed_children = { (TEXTNS,'index-source-styles') : ( (TEXTNS,'index-source-style'), ), -# allowed_children + # allowed_children (TEXTNS,'index-title') : ( (DR3DNS,'scene'), (DRAWNS,'a'), @@ -2553,7 +2553,7 @@ allowed_children = { (TEXTNS,'note-body'), (TEXTNS,'note-citation'), ), -# allowed_children + # allowed_children (TEXTNS,'note-body') : ( (DR3DNS,'scene'), (DRAWNS,'a'), @@ -2633,7 +2633,7 @@ allowed_children = { (TEXTNS,'outline-style') : ( (TEXTNS,'outline-level-style'), ), -# allowed_children + # allowed_children (TEXTNS,'p') : ( (DR3DNS,'scene'), (DRAWNS,'a'), @@ -2790,7 +2790,7 @@ allowed_children = { ), (TEXTNS,'reference-mark-end') : ( ), -# allowed_children + # allowed_children (TEXTNS,'reference-mark-start') : ( ), (TEXTNS,'reference-ref') : ( @@ -2926,7 +2926,7 @@ allowed_children = { (TEXTNS,'variable-input'), (TEXTNS,'variable-set'), ), -# allowed_children + # allowed_children (TEXTNS,'ruby-text') : ( ), (TEXTNS,'s') : ( @@ -2980,7 +2980,7 @@ allowed_children = { ), (TEXTNS,'sender-country') : ( ), -# allowed_children + # allowed_children (TEXTNS,'sender-email') : ( ), (TEXTNS,'sender-fax') : ( @@ -3020,7 +3020,7 @@ allowed_children = { ), (TEXTNS,'sort-key') : ( ), -# allowed_children + # allowed_children (TEXTNS,'span') : ( (DR3DNS,'scene'), (DRAWNS,'a'), @@ -3148,7 +3148,7 @@ allowed_children = { (TEXTNS,'variable-input'), (TEXTNS,'variable-set'), ), -# allowed_children + # allowed_children (TEXTNS,'subject') : ( ), (TEXTNS,'tab') : ( @@ -3203,7 +3203,7 @@ allowed_children = { ), (TEXTNS,'toc-mark-start') : ( ), -# allowed_children + # allowed_children (TEXTNS,'tracked-changes') : ( (TEXTNS,'changed-region'), ), @@ -3229,7 +3229,7 @@ allowed_children = { (TEXTNS,'index-entry-tab-stop'), (TEXTNS,'index-entry-text'), ), -# allowed_children + # allowed_children (TEXTNS,'user-index-mark') : ( ), (TEXTNS,'user-index-mark-end') : ( @@ -3254,6 +3254,7 @@ allowed_children = { ), (TEXTNS,'word-count') : ( ), + # allowed_children } # @@ -3267,17 +3268,17 @@ allows_text = ( (DCNS,'language'), (DCNS,'subject'), (DCNS,'title'), -# Completes Dublin Core start -# (DCNS,'contributor'), -# (DCNS,'coverage'), -# (DCNS,'format'), -# (DCNS,'identifier'), -# (DCNS,'publisher'), -# (DCNS,'relation'), -# (DCNS,'rights'), -# (DCNS,'source'), -# (DCNS,'type'), -# Completes Dublin Core end + # Completes Dublin Core start + # (DCNS,'contributor'), + # (DCNS,'coverage'), + # (DCNS,'format'), + # (DCNS,'identifier'), + # (DCNS,'publisher'), + # (DCNS,'relation'), + # (DCNS,'rights'), + # (DCNS,'source'), + # (DCNS,'type'), + # Completes Dublin Core end (FORMNS,'item'), (FORMNS,'option'), (MATHNS,'math'), @@ -3285,7 +3286,7 @@ allows_text = ( (METANS,'date-string'), (METANS,'editing-cycles'), (METANS,'editing-duration'), -# allows_text + # allows_text (METANS,'generator'), (METANS,'initial-creator'), (METANS,'keyword'), @@ -3328,7 +3329,7 @@ allows_text = ( (TEXTNS,'hidden-paragraph'), (TEXTNS,'hidden-text'), (TEXTNS,'image-count'), -# allowed_children + # allows_text (TEXTNS,'index-entry-span'), (TEXTNS,'index-title-template'), (TEXTNS,'initial-creator'), @@ -3376,7 +3377,7 @@ allows_text = ( (TEXTNS,'sequence'), (TEXTNS,'sequence-ref'), (TEXTNS,'sheet-name'), -# allowed_children + # allows_text (TEXTNS,'span'), (TEXTNS,'subject'), (TEXTNS,'table-count'), @@ -3392,6 +3393,7 @@ allows_text = ( (TEXTNS,'variable-input'), (TEXTNS,'variable-set'), (TEXTNS,'word-count'), + # allows_text ) # Only the elements with at least one required attribute is listed @@ -3420,7 +3422,7 @@ required_attributes = { (ANIMNS,'set'): ( (SMILNS,'attributeName'), ), -# required_attributes + # required_attributes (ANIMNS,'transitionFilter'): ( (SMILNS,'type'), ), @@ -3446,7 +3448,7 @@ required_attributes = { (CONFIGNS,'config-item-set'): ( (CONFIGNS,'name'), ), -# required_attributes + # required_attributes (NUMBERNS,'boolean-style'): ( (STYLENS,'name'), ), @@ -3482,7 +3484,7 @@ required_attributes = { (SVGNS,'viewBox'), (SVGNS,'d'), ), -# required_attributes + # required_attributes (DRAWNS,'a'): ( (XLINKNS,'href'), ), @@ -3531,7 +3533,7 @@ required_attributes = { (DRAWNS,'id'), (DRAWNS,'escape-direction'), ), -# required_attributes + # required_attributes (DRAWNS,'gradient'): ( (DRAWNS,'style'), ), @@ -3579,7 +3581,7 @@ required_attributes = { (DRAWNS,'points'), (SVGNS,'viewBox'), ), -# required_attributes + # required_attributes (DRAWNS,'polyline'): ( (DRAWNS,'points'), (SVGNS,'viewBox'), @@ -3626,7 +3628,7 @@ required_attributes = { (FORMNS,'hidden'): ( (FORMNS,'id'), ), -# required_attributes + # required_attributes (FORMNS,'image'): ( (FORMNS,'id'), ), @@ -3683,7 +3685,7 @@ required_attributes = { (MANIFESTNS,'salt'), (MANIFESTNS,'iteration-count'), ), -# required_attributes + # required_attributes (METANS,'template'): ( (XLINKNS,'href'), ), @@ -3709,7 +3711,7 @@ required_attributes = { (DRAWNS,'color'), (DRAWNS,'shape-id'), ), -# required_attributes + # required_attributes (PRESENTATIONNS,'event-listener'): ( (PRESENTATIONNS,'action'), (SCRIPTNS,'event-name'), @@ -3756,7 +3758,7 @@ required_attributes = { (STYLENS,'column'): ( (STYLENS,'rel-width'), ), -# required_attributes + # required_attributes (STYLENS,'column-sep'): ( (STYLENS,'width'), ), @@ -3804,7 +3806,7 @@ required_attributes = { (SVGNS,'stop'): ( (SVGNS,'offset'), ), -# required_attributes + # required_attributes (TABLENS,'body'): ( (TEXTNS,'style-name'), ), @@ -3836,7 +3838,7 @@ required_attributes = { (TABLENS,'enabled'), (TABLENS,'display-member-mode'), ), -# required_attributes + # required_attributes (TABLENS,'data-pilot-field'): ( (TABLENS,'source-field-name'), ), @@ -3875,7 +3877,7 @@ required_attributes = { (TABLENS,'database-range'): ( (TABLENS,'target-range-address'), ), -# required_attributes + # required_attributes (TABLENS,'database-source-query'): ( (TABLENS,'query-name'), (TABLENS,'database-name'), @@ -3922,7 +3924,7 @@ required_attributes = { (TABLENS,'position'), (TABLENS,'id'), ), -# required_attributes + # required_attributes (TABLENS,'label-range'): ( (TABLENS,'label-cell-range-address'), (TABLENS,'data-cell-range-address'), @@ -3955,7 +3957,7 @@ required_attributes = { (TABLENS,'index'), (TABLENS,'name'), ), -# required_attributes + # required_attributes (TABLENS,'scenario'): ( (TABLENS,'is-active'), (TABLENS,'scenario-ranges'), @@ -3991,7 +3993,7 @@ required_attributes = { (TEXTNS,'a'): ( (XLINKNS,'href'), ), -# required_attributes + # required_attributes (TEXTNS,'alphabetical-index'): ( (TEXTNS,'name'), ), @@ -4024,7 +4026,7 @@ required_attributes = { (TEXTNS,'bookmark'): ( (TEXTNS,'name'), ), -# required_attributes + # required_attributes (TEXTNS,'bookmark-end'): ( (TEXTNS,'name'), ), @@ -4071,7 +4073,7 @@ required_attributes = { (TEXTNS,'dde-connection'): ( (TEXTNS,'connection-name'), ), -# required_attributes + # required_attributes (TEXTNS,'dde-connection-decl'): ( (OFFICENS,'dde-topic'), (OFFICENS,'dde-application'), @@ -4119,7 +4121,7 @@ required_attributes = { (TEXTNS,'list-style'): ( (STYLENS,'name'), ), -# required_attributes + # required_attributes (TEXTNS,'measure'): ( (TEXTNS,'kind'), ), @@ -4169,7 +4171,7 @@ required_attributes = { (TEXTNS,'display-outline-level'), (TEXTNS,'name'), ), -# required_attributes + # required_attributes (TEXTNS,'sort-key'): ( (TEXTNS,'key'), ), @@ -4214,7 +4216,7 @@ required_attributes = { (TEXTNS,'style-name'), (TEXTNS,'outline-level'), ), -# required_attributes + # required_attributes (TEXTNS,'user-index-mark'): ( (TEXTNS,'index-name'), (TEXTNS,'string-value'), @@ -4243,6 +4245,7 @@ required_attributes = { (TEXTNS,'variable-set'): ( (TEXTNS,'name'), ), + # required_attributes } # Empty list means the element has no allowed attributes @@ -4261,29 +4264,29 @@ allowed_attributes = { ), (DCNS,'title'):( ), -# Completes Dublin Core start -# (DCNS,'contributor') : ( -# ), -# (DCNS,'coverage') : ( -# ), -# (DCNS,'format') : ( -# ), -# (DCNS,'identifier') : ( -# ), -# (DCNS,'publisher') : ( -# ), -# (DCNS,'relation') : ( -# ), -# (DCNS,'rights') : ( -# ), -# (DCNS,'source') : ( -# ), -# (DCNS,'type') : ( -# ), -# Completes Dublin Core end + # Completes Dublin Core start + # (DCNS,'contributor') : ( + # ), + # (DCNS,'coverage') : ( + # ), + # (DCNS,'format') : ( + # ), + # (DCNS,'identifier') : ( + # ), + # (DCNS,'publisher') : ( + # ), + # (DCNS,'relation') : ( + # ), + # (DCNS,'rights') : ( + # ), + # (DCNS,'source') : ( + # ), + # (DCNS,'type') : ( + # ), + # Completes Dublin Core end (MATHNS,'math'): None, (XFORMSNS,'model'): None, -# allowed_attributes + # allowed_attributes (ANIMNS,'animate'):( (ANIMNS,'formula'), (ANIMNS,'sub-item'), @@ -4311,7 +4314,7 @@ allowed_attributes = { (SMILNS,'to'), (SMILNS,'values'), ), -# allowed_attributes + # allowed_attributes (ANIMNS,'animateColor'):( (ANIMNS,'color-interpolation'), (ANIMNS,'color-interpolation-direction'), @@ -4341,7 +4344,7 @@ allowed_attributes = { (SMILNS,'to'), (SMILNS,'values'), ), -# allowed_attributes + # allowed_attributes (ANIMNS,'animateMotion'):( (ANIMNS,'formula'), (ANIMNS,'sub-item'), @@ -4371,7 +4374,7 @@ allowed_attributes = { (SVGNS,'origin'), (SVGNS,'path'), ), -# allowed_attributes + # allowed_attributes (ANIMNS,'animateTransform'):( (ANIMNS,'formula'), (ANIMNS,'sub-item'), @@ -4397,7 +4400,7 @@ allowed_attributes = { (SMILNS,'values'), (SVGNS,'type'), ), -# allowed_attributes + # allowed_attributes (ANIMNS,'audio'):( (ANIMNS,'audio-level'), (ANIMNS,'id'), @@ -4428,7 +4431,7 @@ allowed_attributes = { (ANIMNS,'id'), (PRESENTATIONNS,'master-element'), ), -# allowed_attributes + # allowed_attributes (ANIMNS,'iterate'):( (ANIMNS,'id'), (ANIMNS,'iterate-interval'), @@ -4477,7 +4480,7 @@ allowed_attributes = { (SMILNS,'restart'), (PRESENTATIONNS,'master-element'), ), -# allowed_attributes + # allowed_attributes (ANIMNS,'param'):( (ANIMNS,'name'), (ANIMNS,'value'), @@ -4525,7 +4528,7 @@ allowed_attributes = { (SMILNS,'to'), ), -# allowed_attributes + # allowed_attributes (ANIMNS,'transitionFilter'):( (ANIMNS,'formula'), (ANIMNS,'sub-item'), @@ -4556,7 +4559,7 @@ allowed_attributes = { (SMILNS,'values'), ), -# allowed_attributes + # allowed_attributes (CHARTNS,'axis'):( (CHARTNS,'style-name'), (CHARTNS,'dimension'), @@ -4587,7 +4590,7 @@ allowed_attributes = { (SVGNS,'width'), (CHARTNS,'style-name'), ), -# allowed_attributes + # allowed_attributes (CHARTNS,'footer'):( (SVGNS,'y'), (SVGNS,'x'), @@ -4643,7 +4646,7 @@ allowed_attributes = { (CHARTNS,'stock-gain-marker'):( (CHARTNS,'style-name'), ), -# allowed_attributes + # allowed_attributes (CHARTNS,'stock-loss-marker'):( (CHARTNS,'style-name'), ), @@ -4685,7 +4688,7 @@ allowed_attributes = { (CONFIGNS,'config-item-set'):( (CONFIGNS,'name'), ), -# allowed_attributes + # allowed_attributes (NUMBERNS,'am-pm'):( ), (NUMBERNS,'boolean'):( @@ -4719,7 +4722,7 @@ allowed_attributes = { (NUMBERNS,'country'), (NUMBERNS,'language'), ), -# allowed_attributes + # allowed_attributes (NUMBERNS,'date-style'):( (NUMBERNS,'transliteration-language'), (STYLENS,'name'), @@ -4759,7 +4762,7 @@ allowed_attributes = { (NUMBERNS,'hours'):( (NUMBERNS,'style'), ), -# allowed_attributes + # allowed_attributes (NUMBERNS,'minutes'):( (NUMBERNS,'style'), ), @@ -4788,7 +4791,7 @@ allowed_attributes = { (STYLENS,'volatile'), (NUMBERNS,'transliteration-country'), ), -# allowed_attributes + # allowed_attributes (NUMBERNS,'percentage-style'):( (NUMBERNS,'transliteration-language'), (STYLENS,'name'), @@ -4894,7 +4897,7 @@ allowed_attributes = { (PRESENTATIONNS,'class-names'), (DRAWNS,'id'), ), -# allowed_attributes + # allowed_attributes (DR3DNS,'scene'):( (DR3DNS,'ambient-color'), (DR3DNS,'distance'), @@ -5142,7 +5145,7 @@ allowed_attributes = { (DRAWNS,'id'), (TEXTNS,'anchor-type'), ), -# allowed_attributes + # allowed_attributes (DRAWNS,'ellipse'):( (DRAWNS,'layer'), (DRAWNS,'start-angle'), @@ -5173,7 +5176,7 @@ allowed_attributes = { (SVGNS,'x'), (DRAWNS,'text-style-name'), ), -# allowed_attributes + # allowed_attributes (DRAWNS,'enhanced-geometry'):( (DRAWNS,'extrusion-rotation-center'), (DRAWNS,'extrusion-shininess'), @@ -5219,7 +5222,7 @@ allowed_attributes = { (DRAWNS,'glue-point-type'), (DRAWNS,'text-path'), ), -# allowed_attributes + # allowed_attributes (DRAWNS,'equation'):( (DRAWNS,'formula'), (DRAWNS,'name'), @@ -5270,7 +5273,7 @@ allowed_attributes = { (TEXTNS,'anchor-page-number'), (TEXTNS,'anchor-type'), ), -# allowed_attributes + # allowed_attributes (DRAWNS,'g'):( (DRAWNS,'id'), (DRAWNS,'caption-id'), @@ -5343,7 +5346,7 @@ allowed_attributes = { (DRAWNS,'name'), (DRAWNS,'display'), ), -# allowed_attributes + # allowed_attributes (DRAWNS,'layer-set'):( ), (DRAWNS,'line'):( @@ -5375,7 +5378,7 @@ allowed_attributes = { (DRAWNS,'name'), (SVGNS,'viewBox'), ), -# allowed_attributes + # allowed_attributes (DRAWNS,'measure'):( (TABLENS,'end-cell-address'), (DRAWNS,'layer'), @@ -5465,7 +5468,7 @@ allowed_attributes = { (DRAWNS,'name'), (DRAWNS,'value'), ), -# allowed_attributes + # allowed_attributes (DRAWNS,'path'):( (TABLENS,'table-background'), (DRAWNS,'layer'), @@ -5523,7 +5526,7 @@ allowed_attributes = { (SVGNS,'viewBox'), (TEXTNS,'anchor-type'), ), -# allowed_attributes + # allowed_attributes (DRAWNS,'polyline'):( (TABLENS,'table-background'), (DRAWNS,'layer'), @@ -5573,7 +5576,7 @@ allowed_attributes = { (TEXTNS,'anchor-page-number'), (TEXTNS,'anchor-type'), ), -# allowed_attributes + # allowed_attributes (DRAWNS,'regular-polygon'):( (TABLENS,'table-background'), (DRAWNS,'layer'), @@ -5619,7 +5622,7 @@ allowed_attributes = { (FONS,'max-width'), (TEXTNS,'id'), ), -# allowed_attributes + # allowed_attributes (FORMNS,'button'):( (FORMNS,'tab-stop'), (FORMNS,'focus-on-click'), @@ -5691,7 +5694,7 @@ allowed_attributes = { (FORMNS,'current-value'), (FORMNS,'size'), ), -# allowed_attributes + # allowed_attributes (FORMNS,'connection-resource'):( (XLINKNS,'href'), ), @@ -5741,7 +5744,7 @@ allowed_attributes = { (FORMNS,'printable'), (FORMNS,'id'), ), -# allowed_attributes + # allowed_attributes (FORMNS,'form'):( (XLINKNS,'actuate'), (XLINKNS,'href'), @@ -5798,7 +5801,7 @@ allowed_attributes = { (FORMNS,'printable'), (FORMNS,'id'), ), -# allowed_attributes + # allowed_attributes (FORMNS,'generic-control'):( (FORMNS,'control-implementation'), (XFORMSNS,'bind'), @@ -5861,7 +5864,7 @@ allowed_attributes = { (FORMNS,'list-value'):( (OFFICENS,'string-value'), ), -# allowed_attributes + # allowed_attributes (FORMNS,'listbox'):( (FORMNS,'tab-stop'), (FORMNS,'bound-column'), @@ -6043,7 +6046,7 @@ allowed_attributes = { ), (MANIFESTNS,'manifest'):( ), -# allowed_attributes + # allowed_attributes (METANS,'auto-reload'):( (METANS,'delay'), (XLINKNS,'actuate'), @@ -6078,7 +6081,7 @@ allowed_attributes = { ), (METANS,'generator'):( ), -# allowed_attributes + # allowed_attributes (METANS,'hyperlink-behaviour'):( (OFFICENS,'target-frame-name'), (XLINKNS,'show'), @@ -6174,7 +6177,7 @@ allowed_attributes = { ), (OFFICENS,'image'):( ), -# allowed_attributes + # allowed_attributes (OFFICENS,'master-styles'):( ), (OFFICENS,'meta'):( @@ -6245,7 +6248,7 @@ allowed_attributes = { (PRESENTATIONNS,'speed'), (DRAWNS,'shape-id'), ), -# allowed_attributes + # allowed_attributes (PRESENTATIONNS,'hide-text'):( (PRESENTATIONNS,'direction'), (PRESENTATIONNS,'effect'), @@ -6273,7 +6276,7 @@ allowed_attributes = { (PRESENTATIONNS,'speed'), (DRAWNS,'shape-id'), ), -# allowed_attributes + # allowed_attributes (PRESENTATIONNS,'settings'):( (PRESENTATIONNS,'animations'), (PRESENTATIONNS,'endless'), @@ -6319,7 +6322,7 @@ allowed_attributes = { (PRESENTATIONNS,'play-full'), (XLINKNS,'show'), ), -# allowed_attributes + # allowed_attributes (SCRIPTNS,'event-listener'):( (SCRIPTNS,'language'), (SCRIPTNS,'macro-name'), @@ -6412,7 +6415,7 @@ allowed_attributes = { (STYLENS,'default-style'):( (STYLENS,'family'), ), -# allowed_attributes + # allowed_attributes (STYLENS,'drawing-page-properties'): ( (DRAWNS,'fill'), (DRAWNS,'fill-color'), @@ -6455,7 +6458,7 @@ allowed_attributes = { (STYLENS,'style-name'), (STYLENS,'lines'), ), -# allowed_attributes + # allowed_attributes (STYLENS,'font-face'):( (STYLENS,'font-adornments'), (STYLENS,'font-charset'), @@ -6513,7 +6516,7 @@ allowed_attributes = { (STYLENS,'line-style'), (STYLENS,'adjustment'), ), -# allowed_attributes + # allowed_attributes (STYLENS,'graphic-properties'): ( (DR3DNS,'ambient-color'), (DR3DNS,'back-scale'), @@ -6568,7 +6571,7 @@ allowed_attributes = { (DRAWNS,'fill-image-ref-point-x'), (DRAWNS,'fill-image-ref-point-y'), (DRAWNS,'fill-image-width'), -# allowed_attributes + # allowed_attributes (DRAWNS,'fit-to-contour'), (DRAWNS,'fit-to-size'), (DRAWNS,'frame-display-border'), @@ -6621,7 +6624,7 @@ allowed_attributes = { (DRAWNS,'visible-area-top'), (DRAWNS,'visible-area-width'), (DRAWNS,'wrap-influence-on-position'), -# allowed_attributes + # allowed_attributes (FONS,'background-color'), (FONS,'border'), (FONS,'border-bottom'), @@ -6696,7 +6699,7 @@ allowed_attributes = { (PRESENTATIONNS,'use-header-name'), (PRESENTATIONNS,'use-date-time-name'), ), -# allowed_attributes + # allowed_attributes (STYLENS,'header'):( (STYLENS,'display'), ), @@ -6732,7 +6735,7 @@ allowed_attributes = { ), (STYLENS,'header-style'):( ), -# allowed_attributes + # allowed_attributes (STYLENS,'list-level-properties'): ( (FONS,'height'), (FONS,'text-align'), @@ -6761,7 +6764,7 @@ allowed_attributes = { (STYLENS,'name'), (STYLENS,'page-usage'), ), -# allowed_attributes + # allowed_attributes (STYLENS,'page-layout-properties'): ( (FONS,'background-color'), (FONS,'border'), @@ -6811,7 +6814,7 @@ allowed_attributes = { (STYLENS,'table-centering'), (STYLENS,'writing-mode'), ), -# allowed_attributes + # allowed_attributes (STYLENS,'paragraph-properties'): ( (FONS,'background-color'), (FONS,'border'), @@ -6870,7 +6873,7 @@ allowed_attributes = { (STYLENS,'display-name'), (STYLENS,'name'), ), -# allowed_attributes + # allowed_attributes (STYLENS,'region-center'):( ), (STYLENS,'region-left'):( @@ -6902,7 +6905,7 @@ allowed_attributes = { (STYLENS,'display-name'), (STYLENS,'parent-style-name'), ), -# allowed_attributes + # allowed_attributes (STYLENS,'tab-stop'):( (STYLENS,'leader-text-style'), (STYLENS,'leader-width'), @@ -6951,7 +6954,7 @@ allowed_attributes = { (STYLENS,'text-align-source'), (STYLENS,'vertical-align'), ), -# allowed_attributes + # allowed_attributes (STYLENS,'table-column-properties'): ( (FONS,'break-after'), (FONS,'break-before'), @@ -6988,7 +6991,7 @@ allowed_attributes = { (STYLENS,'row-height'), (STYLENS,'use-optimal-row-height'), ), -# allowed_attributes + # allowed_attributes (STYLENS,'text-properties'): ( (FONS,'background-color'), (FONS,'color'), @@ -7074,7 +7077,7 @@ allowed_attributes = { (SVGNS,'font-face-format'):( (SVGNS,'string'), ), -# allowed_attributes + # allowed_attributes (SVGNS,'font-face-name'):( (SVGNS,'name'), ), @@ -7115,7 +7118,7 @@ allowed_attributes = { ), (SVGNS,'title'):( ), -# allowed_attributes + # allowed_attributes (TABLENS,'body'):( (TEXTNS,'paragraph-style-name'), (TEXTNS,'style-name'), @@ -7185,7 +7188,7 @@ allowed_attributes = { ), (TABLENS,'content-validations'):( ), -# allowed_attributes + # allowed_attributes (TABLENS,'covered-table-cell'):( (TABLENS,'protect'), (OFFICENS,'string-value'), @@ -7222,7 +7225,7 @@ allowed_attributes = { (TABLENS,'member-type'), (TABLENS,'type'), ), -# allowed_attributes + # allowed_attributes (TABLENS,'data-pilot-group'):( (TABLENS,'name'), ), @@ -7245,7 +7248,7 @@ allowed_attributes = { (TABLENS,'data-pilot-level'):( (TABLENS,'show-empty'), ), -# allowed_attributes + # allowed_attributes (TABLENS,'data-pilot-member'):( (TABLENS,'show-details'), (TABLENS,'name'), @@ -7274,7 +7277,7 @@ allowed_attributes = { (TABLENS,'show-filter-button'), (TABLENS,'grand-total'), ), -# allowed_attributes + # allowed_attributes (TABLENS,'data-pilot-tables'):( ), (TABLENS,'database-range'):( @@ -7295,7 +7298,7 @@ allowed_attributes = { (TABLENS,'query-name'), (TABLENS,'database-name'), ), -# allowed_attributes + # allowed_attributes (TABLENS,'database-source-sql'):( (TABLENS,'parse-sql-statement'), (TABLENS,'database-name'), @@ -7318,7 +7321,7 @@ allowed_attributes = { (TABLENS,'type'), (TABLENS,'id'), ), -# allowed_attributes + # allowed_attributes (TABLENS,'deletions'):( ), (TABLENS,'dependencies'):( @@ -7344,7 +7347,7 @@ allowed_attributes = { (TEXTNS,'paragraph-style-name'), (TEXTNS,'style-name'), ), -# allowed_attributes + # allowed_attributes (TABLENS,'filter'):( (TABLENS,'target-range-address'), (TABLENS,'display-duplicates'), @@ -7370,7 +7373,7 @@ allowed_attributes = { (TEXTNS,'paragraph-style-name'), (TEXTNS,'style-name'), ), -# allowed_attributes + # allowed_attributes (TABLENS,'help-message'):( (TABLENS,'display'), (TABLENS,'title'), @@ -7399,7 +7402,7 @@ allowed_attributes = { (TABLENS,'maximum-difference'), (TABLENS,'steps'), ), -# allowed_attributes + # allowed_attributes (TABLENS,'label-range'):( (TABLENS,'label-cell-range-address'), (TABLENS,'data-cell-range-address'), @@ -7501,7 +7504,7 @@ allowed_attributes = { (TABLENS,'end-table'), (TABLENS,'start-column'), ), -# allowed_attributes + # allowed_attributes (TABLENS,'source-service'):( (TABLENS,'user-name'), (TABLENS,'source-name'), @@ -7548,7 +7551,7 @@ allowed_attributes = { (TABLENS,'formula'), (OFFICENS,'time-value'), ), -# allowed_attributes + # allowed_attributes (TABLENS,'table-column'):( (TABLENS,'style-name'), (TABLENS,'default-cell-style-name'), @@ -7606,7 +7609,7 @@ allowed_attributes = { (TABLENS,'tracked-changes'):( (TABLENS,'track-changes'), ), -# allowed_attributes + # allowed_attributes (TEXTNS,'a'):( (TEXTNS,'visited-style-name'), (OFFICENS,'name'), @@ -7641,7 +7644,7 @@ allowed_attributes = { (TEXTNS,'key2-phonetic'), (TEXTNS,'string-value-phonetic'), ), -# allowed_attributes + # allowed_attributes (TEXTNS,'alphabetical-index-mark-end'):( (TEXTNS,'id'), ), @@ -7670,7 +7673,7 @@ allowed_attributes = { (TEXTNS,'main-entry-style-name'), (TEXTNS,'use-keys-as-entries'), ), -# allowed_attributes + # allowed_attributes (TEXTNS,'author-initials'):( (TEXTNS,'fixed'), ), @@ -7696,7 +7699,7 @@ allowed_attributes = { (TEXTNS,'style-name'), (TEXTNS,'bibliography-type'), ), -# allowed_attributes + # allowed_attributes (TEXTNS,'bibliography-mark'):( (TEXTNS,'address'), (TEXTNS,'annote'), @@ -7746,7 +7749,7 @@ allowed_attributes = { (TEXTNS,'bookmark-start'):( (TEXTNS,'name'), ), -# allowed_attributes + # allowed_attributes (TEXTNS,'change'):( (TEXTNS,'change-id'), ), @@ -7815,7 +7818,7 @@ allowed_attributes = { (TEXTNS,'database-name'), (TEXTNS,'condition'), ), -# allowed_attributes + # allowed_attributes (TEXTNS,'date'):( (TEXTNS,'date-value'), (TEXTNS,'fixed'), @@ -7866,7 +7869,7 @@ allowed_attributes = { (TEXTNS,'fixed'), (TEXTNS,'display'), ), -# allowed_attributes + # allowed_attributes (TEXTNS,'format-change'):( ), (TEXTNS,'h'):( @@ -7914,7 +7917,7 @@ allowed_attributes = { (TEXTNS,'style-name'), (TEXTNS,'display'), ), -# allowed_attributes + # allowed_attributes (TEXTNS,'index-entry-link-end'):( (TEXTNS,'style-name'), ), @@ -7956,7 +7959,7 @@ allowed_attributes = { ), (TEXTNS,'insertion'):( ), -# allowed_attributes + # allowed_attributes (TEXTNS,'keywords'):( (TEXTNS,'fixed'), ), @@ -8011,7 +8014,7 @@ allowed_attributes = { (STYLENS,'num-letter-sync'), (TEXTNS,'start-value'), ), -# allowed_attributes + # allowed_attributes (TEXTNS,'list-style'):( (TEXTNS,'consecutive-numbering'), (STYLENS,'display-name'), @@ -8080,7 +8083,7 @@ allowed_attributes = { (TEXTNS,'name'), (TEXTNS,'protection-key'), ), -# allowed_attributes + # allowed_attributes (TEXTNS,'object-index-entry-template'):( (TEXTNS,'style-name'), ), @@ -8201,7 +8204,7 @@ allowed_attributes = { (TEXTNS,'sender-country'):( (TEXTNS,'fixed'), ), -# allowed_attributes + # allowed_attributes (TEXTNS,'sender-email'):( (TEXTNS,'fixed'), ), @@ -8264,7 +8267,7 @@ allowed_attributes = { (TEXTNS,'sort-ascending'), (TEXTNS,'key'), ), -# allowed_attributes + # allowed_attributes (TEXTNS,'span'):( (TEXTNS,'style-name'), (TEXTNS,'class-names'), @@ -8296,7 +8299,7 @@ allowed_attributes = { (TEXTNS,'caption-sequence-format'), (TEXTNS,'relative-tab-stop-position'), ), -# allowed_attributes + # allowed_attributes (TEXTNS,'table-of-content'):( (TEXTNS,'protected'), (TEXTNS,'style-name'), @@ -8372,7 +8375,7 @@ allowed_attributes = { (TEXTNS,'name'), (TEXTNS,'display'), ), -# allowed_attributes + # allowed_attributes (TEXTNS,'user-field-input'):( (STYLENS,'data-style-name'), (TEXTNS,'name'), @@ -8402,7 +8405,7 @@ allowed_attributes = { (TEXTNS,'id'), (TEXTNS,'outline-level'), ), -# allowed_attributes + # allowed_attributes (TEXTNS,'user-index-source'):( (TEXTNS,'copy-outline-levels'), (TEXTNS,'index-name'), @@ -8445,5 +8448,5 @@ allowed_attributes = { (TEXTNS,'formula'), (OFFICENS,'time-value'), ), -# allowed_attributes + # allowed_attributes } diff --git a/src/odf/odf2xhtml.py b/src/odf/odf2xhtml.py index 2cfbe333b0..571333ca91 100644 --- a/src/odf/odf2xhtml.py +++ b/src/odf/odf2xhtml.py @@ -424,22 +424,22 @@ class ODF2XHTML(handler.ContentHandler): (OFFICENS, 'scripts'):(self.s_ignorexml, None), (OFFICENS, 'settings'):(self.s_ignorexml, None), (PRESENTATIONNS, 'notes'):(self.s_ignorexml, None), -# (STYLENS, "default-page-layout"):(self.s_style_default_page_layout, self.e_style_page_layout), + # (STYLENS, "default-page-layout"):(self.s_style_default_page_layout, self.e_style_page_layout), (STYLENS, 'default-page-layout'):(self.s_ignorexml, None), (STYLENS, 'default-style'):(self.s_style_default_style, self.e_style_default_style), (STYLENS, 'drawing-page-properties'):(self.s_style_handle_properties, None), (STYLENS, 'font-face'):(self.s_style_font_face, None), -# (STYLENS, "footer"):(self.s_style_footer, self.e_style_footer), -# (STYLENS, "footer-style"):(self.s_style_footer_style, None), + # (STYLENS, "footer"):(self.s_style_footer, self.e_style_footer), + # (STYLENS, "footer-style"):(self.s_style_footer_style, None), (STYLENS, 'graphic-properties'):(self.s_style_handle_properties, None), (STYLENS, 'handout-master'):(self.s_ignorexml, None), -# (STYLENS, "header"):(self.s_style_header, self.e_style_header), -# (STYLENS, "header-footer-properties"):(self.s_style_handle_properties, None), -# (STYLENS, "header-style"):(self.s_style_header_style, None), + # (STYLENS, "header"):(self.s_style_header, self.e_style_header), + # (STYLENS, "header-footer-properties"):(self.s_style_handle_properties, None), + # (STYLENS, "header-style"):(self.s_style_header_style, None), (STYLENS, 'master-page'):(self.s_style_master_page, None), (STYLENS, 'page-layout-properties'):(self.s_style_handle_properties, None), (STYLENS, 'page-layout'):(self.s_style_page_layout, self.e_style_page_layout), -# (STYLENS, "page-layout"):(self.s_ignorexml, None), + # (STYLENS, "page-layout"):(self.s_ignorexml, None), (STYLENS, 'paragraph-properties'):(self.s_style_handle_properties, None), (STYLENS, 'style'):(self.s_style_style, self.e_style_style), (STYLENS, 'table-cell-properties'):(self.s_style_handle_properties, None), @@ -792,10 +792,10 @@ class ODF2XHTML(handler.ContentHandler): return # Added by Kovid objhref = attrs[(XLINKNS,'href')] # Remove leading "./": from "./Object 1" to "Object 1" -# objhref = objhref [2:] + # objhref = objhref [2:] # Not using os.path.join since it fails to find the file on Windows. -# objcontentpath = '/'.join([objhref, 'content.xml']) + # objcontentpath = '/'.join([objhref, 'content.xml']) for c in self.document.childnodes: if c.folder == objhref: @@ -839,7 +839,7 @@ class ODF2XHTML(handler.ContentHandler): if (FONS,'min-height') in attrs: style = style + 'min-height:' + attrs[(FONS,'min-height')] + ';' self.opentag('div') -# self.opentag('div', {'style': style}) + # self.opentag('div', {'style': style}) def e_draw_textbox(self, tag, attrs): ''' End the @@ -937,11 +937,11 @@ dl.notes dd:last-of-type { page-break-after: avoid } self.opentag('dl', {'class':'notes'}) for key in range(1,self.currentnote+1): note = self.notedict[key] -# for key,note in self.notedict.items(): + # for key,note in self.notedict.items(): self.opentag('dt', {'id':f'footnote-{key}'}) -# self.opentag('sup') -# self.writeout(escape(note['citation'])) -# self.closetag('sup', False) + # self.opentag('sup') + # self.writeout(escape(note['citation'])) + # self.closetag('sup', False) self.writeout('[') self.opentag('a', {'href': f'#citation-{key}'}) self.writeout(f'←{key}') @@ -1030,7 +1030,7 @@ dl.notes dd:last-of-type { page-break-after: avoid } family = attrs[(STYLENS,'family')] htmlfamily = self.familymap.get(family,'unknown') self.currentstyle = htmlfamily -# self.stylestack.append(self.currentstyle) + # self.stylestack.append(self.currentstyle) self.styledict[self.currentstyle] = {} def e_style_default_style(self, tag, attrs): @@ -1475,7 +1475,7 @@ dl.notes dd:last-of-type { page-break-after: avoid } 'class': 'citation', 'id':f'citation-{self.currentnote}', }) -# self.writeout( escape(mark) ) + # self.writeout( escape(mark) ) # Since HTML only knows about endnotes, there is too much risk that the # marker is reused in the source. Therefore we force numeric markers self.writeout(str(self.currentnote)) @@ -1672,11 +1672,11 @@ class ODF2XHTMLembedded(ODF2XHTML): # Tags self.generate_css = generate_css self.elements = { -# (DCNS, 'title'): (self.s_processcont, self.e_dc_title), -# (DCNS, 'language'): (self.s_processcont, self.e_dc_contentlanguage), -# (DCNS, 'creator'): (self.s_processcont, self.e_dc_metatag), -# (DCNS, 'description'): (self.s_processcont, self.e_dc_metatag), -# (DCNS, 'date'): (self.s_processcont, self.e_dc_metatag), + # (DCNS, 'title'): (self.s_processcont, self.e_dc_title), + # (DCNS, 'language'): (self.s_processcont, self.e_dc_contentlanguage), + # (DCNS, 'creator'): (self.s_processcont, self.e_dc_metatag), + # (DCNS, 'description'): (self.s_processcont, self.e_dc_metatag), + # (DCNS, 'date'): (self.s_processcont, self.e_dc_metatag), (DRAWNS, 'frame'): (self.s_draw_frame, self.e_draw_frame), (DRAWNS, 'image'): (self.s_draw_image, None), (DRAWNS, 'fill-image'): (self.s_draw_fill_image, None), @@ -1685,48 +1685,48 @@ class ODF2XHTMLembedded(ODF2XHTML): (DRAWNS, 'object'): (self.s_draw_object, None), (DRAWNS, 'object-ole'): (self.s_draw_object_ole, None), (DRAWNS, 'text-box'): (self.s_draw_textbox, self.e_draw_textbox), -# (METANS, 'creation-date'):(self.s_processcont, self.e_dc_metatag), -# (METANS, 'generator'):(self.s_processcont, self.e_dc_metatag), -# (METANS, 'initial-creator'): (self.s_processcont, self.e_dc_metatag), -# (METANS, 'keyword'): (self.s_processcont, self.e_dc_metatag), + # (METANS, 'creation-date'):(self.s_processcont, self.e_dc_metatag), + # (METANS, 'generator'):(self.s_processcont, self.e_dc_metatag), + # (METANS, 'initial-creator'): (self.s_processcont, self.e_dc_metatag), + # (METANS, 'keyword'): (self.s_processcont, self.e_dc_metatag), (NUMBERNS, 'boolean-style'):(self.s_ignorexml, None), (NUMBERNS, 'currency-style'):(self.s_ignorexml, None), (NUMBERNS, 'date-style'):(self.s_ignorexml, None), (NUMBERNS, 'number-style'):(self.s_ignorexml, None), (NUMBERNS, 'text-style'):(self.s_ignorexml, None), -# (OFFICENS, "automatic-styles"):(self.s_office_automatic_styles, None), -# (OFFICENS, "document-content"):(self.s_office_document_content, self.e_office_document_content), + # (OFFICENS, "automatic-styles"):(self.s_office_automatic_styles, None), + # (OFFICENS, "document-content"):(self.s_office_document_content, self.e_office_document_content), (OFFICENS, 'forms'):(self.s_ignorexml, None), -# (OFFICENS, "master-styles"):(self.s_office_master_styles, None), + # (OFFICENS, "master-styles"):(self.s_office_master_styles, None), (OFFICENS, 'meta'):(self.s_ignorecont, None), -# (OFFICENS, "presentation"):(self.s_office_presentation, self.e_office_presentation), -# (OFFICENS, "spreadsheet"):(self.s_office_spreadsheet, self.e_office_spreadsheet), -# (OFFICENS, "styles"):(self.s_office_styles, None), -# (OFFICENS, "text"):(self.s_office_text, self.e_office_text), + # (OFFICENS, "presentation"):(self.s_office_presentation, self.e_office_presentation), + # (OFFICENS, "spreadsheet"):(self.s_office_spreadsheet, self.e_office_spreadsheet), + # (OFFICENS, "styles"):(self.s_office_styles, None), + # (OFFICENS, "text"):(self.s_office_text, self.e_office_text), (OFFICENS, 'scripts'):(self.s_ignorexml, None), (PRESENTATIONNS, 'notes'):(self.s_ignorexml, None), -# (STYLENS, "default-page-layout"):(self.s_style_default_page_layout, self.e_style_page_layout), -# (STYLENS, "default-page-layout"):(self.s_ignorexml, None), -# (STYLENS, "default-style"):(self.s_style_default_style, self.e_style_default_style), -# (STYLENS, "drawing-page-properties"):(self.s_style_handle_properties, None), -# (STYLENS, "font-face"):(self.s_style_font_face, None), -# (STYLENS, "footer"):(self.s_style_footer, self.e_style_footer), -# (STYLENS, "footer-style"):(self.s_style_footer_style, None), -# (STYLENS, "graphic-properties"):(self.s_style_handle_properties, None), -# (STYLENS, "handout-master"):(self.s_ignorexml, None), -# (STYLENS, "header"):(self.s_style_header, self.e_style_header), -# (STYLENS, "header-footer-properties"):(self.s_style_handle_properties, None), -# (STYLENS, "header-style"):(self.s_style_header_style, None), -# (STYLENS, "master-page"):(self.s_style_master_page, None), -# (STYLENS, "page-layout-properties"):(self.s_style_handle_properties, None), -# (STYLENS, "page-layout"):(self.s_style_page_layout, self.e_style_page_layout), -# (STYLENS, "page-layout"):(self.s_ignorexml, None), -# (STYLENS, "paragraph-properties"):(self.s_style_handle_properties, None), -# (STYLENS, "style"):(self.s_style_style, self.e_style_style), -# (STYLENS, "table-cell-properties"):(self.s_style_handle_properties, None), -# (STYLENS, "table-column-properties"):(self.s_style_handle_properties, None), -# (STYLENS, "table-properties"):(self.s_style_handle_properties, None), -# (STYLENS, "text-properties"):(self.s_style_handle_properties, None), + # (STYLENS, "default-page-layout"):(self.s_style_default_page_layout, self.e_style_page_layout), + # (STYLENS, "default-page-layout"):(self.s_ignorexml, None), + # (STYLENS, "default-style"):(self.s_style_default_style, self.e_style_default_style), + # (STYLENS, "drawing-page-properties"):(self.s_style_handle_properties, None), + # (STYLENS, "font-face"):(self.s_style_font_face, None), + # (STYLENS, "footer"):(self.s_style_footer, self.e_style_footer), + # (STYLENS, "footer-style"):(self.s_style_footer_style, None), + # (STYLENS, "graphic-properties"):(self.s_style_handle_properties, None), + # (STYLENS, "handout-master"):(self.s_ignorexml, None), + # (STYLENS, "header"):(self.s_style_header, self.e_style_header), + # (STYLENS, "header-footer-properties"):(self.s_style_handle_properties, None), + # (STYLENS, "header-style"):(self.s_style_header_style, None), + # (STYLENS, "master-page"):(self.s_style_master_page, None), + # (STYLENS, "page-layout-properties"):(self.s_style_handle_properties, None), + # (STYLENS, "page-layout"):(self.s_style_page_layout, self.e_style_page_layout), + # (STYLENS, "page-layout"):(self.s_ignorexml, None), + # (STYLENS, "paragraph-properties"):(self.s_style_handle_properties, None), + # (STYLENS, "style"):(self.s_style_style, self.e_style_style), + # (STYLENS, "table-cell-properties"):(self.s_style_handle_properties, None), + # (STYLENS, "table-column-properties"):(self.s_style_handle_properties, None), + # (STYLENS, "table-properties"):(self.s_style_handle_properties, None), + # (STYLENS, "text-properties"):(self.s_style_handle_properties, None), (SVGNS, 'desc'): (self.s_ignorexml, None), (TABLENS, 'covered-table-cell'): (self.s_ignorexml, None), (TABLENS, 'table-cell'): (self.s_table_table_cell, self.e_table_table_cell), diff --git a/src/odf/opendocument.py b/src/odf/opendocument.py index 9a6d268a06..11c6f103f7 100644 --- a/src/odf/opendocument.py +++ b/src/odf/opendocument.py @@ -402,8 +402,8 @@ class OpenDocument: zi.external_attr = UNIXPERMS self._z.writestr(zi, fileobj) # According to section 17.7.3 in ODF 1.1, the pictures folder should not have a manifest entry -# if hasPictures: -# self.manifest.addElement(manifest.FileEntry(fullpath=f"{folder}Pictures/", mediatype="")) + # if hasPictures: + # self.manifest.addElement(manifest.FileEntry(fullpath=f"{folder}Pictures/", mediatype="")) # Look in subobjects subobjectnum = 1 for subobject in object.childobjects: