优化Module的目录结构

breath-co2 · Sep 12, 2013 · cd3ca34 · cd3ca34
1 parent e762ec2
commit cd3ca34
Show file tree

Hide file tree

Showing 37 changed files with 16 additions and 4 deletions.
diff --git a/core/bootstrap.php b/core/bootstrap.php
@@ -767,7 +767,12 @@ public static function auto_load($class_name)
             }
             elseif ($ns=='module')
             {
-                $file = DIR_MODULE . $ns_name . DS;
+                $file = DIR_MODULE;
+
+                if ($new_class_name==$ns_name)
+                {
+                    $file .= $ns_name . DS;
+                }
             }
             else
             {
@@ -817,7 +822,7 @@ public static function auto_load($class_name)
                 # 生成一个module路径，比如 Database_Driver_MySQL 就是在 module/database 中
                 $include_path['module'] = array
                 (
-                    'module' => DIR_MODULE .$tmp_prefix. DS,
+                    'module' => DIR_MODULE,
                 );
             }
 
@@ -965,8 +970,15 @@ public static function find_file($dir, $file, $ext=null, $auto_require=false)
         if ($dir == 'classes')
         {
             # 类库目录增加 module 目录
-            list($module_name) = explode('/', $file, 2);
-            $module_dir = DIR_MODULE . $module_name . DS;
+            if (false===strpos($file, '/'))
+            {
+                list($module_name) = explode('/', $file, 2);
+                $module_dir = DIR_MODULE . $module_name . DS;
+            }
+            else
+            {
+                $module_dir = DIR_MODULE;
+            }
 
             if (is_dir($module_dir))
             {

diff --git a/modules/cache/cache/driver.class.php → modules/cache/driver.class.php b/modules/cache/cache/driver.class.php → modules/cache/driver.class.php
diff --git a/modules/cache/cache/driver/apc.class.php → modules/cache/driver/apc.class.php b/modules/cache/cache/driver/apc.class.php → modules/cache/driver/apc.class.php
diff --git a/...les/cache/cache/driver/database.class.php → modules/cache/driver/database.class.php b/...les/cache/cache/driver/database.class.php → modules/cache/driver/database.class.php
diff --git a/modules/cache/cache/driver/file.class.php → modules/cache/driver/file.class.php b/modules/cache/cache/driver/file.class.php → modules/cache/driver/file.class.php
diff --git a/...les/cache/cache/driver/memcache.class.php → modules/cache/driver/memcache.class.php b/...les/cache/cache/driver/memcache.class.php → modules/cache/driver/memcache.class.php
diff --git a/modules/cache/cache/driver/redis.class.php → modules/cache/driver/redis.class.php b/modules/cache/cache/driver/redis.class.php → modules/cache/driver/redis.class.php
diff --git a/modules/cache/cache/driver/sqlite.class.php → modules/cache/driver/sqlite.class.php b/modules/cache/cache/driver/sqlite.class.php → modules/cache/driver/sqlite.class.php
diff --git a/...les/cache/cache/driver/wincache.class.php → modules/cache/driver/wincache.class.php b/...les/cache/cache/driver/wincache.class.php → modules/cache/driver/wincache.class.php
diff --git a/modules/database/database/driver.class.php → modules/database/driver.class.php b/modules/database/database/driver.class.php → modules/database/driver.class.php
diff --git a/.../database/database/driver/mongo.class.php → modules/database/driver/mongo.class.php b/.../database/database/driver/mongo.class.php → modules/database/driver/mongo.class.php
diff --git a/...se/database/driver/mongo/result.class.php → ...es/database/driver/mongo/result.class.php b/...se/database/driver/mongo/result.class.php → ...es/database/driver/mongo/result.class.php
diff --git a/.../database/database/driver/mysql.class.php → modules/database/driver/mysql.class.php b/.../database/database/driver/mysql.class.php → modules/database/driver/mysql.class.php
diff --git a/...se/database/driver/mysql/result.class.php → ...es/database/driver/mysql/result.class.php b/...se/database/driver/mysql/result.class.php → ...es/database/driver/mysql/result.class.php
diff --git a/...tabase/driver/mysql/transaction.class.php → ...tabase/driver/mysql/transaction.class.php b/...tabase/driver/mysql/transaction.class.php → ...tabase/driver/mysql/transaction.class.php
diff --git a/...database/database/driver/mysqli.class.php → modules/database/driver/mysqli.class.php b/...database/database/driver/mysqli.class.php → modules/database/driver/mysqli.class.php
diff --git a/...e/database/driver/mysqli/result.class.php → ...s/database/driver/mysqli/result.class.php b/...e/database/driver/mysqli/result.class.php → ...s/database/driver/mysqli/result.class.php
diff --git a/...abase/driver/mysqli/transaction.class.php → ...abase/driver/mysqli/transaction.class.php b/...abase/driver/mysqli/transaction.class.php → ...abase/driver/mysqli/transaction.class.php
diff --git a/...atabase/database/driver/postgre.class.php → modules/database/driver/postgre.class.php b/...atabase/database/driver/postgre.class.php → modules/database/driver/postgre.class.php
diff --git a/.../database/driver/postgre/result.class.php → .../database/driver/postgre/result.class.php b/.../database/driver/postgre/result.class.php → .../database/driver/postgre/result.class.php
diff --git a/...base/driver/postgre/transaction.class.php → ...base/driver/postgre/transaction.class.php b/...base/driver/postgre/transaction.class.php → ...base/driver/postgre/transaction.class.php
diff --git a/...database/database/driver/sqlite.class.php → modules/database/driver/sqlite.class.php b/...database/database/driver/sqlite.class.php → modules/database/driver/sqlite.class.php
diff --git a/...e/database/driver/sqlite/result.class.php → ...s/database/driver/sqlite/result.class.php b/...e/database/driver/sqlite/result.class.php → ...s/database/driver/sqlite/result.class.php
diff --git a/...es/database/database/expression.class.php → modules/database/expression.class.php b/...es/database/database/expression.class.php → modules/database/expression.class.php
diff --git a/.../database/database/querybuilder.class.php → modules/database/querybuilder.class.php b/.../database/database/querybuilder.class.php → modules/database/querybuilder.class.php
diff --git a/modules/database/database/result.class.php → modules/database/result.class.php b/modules/database/database/result.class.php → modules/database/result.class.php
diff --git a/...s/database/database/transaction.class.php → modules/database/transaction.class.php b/...s/database/database/transaction.class.php → modules/database/transaction.class.php
diff --git a/...tpclient/httpclient/driver/curl.class.php → modules/httpclient/driver/curl.class.php b/...tpclient/httpclient/driver/curl.class.php → modules/httpclient/driver/curl.class.php
diff --git a/...pclient/httpclient/driver/fsock.class.php → modules/httpclient/driver/fsock.class.php b/...pclient/httpclient/driver/fsock.class.php → modules/httpclient/driver/fsock.class.php
diff --git a/...es/httpclient/httpclient/result.class.php → modules/httpclient/result.class.php b/...es/httpclient/httpclient/result.class.php → modules/httpclient/result.class.php
diff --git a/...es/session/session/driver/cache.class.php → modules/session/driver/cache.class.php b/...es/session/session/driver/cache.class.php → modules/session/driver/cache.class.php
diff --git a/.../session/session/driver/default.class.php → modules/session/driver/default.class.php b/.../session/session/driver/default.class.php → modules/session/driver/default.class.php
diff --git a/modules/storage/storage/driver.class.php → modules/storage/driver.class.php b/modules/storage/storage/driver.class.php → modules/storage/driver.class.php
diff --git a/...storage/storage/driver/database.class.php → modules/storage/driver/database.class.php b/...storage/storage/driver/database.class.php → modules/storage/driver/database.class.php
diff --git a/...les/storage/storage/driver/file.class.php → modules/storage/driver/file.class.php b/...les/storage/storage/driver/file.class.php → modules/storage/driver/file.class.php
diff --git a/...es/storage/storage/driver/redis.class.php → modules/storage/driver/redis.class.php b/...es/storage/storage/driver/redis.class.php → modules/storage/driver/redis.class.php
diff --git a/...es/storage/storage/driver/swift.class.php → modules/storage/driver/swift.class.php b/...es/storage/storage/driver/swift.class.php → modules/storage/driver/swift.class.php