Use static import to avoid code duplication from ddox.main

Author: wilzbach

dpl-docs/source/ddox_main.d

@@ -47,112 +47,14 @@ int ddoxMain(string[] args)
 	return 1;
 }
 
-int cmdGenerateHtml(string[] args)
-{
-	GeneratorSettings gensettings;
-	Package pack;
-	if( auto ret = setupGeneratorInput(args, gensettings, pack) )
-		return ret;
-
-	generateHtmlDocs(Path(args[3]), pack, gensettings);
-	return 0;
-}
-
-int cmdServeHtml(string[] args)
-{
-	string[] webfiledirs;
-	getopt(args,
-		config.passThrough,
-		"web-file-dir", &webfiledirs);
-
-	GeneratorSettings gensettings;
-	Package pack;
-	if( auto ret = setupGeneratorInput(args, gensettings, pack) )
-		return ret;
-
-	// register the api routes and start the server
-	auto router = new URLRouter;
-	registerApiDocs(router, pack, gensettings);
-
-	foreach (dir; webfiledirs)
-		router.get("*", serveStaticFiles(dir));
-
-	writefln("Listening on port 8080...");
-	auto settings = new HTTPServerSettings;
-	settings.port = 8080;
-	listenHTTP(settings, router);
-
-	return runEventLoop();
-}
-
-int cmdServeTest(string[] args)
-{
-	string[] webfiledirs;
-	auto docsettings = new DdoxSettings;
-	auto gensettings = new GeneratorSettings;
+static import ddox.main;
 
-	auto pack = parseD(args[2 .. $]);
-
-	processDocs(pack, docsettings);
-
-	// register the api routes and start the server
-	auto router = new URLRouter;
-	registerApiDocs(router, pack, gensettings);
-
-	foreach (dir; webfiledirs)
-		router.get("*", serveStaticFiles(dir));
-
-	writefln("Listening on port 8080...");
-	auto settings = new HTTPServerSettings;
-	settings.port = 8080;
-	listenHTTP(settings, router);
-
-	return runEventLoop();
-}
-
-int setupGeneratorInput(ref string[] args, out GeneratorSettings gensettings, out Package pack)
-{
-	gensettings = new GeneratorSettings;
-	auto docsettings = new DdoxSettings;
-
-	string[] macrofiles;
-	string[] overridemacrofiles;
-	string sitemapurl = "http://127.0.0.1/";
-	bool lowercasenames;
-	bool hyphenate;
-	getopt(args,
-		//config.passThrough,
-		"decl-sort", &docsettings.declSort,
-		"file-name-style", &gensettings.fileNameStyle,
-		"hyphenate", &hyphenate,
-		"lowercase-names", &lowercasenames,
-		"module-sort", &docsettings.moduleSort,
-		"navigation-type", &gensettings.navigationType,
-		"override-macros", &overridemacrofiles,
-		"package-order", &docsettings.packageOrder,
-		"sitemap-url", &sitemapurl,
-		"std-macros", &macrofiles,
-		"enum-member-pages", &gensettings.enumMemberPages,
-		"html-style", &gensettings.htmlOutputStyle,
-		);
-	gensettings.siteUrl = URL(sitemapurl);
-
-	if (lowercasenames) gensettings.fileNameStyle = MethodStyle.lowerCase;
-
-	if( args.length < 3 ){
-		showUsage(args);
-		return 1;
-	}
-
-	setDefaultDdocMacroFiles(macrofiles);
-	setOverrideDdocMacroFiles(overridemacrofiles);
-	if (hyphenate) enableHyphenation();
-
-	// parse the json output file
-	pack = parseDocFile(args[2], docsettings);
-
-	return 0;
-}
+alias cmdGenerateHtml = ddox.main.cmdGenerateHtml;
+alias cmdServeHtml = ddox.main.cmdServeTest;
+alias cmdServeTest = ddox.main.cmdServeTest;
+alias parseDocFile = ddox.main.parseDocFile;
+alias setupGeneratorInput = ddox.main.setupGeneratorInput;
+alias showUsage = ddox.main.showUsage;
 
 int cmdFilterDocs(string[] args)
 {
@@ -298,122 +200,7 @@ int cmdFilterDocs(string[] args)
 	return 0;
 }
 
