preprocess: add workaround

Author: myfreeer

preprocess-zh.sh

@@ -46,7 +46,7 @@ VERSION="${VERSION:-$(date +%Y%m%d)}"
 CPUS="$(cat /proc/cpuinfo | grep -c '^processor')"
 
 # package un-processed files
-"${_7Z}" a -mx9 -myx9 "cppreference-unprocessed-${VERSION}.7z" ./reference
+"${_7Z}" a -mx9 -myx9 "../cppreference-unprocessed-${VERSION}.7z" ./reference
 
 # https://gist.github.com/cdown/1163649/8a35c36fdd24b373788a7057ed483a5bcd8cd43e
 url_encode() {
@@ -124,10 +124,20 @@ find -iname "${startup_scripts_replace}" | xargs sed -i 's/document\.write/void
 find -iname "${site_scripts_replace}" | xargs sed -i '1 i if(window.mw)'
 find -iname "${skin_scripts_replace}" | xargs sed -i '1 i if(window.mw)'
 find -iname '*.css' | xargs sed -i -r 's/\.\.\/([^.]+?)\.ttf/\1.ttf/ig'
+
+# workaround navbar-inv-tab.png
+find -iname '*.css' | xargs sed -i -r 's/https?:\/\/..\.cppreference\.com\/mwiki\/skins\/cppreference2\/images/skins\/cppreference2\/images/ig'
+pushd "${font_path}/skins/cppreference2/images"
+wget -nv 'https://en.cppreference.com/mwiki/skins/cppreference2/images/navbar-inv-tab.png'
+popd
+echo Cleaning up carbonads scripts
+find ./ -iname '*.html' -type f | xargs -P "${CPUS}" sed -i -r 's/<script.+?carbonads\.com\/carbon\.js.+?<\/script>//ig' 
 echo Done.
 
+rm -rf 'reference/zh.cppreference.com'
+
 # package processed files
-"${_7Z}" a -mx9 -myx9 "html-book-${VERSION}.7z" ./reference
+"${_7Z}" a -mx9 -myx9 "../html-book-${VERSION}.7z" ./reference
 
 # move processed files to parent folder
 # for make_chm.sh

zh.diff

@@ -1,5 +1,5 @@
 diff --git a/Makefile b/Makefile
-index deadfe2..46abab2 100644
+index deadfe2..be18286 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -230,7 +230,7 @@ indexes:
@@ -34,7 +34,7 @@ index deadfe2..46abab2 100644
 -	./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 ed67174..ada56fe 100644
+index ed67174..aec036c 100644
 --- a/commands/preprocess.py
 +++ b/commands/preprocess.py
 @@ -40,15 +40,15 @@ def rearrange_archive(root):
@@ -66,6 +66,15 @@ index ed67174..ada56fe 100644
          path = os.path.join(root, lang + ".cppreference.com/")
          src_html_path = path + "w/"
          src_data_path = path + "mwiki/"
+@@ -77,7 +77,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'):
 @@ -214,7 +214,7 @@ def has_class(el, classes_to_check):
      return False
 
@@ -75,8 +84,19 @@ index ed67174..ada56fe 100644
      html = etree.parse(fn, parser)
 
      # remove non-printable elements
+@@ -236,7 +236,9 @@ def preprocess_html_file(root, fn, rename_map):
+     for el in html.xpath('/html/body/script'):
+         if el.get('src') is not None and 'google-analytics.com/ga.js' in el.get('src'):
+             el.getparent().remove(el)
+-        elif el.text is not None and ('google-analytics.com/ga.js' in el.text or 'pageTracker' in el.text):
++        elif el.text is not None and ('google-analytics.com/ga.js' in el.text or 'pageTracker' in el.text or '_trackPageview' in el.text):
++            el.getparent().remove(el)
++        elif el.get('src') is not None and 'carbonads.com/carbon.js' in el.get('src'):
+             el.getparent().remove(el)
+ 
+     # make custom footer
 diff --git a/gadgets/standard_revisions-tests/base.py b/gadgets/standard_revisions-tests/base.py
-index 848d431..67d00f4 100644
+index 848d431..91a0a99 100644
 --- a/gadgets/standard_revisions-tests/base.py
 +++ b/gadgets/standard_revisions-tests/base.py
 @@ -27,7 +27,7 @@ import unittest, time, re
@@ -102,7 +122,7 @@ index 9aa3fc7..13294ec 100755
      pywikibot.config2.step = 100
      pywikibot.config2.put_throttle = 0
 diff --git a/index2ddg.py b/index2ddg.py
-index 9789e56..7a3a3dc 100755
+index 9789e56..8962791 100755
 --- a/index2ddg.py
 +++ b/index2ddg.py
 @@ -447,7 +447,7 @@ def process_identifier(out, redirects, root, link, item_ident, item_type,
@@ -115,7 +135,7 @@ index 9789e56..7a3a3dc 100755
 
          build_redirects(redirects, item_ident, item_type)
 diff --git a/index_transform/browser.py b/index_transform/browser.py
-index d2e625c..82cb11f 100644
+index d2e625c..11375f2 100644
 --- a/index_transform/browser.py
 +++ b/index_transform/browser.py
 @@ -42,7 +42,7 @@ class Index2Browser(IndexTransform):
@@ -149,7 +169,7 @@ index cb6e8cc..a8ac18f 100755
      rearrange_archive(root)
 
 diff --git a/tests/test_preprocess.py b/tests/test_preprocess.py
-index e4aa687..d6f143f 100644
+index e4aa687..4856f1b 100644
 --- a/tests/test_preprocess.py
 +++ b/tests/test_preprocess.py
 @@ -6,23 +6,23 @@ from lxml import etree