update monster list

2015-12-11 04:32:22 -06:00
parent 210f3ed302
commit 44e62b01dc
5 changed files with 155 additions and 5 deletions
--- a/bin/parse-wikia-monsters.py
+++ b/bin/parse-wikia-monsters.py
@@ -18,7 +18,6 @@ Returns list of dict, e.g.:
 import sys
 import re
 import json
-from collections import defaultdict, OrderedDict

 import requests

@@ -32,9 +31,12 @@ NAME_RE = re.compile(


 MONSTER_RE = re.compile(
-    '(?:</td>)?<td style="[^"]*background-color:#EBEBEB;">\s*'
+    '(?:</td>)?<td style="[^"]*background-color:#EBEBEB;[^"]*">\s*'
    '<a href="([^"]*)" [^>]* title="([^"]*)"')

+MONSTER_LINK_RE = re.compile(
+ '<a href="(/wiki/[^/"]*)"\s+class="image image-thumbnail link-internal"\s+'
+ 'title="([^"]*)"\s+>')

 JAPANESE_NAME_STR = '<h3 class="pi-data-label pi-secondary-font">Japanese:</h3>'
 JAPANESE_NAME_RE = re.compile(
@@ -57,8 +59,7 @@ def parse_wikia_monsters(f):
            continue
        if section != "Large Monsters":
            continue
-        m = MONSTER_RE.search(line)
-        if m:
+        for m in MONSTER_LINK_RE.finditer(line):
            monster = dict(href=m.group(1), name=m.group(2))
            if monster["name"].startswith("File:"):
                continue
@@ -71,7 +72,6 @@ def parse_wikia_monsters(f):
 def get_jp_names(monster_path):
    url = "http://monsterhunter.wikia.com" + monster_path
    r = requests.get(url)
-    html = r.text
    lines = r.text.split("\n")
    names = []
    while lines:
--- a/db/mhx_monster_list.json
+++ b/db/mhx_monster_list.json
@@ -59,6 +59,18 @@
    "name": "Spearbreaker Daimyo Hermitaur", 
    "name_jp": "\u77db\u7815\u30c0\u30a4\u30df\u30e7\u30a6\u30b6\u30b6\u30df"
  }, 
+  {
+    "title_jp": "\u6050\u66b4\u7adc", 
+    "href": "/wiki/Deviljho", 
+    "name": "Deviljho", 
+    "name_jp": "\u30a4\u30d3\u30eb\u30b8\u30e7\u30fc"
+  }, 
+  {
+    "title_jp": "\u6050\u66b4\u7adc", 
+    "href": "/wiki/Savage_Deviljho", 
+    "name": "Savage Deviljho", 
+    "name_jp": "\u6012\u308a\u55b0\u3089\u3046\u30a4\u30d3\u30eb\u30b8\u30e7\u30fc"
+  }, 
  {
    "title_jp": "\u65ac\u7adc", 
    "href": "/wiki/Dinovaldo", 
@@ -191,6 +203,18 @@
    "name": "Raizekusu", 
    "name_jp": "\u30e9\u30a4\u30bc\u30af\u30b9"
  }, 
+  {
+    "title_jp": "\u91d1\u7345\u5b50", 
+    "href": "/wiki/Rajang", 
+    "name": "Rajang", 
+    "name_jp": "\u30e9\u30fc\u30b8\u30e3\u30f3"
+  }, 
+  {
+    "title_jp": "\u91d1\u7345\u5b50", 
+    "href": "/wiki/Furious_Rajang", 
+    "name": "Furious Rajang", 
+    "name_jp": "\u6fc0\u6602\u3057\u305f\u30e9\u30fc\u30b8\u30e3\u30f3"
+  }, 
  {
    "title_jp": "\u706b\u7adc", 
    "href": "/wiki/Rathalos", 
--- a/web/translate/monster-titles.html
+++ b/web/translate/monster-titles.html
@@ -235,6 +235,24 @@
  
  
  
+  <div class="pure-g poogie-li">
+       
+    <div class="pure-u-1-2">恐暴竜</div>
+       
+    <div class="pure-u-1-2">Deviljho</div>
+  </div>
+  
+  
+  
+  <div class="pure-g poogie-li">
+       
+    <div class="pure-u-1-2">恐暴竜</div>
+       
+    <div class="pure-u-1-2">Savage Deviljho</div>
+  </div>
+  
+  
+  
  <div class="pure-g poogie-li">
       
    <div class="pure-u-1-2">悪相の千両役者</div>
@@ -586,6 +604,24 @@
  
  
  
+  <div class="pure-g poogie-li">
+       
+    <div class="pure-u-1-2">金獅子</div>
+       
+    <div class="pure-u-1-2">Rajang</div>
+  </div>
+  
+  
+  
+  <div class="pure-g poogie-li">
+       
+    <div class="pure-u-1-2">金獅子</div>
+       
+    <div class="pure-u-1-2">Furious Rajang</div>
+  </div>
+  
+  
+  
  <div class="pure-g poogie-li">
       
    <div class="pure-u-1-2">銀火竜</div>
--- a/web/translate/monsters-en.html
+++ b/web/translate/monsters-en.html
@@ -290,6 +290,17 @@
  
  
  
+  <div class="pure-g poogie-li">
+       
+    <div class="pure-u-1-2">Deviljho</div>
+       
+    <div class="pure-u-1-2">イビルジョー</div>
+       
+    <div class="pure-u">Title: 恐暴竜</div>
+  </div>
+  
+  
+  
  <div class="pure-g poogie-li">
       
    <div class="pure-u-1-2">Dinovaldo</div>
@@ -322,6 +333,17 @@
  </div>
  
  
+  
+  <div class="pure-g poogie-li">
+       
+    <div class="pure-u-1-2">Furious Rajang</div>
+       
+    <div class="pure-u-1-2">激昂したラージャン</div>
+       
+    <div class="pure-u">Title: 金獅子</div>
+  </div>
+  
+  
  <div class="poogie-li poogie-li-divider">G</div>
  
  <div class="pure-g poogie-li">
@@ -773,6 +795,17 @@
  
  
  
+  <div class="pure-g poogie-li">
+       
+    <div class="pure-u-1-2">Rajang</div>
+       
+    <div class="pure-u-1-2">ラージャン</div>
+       
+    <div class="pure-u">Title: 金獅子</div>
+  </div>
+  
+  
+  
  <div class="pure-g poogie-li">
       
    <div class="pure-u-1-2">Rathalos</div>
@@ -862,6 +895,17 @@
  
  <div class="poogie-li poogie-li-divider">S</div>
  
+  <div class="pure-g poogie-li">
+       
+    <div class="pure-u-1-2">Savage Deviljho</div>
+       
+    <div class="pure-u-1-2">怒り喰らうイビルジョー</div>
+       
+    <div class="pure-u">Title: 恐暴竜</div>
+  </div>
+  
+  
+  
  <div class="pure-g poogie-li">
       
    <div class="pure-u-1-2">Seltas</div>
--- a/web/translate/monsters-jp.html
+++ b/web/translate/monsters-jp.html
@@ -148,6 +148,17 @@
  
  <div class="poogie-li poogie-li-divider">イ</div>
  
+  <div class="pure-g poogie-li">
+       
+    <div class="pure-u-1-2">イビルジョー</div>
+       
+    <div class="pure-u-1-2">Deviljho</div>
+       
+    <div class="pure-u">Title: 恐暴竜</div>
+  </div>
+  
+  
+  
  <div class="pure-g poogie-li">
       
    <div class="pure-u-1-2">イャンガルルガ</div>
@@ -941,6 +952,17 @@
  </div>
  
  
+  
+  <div class="pure-g poogie-li">
+       
+    <div class="pure-u-1-2">ラージャン</div>
+       
+    <div class="pure-u-1-2">Rajang</div>
+       
+    <div class="pure-u">Title: 金獅子</div>
+  </div>
+  
+  
  <div class="poogie-li poogie-li-divider">リ</div>
  
  <div class="pure-g poogie-li">
@@ -1080,6 +1102,30 @@
  </div>
  
  
+  <div class="poogie-li poogie-li-divider">怒</div>
+  
+  <div class="pure-g poogie-li">
+       
+    <div class="pure-u-1-2">怒り喰らうイビルジョー</div>
+       
+    <div class="pure-u-1-2">Savage Deviljho</div>
+       
+    <div class="pure-u">Title: 恐暴竜</div>
+  </div>
+  
+  
+  <div class="poogie-li poogie-li-divider">激</div>
+  
+  <div class="pure-g poogie-li">
+       
+    <div class="pure-u-1-2">激昂したラージャン</div>
+       
+    <div class="pure-u-1-2">Furious Rajang</div>
+       
+    <div class="pure-u">Title: 金獅子</div>
+  </div>
+  
+  
  <div class="poogie-li poogie-li-divider">燼</div>
  
  <div class="pure-g poogie-li">