Из private store убран origin, поправленны ссылки

PastVu · Jun 1, 2013 · 447ea63 · 447ea63
1 parent 2b34569
commit 447ea63
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -22,7 +22,6 @@ logs/*.log.*
 
 # USER CONTENT #
 ######################
-publicContent
 
 # Temp Files #
 ######################

diff --git a/app.js b/app.js
@@ -50,6 +50,8 @@ for (var k in interfaces) {
  * Окружение (dev, test, prod)
  */
 var pkg = JSON.parse(fs.readFileSync(__dirname + '/package.json', 'utf8')),
+	confFile = argv.conffile || __dirname + '/config.json',
+	conf = JSON.parse(fs.readFileSync(confFile, 'utf8')),
 	land = argv.land || 'dev',
 	domain = argv.domain || addresses[0] || 'localhost',
 	port = argv.port || 3000,
@@ -68,7 +70,7 @@ logger.info('Application Hash: ' + app.hash);
 
 io = require('socket.io').listen(server);
 
-new File("publicContent/avatars").createDirectory();
+new File("../store/public/avatars").createDirectory();
 new File("../store/public/photos/micros").createDirectory();
 new File("../store/public/photos/micro").createDirectory();
 new File("../store/public/photos/mini").createDirectory();

diff --git a/config.json b/config.json
@@ -0,0 +1,2 @@
+{
+}
diff --git a/controllers/photo.js b/controllers/photo.js
@@ -15,7 +15,7 @@ var auth = require('./auth.js'),
 	Utils = require('../commons/Utils.js'),
 	log4js = require('log4js'),
 	logger,
-	photoDir = process.cwd() + '/publicContent/photos',
+	photoDir = process.cwd() + '/../store/public/photos',
 	imageFolders = [photoDir + '/micros/', photoDir + '/micro/', photoDir + '/mini/', photoDir + '/midi/', photoDir + '/thumb/', photoDir + '/standard/', photoDir + '/origin/'];
 
 /**

diff --git a/controllers/photoConverter.js b/controllers/photoConverter.js
@@ -25,7 +25,7 @@ var path = require('path'),
 	conveyerMaxLength = 0,
 	conveyerConverted = 0,
 
-	sourceDir = __dirname + '/../../store/private/photos/origin/',
+	sourceDir = __dirname + '/../../store/private/photos/',
 	targetDir = __dirname + '/../../store/public/photos/',
 
 	maxWorking = 2, // Возможно параллельно конвертировать

diff --git a/uploader.js b/uploader.js
@@ -11,7 +11,7 @@
 		Utils = require('./commons/Utils.js'),
 		options = {
 			incomeDir: __dirname + '/../store/incoming',
-			targetDir: __dirname + '/../store/private/photos/origin/',
+			targetDir: __dirname + '/../store/private/photos/',
 			minFileSize: 10240, //10kB
 			maxFileSize: 52428800, //50Mb
 			maxPostSize: 53477376, //51Mb,