-Package parseDocFile(string filename, DdoxSettings settings)
-{
-	writefln("Reading doc file...");
-	auto text = readText(filename);
-	int line = 1;
-	writefln("Parsing JSON...");
-	auto json = parseJson(text, &line);
-	writefln("Parsing docs...");
-	Package root;
-	root = parseJsonDocs(json);
-	writefln("Finished parsing docs.");
-
-	processDocs(root, settings);
-	return root;
-}
-
-void showUsage(string[] args)
-{
-	string cmd;
-	if( args.length >= 2 ) cmd = args[1];
-
-	switch(cmd){
-		default:
-			writefln(
-`Usage: %s <COMMAND> [args...]
-
-    <COMMAND> can be one of:
-        generate-html
-        serve-html
-        filter
-
- -h --help                 Show this help
-
-Use <COMMAND> -h|--help to get detailed usage information for a command.
-`, args[0]);
-			break;
-		case "serve-html":
-			writefln(
-`Usage: %s serve-html <ddocx-input-file>
-    --std-macros=FILE      File containing DDOC macros that will be available
-    --override-macros=FILE File containing DDOC macros that will override local
-                           definitions (Macros: section)
-    --navigation-type=TYPE Change the type of navigation (ModuleList,
-                           ModuleTree (default), DeclarationTree)
-    --package-order=NAME   Causes the specified module to be ordered first. Can
-                           be specified multiple times.
-    --sitemap-url          Specifies the base URL used for sitemap generation
-    --module-sort=MODE     The sort order used for lists of modules
-    --decl-sort=MODE       The sort order used for declaration lists
-    --web-file-dir=DIR     Make files from dir available on the served site
-    --enum-member-pages    Generate a single page per enum member
-    --html-style=STYLE     Sets the HTML output style, either pretty (default)
-                           or compact.
-    --hyphenate            hyphenate text
- -h --help                 Show this help
-
-The following values can be used as sorting modes: none, name, protectionName,
-protectionInheritanceName
-`, args[0]);
-			break;
-		case "generate-html":
-			writefln(
-`Usage: %s generate-html <ddocx-input-file> <output-dir>
-    --std-macros=FILE      File containing DDOC macros that will be available
-    --override-macros=FILE File containing DDOC macros that will override local
-                           definitions (Macros: section)
-    --navigation-type=TYPE Change the type of navigation (ModuleList,
-                           ModuleTree, DeclarationTree)
-    --package-order=NAME   Causes the specified module to be ordered first. Can
-                           be specified multiple times.
-    --sitemap-url          Specifies the base URL used for sitemap generation
-    --module-sort=MODE     The sort order used for lists of modules
-    --decl-sort=MODE       The sort order used for declaration lists
-    --file-name-style=STY  Sets a translation style for symbol names to file
-                           names. Use this instead of --lowercase-name.
-                           Possible values for STY:
-                             unaltered, camelCase, pascalCase, lowerCase,
-                             upperCase, lowerUnderscored, upperUnderscored
-    --lowercase-names      DEPRECATED: Outputs all file names in lower case.
-                           This option is useful on case insensitive file
-                           systems.
-    --enum-member-pages    Generate a single page per enum member
-    --html-style=STYLE     Sets the HTML output style, either pretty (default)
-                           compact or .
-    --hyphenate            hyphenate text
- -h --help                 Show this help
-
-The following values can be used as sorting modes: none, name, protectionName,
-protectionInheritanceName
-`, args[0]);
-			break;
-		case "filter":
-			writefln(
-`Usage: %s filter <ddocx-input-file> [options]
-    --ex=PREFIX            Exclude modules with prefix
-    --in=PREFIX            Force include of modules with prefix
-    --min-protection=PROT  Remove items with lower protection level than
-                           specified.
-                           PROT can be: Public, Protected, Package, Private
-    --only-documented      Remove undocumented entities.
-    --keep-unittests       Do not remove unit tests from documentation.
-                           Implies --keep-internals.
-    --keep-internals       Do not remove symbols starting with two underscores.
-    --unittest-examples    Add documented unit tests as examples to the
-                           preceding declaration (deprecated, enabled by
-                           default)
-    --no-unittest-examples Don't convert documented unit tests to examples
- -h --help                 Show this help
-`, args[0]);
-	}
-	if( args.length < 2 ){
-	} else {
-
-	}
-}
-
+// from ddox
 private string extractUnittestSourceCode(Json decl, Json mod)
 {
 	auto filename = mod["file"].get!string();