Merge be7c07a into 460e7f4

package.json

@@ -19,23 +19,24 @@
     }
   },
   "dependencies": {
-    "humanize-number": "0.0.2",
+    "forward": ">=0.0.4",
+    "humanize-number": ">=0.0.2",
     "gravatar": "1.0.6",
-    "urllib": "0.5.5",
+    "urllib": ">=0.5.5",
     "connect-markdown": "0.0.3",
-    "qn": "0.2.0",
+    "qn": ">=0.2.0",
     "microtime": "0.5.1",
-    "debug": "0.7.4",
-    "utility": "0.1.9",
+    "debug": ">=0.7.4",
+    "utility": ">=0.1.9",
     "ready": "0.1.1",
     "connect": "2.12.0",
     "connect-rt": "0.0.2",
     "connect-redis": "1.4.6",
     "connect-render": "0.3.2",
-    "urlrouter": "0.5.4",
-    "graceful": "0.0.5",
+    "urlrouter": ">=0.5.4",
+    "graceful": ">=0.0.5",
     "moment": "2.4.0",
-    "logfilestream": "0.1.0",
+    "logfilestream": ">=0.1.0",
     "ms": "0.6.2",
     "mkdirp": "0.3.5",
     "mysql": "2.0.0-rc2",
@@ -45,7 +46,7 @@
     "semver": "2.2.1",
     "marked": "0.2.10",
     "nodemailer": "0.5.15",
-    "eventproxy": "0.2.6"
+    "eventproxy": ">=0.2.6"
   },
   "devDependencies": {
     "supertest": "*",

proxy/module.js

@@ -21,9 +21,6 @@ var mysql = require('../common/mysql');
 
 var MODULE_COLUMNS = 'id, publish_time, gmt_create, gmt_modified, author, name, version, description, package, dist_tarball, dist_shasum, dist_size';
 
-// var INSERT_MODULE_SQL = 'INSERT INTO module(gmt_create, gmt_modified, author, name, version, package, dist_tarball, dist_shasum, dist_size) \
-//   VALUES(now(), now(), ?, ?, ?, ?, ?, ?, ?);';
-
 var INSERT_MODULE_SQL = 'INSERT INTO module(gmt_create, gmt_modified, \
   publish_time, author, name, version, package, dist_tarball, dist_shasum, dist_size, description) \
   VALUES(now(), now(), ?, ?, ?, ?, ?, ?, ?, ?, ?) \
@@ -254,7 +251,7 @@ exports.listShort = function (callback) {
 
 var LIST_ALL_MODULE_NAMES_SQL = 'SELECT distinct(name) FROM module ORDER BY name';
 exports.listAllModuleNames = function (callback) {
-  mysql.query(LIST_SHORT_SQL, callback);
+  mysql.query(LIST_ALL_MODULE_NAMES_SQL, callback);
 };
 
 var DELETE_MODULE_BY_NAME_SQL = 'DELETE FROM module WHERE name=?;';
@@ -287,7 +284,7 @@ exports.listByAuthor = function (author, callback) {
     mysql.query(LIST_BY_AUTH_SQLS[1], [names], ep.done(function (rows) {
       if (!rows || rows.length === 0) {
         return callback(null, []);
-      }      
+      }
       ep.emit('ids', rows.map(function (r) {
         return r.module_id;
       }));

proxy/sync_module_worker.js

@@ -40,6 +40,11 @@ function SyncModuleWorker(options) {
   }
 
   this.names = options.name;
+  for (var i = 0; i < this.names.length; i++) {
+    // ensure package name is lower case
+    this.names[i] = this.names[i].toLowerCase();
+  }
+
   this.username = options.username;
   this.concurrency = options.concurrency || 1;
   this.syncingNames = {};

servers/registry.js

@@ -21,12 +21,15 @@ var connect = require('connect');
 var rt = require('connect-rt');
 var responseCookie = require('response-cookie');
 var urlrouter = require('urlrouter');
+var forward = require('forward');
+var path = require('path');
 var routes = require('../routes/registry');
 var logger = require('../common/logger');
 var config = require('../config');
 var session = require('../common/session');
 var auth = require('../middleware/auth');
 
+var rootdir = path.dirname(__dirname);
 var app = connect();
 
 app.use(rt({headerName: 'X-ReadTime'}));
@@ -35,6 +38,8 @@ app.use(function (req, res, next) {
   next();
 });
 
+app.use('/favicon.ico', forward(path.join(rootdir, 'public', 'favicon.png')));
+
 app.use('/dist', connect.static(config.uploadDir));
 
 app.use(responseCookie());

sync/sync_all.js

@@ -14,27 +14,31 @@
  * Module dependencies.
  */
 
+var debug = require('debug')('cnpmjs.org:sync:sync_all');
+var eventproxy = require('eventproxy');
+var ms = require('ms');
+var utility = require('utility');
 var config = require('../config');
+var Status = require('./status');
 var Npm = require('../proxy/npm');
 var Total = require('../proxy/total');
-var eventproxy = require('eventproxy');
 var SyncModuleWorker = require('../proxy/sync_module_worker');
-var debug = require('debug')('cnpmjs.org:sync:sync_all');
-var utility = require('utility');
-var Status = require('./status');
 var Module = require('../proxy/module');
-var ms = require('ms');
 
 function subtract(subtracter, minuend) {
   subtracter = subtracter || [];
   minuend = minuend || [];
   var map = {};
   var results = [];
   minuend.forEach(function (name) {
-    map[name] = true;
+    map[name.toLowerCase()] = true;
   });
   subtracter.forEach(function (name) {
-    !map[name] && results.push(name);
+    var lowerName = name.toLowerCase();
+    if (!map[lowerName] && !/[A-Z]/.test(name)) {
+      // ensure package name is lower case
+      results.push(lowerName);
+    }
   });
   return results;
 }
@@ -52,7 +56,7 @@ function union(arrOne, arrTwo) {
 /**
  * when sync from official at the first time
  * get all packages by short and restart from last synced module
- * @param {String} lastSyncModule 
+ * @param {String} lastSyncModule
  * @param {Function} callback
  */
 function getFirstSyncPackages(lastSyncModule, callback) {
@@ -71,8 +75,8 @@ function getFirstSyncPackages(lastSyncModule, callback) {
 
 /**
  * get all the packages that update time > lastSyncTime
- * @param {Number} lastSyncTime 
- * @param {Function} callback 
+ * @param {Number} lastSyncTime
+ * @param {Function} callback
  */
 function getCommonSyncPackages(lastSyncTime, callback) {
   Npm.getAllSince(lastSyncTime, function (err, data) {