Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
yPhil
Pétrolette
Commits
f06fe351
Commit
f06fe351
authored
Dec 08, 2017
by
yPhil
Browse files
Merge branch 'layout' into dev
parents
73ee973d
42511f24
Changes
1
Hide whitespace changes
Inline
Side-by-side
routes/index.js
View file @
f06fe351
...
...
@@ -29,12 +29,10 @@ function getFeed (urlfeed, callback) {
var
stream
=
this
;
if
(
res
.
statusCode
===
200
&&
res
.
headers
[
'
content-type
'
].
includes
(
'
xml
'
))
{
stream
.
pipe
(
feedparser
);
// console.log ("OK: (code %s) reading (%s) res: %s", res.statusCode, urlfeed, JSON.stringify(res.headers['content-type']));
}
else
{
callback
(
'
HTML page
'
);
return
;
// console.log ("Error (code %s) reading (%s)", res.statusCode, urlfeed);
}
});
req
.
on
(
"
error
"
,
function
(
res
)
{
...
...
@@ -61,21 +59,13 @@ function getFeed (urlfeed, callback) {
router
.
get
(
'
/feed
'
,
function
(
req
,
res
)
{
// var timer = setTimeout(function () {
// res.send({error:"error"});
// }, 2500);
// req.once('timeout', function () {
// clearTimeout(timer);
// });
getFeed
(
req
.
query
.
feedurl
,
function
(
err
,
feedItems
,
feedTitle
)
{
getFeed
(
req
.
query
.
feedurl
,
function
(
err
,
feedItems
,
feedTitle
)
{
if
(
feedItems
)
{
res
.
send
({
feedItems
:
feedItems
,
feedTitle
:
feedTitle
});
}
else
{
console
.
log
(
'
Huston, we have a [%s] (%s)
'
,
JSON
.
stringify
(
err
),
req
.
query
.
feedurl
);
res
.
send
({
error
:
err
});
}
});
...
...
@@ -109,20 +99,4 @@ router.get('/discover', function(req, res) {
});
router
.
post
(
'
/upload
'
,
function
(
req
,
res
)
{
if
(
!
req
.
files
)
return
res
.
status
(
400
).
send
(
'
No files were uploaded.
'
);
// The name of the input field (i.e. "sampleFile") is used to retrieve the uploaded file
let
sampleFile
=
req
.
files
.
sampleFile
;
// Use the mv() method to place the file somewhere on your server
sampleFile
.
mv
(
'
/tmp/plop.json
'
,
function
(
err
)
{
if
(
err
)
return
res
.
status
(
500
).
send
(
err
);
res
.
send
(
'
File uploaded!
'
);
});
});
module
.
exports
=
router
;
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment