|
@@ -9,8 +9,8 @@ const swisstennis = express.Router()
|
|
|
|
|
|
const session = bhttp.session()
|
|
|
|
|
|
-function fileDate(date) {
|
|
|
- return `${ date.getFullYear()*10000 + (date.getMonth()+1)*100 + date.getDate() }${ date.getHours()*10000 + date.getMinutes()*100 + date.getSeconds() }`
|
|
|
+function fileDate (date) {
|
|
|
+ return `${date.getFullYear() * 10000 + (date.getMonth() + 1) * 100 + date.getDate()}${date.getHours() * 10000 + date.getMinutes() * 100 + date.getSeconds()}`
|
|
|
}
|
|
|
|
|
|
|
|
@@ -23,11 +23,11 @@ swisstennis.post('/login', async (req, res) => {
|
|
|
|
|
|
|
|
|
if (!username || !password) {
|
|
|
- res.status(400).json({
|
|
|
- success: false,
|
|
|
- msg: 'Parameters username and password are required'
|
|
|
+ res.status(400).json({
|
|
|
+ success: false,
|
|
|
+ msg: 'Parameters username and password are required'
|
|
|
})
|
|
|
- return
|
|
|
+ return
|
|
|
}
|
|
|
|
|
|
|
|
@@ -73,10 +73,10 @@ swisstennis.get('/tournaments', async (req, res) => {
|
|
|
success: false,
|
|
|
message: 'Not logged in.'
|
|
|
})
|
|
|
- return
|
|
|
+ return
|
|
|
}
|
|
|
const tournamentRegexp = /<a href=".*ProtectedDisplayTournament.*tournament=Id(\d+)">([^<]+)<\/a>/gm
|
|
|
-
|
|
|
+
|
|
|
do {
|
|
|
match = tournamentRegexp.exec(strMyTournamentsPage)
|
|
|
if (match) {
|
|
@@ -116,7 +116,7 @@ swisstennis.get('/draws/:tournament', async (req, res) => {
|
|
|
success: false,
|
|
|
message: 'Not logged in.'
|
|
|
})
|
|
|
- return
|
|
|
+ return
|
|
|
}
|
|
|
const drawRegexp = /<a (?:class="text" )?href=".*DisplayEvent.*eventId=(\d+).*">([^<]+)<\/a>/gm
|
|
|
|
|
@@ -129,13 +129,12 @@ swisstennis.get('/draws/:tournament', async (req, res) => {
|
|
|
res.json({
|
|
|
success: true,
|
|
|
draws
|
|
|
- })
|
|
|
+ })
|
|
|
} catch (error) {
|
|
|
res.status(400).json({
|
|
|
success: false,
|
|
|
msg: error.toString()
|
|
|
})
|
|
|
- return
|
|
|
}
|
|
|
})
|
|
|
|
|
@@ -162,8 +161,7 @@ swisstennis.get('/download/playerlist/:tournament', async (req, res) => {
|
|
|
success: false,
|
|
|
msg: error.toString()
|
|
|
})
|
|
|
- return
|
|
|
- }
|
|
|
+ }
|
|
|
})
|
|
|
|
|
|
swisstennis.get('/download/calendar/:tournament', async (req, res) => {
|
|
@@ -189,8 +187,7 @@ swisstennis.get('/download/calendar/:tournament', async (req, res) => {
|
|
|
success: false,
|
|
|
msg: error.toString()
|
|
|
})
|
|
|
- return
|
|
|
- }
|
|
|
+ }
|
|
|
})
|
|
|
|
|
|
swisstennis.get('/download/draw/:draw', async (req, res) => {
|
|
@@ -204,23 +201,22 @@ swisstennis.get('/download/draw/:draw', async (req, res) => {
|
|
|
return
|
|
|
}
|
|
|
try {
|
|
|
- const drawFile = fs.createWriteStream(`swisstennis_files/DisplayDraw${draw}-${fileDate(new Date())}.xls`)
|
|
|
+ const fileName = `DisplayDraw${draw}-${fileDate(new Date())}.xls`
|
|
|
+ const drawFile = fs.createWriteStream(`swisstennis_files/${fileName}`)
|
|
|
const drawDisplay = await session.get(`https://comp.swisstennis.ch/advantage/servlet/DisplayDraw.xls?eventId=${draw}&lang=D`, {stream: true})
|
|
|
drawDisplay.pipe(drawFile)
|
|
|
res.json({
|
|
|
success: true,
|
|
|
- msg: 'Download successful.'
|
|
|
+ fileName
|
|
|
})
|
|
|
} catch (error) {
|
|
|
res.status(400).json({
|
|
|
success: false,
|
|
|
msg: error.toString()
|
|
|
})
|
|
|
- return
|
|
|
- }
|
|
|
+ }
|
|
|
})
|
|
|
|
|
|
-
|
|
|
function generatePlayerList (file) {
|
|
|
return new Promise((resolve, reject) => {
|
|
|
console.log('About to read the player list.')
|
|
@@ -239,5 +235,4 @@ function generatePlayerList (file) {
|
|
|
})
|
|
|
}
|
|
|
|
|
|
-
|
|
|
-export default swisstennis
|
|
|
+export default swisstennis
|