From 59e3c1e8105477b5b6c78ef0579a3f809ef89949 Mon Sep 17 00:00:00 2001

From: myfreeer <myfreeer@users.noreply.github.com>

Date: Fri, 5 Apr 2019 07:50:59 +0800

Subject: [PATCH] source: use zh localized version

---

Makefile | 54 ++++++++++++------------

commands/preprocess.py | 21 +++++----

commands/preprocess_cssless.py | 4 +-

gadgets/standard_revisions_tests/base.py | 2 +-

gadgets/sync_tests_mwiki.py | 2 +-

index2ddg.py | 4 +-

index_transform/browser.py | 2 +-

preprocess.py | 8 ++--

tests/test_preprocess.py | 2 +-

tests/test_preprocess_cssless.py | 2 +-

10 files changed, 52 insertions(+), 49 deletions(-)

diff --git a/Makefile b/Makefile

index e54b72d..84d98a5 100644

--- a/Makefile

+++ b/Makefile

@@ -100,18 +100,18 @@ install: all

popd > /dev/null

# install the devhelp documentation

- install -DT -m 644 "output/cppreference-doc-en-c.devhelp2" \

- "$(DESTDIR)$(bookdir)/cppreference-doc-en-c/cppreference-doc-en-c.devhelp2"

- install -DT -m 644 "output/cppreference-doc-en-cpp.devhelp2" \

- "$(DESTDIR)$(bookdir)/cppreference-doc-en-cpp/cppreference-doc-en-cpp.devhelp2"

+ install -DT -m 644 "output/cppreference-doc-zh-c.devhelp2" \

+ "$(DESTDIR)$(bookdir)/cppreference-doc-zh-c/cppreference-doc-zh-c.devhelp2"

+ install -DT -m 644 "output/cppreference-doc-zh-cpp.devhelp2" \

+ "$(DESTDIR)$(bookdir)/cppreference-doc-zh-cpp/cppreference-doc-zh-cpp.devhelp2"

install -DT -m 644 "output/cppreference-doxygen-local.tag.xml" \

"$(DESTDIR)$(bookdir)/cppreference-doxygen-local.tag.xml"

install -DT -m 644 "output/cppreference-doxygen-web.tag.xml" \

"$(DESTDIR)$(bookdir)/cppreference-doxygen-web.tag.xml"

# install the .qch (Qt Help) documentation

- install -DT -m 644 "output/cppreference-doc-en-cpp.qch" \

- "$(DESTDIR)$(docdir)/qch/cppreference-doc-en-cpp.qch"

+ install -DT -m 644 "output/cppreference-doc-zh-cpp.qch" \

+ "$(DESTDIR)$(docdir)/qch/cppreference-doc-zh-cpp.qch"

uninstall:

rm -rf "$(DESTDIR)$(docdir)"

@@ -138,16 +138,16 @@ release: all

# zip qch

pushd "output"; \

- tar c$(TAR_OPTION)f "../release/qch-book-$(VERSION).tar.$(TAR_FORMAT)" "cppreference-doc-en-cpp.qch"; \

- zip -qr "../release/qch-book-$(VERSION).zip" "cppreference-doc-en-cpp.qch"; \

+ tar c$(TAR_OPTION)f "../release/qch-book-$(VERSION).tar.$(TAR_FORMAT)" "cppreference-doc-zh-cpp.qch"; \

+ zip -qr "../release/qch-book-$(VERSION).zip" "cppreference-doc-zh-cpp.qch"; \

popd

#WORKER RULES

doc_html: output/reference

-doc_devhelp: output/cppreference-doc-en-c.devhelp2 output/cppreference-doc-en-cpp.devhelp2

+doc_devhelp: output/cppreference-doc-zh-c.devhelp2 output/cppreference-doc-zh-cpp.devhelp2

-doc_qch: output/cppreference-doc-en-cpp.qch

+doc_qch: output/cppreference-doc-zh-cpp.qch

doc_doxygen: output/cppreference-doxygen-web.tag.xml output/cppreference-doxygen-local.tag.xml

@@ -156,32 +156,32 @@ output/link-map.xml: output/reference

./build_link_map.py

#build the .devhelp2 index

