diff --git a/backend/generator.js b/backend/generator.js index 51196a94..f209929a 100644 --- a/backend/generator.js +++ b/backend/generator.js @@ -9,41 +9,42 @@ exports.executeScript = function (socket, formData) { socket.emit('err-logs', "Failed to generated documentation due to an error in input fields"); return false; } - var email = formData.email; - var gitUrl = formData.gitUrl; - var docTheme = formData.docTheme; - var uniqueId = uuidV4(); - var webUI = "true" - - var donePercent = 0; - - const args = [ - "-g", gitUrl, - "-t", docTheme, - "-m", email, - "-u", uniqueId, - "-w", webUI - ]; - - var process = spawn("./generate.sh", args); - - process.stdout.on('data', function (data) { - console.log(data.toString()); - socket.emit('logs', {donePercent: (donePercent = donePercent + 4), data: data.toString()}); - }); - - process.stderr.on('data', function (data) { - console.log(data.toString()); - socket.emit('err-logs', data.toString()); - }); - - process.on('exit', function (code) { - console.log('child process exited with code ' + code); - if (code === 0) { - socket.emit('success', {email: email, uniqueId: uniqueId, gitUrl: gitUrl}); - } else { - socket.emit('failure', {errorCode: code}); - } - }); - return true; + var email = formData.email; + var gitUrl = formData.gitUrl[0]; + var docTheme = formData.docTheme; + var webUI = "true" + + var uniqueId = uuidV4(); + var donePercent = 0; + + const args = [ + "-g", gitUrl, + "-t", docTheme, + "-m", email, + "-u", uniqueId, + "-w", webUI + ]; + + var process = spawn("./generate.sh", args); + + process.stdout.on('data', function (data) { + console.log(data.toString()); + socket.emit('logs', {donePercent: (donePercent = donePercent + 4), data: data.toString()}); + }); + + process.stderr.on('data', function (data) { + console.log(data.toString()); + socket.emit('err-logs', data.toString()); + }); + + process.on('exit', function (code) { + console.log('child process exited with code ' + code); + if (code === 0) { + socket.emit('success', {email: email, uniqueId: uniqueId, gitUrl: gitUrl}); + } else { + socket.emit('failure', {errorCode: code}); + } + }); + return true; + } }; diff --git a/modules/scripts/genindex.py b/modules/scripts/genindex.py index 46ce4512..12ef4e96 100644 --- a/modules/scripts/genindex.py +++ b/modules/scripts/genindex.py @@ -19,7 +19,7 @@ def get_toctree(dirpath, filenames): toctree = ['.. toctree::', ' :maxdepth: 1'] caption_template = ' :caption: {caption}' content_template = ' {document}' - + caption = os.path.basename(dirpath).replace('_', ' ').title() if caption == os.curdir: caption = 'Contents' @@ -52,9 +52,9 @@ def get_index(root): index.append(get_include(root, 'README.rst')) elif 'README.md' in root_files: index.append(get_include(root, 'README.md')) - + # Add toctrees as per the directory structure - for (dirpath, dirnames, filenames) in os.walk(os.curdir): + for (dirpath, dirnames, filenames) in os.walk(root): if filenames: toctree = get_toctree(dirpath, filenames) if toctree: diff --git a/public/scripts/form.js b/public/scripts/form.js index 42ecfd9b..75da9f65 100644 --- a/public/scripts/form.js +++ b/public/scripts/form.js @@ -7,8 +7,8 @@ $(function () { $("#btnGenerate").click(function () { var formData = getData(); - if (validation.isValid(formData)) { - socket.emit('execute', formData); + if (validation.isValid(formData)) { + socket.emit('execute', formData); $(this).attr("disabled", "none"); } else { $('.notification').append($('