Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-31 14:33:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

code indentation (manual)

Browse Source 
ruff 'E111,E112,E113,E117'
This commit is contained in:
un-pogaz 2025-01-24 11:14:21 +01:00
parent 8d28380515
commit 8032201318
17 changed files with 133 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
recipes/andhrajyothy_ap.recipe
View File

@ -51,7 +51,7 @@ class andhra(BasicNewsRecipe):
self.log('## For your local edition id, modify this recipe to match your edi_id from the cities below\n') self.log('## For your local edition id, modify this recipe to match your edi_id from the cities below\n')
for edi in edi_data: for edi in edi_data:
if edi['org_location'] in {'Magazines', 'Navya Daily'}: if edi['org_location'] in {'Magazines', 'Navya Daily'}:
continue continue
self.log(edi['org_location']) self.log(edi['org_location'])
cities = [] cities = []
for edi_loc in edi['editionlocation']: for edi_loc in edi['editionlocation']:

2
recipes/andhrajyothy_tel.recipe
View File

@ -51,7 +51,7 @@ class andhra(BasicNewsRecipe):
self.log('## For your local edition id, modify this recipe to match your edi_id from the cities below\n') self.log('## For your local edition id, modify this recipe to match your edi_id from the cities below\n')
for edi in edi_data: for edi in edi_data:
if edi['org_location'] in {'Magazines', 'Navya Daily'}: if edi['org_location'] in {'Magazines', 'Navya Daily'}:
continue continue
self.log(edi['org_location']) self.log(edi['org_location'])
cities = [] cities = []
for edi_loc in edi['editionlocation']: for edi_loc in edi['editionlocation']:

4
recipes/economist.recipe
View File

@ -339,9 +339,9 @@ class Economist(BasicNewsRecipe):
def economist_parse_index(self, raw): def economist_parse_index(self, raw):
# edition_date = self.recipe_specific_options.get('date') # edition_date = self.recipe_specific_options.get('date')
# if edition_date and isinstance(edition_date, str): # if edition_date and isinstance(edition_date, str):
# data = json.loads(raw)['data']['section'] # data = json.loads(raw)['data']['section']
# else: # else:
# data = json.loads(raw)['data']['canonical']['hasPart']['parts'][0] # data = json.loads(raw)['data']['canonical']['hasPart']['parts'][0]
data = json.loads(raw)['data']['canonical']['hasPart']['parts'][0] data = json.loads(raw)['data']['canonical']['hasPart']['parts'][0]
dt = datetime.fromisoformat(data['datePublished'][:-1]) + timedelta(seconds=time.timezone) dt = datetime.fromisoformat(data['datePublished'][:-1]) + timedelta(seconds=time.timezone)
dt = dt.strftime('%b %d, %Y') dt = dt.strftime('%b %d, %Y')

4
recipes/economist_free.recipe
View File

@ -339,9 +339,9 @@ class Economist(BasicNewsRecipe):
def economist_parse_index(self, raw): def economist_parse_index(self, raw):
# edition_date = self.recipe_specific_options.get('date') # edition_date = self.recipe_specific_options.get('date')
# if edition_date and isinstance(edition_date, str): # if edition_date and isinstance(edition_date, str):
# data = json.loads(raw)['data']['section'] # data = json.loads(raw)['data']['section']
# else: # else:
# data = json.loads(raw)['data']['canonical']['hasPart']['parts'][0] # data = json.loads(raw)['data']['canonical']['hasPart']['parts'][0]
data = json.loads(raw)['data']['canonical']['hasPart']['parts'][0] data = json.loads(raw)['data']['canonical']['hasPart']['parts'][0]
dt = datetime.fromisoformat(data['datePublished'][:-1]) + timedelta(seconds=time.timezone) dt = datetime.fromisoformat(data['datePublished'][:-1]) + timedelta(seconds=time.timezone)
dt = dt.strftime('%b %d, %Y') dt = dt.strftime('%b %d, %Y')

42
recipes/endgadget.recipe
View File

