Merge pull request #240 from mh-northlander/fetch-latest-dictionary

`fetch_dictionary.sh` now fetches latest dictionary. Github workflows use it with explicit dictionary versions.

.github/workflows/build-python-wheels.yml

@@ -41,7 +41,7 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Download dictionary
-        run: bash fetch_dictionary.sh
+        run: bash fetch_dictionary.sh "20220519" "core"
 
       - uses: actions/cache@v3
         with:

.github/workflows/python-upload-test.yml

@@ -39,7 +39,7 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Download dictionary
-        run: bash fetch_dictionary.sh
+        run: bash fetch_dictionary.sh "20220519" "core"
 
       - uses: actions/cache@v3
         with:

.github/workflows/python.yml

@@ -19,7 +19,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Download dictionary
-        run: bash fetch_dictionary.sh
+        run: bash fetch_dictionary.sh "20220519" "core"
 
       - uses: actions/cache@v3
         with:

.github/workflows/rust-noncached.yml

@@ -20,7 +20,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Download dictionary
-        run: bash fetch_dictionary.sh
+        run: bash fetch_dictionary.sh "20220519" "core"
       - name: Run tests (Debug)
         run: cargo test --verbose
       - name: Run tests (Release)

.github/workflows/rust.yml

@@ -22,7 +22,7 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - name: Download dictionary
-      run: bash fetch_dictionary.sh
+      run: bash fetch_dictionary.sh "20220519" "core"
 
     - uses: actions/cache@v3
       with:

fetch_dictionary.sh

@@ -1,21 +1,22 @@
 #!/bin/sh
 
-DICT_NAME_BASE="sudachi-dictionary-20220519"
-DICT_TYPE="core"
-DICT_NAME="${DICT_NAME_BASE}-${DICT_TYPE}"
+DICT_VERSION=${1:-"latest"}
+DICT_TYPE=${2:-"core"}
+
+DICT_NAME="sudachi-dictionary-${DICT_VERSION}-${DICT_TYPE}"
 
 echo "Downloading a dictionary file \`${DICT_NAME}\` ..."
 echo
 
 curl -L \
-    http://sudachi.s3-website-ap-northeast-1.amazonaws.com/sudachidict/${DICT_NAME}.zip \
+    https://d2ej7fkh96fzlu.cloudfront.net/sudachidict/${DICT_NAME}.zip \
     > ${DICT_NAME}.zip
 
-unzip ${DICT_NAME}.zip
+unzip -j ${DICT_NAME}.zip -d ${DICT_NAME}
 
-mv ${DICT_NAME_BASE}/system_${DICT_TYPE}.dic resources/system.dic
+mv ${DICT_NAME}/system_${DICT_TYPE}.dic resources/system.dic
 
-rm -rf ${DICT_NAME}.zip ${DICT_NAME_BASE}
+rm -rf ${DICT_NAME}.zip ${DICT_NAME}
 
 echo
 echo "Placed a dictionary file to \`resources/system.dic\` ."