',
- cit[2:],
- )
+ text = refless(cit[2:])
if ' p=' in name and ' | page=' not in text:
name = name.replace(' p=', ' p. ')
if pages:
- text = text[:-2] + ' | page=' + pages + '}}'
+ text = f'{text[:-2]} | page={pages}}}}}'
else:
- text = text[:-2] + ' | page=}}'
+ text = f'{text[:-2]} | page=}}}}'
elif ' pp=' in name:
name = name.replace(' pp=', ' pp. ')
if pages and ' | pages=' not in text:
- text = text[:-2] + ' | pages=' + pages + '}}'
- ref = '<ref name="' + name + '">' + text + '</ref>'
+ text = f'{text[:-2]} | pages={pages}}}}}'
+ ref = f'<ref name="{name}">{text}</ref>'
return sfn, cit, ref
@@ -303,38 +281,35 @@ def names2para(names, fn_parameter, ln_parameter, nofn_parameter=None):
c += 1
if c == 1:
if first or not nofn_parameter:
- s += ' | ' + ln_parameter + '=' + last
- s += ' | ' + fn_parameter + '=' + first
+ s += f' | {ln_parameter}={last} | {fn_parameter}={first}'
else:
- s += ' | ' + nofn_parameter + '=' + fullname(first, last)
+ s += f' | {nofn_parameter}={fullname(first, last)}'
else:
if first or not nofn_parameter:
- s += ' | ' + ln_parameter + str(c) + '=' + last
- s += ' | ' + fn_parameter + str(c) + '=' + first
+ s += f' | {ln_parameter}{c}={last} | {fn_parameter}{c}={first}'
else:
- s += ' | ' + nofn_parameter + str(c) + '=' + \
- fullname(first, last)
+ s += f' | {nofn_parameter}{c}={fullname(first, last)}'
return s
def names1para(translators, para):
"""Take list of names. Return the string to be appended to citation."""
- s = ' | ' + para + '='
+ s = f' | {para}='
c = 0
for first, last in translators:
c += 1
if c == 1:
s += fullname(first, last)
elif c == len(translators):
- s += ', and ' + fullname(first, last)
+ s += f', and {fullname(first, last)}'
else:
- s += ', ' + fullname(first, last)
+ s += f', {fullname(first, last)}'
return s
def fullname(first: str, last: str) -> str:
if first:
- return first + ' ' + last
+ return f'{first} {last}'
return last
diff --git a/lib/generator_fa.py b/lib/generator_fa.py
index abc023d1..be6439c9 100644
--- a/lib/generator_fa.py
+++ b/lib/generator_fa.py
@@ -1,6 +1,3 @@
-#! /usr/bin/python
-# -*- coding: utf-8 -*-
-
"""Codes required to create citation templates for wikifa."""
@@ -63,6 +60,7 @@
'journal': 'ژورنال',
# https://eutils.ncbi.nlm.nih.gov/entrez/eutils/esummary.fcgi?db=pubmed&id=22368089&retmode=json&tool=my_tool&email=my_email@example.com
'Journal Article': 'ژورنال',
+ 'article-journal': 'ژورنال',
'component': '',
'book-chapter': 'کتاب',
'report-series': 'report',
@@ -76,6 +74,7 @@
'book-series': 'کتاب',
'edited-book': 'کتاب',
'standard-series': '',
+ 'jour': 'ژورنال',
}.get
# According to https://en.wikipedia.org/wiki/Help:Footnotes,
@@ -87,9 +86,8 @@
def sfn_cit_ref(d: defaultdict) -> tuple:
- """Create citation templates using the given dictionary."""
- cite_type = TYPE_TO_CITE(d['cite_type'])
- if not cite_type:
+ """Return sfn, citation, and ref."""
+ if not (cite_type := TYPE_TO_CITE(d['cite_type'])):
logger.warning('Unknown citation type: %s, d: %s', cite_type, d)
cite_type = ''
if cite_type in ('کتاب', 'ژورنال', 'وب'):
@@ -97,8 +95,7 @@ def sfn_cit_ref(d: defaultdict) -> tuple:
else:
return en_citations(d)
- authors = d['authors']
- if authors:
+ if authors := d['authors']:
cit += names2para(authors, 'نام', 'نام خانوادگی', 'نویسنده')
sfn = '<ref>{{پک'
for first, last in authors[:4]:
@@ -106,22 +103,17 @@ def sfn_cit_ref(d: defaultdict) -> tuple:
else:
sfn = '<ref>{{پک/بن'
- editors = d['editors']
- if editors:
+ if editors := d['editors']:
cit += names2para(
- editors, 'نام ویراستار', 'نام خانوادگی ویراستار', 'ویراستار'
- )
+ editors, 'نام ویراستار', 'نام خانوادگی ویراستار', 'ویراستار')
- translators = d['translators']
- if translators:
+ if translators := d['translators']:
cit += names1para(translators, 'ترجمه')
- others = d['others']
- if others:
+ if others := d['others']:
cit += names1para(others, 'دیگران')
- year = d['year']
- if year:
+ if year := d['year']:
sfn += ' | ' + year
if cite_type == 'book':
@@ -148,81 +140,67 @@ def sfn_cit_ref(d: defaultdict) -> tuple:
else:
website = d['website']
if website:
- cit += ' | وبگاه=' + website
+ cit += ' | وبگاه=' + website
- chapter = d['chapter']
- if chapter:
+ if chapter := d['chapter']:
cit += ' | فصل=' + chapter
- publisher = d['publisher'] or d['organization']
- if publisher:
+ if publisher := (d['publisher'] or d['organization']):
cit += ' | ناشر=' + publisher
- address = d['address'] or d['publisher-location']
- if address:
+ if address := (d['address'] or d['publisher-location']):
cit += ' | مکان=' + address
- edition = d['edition']
- if edition:
+ if edition := d['edition']:
cit += ' | ویرایش=' + edition
- series = d['series']
- if series:
+ if series := d['series']:
cit += ' | سری=' + series
- volume = d['volume']
- if volume:
+ if volume := d['volume']:
cit += ' | جلد=' + volume
- issue = d['issue'] or d['number']
- if issue:
+ if issue := (d['issue'] or d['number']):
cit += ' | شماره=' + issue
- ddate = d['date']
- if ddate:
+ if ddate := d['date']:
if isinstance(ddate, str):
cit += ' | تاریخ=' + ddate
else:
cit += ' | تاریخ=' + date.isoformat(ddate)
-
- if year:
+ elif year:
cit += ' | سال=' + year
- month = d['month']
- if month:
- cit += ' | ماه=' + month
-
- isbn = d['isbn']
- if isbn:
+ if isbn := d['isbn']:
cit += ' | شابک=' + isbn
- issn = d['issn']
- if issn:
+ if issn := d['issn']:
cit += ' | issn=' + issn
- pmid = d['pmid']
- if pmid:
+ if pmid := d['pmid']:
cit += ' | pmid=' + pmid
- pmcid = d['pmcid']
- if pmcid:
+ if pmcid := d['pmcid']:
cit += ' | pmc=' + pmcid
- doi = d['doi']
- if doi:
+ if doi := d['doi']:
cit += ' | doi=' + doi
- oclc = d['oclc']
- if oclc:
+ if oclc := d['oclc']:
cit += ' | oclc=' + oclc
+ if jstor := d['jstor']:
+ cit += f' | jstor={jstor}'
+ jstor_access = d['jstor-access']
+ if jstor_access:
+ cit += f' | jstor-access=free'
+
pages = d['page']
if cite_type == 'ژورنال':
if pages:
cit += ' | صفحه=' + pages
- url = d['url']
- if url:
+ if url := d['url']:
# Don't add a DOI URL if we already have added a DOI.
if not doi or not DOI_URL_MATCH(url):
cit += ' | پیوند=' + url
@@ -230,33 +208,29 @@ def sfn_cit_ref(d: defaultdict) -> tuple:
# To prevent addition of access date
url = None
- archive_url = d['archive-url']
- if archive_url:
+ if archive_url := d['archive-url']:
cit += (
- ' | پیوند بایگانی=' + archive_url +
- ' | تاریخ بایگانی=' + d['archive-date'].isoformat() +
- ' | پیوند مرده=' + ('آری' if d['dead-url'] == 'yes' else 'نه')
- )
+ f' | پیوند بایگانی={archive_url}'
+ f' | تاریخ بایگانی={d["archive-date"].isoformat()}'
+ f" | پیوند مرده={('آری' if d['url-status'] == 'yes' else 'نه')}")
- language = d['language']
- if language:
+ if language := d['language']:
language = TO_TWO_LETTER_CODE(language.lower(), language)
if cite_type == 'وب':
- cit += ' | کد زبان=' + language
+ cit += f' | کد زبان={language}'
else:
- cit += ' | زبان=' + language
- sfn += ' | زبان=' + language
+ cit += f' | زبان={language}'
+ sfn += f' | زبان={language}'
if pages:
- sfn += ' | ص=' + pages
+ sfn += f' | ص={pages}'
# Seed the random generator before adding today's date.
randseed(cit)
ref_name = (
randchoice(ascii_lowercase) # it should contain at least one non-digit
- + ''.join(randchoice(LOWER_ALPHA_DIGITS) for _ in range(4))
- )
+ + ''.join(randchoice(LOWER_ALPHA_DIGITS) for _ in range(4)))
if url:
- cit += ' | تاریخ بازبینی=' + date.today().isoformat()
+ cit += f' | تاریخ بازبینی={date.today().isoformat()}'
if not pages and cite_type != 'وب':
sfn += ' | ص='
@@ -266,10 +240,10 @@ def sfn_cit_ref(d: defaultdict) -> tuple:
# Finally create the ref tag.
ref = cit[2:]
if pages and ' | صفحه=' not in ref:
- ref = ref[:-2] + ' | صفحه=' + pages + '}}'
+ ref = f'{ref[:-2]} | صفحه={pages}}}}}'
elif not url:
- ref = ref[:-2] + ' | صفحه=}}'
- ref = '<ref name="' + ref_name + '">' + ref + '\u200F</ref>'
+ ref = f'{ref[:-2]} | صفحه=}}}}'
+ ref = f'<ref name="{ref_name}">{ref}\u200F</ref>'
return sfn, cit, ref
@@ -282,39 +256,35 @@ def names2para(names, fn_parameter, ln_parameter, nofn_parameter=None):
if c == 1:
if first or not nofn_parameter:
s += (
- ' | ' + ln_parameter + '=' + last +
- ' | ' + fn_parameter + '=' + first
- )
+ f' | {ln_parameter}=' + last +
+ f' | {fn_parameter}=' + first)
else:
- s += ' | ' + nofn_parameter + '=' + fullname(first, last)
+ s += f' | {nofn_parameter}=' + fullname(first, last)
else:
if first or not nofn_parameter:
s += (
- ' | ' + ln_parameter + str(c).translate(DIGITS_TO_FA)
- + '=' + last +
- ' | ' + fn_parameter + str(c).translate(DIGITS_TO_FA)
- + '=' + first
- )
+ f' | {ln_parameter}{str(c).translate(DIGITS_TO_FA)}'
+ f'={last} | {fn_parameter}{str(c).translate(DIGITS_TO_FA)}'
+ f'={first}')
else:
s += (
- ' | ' + nofn_parameter + str(c).translate(DIGITS_TO_FA)
- + '=' + fullname(first, last)
- )
+ f' | {nofn_parameter}{str(c).translate(DIGITS_TO_FA)}'
+ f'={fullname(first, last)}')
return s
def names1para(translators, para):
"""Take list of names. Return the string to be appended to citation."""
- s = ' | ' + para + '='
+ s = f' | {para}='
c = 0
for first, last in translators:
c += 1
if c == 1:
s += fullname(first, last)
elif c == len(translators):
- s += ' و ' + fullname(first, last)
+ s += f' و {fullname(first, last)}'
else:
- s += '، ' + fullname(first, last)
+ s += f'، {fullname(first, last)}'
return s
diff --git a/lib/googlebooks.py b/lib/googlebooks.py
index bc09a133..e5729c7e 100644
--- a/lib/googlebooks.py
+++ b/lib/googlebooks.py
@@ -1,59 +1,30 @@
-#! /usr/bin/python
-# -*- coding: utf-8 -*-
-
-"""All things specifically related to the Google Books website."""
-
-
from urllib.parse import parse_qs
-from urllib.parse import urlparse
from langid import classify
-# import bibtex [1]
-from lib.commons import fetch
-from lib.ris import parse as ris_parse
-from lib.commons import dict_to_sfn_cit_ref
+from lib.commons import request
+from lib.ris import ris_parse
-def googlebooks_sfn_cit_ref(url, date_format='%Y-%m-%d') -> tuple:
+def url_to_dict(parsed_url, date_format='%Y-%m-%d') -> dict:
"""Create the response namedtuple."""
- # bibtex_result = get_bibtex(url) [1]
- # dictionary = bibtex.parse(bibtex_result) [1]
- dictionary = ris_parse(get_ris(url))
+ parsed_query = parse_qs(parsed_url.query)
+
+ if (id_ := parsed_query.get('id')) is not None:
+ volume_id = id_[0]
+ else: # the new URL format
+ volume_id = parsed_url.path.rpartition('/')[2]
+
+ dictionary = ris_parse(request(
+ f'https://{parsed_url.netloc}/books/download/?id={volume_id}'
+ f'&output=ris', spoof=True).content.decode('utf8'))
dictionary['date_format'] = date_format
- pu = urlparse(url)
- pq = parse_qs(pu.query)
- # default domain is prefered:
- dictionary['url'] = 'https://' + pu.netloc + '/books?id=' + pq['id'][0]
# manually adding page number to dictionary:
- if 'pg' in pq:
- dictionary['page'] = pq['pg'][0][2:]
- dictionary['url'] += '&pg=' + pq['pg'][0]
+ if (pg := parsed_query.get('pg')) is not None:
+ pg0 = pg[0]
+ dictionary['page'] = pg0[2:]
+ dictionary['url'] += f'&pg={pg0}'
# although google does not provide a language field:
if not dictionary['language']:
dictionary['language'] = classify(dictionary['title'])[0]
- return dict_to_sfn_cit_ref(dictionary)
-
-
-def get_bibtex(googlebook_url) -> bytes:
- """Get bibtex file content from a noormags url."""
- # getting id:
- pu = urlparse(googlebook_url)
- pq = parse_qs(pu.query)
- bookid = pq['id'][0]
- url = 'http://books.google.com/books/download/?id=' +\
- bookid + '&output=bibtex'
- # Agent spoofing is needed, otherwise: HTTP Error 401: Unauthorized
- return fetch(url, spoof=True, timeout=10).content
-
-
-def get_ris(googlebook_url):
- """Get ris file content from a noormags url."""
- # getting id:
- pu = urlparse(googlebook_url)
- pq = parse_qs(pu.query)
- bookid = pq['id'][0]
- url = 'http://books.google.com/books/download/?id=' +\
- bookid + '&output=ris'
- # Agent spoofing is needed, otherwise: HTTP Error 401: Unauthorized
- return fetch(url, spoof=True).text
+ return dictionary
diff --git a/lib/html/en.html b/lib/html/en.html
index 17c1db6a..df30c33c 100644
--- a/lib/html/en.html
+++ b/lib/html/en.html
@@ -1,4 +1,5 @@
+Citer
@@ -17,11 +18,11 @@
Date format:
- Shortened footnote and citation:
@@ -36,13 +37,13 @@
Google Books URL , DOI , ISBN , PMID , PMCID , OCLC number, or the URL of many major news websites.
- Note that there is always a chance of error in the generated output. Please check the results before using them on Wiki .
+ Note that there is always a chance of error in the generated output. Please check the results before using them on wiki .
- Found a bug or have a suggestion? Contact me on my talk page or open an issue on github .
- Bookmarklet
+ Found a bug or have a suggestion? Contact me on my talk page or open an issue on GitHub .
+ Bookmarklet (drag to favorites bar)
-
\ No newline at end of file
+