@ -44,27 +44,27 @@ class Engadget(BasicNewsRecipe):
feeds = [(u'Posts', u'https://www.engadget.com/rss.xml')] feeds = [(u'Posts', u'https://www.engadget.com/rss.xml')]
def parse_feeds(self): def parse_feeds(self):
# Call parent's method. # Call parent's method.
feeds = BasicNewsRecipe.parse_feeds(self) feeds = BasicNewsRecipe.parse_feeds(self)
# Loop through all feeds. # Loop through all feeds.
for feed in feeds: for feed in feeds:
# Loop through all articles in feed. # Loop through all articles in feed.
for article in feed.articles[:]: for article in feed.articles[:]:
# Remove articles with '...' in the url. # Remove articles with '...' in the url.
if '/deals/' in article.url: if '/deals/' in article.url:
print('Removing:',article.title) print('Removing:',article.title)
feed.articles.remove(article) feed.articles.remove(article)
# Remove articles with '...' in the title. # Remove articles with '...' in the title.
elif 'best tech deals' in article.title: elif 'best tech deals' in article.title:
print('Removing:',article.title) print('Removing:',article.title)
feed.articles.remove(article) feed.articles.remove(article)
elif 'Podcast' in article.title: elif 'Podcast' in article.title:
print('Removing:',article.title) print('Removing:',article.title)
feed.articles.remove(article) feed.articles.remove(article)
elif 'The Morning After' in article.title: elif 'The Morning After' in article.title:
print('Removing:',article.title) print('Removing:',article.title)
feed.articles.remove(article) feed.articles.remove(article)
return feeds return feeds
def preprocess_html(self, soup): def preprocess_html(self, soup):
for attr in 'data-src data-src-mobile'.split(): for attr in 'data-src data-src-mobile'.split():

4
recipes/faz_net.recipe
View File

@ -33,7 +33,7 @@ def format_tickaroo_liveblog(soup):
ntag.insert_after(temp) ntag.insert_after(temp)
# process run of images # process run of images
def bilderstrecke(soup,tag): def bilderstrecke(soup,tag):
flag = False flag = False
try: try:
@ -242,7 +242,7 @@ class FazNet(BasicNewsRecipe):
# format liveblog # format liveblog
if soup.find(attrs={'class':'tik4-live__container'}): if soup.find(attrs={'class':'tik4-live__container'}):
format_tickaroo_liveblog(soup) format_tickaroo_liveblog(soup)
# remove sizes and calc attributes in images # remove sizes and calc attributes in images
for tag in soup.findAll('img'): for tag in soup.findAll('img'):

24
recipes/radio_canada.recipe
View File

@ -153,15 +153,15 @@ class RadioCanada(BasicNewsRecipe):
# https://www.mobileread.com/forums/showpost.php?p=1165462&postcount=6 # https://www.mobileread.com/forums/showpost.php?p=1165462&postcount=6
# Credit goes to user Starson17 # Credit goes to user Starson17
def parse_feeds (self): def parse_feeds (self):
feeds = BasicNewsRecipe.parse_feeds(self) feeds = BasicNewsRecipe.parse_feeds(self)
for feed in feeds: for feed in feeds:
for article in feed.articles[:]: for article in feed.articles[:]:
if ('VIDEO' in article.title.upper() or if ('VIDEO' in article.title.upper() or
'OHDIO' in article.title.upper() or 'OHDIO' in article.title.upper() or
'/emissions/' in article.url or '/emissions/' in article.url or
'/segments/' in article.url or '/segments/' in article.url or
'/entrevue/' in article.url or '/entrevue/' in article.url or
'/ohdio/' in article.url '/ohdio/' in article.url
): ):
feed.articles.remove(article) feed.articles.remove(article)
return feeds return feeds

71
recipes/rnd.recipe
View File

