update code

Author: ilsanbao

README.md

@@ -1,2 +1,5 @@
 # ipdb-php
 IPIP.net officially supported IP database ipdb format parsing library
+
+# Installing
+composer install ipip/db

example.php

@@ -3,7 +3,7 @@
 require_once __DIR__ . '/src/ipip/db/Info.php';
 require_once __DIR__ . '/src/ipip/db/Reader.php';
 
-$db = new ipip\db\Reader('c:\work\tiantexin\bb\v6\mydata6vipday4.ipdb');
+$db = new ipip\db\Reader('c:\tmp\ipdb\mydata6vipday4.ipdb');
 $loc = $db->find("2001:250:200::");
 $map = $db->findMap("2001:250:200::");
 $obj = $db->findInfo("2001:250:200::");

src/ipip/db/Reader.php

@@ -23,21 +23,17 @@ class Reader
      */
     public function __construct($database)
     {
-        if (is_readable($database) === FALSE)
-        {
-            throw new \InvalidArgumentException("The IP Database file \"{$database}\" does not exist or is not readable.");
-        }
-
         $this->database = $database;
 
         $this->init();
     }
 
-    /**
-     * @throws \Exception
-     */
     private function init()
     {
+        if (is_readable($this->database) === FALSE)
+        {
+            throw new \InvalidArgumentException("The IP Database file \"{$this->database}\" does not exist or is not readable.");
+        }
         $this->file = @fopen($this->database, 'rb');
         if ($this->file === FALSE)
         {
@@ -71,7 +67,7 @@ private function init()
     /**
      * @param $ip
      * @param string $language
-     * @return array|null
+     * @return array|NULL
      */
     public function find($ip, $language = 'CN')
     {
@@ -90,29 +86,30 @@ public function find($ip, $language = 'CN')
             throw new \InvalidArgumentException("The value \"$ip\" is not a valid IP address.");
         }
 
-        if (strpos($ip, '.') !== FALSE)
+        if (strpos($ip, '.') !== FALSE && !$this->supportV4())
         {
-            if (!$this->supportV4())
-            {
-                throw new \InvalidArgumentException("The Database not support IPv4 address.");
-            }
+            throw new \InvalidArgumentException("The Database not support IPv4 address.");
         }
-        elseif (strpos($ip, ':') !== FALSE)
+        elseif (strpos($ip, ':') !== FALSE && !$this->supportV6())
         {
-            if (!$this->supportV6())
-            {
-                throw new \InvalidArgumentException("The Database not support IPv6 address.");
-            }
+            throw new \InvalidArgumentException("The Database not support IPv6 address.");
         }
 
-        $node = $this->findNode($ip);
-        if ($node > 0)
+        try
         {
-            $data = $this->resolve($node);
+            $node = $this->findNode($ip);
+            if ($node > 0)
+            {
+                $data = $this->resolve($node);
 
-            $values = explode("\t", $data);
+                $values = explode("\t", $data);
 
-            return array_slice($values, $this->meta['languages'][$language], count($this->meta['fields']));
+                return array_slice($values, $this->meta['languages'][$language], count($this->meta['fields']));
+            }
+        }
+        catch (\Exception $e)
+        {
+            return NULL;
         }
 
         return NULL;
@@ -121,7 +118,7 @@ public function find($ip, $language = 'CN')
     public function findMap($ip, $language = 'CN')
     {
         $array = $this->find($ip, $language);
-        if (NULL === $array)
+        if (NULL == $array)
         {
             return NULL;
         }
@@ -132,7 +129,7 @@ public function findMap($ip, $language = 'CN')
     public function findInfo($ip, $language = 'CN')
     {
         $map = $this->findMap($ip, $language);
-        if (NULL === $map)
+        if (NULL == $map)
         {
             return NULL;
         }
@@ -143,7 +140,7 @@ public function findInfo($ip, $language = 'CN')
     /**
      * @param $ip
      * @return int
-     * @throws \RuntimeException
+     * @throws \Exception
      */
     private function findNode($ip)
     {
@@ -215,7 +212,7 @@ private function findNode($ip)
             return $node;
         }
 
-        throw new \RuntimeException("find node failed");
+        throw new \Exception("find node failed");
     }
 
     /**
@@ -278,7 +275,7 @@ private function read($stream, $offset, $length)
                 }
             }
 
-            throw new \Exception("The DB file read bad data");
+            throw new \Exception("The Database file read bad data");
         }
 
         return '';