Clean up API changes

This commit is contained in:
Frank Li 2017-08-02 15:13:10 -07:00
parent 419e0c0ff9
commit 6d2b6740c1
3 changed files with 10 additions and 17 deletions

View file

@ -70,8 +70,6 @@ function execute() {
console.log("generate.js triggered..."); console.log("generate.js triggered...");
const regexSubFolder = /translated_docs\/(.*)\/.*/;
const enabledLanguages = []; const enabledLanguages = [];
languages.filter(lang => lang.enabled).map(lang => { languages.filter(lang => lang.enabled).map(lang => {
enabledLanguages.push(lang.tag); enabledLanguages.push(lang.tag);
@ -142,6 +140,7 @@ function execute() {
files.forEach(file => { files.forEach(file => {
let language = "en"; let language = "en";
const regexSubFolder = /translated_docs\/(.*)\/.*/;
const match = regexSubFolder.exec(file); const match = regexSubFolder.exec(file);
if (match) { if (match) {
language = match[1]; language = match[1];

View file

@ -12,7 +12,6 @@ const CWD = process.cwd();
const path = require("path"); const path = require("path");
const fs = require("fs"); const fs = require("fs");
const os = require("os"); const os = require("os");
const sidebar = require(CWD + "/sidebar.json");
const glob = require("glob"); const glob = require("glob");
const siteConfig = require(CWD + "/siteConfig.js"); const siteConfig = require(CWD + "/siteConfig.js");
let languages; let languages;
@ -28,7 +27,8 @@ if (fs.existsSync(CWD + "/languages.js")) {
]; ];
} }
function readSidebar(allSidebars) { function readSidebar() {
const allSidebars = require(CWD + "/sidebar.json");
const order = {}; const order = {};
Object.keys(allSidebars).forEach(sidebar => { Object.keys(allSidebars).forEach(sidebar => {
@ -120,7 +120,7 @@ function processMetadata(file) {
metadata.id = language + "-" + metadata.id; metadata.id = language + "-" + metadata.id;
metadata.language = language; metadata.language = language;
const order = readSidebar(sidebar); const order = readSidebar();
const id = metadata.localized_id; const id = metadata.localized_id;
metadata.sidebar = order[id].sidebar; metadata.sidebar = order[id].sidebar;
@ -139,7 +139,7 @@ function processMetadata(file) {
} }
function generateDocsMetadata() { function generateDocsMetadata() {
const order = readSidebar(sidebar); const order = readSidebar();
const regexSubFolder = /translated_docs\/(.*)\/.*/; const regexSubFolder = /translated_docs\/(.*)\/.*/;

View file

@ -9,7 +9,6 @@
function execute(port) { function execute(port) {
const translation = require("./translation.js"); const translation = require("./translation.js");
const CWD = process.cwd();
const express = require("express"); const express = require("express");
const React = require("react"); const React = require("react");
const request = require("request"); const request = require("request");
@ -21,9 +20,12 @@ function execute(port) {
const mkdirp = require("mkdirp"); const mkdirp = require("mkdirp");
const glob = require("glob"); const glob = require("glob");
const translate = require("./translate.js"); const translate = require("./translate.js");
let siteConfig = require(CWD + "/siteConfig.js");
const CWD = process.cwd();
const ENABLE_TRANSLATION = fs.existsSync(CWD + "/languages.js"); const ENABLE_TRANSLATION = fs.existsSync(CWD + "/languages.js");
let siteConfig = require(CWD + "/siteConfig.js");
/** /**
* Removes a module from the cache * Removes a module from the cache
*/ */
@ -125,8 +127,6 @@ function execute(port) {
purgeCache(CWD + "/siteConfig.js"); purgeCache(CWD + "/siteConfig.js");
siteConfig = require(CWD + "/siteConfig.js"); siteConfig = require(CWD + "/siteConfig.js");
console.log(req.path);
reloadMetadata(); reloadMetadata();
let links = {}; let links = {};
for (let i = 0; i < Metadata.length; i++) { for (let i = 0; i < Metadata.length; i++) {
@ -146,10 +146,9 @@ function execute(port) {
} }
mdToHtml[metadata.source] = siteConfig.baseUrl + metadata.permalink; mdToHtml[metadata.source] = siteConfig.baseUrl + metadata.permalink;
} }
console.log(mdToHtml);
let file = links[req.path.toString().replace(siteConfig.baseUrl, "")]; let file = links[req.path.toString().replace(siteConfig.baseUrl, "")];
console.log(file);
if (!fs.existsSync(file)) { if (!fs.existsSync(file)) {
next(); next();
return; return;
@ -190,8 +189,6 @@ function execute(port) {
}); });
/* handle all requests for blog pages and posts */ /* handle all requests for blog pages and posts */
app.get(/blog\/.*html$/, (req, res) => { app.get(/blog\/.*html$/, (req, res) => {
console.log(req.path);
purgeCache(CWD + "/siteConfig.js"); purgeCache(CWD + "/siteConfig.js");
siteConfig = require(CWD + "/siteConfig.js"); siteConfig = require(CWD + "/siteConfig.js");
@ -283,8 +280,6 @@ function execute(port) {
purgeCache(CWD + "/siteConfig.js"); purgeCache(CWD + "/siteConfig.js");
siteConfig = require(CWD + "/siteConfig.js"); siteConfig = require(CWD + "/siteConfig.js");
console.log(req.path);
/* look for user provided html file first */ /* look for user provided html file first */
let htmlFile = req.path.toString().replace(siteConfig.baseUrl, ""); let htmlFile = req.path.toString().replace(siteConfig.baseUrl, "");
htmlFile = CWD + "/pages/" + htmlFile; htmlFile = CWD + "/pages/" + htmlFile;
@ -362,7 +357,6 @@ function execute(port) {
res.send(str); res.send(str);
} else { } else {
console.log(req.path);
next(); next();
return; return;
} }