@ -80,42 +80,41 @@ class RND(BasicNewsRecipe):
] ]
def parse_feeds(self): def parse_feeds(self):
# Call parent's method. # Call parent's method.
feeds = BasicNewsRecipe.parse_feeds(self) feeds = BasicNewsRecipe.parse_feeds(self)
# Loop through all feeds. # Loop through all feeds.
for feed in feeds: for feed in feeds:
# Loop through all articles in feed. # Loop through all articles in feed.
for article in feed.articles[:]: for article in feed.articles[:]:
# Remove articles with '...' in the url. # Remove articles with '...' in the url.
if '/anzeige/' in article.url: if '/anzeige/' in article.url:
print('Removing:',article.title) print('Removing:',article.title)
feed.articles.remove(article) feed.articles.remove(article)
# Remove articles with '...' in the title. # Remove articles with '...' in the title.
elif 'Liveticker' in article.title: elif 'Liveticker' in article.title:
print('Removing:',article.title) print('Removing:',article.title)
feed.articles.remove(article) feed.articles.remove(article)
elif 'Liveblog' in article.title: elif 'Liveblog' in article.title:
print('Removing:',article.title) print('Removing:',article.title)
feed.articles.remove(article) feed.articles.remove(article)
elif 'Newsblog' in article.title: elif 'Newsblog' in article.title:
print('Removing:',article.title) print('Removing:',article.title)
feed.articles.remove(article) feed.articles.remove(article)
elif 'Podcast' in article.title: elif 'Podcast' in article.title:
print('Removing:',article.title) print('Removing:',article.title)
feed.articles.remove(article) feed.articles.remove(article)
return feeds
return feeds
def preprocess_raw_html(self, raw, url): def preprocess_raw_html(self, raw, url):
# remove articles requiring login and advertisements # remove articles requiring login and advertisements
unwantedtag='ArticleHeadstyled__ArticleHeadPaidIconContainer' unwantedtag='ArticleHeadstyled__ArticleHeadPaidIconContainer'
if unwantedtag in raw: if unwantedtag in raw:
print('Skipping unwanted article with tag:',unwantedtag) print('Skipping unwanted article with tag:',unwantedtag)
self.abort_article('Skipping unwanted article') self.abort_article('Skipping unwanted article')
unwanted_article_keywords = ['Zum Login'] unwanted_article_keywords = ['Zum Login']
for keyword in unwanted_article_keywords: for keyword in unwanted_article_keywords:
if keyword in raw: if keyword in raw:
print('Skipping unwanted article with keyword(s):',keyword) print('Skipping unwanted article with keyword(s):',keyword)
#self.abort_article('Skipping unwanted article') #self.abort_article('Skipping unwanted article')
return raw return raw

71
recipes/saechsische.recipe
View File

@ -194,42 +194,41 @@ class Saechsische(BasicNewsRecipe):
] ]
def parse_feeds(self): def parse_feeds(self):
# Call parent's method. # Call parent's method.
feeds = BasicNewsRecipe.parse_feeds(self) feeds = BasicNewsRecipe.parse_feeds(self)
# Loop through all feeds. # Loop through all feeds.
for feed in feeds: for feed in feeds:
# Loop through all articles in feed. # Loop through all articles in feed.
for article in feed.articles[:]: for article in feed.articles[:]:
# Remove articles with '...' in the url. # Remove articles with '...' in the url.
if '/anzeige/' in article.url: if '/anzeige/' in article.url:
print('Removing:',article.title) print('Removing:',article.title)
feed.articles.remove(article) feed.articles.remove(article)
# Remove articles with '...' in the title. # Remove articles with '...' in the title.
elif 'Liveticker' in article.title: elif 'Liveticker' in article.title:
print('Removing:',article.title) print('Removing:',article.title)
feed.articles.remove(article) feed.articles.remove(article)
elif 'Liveblog' in article.title: elif 'Liveblog' in article.title:
print('Removing:',article.title) print('Removing:',article.title)
feed.articles.remove(article) feed.articles.remove(article)
elif 'Newsblog' in article.title: elif 'Newsblog' in article.title:
print('Removing:',article.title) print('Removing:',article.title)
feed.articles.remove(article) feed.articles.remove(article)
elif 'Podcast' in article.title: elif 'Podcast' in article.title:
print('Removing:',article.title) print('Removing:',article.title)
feed.articles.remove(article) feed.articles.remove(article)
return feeds
return feeds
def preprocess_raw_html(self, raw, url): def preprocess_raw_html(self, raw, url):
# remove Newsblogs, articles requiring login and advertisements # remove Newsblogs, articles requiring login and advertisements
unwantedtag='ArticleHeadstyled__ArticleHeadPaidIconContainer' unwantedtag='ArticleHeadstyled__ArticleHeadPaidIconContainer'
if unwantedtag in raw: if unwantedtag in raw:
print('Skipping unwanted article with tag:',unwantedtag) print('Skipping unwanted article with tag:',unwantedtag)
self.abort_article('Skipping unwanted article') self.abort_article('Skipping unwanted article')
unwanted_article_keywords = ['Zum Login'] unwanted_article_keywords = ['Zum Login']
for keyword in unwanted_article_keywords: for keyword in unwanted_article_keywords:
if keyword in raw: if keyword in raw:
print('Skipping unwanted article with keyword(s):',keyword) print('Skipping unwanted article with keyword(s):',keyword)
#self.abort_article('Skipping unwanted article') #self.abort_article('Skipping unwanted article')
return raw return raw