-output/cppreference-doc-en-c.devhelp2: output/reference output/link-map.xml

+output/cppreference-doc-zh-c.devhelp2: output/reference output/link-map.xml

./index2devhelp.py $(docdir)/html index-chapters-c.xml \

- "C Standard Library reference" "cppreference-doc-en-c" "c" \

+ "C Standard Library reference" "cppreference-doc-zh-c" "c" \

index-functions-c.xml "output/devhelp-index-c.xml"

./fix_devhelp-links.py "output/devhelp-index-c.xml" \

- "output/cppreference-doc-en-c.devhelp2"

+ "output/cppreference-doc-zh-c.devhelp2"

-output/cppreference-doc-en-cpp.devhelp2: output/reference output/link-map.xml

+output/cppreference-doc-zh-cpp.devhelp2: output/reference output/link-map.xml

./index2devhelp.py $(docdir)/html index-chapters-cpp.xml \

- "C++ Standard Library reference" "cppreference-doc-en-cpp" "cpp" \

+ "C++ Standard Library reference" "cppreference-doc-zh-cpp" "cpp" \

index-functions-cpp.xml "output/devhelp-index-cpp.xml"

./fix_devhelp-links.py "output/devhelp-index-cpp.xml" \

- "output/cppreference-doc-en-cpp.devhelp2"

+ "output/cppreference-doc-zh-cpp.devhelp2"

#build the .qch (QT help) file

-output/cppreference-doc-en-cpp.qch: output/qch-help-project-cpp.xml

+output/cppreference-doc-zh-cpp.qch: output/qch-help-project-cpp.xml

#qhelpgenerator only works if the project file is in the same directory as the documentation

cp "output/qch-help-project-cpp.xml" "output/reference_cssless/qch.qhp"

pushd "output/reference_cssless" > /dev/null; \

- $(qhelpgenerator) "qch.qhp" -o "../cppreference-doc-en-cpp.qch"; \

+ $(qhelpgenerator) "qch.qhp" -o "../cppreference-doc-zh-cpp.qch"; \

popd > /dev/null

rm -f "output/reference_cssless/qch.qhp"

-output/qch-help-project-cpp.xml: output/cppreference-doc-en-cpp.devhelp2 output/reference_cssless

+output/qch-help-project-cpp.xml: output/cppreference-doc-zh-cpp.devhelp2 output/reference_cssless

#build the file list

echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?><files>" > "output/qch-files.xml"

@@ -193,7 +193,7 @@ output/qch-help-project-cpp.xml: output/cppreference-doc-en-cpp.devhelp2 output/

echo "</files>" >> "output/qch-files.xml"

#create the project (copies the file list)

- ./devhelp2qch.py --src=output/cppreference-doc-en-cpp.devhelp2 \

+ ./devhelp2qch.py --src=output/cppreference-doc-zh-cpp.devhelp2 \

--dst=output/qch-help-project-cpp.xml \

--virtual_folder=cpp --file_list=output/qch-files.xml

@@ -229,7 +229,7 @@ indexes:

./index2autolinker.py index-functions-c.xml output/indexes/autolink-c

./index2autolinker.py index-functions-cpp.xml output/indexes/autolink-cpp

-#redownloads the source documentation directly from en.cppreference.com

+#redownloads the source documentation directly from zh.cppreference.com

source:

rm -rf "reference"

mkdir "reference"

@@ -238,15 +238,15 @@ source:

regex=".*index\\.php.*|.*/Special:.*|.*/Talk:.*" \

regex+="|.*/Help:.*|.*/File:.*|.*/Cppreference:.*" \

regex+="|.*/WhatLinksHere:.*|.*/Template:.*|.*/Category:.*" \

- regex+="|.*action=.*|.*printable=.*|.*en.cppreference.com/book.*" ; \

+ regex+="|.*action=.*|.*printable=.*|.*zh.cppreference.com/book.*" ; \

echo $$regex ; \

wget --adjust-extension --page-requisites --convert-links \

- --force-directories --recursive --level=15 \

- --span-hosts --domains=en.cppreference.com,upload.cppreference.com \

+ --force-directories --recursive --level=17 \

+ --span-hosts --domains=zh.cppreference.com,upload.cppreference.com \

