Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[WIP] fix: Fixed errors getting during using wsgen after uploading zip or using endpoint #2144

Closed
wants to merge 4 commits into from
Closed

[WIP] fix: Fixed errors getting during using wsgen after uploading zip or using endpoint #2144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
829793d
fix: Fixed errors getting during using wsgen after uploading zip
prateekj117 Aug 2, 2019
c960ac6
Correct logic
prateekj117 Aug 2, 2019
423763f
fix: Fixed errors getting during using wsgen for eventyay endpoint
prateekj117 Aug 3, 2019
dfcdcb0
Merge branch 'development' into zip-upload-errors
mariobehling Dec 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/backend/dist.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -451,7 +451,8 @@ module.exports = {
});

unzipper.extract({
path: appPath + '/zip'
path: appPath + '/zip',
restrict: false
});

unzipper.on('extract', function(log) {
Expand Down
153 changes: 88 additions & 65 deletions src/backend/fold_v2.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,9 @@ function replaceSpaceWithUnderscore(str) {
}

function removeSpace(str) {
return str.replace(/ /g, '');
if (str) {
return str.replace(/ /g, '');
}
}

function returnTrackColor(trackInfo, id) {
Expand Down Expand Up @@ -143,11 +145,11 @@ function convertLicenseToCopyright(licence, copyright) {

function foldByTrack(sessions, speakers, trackInfo, reqOpts, next) {
const trackData = new Map();
const speakersMap = new Map(speakers.map((s) => [s.id, s]));
const speakersMap = new Map(Object.keys(speakers).map((s) => [s.id, s]));
const trackDetails = {};
const trackDetailsFont = {};

trackInfo.forEach((track) => {
Object.keys(trackInfo).forEach((track) => {
trackDetails[track.id] = track.color;
trackDetailsFont[track.id] = track['font-color'] !== null ? track['font-color'] : '#000000';
});
Expand Down Expand Up @@ -261,16 +263,16 @@ function foldByTrack(sessions, speakers, trackInfo, reqOpts, next) {

function foldByTime(sessions, speakers, trackInfo) {
const dateMap = new Map();
const speakersMap = new Map(speakers.map((s) => [s.id, s]));
const speakersMap = new Map(Object.keys(speakers).map((s) => [s.id, s]));
const trackDetails = {};
const trackDetailsFont = {};

trackInfo.forEach((track) => {
Object.keys(trackInfo).forEach((track) => {
trackDetails[track.id] = track.color;
trackDetailsFont[track.id] = track['font-color'] !== null ? track['font-color'] : '#000000';
});

sessions.forEach((session) => {
Object.keys(sessions).forEach((session) => {
let roomName = '';

if (session.state === 'rejected' || session.state === 'pending' || session.state === 'draft') {
Expand All @@ -279,13 +281,40 @@ function foldByTime(sessions, speakers, trackInfo) {
if (session.microlocation) {
roomName = session.microlocation.name;
}
const session_type = session['session-type'] === null ? ' ' : session['session-type'].name;
if (typeof session['session-type'] !== 'undefined') {
const session_type = session['session-type'] === null ? ' ' : session['session-type'].name;
timeMap.get(time).sessions.push({
type: session_type
});
}
const date = moment.parseZone(session['starts-at']).format('YYYY-MM-DD');
const startTime = moment.parseZone(session['starts-at']).format('HH:mm');
const endTime = moment.parseZone(session['ends-at']).format('HH:mm');
const time = startTime + ' - ' + endTime;
const speakersNum = session.speakers.length;
const tracktitle = session.track === null ? ' ' : session.track.name;
if (typeof session.speakers !== 'undefined') {
const speakersNum = session.speakers.length;
timeMap.get(time).sessions.push({
speakers_list: session.speakers.map((speaker) => {
const spkr = speakersMap.get(speaker.id);

if (spkr['photo-url']) {
spkr.thumb = 'images/speakers/thumbnails/' + spkr['photo-url'].split('/').pop();
spkr.photo = spkr['photo-url'];
}
spkr.nameIdSlug = slugify(spkr.name + spkr.id);
return spkr;
}),
speakers: speakersNum
});
}
if (typeof session.track !== 'undefined') {
const tracktitle = session.track === null ? ' ' : session.track.name;
timeMap.get(time).sessions.push({
color: returnTrackColor(trackDetails, session.track === null ? null : session.track.id),
font_color: returnTrackFontColor(trackDetailsFont, session.track === null ? null : session.track.id),
tracktitle: tracktitle
});
}

if (!dateMap.has(date)) {
dateMap.set(date, {
Expand All @@ -308,30 +337,15 @@ function foldByTime(sessions, speakers, trackInfo) {
end: moment.parseZone(session['ends-at']).format('HH:mm'),
calendarStart: session['starts-at'],
calendarEnd: session['ends-at'],
color: returnTrackColor(trackDetails, session.track === null ? null : session.track.id),
font_color: returnTrackFontColor(trackDetailsFont, session.track === null ? null : session.track.id),
title: session.title,
type: session_type,
location: roomName,
speakers_list: session.speakers.map((speaker) => {
const spkr = speakersMap.get(speaker.id);

if (spkr['photo-url']) {
spkr.thumb = 'images/speakers/thumbnails/' + spkr['photo-url'].split('/').pop();
spkr.photo = spkr['photo-url'];
}
spkr.nameIdSlug = slugify(spkr.name + spkr.id);
return spkr;
}),
description: checkNullHtml(session['long-abstract']) ? session['short-abstract'] : session['long-abstract'],
session_id: session.id,
sign_up: session['signup-url'],
video: checkNullHtml(session['video-url']) ? '' : session['video-url'],
slides: session['slides-url'],
audio: session['audio-url'],
sessiondate: moment.parseZone(session['starts-at']).format('dddd, Do MMM'),
tracktitle: tracktitle,
speakers: speakersNum
sessiondate: moment.parseZone(session['starts-at']).format('dddd, Do MMM')
});
});
const dates = Array.from(dateMap.values());
Expand Down Expand Up @@ -372,12 +386,12 @@ function returnTracknames(sessions, trackInfo) {
const trackDetails = {};
const trackDetailsFont = {};

trackInfo.forEach((track) => {
Object.keys(trackInfo).forEach((track) => {
trackDetails[track.id] = track.color;
trackDetailsFont[track.id] = track['font-color'] !== null ? track['font-color'] : '#000000';
});

sessions.forEach((session) => {
Object.keys(sessions).forEach((session) => {
if (!session['starts-at']) {
return;
}
Expand Down Expand Up @@ -437,6 +451,10 @@ function returnAttendees(attendeesData) {
}

function createSocialLinks(event) {
if (event['social-links'] === 'null' || !('social-links' in event)) {
return null;
}

const sociallinks = Array.from(event['social-links']);

sociallinks.forEach((link) => {
Expand Down Expand Up @@ -485,31 +503,20 @@ function createSocialLinks(event) {
}

function extractEventUrls(event, speakers, sponsors, reqOpts, next) {
const sociallinks = Array.from(event['social-links']);
let sociallink = '';
let featuresection = 0;
let sponsorsection = 0;

sociallinks.forEach((link) => {
if (link.name.toLowerCase() === 'twitter') {
sociallink = link.link;
}
});

sponsors.forEach((sponsor) => {
Object.keys(sponsors).forEach((sponsor) => {
if (sponsor.id !== undefined && typeof sponsor.id === 'number') {
sponsorsection++;
}
});
speakers.forEach((speaker) => {
Object.keys(speakers).forEach((speaker) => {
if (speaker['is-featured'] !== undefined && speaker['is-featured'] !== false && speaker['is-featured'] === true) {
featuresection++;
}
});

const arrayTwitterLink = sociallink.split('/');
const twitterLink = arrayTwitterLink[arrayTwitterLink.length - 1];

const urls = {
main_page_url: event['event-url'],
logo_url: event['logo-url'],
Expand All @@ -528,8 +535,6 @@ function extractEventUrls(event, speakers, sponsors, reqOpts, next) {
longitude: event.longitude,
register: event['ticket-url'],
timezone: event.timezone,
twitterLink: twitterLink,
tweetUrl: sociallink,
email: event.email,
orgname: event['organizer-name'],
orgdescription: event['organizer-description'],
Expand All @@ -539,10 +544,26 @@ function extractEventUrls(event, speakers, sponsors, reqOpts, next) {
codeOfConduct: event['code-of-conduct']
};

if (event['social-links'] !== 'null' && 'social-links' in event) {
const sociallinks = Array.from(event['social-links']);
let sociallink = '';

sociallinks.forEach((link) => {
if (link.name.toLowerCase() === 'twitter') {
sociallink = link.link;
}
});
const arrayTwitterLink = sociallink.split('/');
const twitterLink = arrayTwitterLink[arrayTwitterLink.length - 1];

urls.twitterLink = twitterLink;
urls.tweetUrl = sociallink;
}

if (reqOpts.assetmode === 'download') {
const appFolder = reqOpts.email + '/' + slugify(reqOpts.name);

if (event['logo-url'] !== null && event['logo-url'] !== '') {
if (event['logo-url'] !== null && event['logo-url'] !== '' && 'logo-url' in event) {
if (event['logo-url'].substring(0, 4) === 'http') {
distHelper.downloadLogo(appFolder, event['logo-url'], function(result) {
urls.logo_url = encodeURI(result);
Expand All @@ -563,7 +584,7 @@ function extractEventUrls(event, speakers, sponsors, reqOpts, next) {
}
}

if (event['original-image-url'] !== null && event['original-image-url'] !== '') {
if (event['original-image-url'] !== null && event['original-image-url'] !== '' && 'original-image-url' in event) {
if (event['original-image-url'].substring(0, 4) === 'http') {
distHelper.downloadLogo(appFolder, event['original-image-url'], function(result) {
urls.background_url = result;
Expand Down Expand Up @@ -629,7 +650,7 @@ function foldByLevel(sponsors, reqOpts, next) {
let level3 = 0;
const appFolder = reqOpts.email + '/' + slugify(reqOpts.name);

sponsors.forEach((sponsor) => {
Object.keys(sponsors).forEach((sponsor) => {
if (sponsor.level === '1' && (sponsor['logo-url'] !== null || ' ')) {
level1++;
}
Expand Down Expand Up @@ -679,7 +700,7 @@ function foldByLevel(sponsors, reqOpts, next) {
sponsorItem.sponsorimg = 'vcenter sponsorimg';
}

if (sponsor['logo-url'] !== null && sponsor['logo-url'] !== '') {
if (sponsor['logo-url'] !== null && sponsor['logo-url'] !== '' && 'logo-url' in sponsor) {
if (sponsor['logo-url'].substring(0, 4) === 'http') {
distHelper.downloadSponsorPhoto(appFolder, sponsor['logo-url'], function(result) {
sponsorItem.logo = encodeURI(result);
Expand Down Expand Up @@ -754,15 +775,15 @@ function foldByRooms(room, sessions, speakers, trackInfo) {
const roomData = new Map();
const trackDetails = {};
const trackDetailsFont = {};
const speakersMap = new Map(speakers.map((s) => [s.id, s]));
const speakersMap = new Map(Object.keys(speakers).map((s) => [s.id, s]));
const microlocationArray = [];

trackInfo.forEach((track) => {
Object.keys(trackInfo).forEach((track) => {
trackDetails[track.id] = track.color;
trackDetailsFont[track.id] = track['font-color'] !== null ? track['font-color'] : '#000000';
});

sessions.forEach((session) => {
Object.keys(sessions).forEach((session) => {
if (!session['starts-at'] || session.state === 'pending' || session.state === 'rejected' || session.state === 'draft') {
return;
}
Expand Down Expand Up @@ -932,7 +953,7 @@ function foldBySpeakers(speakers, sessions, tracksData, reqOpts, next) {
let thumb = '';

async.eachOfSeries(speakers, (speaker, key, callback) => {
if (speaker['photo-url'] !== null && speaker['photo-url'] !== '') {
if (speaker['photo-url'] !== null && speaker['photo-url'] !== '' && 'photo-url' in speaker) {
if (speaker['photo-url'].substring(0, 4) === 'http') {
distHelper.downloadSpeakerPhoto(appFolder, speaker['photo-url'], function(result) {
speakers[key]['photo-url'] = encodeURI(result);
Expand Down Expand Up @@ -960,7 +981,7 @@ function foldBySpeakers(speakers, sessions, tracksData, reqOpts, next) {
}, function() {
const speakerslist = [];

speakers.forEach((speaker) => {
Object.keys(speakers).forEach((speaker) => {
if (speaker['photo-url']) {
thumb = 'images/speakers/thumbnails/' + speaker['photo-url'].split('/').pop();
}
Expand Down Expand Up @@ -1002,27 +1023,29 @@ function getAllSessions(speakerid, session, trackInfo) {
const trackDetailsFont = {};
let speakerSessionDetail = {};

trackInfo.forEach((track) => {
Object.keys(trackInfo).forEach((track) => {
trackDetails[track.id] = track.color;
trackDetailsFont[track.id] = track['font-color'] !== null ? track['font-color'] : '#000000';
});

const sessionsMap = new Map(session.map((s) => [s.id, s]));
const sessionsMap = new Map(Object.keys(session).map((s) => [s.id, s]));

speakerid.forEach((speaker) => {
if (speaker !== undefined) {
speakerSessionDetail = sessionsMap.get(speaker.id);
if (typeof speakerid !== 'undefined') {
Object.keys(speakerid).forEach((speaker) => {
if (speaker !== undefined) {
speakerSessionDetail = sessionsMap.get(speaker.id);

if (speakerSessionDetail === undefined) {
return;
}
if (speakerSessionDetail.state === 'accepted' || speakerSessionDetail.state === 'confirmed') {
sessiondetail.push({
detail: speakerSessionDetail
});
if (speakerSessionDetail === undefined) {
return;
}
if (speakerSessionDetail.state === 'accepted' || speakerSessionDetail.state === 'confirmed') {
sessiondetail.push({
detail: speakerSessionDetail
});
}
}
}
});
});
}
// eslint-disable-next-line no-shadow
sessiondetail.forEach((session) => {
const roomname = session.detail === null || session.detail.microlocation === null ? ' ' : session.detail.microlocation.name;
Expand Down
5 changes: 3 additions & 2 deletions src/backend/generator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -537,7 +537,8 @@ exports.createDistDir = function(req, socket, callback) {
}
logger.addLog('Info', 'Compiling the html pages from the templates', socket);

const jsonData = data;
const jsonData = data;

eventName = fold.removeSpace(jsonData.eventurls.name);
const backPath = distHelper.distPath + '/' + appFolder + '/' + jsonData.eventurls.background_path;
const basePath = distHelper.distPath + '/' + appFolder + '/images';
Expand Down Expand Up @@ -727,7 +728,7 @@ exports.createDistDir = function(req, socket, callback) {
socket.emit('live.process', {donePercent: 85, status: 'Copying Service Worker File'});
}

hasher.hashElement(eventName, distHelper.distPath + '/' + req.body.email, function(err, hashObj) {
hasher.hashElement(eventName + '', distHelper.distPath + '/' + req.body.email, function(err, hashObj) {
if (err) {
console.log(err);
logger.addLog('Error', 'Error occured when calculating hash of event folder', socket, err);
Expand Down