2
recipes/wsj_free.recipe
View File

@ -114,7 +114,7 @@ class WSJ(BasicNewsRecipe):
for figc in soup.findAll('figcaption'): for figc in soup.findAll('figcaption'):
figc['id'] = 'big-top-caption' figc['id'] = 'big-top-caption'
if name:= soup.find('h2', attrs={'itemprop':'name'}): if name:= soup.find('h2', attrs={'itemprop':'name'}):
name.extract() name.extract()
for h2 in soup.findAll('h2'): for h2 in soup.findAll('h2'):
if self.tag_to_string(h2).startswith(('What to Read Next', 'Conversation')): if self.tag_to_string(h2).startswith(('What to Read Next', 'Conversation')):
h2.extract() h2.extract()

1
ruff-strict-pep8.toml
View File

@ -37,6 +37,7 @@ select = [
'RUF039', # always use raw-string for regex 'RUF039', # always use raw-string for regex
'RUF047', # needless else 'RUF047', # needless else
'E302', 'E303', 'E304', 'E305', 'W391', # blank-line standard 'E302', 'E303', 'E304', 'E305', 'W391', # blank-line standard
'E111', 'E112', 'E113', 'E117', # code indentation
] ]
[lint.per-file-ignores] [lint.per-file-ignores]

6
src/calibre/ebooks/metadata/opf2.py
View File

@ -529,9 +529,9 @@ def serialize_user_metadata(metadata_elem, all_user_metadata, tail='\n'+(' '*8))
for name, fm in all_user_metadata.items(): for name, fm in all_user_metadata.items():
try: try:
fm = copy.copy(fm) fm = copy.copy(fm)
if (fm.get('datatype', 'text') == 'composite' and if (fm.get('datatype', 'text') == 'composite'
not fm.get('display', {}).get('composite_store_template_value_in_opf', True)): and not fm.get('display', {}).get('composite_store_template_value_in_opf', True)):
fm['#value#'] = '' fm['#value#'] = ''
encode_is_multiple(fm) encode_is_multiple(fm)
fm = object_to_unicode(fm) fm = object_to_unicode(fm)
fm = json.dumps(fm, default=to_json, ensure_ascii=False) fm = json.dumps(fm, default=to_json, ensure_ascii=False)

6
src/calibre/ebooks/metadata/opf3.py
View File

@ -951,9 +951,9 @@ def set_user_metadata(root, prefixes, refines, val):
nval = {} nval = {}
for name, fm in val.items(): for name, fm in val.items():
fm = fm.copy() fm = fm.copy()
if (fm.get('datatype', 'text') == 'composite' and if (fm.get('datatype', 'text') == 'composite'
not fm.get('display', {}).get('composite_store_template_value_in_opf', True)): and not fm.get('display', {}).get('composite_store_template_value_in_opf', True)):
fm['#value#'] = '' fm['#value#'] = ''
encode_is_multiple(fm) encode_is_multiple(fm)
nval[name] = fm nval[name] = fm
set_user_metadata3(root, prefixes, refines, nval) set_user_metadata3(root, prefixes, refines, nval)

18
src/calibre/ebooks/pdf/reflow.py
View File