--reject-regex $$regex \

- --timeout=5 --tries=50 --no-verbose \

+ --timeout=5 --tries=150 --no-verbose \

--retry-connrefused --waitretry=10 --read-timeout=20 \

- https://en.cppreference.com/w/ ; \

+ https://zh.cppreference.com/w/ ; \

popd > /dev/null

- ./export.py --url=http://en.cppreference.com/mwiki reference/cppreference-export-ns0,4,8,10.xml 0 4 8 10

+ ./export.py --url=https://zh.cppreference.com/mwiki reference/cppreference-export-ns0,4,8,10.xml 0 4 8 10

diff --git a/commands/preprocess.py b/commands/preprocess.py

index 2f8ff4c..43a527a 100644

--- a/commands/preprocess.py

+++ b/commands/preprocess.py

@@ -42,23 +42,23 @@ def rearrange_archive(root):

# rearrange the archive. {root} here is output/reference

# before

- # {root}/en.cppreference.com/w/ : html

- # {root}/en.cppreference.com/mwiki/ : data

- # {root}/en.cppreference.com/ : data

+ # {root}/zh.cppreference.com/w/ : html

+ # {root}/zh.cppreference.com/mwiki/ : data

+ # {root}/zh.cppreference.com/ : data

# ... (other languages)

# {root}/upload.cppreference.com/mwiki/ : data

# after

# {root}/common/ : all common data

- # {root}/en/ : html for en

+ # {root}/zh/ : html for zh

# ... (other languages)

data_path = os.path.join(root, 'common')

rmtree_if_exists(data_path)

shutil.move(os.path.join(root, 'upload.cppreference.com/mwiki'), data_path)

- shutil.rmtree(os.path.join(root, 'upload.cppreference.com'))

+ shutil.rmtree(os.path.join(root, 'upload.cppreference.com'), ignore_errors=True)

- for lang in ["en"]:

+ for lang in ["zh"]:

path = os.path.join(root, lang + ".cppreference.com/")

src_html_path = path + "w/"

src_data_path = path + "mwiki/"

@@ -81,7 +81,7 @@ def rearrange_archive(root):

shutil.copy(os.path.join(path, 'favicon.ico'), data_path)

# remove what's left

- shutil.rmtree(path)

+ # shutil.rmtree(path)

# remove the XML source file

for fn in fnmatch.filter(os.listdir(root), 'cppreference-export*.xml'):

@@ -341,7 +341,10 @@ def remove_fileinfo(html):

# make custom footer

def add_footer(html, root, fn):

- footer = html.xpath('//*[@id=\'footer\']')[0]

+ footers = html.xpath('//*[@id=\'footer\']')

+ if len(footers) == 0:

+ return

+ footer = footers[0]

for child in footer.getchildren():

id = child.get('id')

if id == 'cpp-navigation':

@@ -377,7 +380,7 @@ def remove_unused_external(html):

def preprocess_html_file(root, fn, rename_map):

- parser = etree.HTMLParser()

+ parser = etree.HTMLParser(encoding="utf-8")

html = etree.parse(fn, parser)

output = io.StringIO()

diff --git a/commands/preprocess_cssless.py b/commands/preprocess_cssless.py

index 8bf9142..2df1774 100644

--- a/commands/preprocess_cssless.py

+++ b/commands/preprocess_cssless.py

@@ -28,9 +28,9 @@ from lxml.etree import strip_elements

def preprocess_html_merge_cssless(src_path, dst_path):

- with open(src_path, 'r') as a_file:

+ with open(src_path, 'r', encoding='utf-8') as a_file:

content = a_file.read()

- parser = etree.HTMLParser()

+ parser = etree.HTMLParser(encoding="utf-8")

stripped = content.strip()

root = etree.fromstring(stripped, parser)

diff --git a/gadgets/standard_revisions_tests/base.py b/gadgets/standard_revisions_tests/base.py

index b780e8d..67266e1 100644

--- a/gadgets/standard_revisions_tests/base.py

+++ b/gadgets/standard_revisions_tests/base.py

@@ -24,7 +24,7 @@ from selenium.webdriver.support.ui import Select

class Driver:

def __init__(self):

