Henry Oswald 12 лет назад
Родитель
Сommit
68271b04f9

+ 2 - 2
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)

+ 0 - 1
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')

+ 0 - 6
services/web/app/coffee/managers/GuidManager.coffee

@@ -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())
-