From 68271b04f9698b1c276d00b6b5344ed9fd78f151 Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Fri, 4 Apr 2014 15:58:59 +0100 Subject: [PATCH] deleted guid manager --- .../coffee/Features/ThirdPartyDataStore/UpdateMerger.coffee | 4 ++-- .../web/app/coffee/controllers/ProjectController.coffee | 1 - services/web/app/coffee/managers/GuidManager.coffee | 6 ------ 3 files changed, 2 insertions(+), 9 deletions(-) delete mode 100644 services/web/app/coffee/managers/GuidManager.coffee diff --git a/services/web/app/coffee/Features/ThirdPartyDataStore/UpdateMerger.coffee b/services/web/app/coffee/Features/ThirdPartyDataStore/UpdateMerger.coffee index d4548b4a3e..3a787bc985 100644 --- a/services/web/app/coffee/Features/ThirdPartyDataStore/UpdateMerger.coffee +++ b/services/web/app/coffee/Features/ThirdPartyDataStore/UpdateMerger.coffee @@ -5,7 +5,7 @@ logger = require('logger-sharelatex') Settings = require('settings-sharelatex') slReqIdHelper = require('soa-req-id') FileTypeManager = require('../Uploads/FileTypeManager') -GuidManager = require '../../managers/GuidManager' +uuid = require('node-uuid') fs = require('fs') module.exports = @@ -75,7 +75,7 @@ module.exports = writeStreamToDisk: (project_id, file_id, stream, callback = (err, fsPath)->)-> if !file_id? - file_id = GuidManager.newGuid() + file_id = uuid.v4() dumpPath = "#{Settings.path.dumpFolder}/#{project_id}_#{file_id}" writeStream = fs.createWriteStream(dumpPath) diff --git a/services/web/app/coffee/controllers/ProjectController.coffee b/services/web/app/coffee/controllers/ProjectController.coffee index bb53b6ee20..52e89d29d4 100755 --- a/services/web/app/coffee/controllers/ProjectController.coffee +++ b/services/web/app/coffee/controllers/ProjectController.coffee @@ -7,7 +7,6 @@ _ = require('underscore') fs = require('fs') ProjectHandler = require '../handlers/ProjectHandler' SecurityManager = require '../managers/SecurityManager' -GuidManager = require '../managers/GuidManager' Settings = require('settings-sharelatex') projectCreationHandler = require '../Features/Project/ProjectCreationHandler' projectDuplicator = require('../Features/Project/ProjectDuplicator') diff --git a/services/web/app/coffee/managers/GuidManager.coffee b/services/web/app/coffee/managers/GuidManager.coffee deleted file mode 100644 index c283670282..0000000000 --- a/services/web/app/coffee/managers/GuidManager.coffee +++ /dev/null @@ -1,6 +0,0 @@ -module.exports = - newGuid : ()-> - S4 = ()-> - return (((1+Math.random())*0x10000)|0).toString(16).substring(1) - return (S4()+S4()+"-"+S4()+"-"+S4()+"-"+S4()+"-"+S4()+S4()+S4()) -