Resolve conflicts

Author: linhe0x0

.gitignore

@@ -1,4 +1,5 @@
 # Byte-compiled / optimized / DLL files
+*.epub
 __pycache__/
 *.py[cod]
 

README-ja.md

@@ -0,0 +1,3 @@
+title: System Design Primer
+creator: Donne Martin
+date: 2018

README-zh-Hans.md

@@ -0,0 +1,40 @@
+#! /usr/bin/env sh
+
+generate_from_stdin() {
+  outfile=$1
+  language=$2
+
+  echo "Generating '$language' ..."
+
+  pandoc --metadata-file=epub-metadata.yaml --metadata=lang:$2 --from=markdown -o $1 <&0
+
+  echo "Done! You can find the '$language' book at ./$outfile"
+}
+
+generate_with_solutions () {
+  tmpfile=$(mktemp /tmp/sytem-design-primer-epub-generator.XXX)
+
+  cat ./README.md >> $tmpfile
+
+  for dir in ./solutions/system_design/*; do 
+    case $dir in *template*) continue;; esac
+    case $dir in *__init__.py*) continue;; esac
+    : [[ -d "$dir" ]] && ( cd "$dir" && cat ./README.md >> $tmpfile && echo "" >> $tmpfile )
+  done
+
+  cat $tmpfile | generate_from_stdin 'README.epub' 'en'
+
+  rm "$tmpfile"
+}
+
+generate () {
+  name=$1
+  language=$2
+
+  cat $name.md | generate_from_stdin $name.epub $language
+}
+
+generate_with_solutions
+generate README-ja ja
+generate README-zh-Hans zh-Hans
+generate README-zh-TW zh-TW

README-zh-TW.md

@@ -4,7 +4,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "This notebook was prepared by [Donne Martin](https://github.com/donnemartin). Source and license info is on [GitHub](https://github.com/donnemartin/system-design-primer-primer)."
+    "This notebook was prepared by [Donne Martin](https://github.com/donnemartin). Source and license info is on [GitHub](https://github.com/donnemartin/system-design-primer)."
    ]
   },
   {
@@ -24,9 +24,9 @@
     "    * Operator, supervisor, director\n",
     "* Can we assume operators always get the initial calls?\n",
     "    * Yes\n",
-    "* If there is no free operators or the operator can't handle the call, does the call go to the supervisors?\n",
+    "* If there is no available operators or the operator can't handle the call, does the call go to the supervisors?\n",
     "    * Yes\n",
-    "* If there is no free supervisors or the supervisor can't handle the call, does the call go to the directors?\n",
+    "* If there is no available supervisors or the supervisor can't handle the call, does the call go to the directors?\n",
     "    * Yes\n",
     "* Can we assume the directors can handle all calls?\n",
     "    * Yes\n",

README.md

@@ -66,7 +66,7 @@ def __init__(self, employee_id, name):
         super(Operator, self).__init__(employee_id, name, Rank.DIRECTOR)
 
     def escalate_call(self):
-        raise NotImplemented('Directors must be able to handle any call')
+        raise NotImplementedError('Directors must be able to handle any call')
 
 
 class CallState(Enum):

epub-metadata.yaml

@@ -4,7 +4,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "This notebook was prepared by [Donne Martin](https://github.com/donnemartin). Source and license info is on [GitHub](https://github.com/donnemartin/system-design-primer-primer)."
+    "This notebook was prepared by [Donne Martin](https://github.com/donnemartin). Source and license info is on [GitHub](https://github.com/donnemartin/system-design-primer)."
    ]
   },
   {

generate-epub.sh

@@ -4,7 +4,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "This notebook was prepared by [Donne Martin](https://github.com/donnemartin). Source and license info is on [GitHub](https://github.com/donnemartin/system-design-primer-primer)."
+    "This notebook was prepared by [Donne Martin](https://github.com/donnemartin). Source and license info is on [GitHub](https://github.com/donnemartin/system-design-primer)."
    ]
   },
   {

solutions/object_oriented_design/call_center/call_center.ipynb

@@ -4,7 +4,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "This notebook was prepared by [Donne Martin](https://github.com/donnemartin). Source and license info is on [GitHub](https://github.com/donnemartin/system-design-primer-primer)."
+    "This notebook was prepared by [Donne Martin](https://github.com/donnemartin). Source and license info is on [GitHub](https://github.com/donnemartin/system-design-primer)."
    ]
   },
   {

solutions/object_oriented_design/call_center/call_center.py

@@ -4,7 +4,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "This notebook was prepared by [Donne Martin](https://github.com/donnemartin). Source and license info is on [GitHub](https://github.com/donnemartin/system-design-primer-primer)."
+    "This notebook was prepared by [Donne Martin](https://github.com/donnemartin). Source and license info is on [GitHub](https://github.com/donnemartin/system-design-primer)."
    ]
   },
   {

solutions/object_oriented_design/deck_of_cards/deck_of_cards.ipynb

@@ -4,7 +4,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "This notebook was prepared by [Donne Martin](https://github.com/donnemartin). Source and license info is on [GitHub](https://github.com/donnemartin/system-design-primer-primer)."
+    "This notebook was prepared by [Donne Martin](https://github.com/donnemartin). Source and license info is on [GitHub](https://github.com/donnemartin/system-design-primer)."
    ]
   },
   {