Craftadoc/clsi
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

don't error if a http resource can not be download

Browse Source 
try and continue, log the error but you might still be able to
compile. prevents issue with badly uploaded images in filstore
This commit is contained in:
Henry Oswald
2015-09-08 21:58:27 +01:00
parent c2054a5ec3
commit 6fae6ff40c
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/coffee/ResourceWriter.coffee
View File

@@ -5,6 +5,7 @@ async = require "async"
mkdirp = require "mkdirp" mkdirp = require "mkdirp"
OutputFileFinder = require "./OutputFileFinder" OutputFileFinder = require "./OutputFileFinder"
Metrics = require "./Metrics" Metrics = require "./Metrics"
logger = require "logger-sharelatex"
module.exports = ResourceWriter = module.exports = ResourceWriter =
syncResourcesToDisk: (project_id, resources, basePath, callback = (error) ->) -> syncResourcesToDisk: (project_id, resources, basePath, callback = (error) ->) ->
@@ -55,13 +56,10 @@ module.exports = ResourceWriter =
return callback(error) if error? return callback(error) if error?
# TODO: Don't overwrite file if it hasn't been modified # TODO: Don't overwrite file if it hasn't been modified
if resource.url? if resource.url?
UrlCache.downloadUrlToFile( UrlCache.downloadUrlToFile project_id, resource.url, path, resource.modified, (err)->
project_id, if err?
resource.url, logger.err err:err, "error downloading file for resources"
path, callback() #try and continue compiling even if http resource can not be downloaded at this time
resource.modified,
callback
)
else else
fs.writeFile path, resource.content, callback fs.writeFile path, resource.content, callback