@ -1266,17 +1266,13 @@ class Page:
absorb_into = None absorb_into = None
else: else:
absorb_into = prev_region absorb_into = prev_region
if self.regions[next_region].line_count >= \ if self.regions[next_region].line_count >= self.regions[prev_region].line_count:
self.regions[prev_region].line_count:
avg_column_count = sum(len(r.columns) for r in regions)/float(len(regions)) avg_column_count = sum(len(r.columns) for r in regions)/float(len(regions))
if self.regions[next_region].line_count > \ if self.regions[next_region].line_count > self.regions[prev_region].line_count \
self.regions[prev_region].line_count \ or abs(avg_column_count - len(self.regions[prev_region].columns)) \
or abs(avg_column_count - > abs(avg_column_count - len(self.regions[next_region].columns)):
len(self.regions[prev_region].columns)) \ absorb_into = next_region
> abs(avg_column_count - absorb_at = 'top'
len(self.regions[next_region].columns)):
absorb_into = next_region
absorb_at = 'top'
if absorb_into is not None: if absorb_into is not None:
self.regions[absorb_into].absorb_regions(regions, absorb_at) self.regions[absorb_into].absorb_regions(regions, absorb_at)
absorbed.update(regions) absorbed.update(regions)
@ -1954,7 +1950,7 @@ class PDFDocument:
# Do not merge if the next paragraph is indented # Do not merge if the next paragraph is indented
if page.texts: if page.texts:
if candidate: if candidate:
last_line = candidate.texts[-1] last_line = candidate.texts[-1]
if candidate \ if candidate \
and last_line.bottom > orphan_space \ and last_line.bottom > orphan_space \
and page.texts[0].indented == 0: and page.texts[0].indented == 0:

8
src/calibre/gui2/dialogs/template_general_info.py
View File

@ -33,11 +33,11 @@ class GeneralInformationDialog(Dialog):
l.addWidget(self.bb) l.addWidget(self.bb)
html = '' html = ''
if self.include_general_doc: if self.include_general_doc:
html += '<h2>General Information</h2>' html += '<h2>General Information</h2>'
html += FFMLProcessor().document_to_html(general_doc, 'Template General Information') html += FFMLProcessor().document_to_html(general_doc, 'Template General Information')
if self.include_ffml_doc: if self.include_ffml_doc:
html += '<h2>Format Function Markup Language Documentation</h2>' html += '<h2>Format Function Markup Language Documentation</h2>'
html += FFMLProcessor().document_to_html(ffml_doc, 'FFML Documentation') html += FFMLProcessor().document_to_html(ffml_doc, 'FFML Documentation')
e.setHtml(html) e.setHtml(html)

2
src/calibre/gui2/tag_browser/view.py
View File

@ -101,7 +101,7 @@ class TagDelegate(QStyledItemDelegate): # {{{
def text_color(self, hover, palette) -> QColor: def text_color(self, hover, palette) -> QColor:
if QApplication.instance().is_dark_theme and hover: if QApplication.instance().is_dark_theme and hover:
return QColor(Qt.GlobalColor.black) return QColor(Qt.GlobalColor.black)
return palette.color(QPalette.ColorRole.WindowText) return palette.color(QPalette.ColorRole.WindowText)
def draw_text(self, style, painter, option, widget, index, item): def draw_text(self, style, painter, option, widget, index, item):

4
src/calibre/gui2/tts/speechd.py
View File

@ -66,12 +66,12 @@ class SpeechdTTSBackend(TTSBackend):
@property @property
def available_voices(self) -> dict[str, tuple[Voice, ...]]: def available_voices(self) -> dict[str, tuple[Voice, ...]]:
if self._voices is None: if self._voices is None:
try: try:
self._voices = self._get_all_voices_for_all_output_modules() self._voices = self._get_all_voices_for_all_output_modules()
except Exception as e: except Exception as e:
self._set_error(str(e)) self._set_error(str(e))
return self._voices or {} return self._voices or {}
def stop(self) -> None: def stop(self) -> None:
self._last_mark = self._last_text = '' self._last_mark = self._last_text = ''