- base_url = "http://en.cppreference.com/"

+ base_url = "https://zh.cppreference.com/"

driver = webdriver.Firefox()

driver.implicitly_wait(30)

try:

diff --git a/gadgets/sync_tests_mwiki.py b/gadgets/sync_tests_mwiki.py

index 9aa3fc7..13294ec 100755

--- a/gadgets/sync_tests_mwiki.py

+++ b/gadgets/sync_tests_mwiki.py

@@ -114,7 +114,7 @@ def perform_sync(url, direction, dest_root, title_filter, user, password,

# Supply information to config that would otherwise be defined in

# user-config.py

pywikibot.config2.family = 'cppreference'

- pywikibot.config2.mylang = 'en'

+ pywikibot.config2.mylang = 'zh'

pywikibot.config2.family_files['cppreference'] = url

pywikibot.config2.step = 100

pywikibot.config2.put_throttle = 0

diff --git a/index2ddg.py b/index2ddg.py

index 0cfa557..36bcb45 100755

--- a/index2ddg.py

+++ b/index2ddg.py

@@ -465,7 +465,7 @@ def process_identifier(out, redirects, root, link, item_ident, item_type,

abstract = abstract.replace('\n', '\\n')

line += abstract + '\t'

# source url

- line += 'http://en.cppreference.com/w/' + link + '\n'

+ line += 'https://zh.cppreference.com/w/' + link + '\n'

out.write(line)

build_redirects(redirects, item_ident, item_type)

@@ -580,7 +580,7 @@ def main():

# i+=1

root = e.parse(os.path.join(args.reference, fn),

- parser=html.HTMLParser())

+ parser=html.HTMLParser(encoding="utf-8"))

for ident in idents:

diff --git a/index_transform/browser.py b/index_transform/browser.py

index fb8b976..e9657a4 100644

--- a/index_transform/browser.py

+++ b/index_transform/browser.py

@@ -48,7 +48,7 @@ class Index2Browser(IndexTransform):

res = u''

res += '<tt><b>{0}</b></tt> [<span class="link">'.format(

xml_escape(full_name))

- res += '<a href="http://en.cppreference.com/w/{0}">'.format(

+ res += '<a href="https://zh.cppreference.com/w/{0}">'.format(

xml_escape(full_link))

res += '{0}</a></span>] <span class="mark">{1}</span>\n'.format(

full_link, mark)

diff --git a/preprocess.py b/preprocess.py

index a04abd2..95823b6 100755

--- a/preprocess.py

+++ b/preprocess.py

@@ -35,12 +35,12 @@ def main():

help='Destination folder to put preprocessed archive to')

args = parser.parse_args()

- root = args.dst

- src = args.src

+ root = args.src

+ # src = args.src

# copy the source tree

- preprocess.rmtree_if_exists(root)

- shutil.copytree(src, root)

+ # rmtree_if_exists(root)

+ # shutil.copytree(src, root)

preprocess.rearrange_archive(root)

diff --git a/tests/test_preprocess.py b/tests/test_preprocess.py

index 5233199..38ec845 100644

--- a/tests/test_preprocess.py

+++ b/tests/test_preprocess.py

@@ -256,7 +256,7 @@ class TestPreprocessHtml(unittest.TestCase):

self.testdata = os.path.join(os.path.dirname(__file__),

'preprocess_data')

infile = os.path.join(self.testdata, "fabs.html")

- self.parser = etree.HTMLParser()

+ self.parser = etree.HTMLParser(encoding="utf-8")

self.html = etree.parse(infile, self.parser)

# Check whether the HTML matches the contents of the specified test data

diff --git a/tests/test_preprocess_cssless.py b/tests/test_preprocess_cssless.py

index 0b9f580..ab6dddb 100644

--- a/tests/test_preprocess_cssless.py

+++ b/tests/test_preprocess_cssless.py

@@ -81,7 +81,7 @@ class HTMLTestBase(unittest.TestCase):

expected_output = \

'<html><body>{0}</body></html>'.format(expected_output)

- parser = etree.HTMLParser()

+ parser = etree.HTMLParser(encoding="utf-8")

root = etree.fromstring(input, parser)

root = function(root)

--

2.19.1