Attempt to restore legacy server (#575)

* Fix legacy server for local instances

Previously, trying to create a local instance was causing this error:
`Uncaught exception - /var/www/html/legacy/haxelib.db does not exist.`

The db file and tables are now created automatically if they don't
already exist.

* Fix legacy link on homepage

* Do not expose email address in legacy server

See #570

* [legacy] Drop tables in separate function

Just in case...

* [legacy] Rename function

Author: tobil4sk

src/legacyhaxelib/Site.hx

@@ -36,19 +36,15 @@ class Site {
 	public static var TMP_DIR = CWD+"../tmp";
 	public static var REP_DIR = CWD+"../"+Data.REPOSITORY;
 
-	static function setup() {
-		SiteDb.create(db);
-	}
-
 	static function initDatabase() {
-		var path = "legacy/haxelib.db";
-		FileStorage.instance.readFile(path, function(file) {
-			if (Path.normalize(DB_FILE) != Path.normalize(file))
-				throw '$file should be the same as $DB_FILE';
-			db = neko.db.Sqlite.open(DB_FILE);
-			neko.db.Manager.cnx = db;
-			neko.db.Manager.initialize();
-		});
+		var alreadyExists = sys.FileSystem.exists(DB_FILE);
+		db = neko.db.Sqlite.open(DB_FILE);
+		neko.db.Manager.cnx = db;
+		neko.db.Manager.initialize();
+
+		if (!alreadyExists) {
+			SiteDb.create(db);
+		}
 	}
 
 	static function run() {
@@ -62,7 +58,8 @@ class Site {
 		if( haxe.remoting.HttpConnection.handleRequest(ctx) )
 			return;
 		if( Sys.args()[0] == "setup" ) {
-			setup();
+			SiteDb.dropAll(db);
+			SiteDb.create(db);
 			neko.Lib.print("Setup done\n");
 			return;
 		}
@@ -111,7 +108,7 @@ class Site {
 			act = uri.shift();
 			ctx.basehref = domain + "/legacy/";
 		}
-		else 
+		else
 			ctx.basehref = domain + "/";
 		if( act == null || act == "" || act == "index.n" )
 			act = "index";

src/legacyhaxelib/SiteApi.hx

@@ -68,7 +68,7 @@ class SiteApi {
 		return {
 			name : u.name,
 			fullname : u.fullname,
-			email : u.email,
+			email : "(private)",
 			projects : projects,
 		};
 	}

src/legacyhaxelib/SiteDb.hx

@@ -141,8 +141,16 @@ class TagManager extends neko.db.Manager<Tag> {
 
 class SiteDb {
 
-	public static function create( db : sys.db.Connection ) {
+	public static function dropAll( db : sys.db.Connection ) {
 		db.request("DROP TABLE IF EXISTS User");
+		db.request("DROP TABLE IF EXISTS Project");
+		db.request("DROP TABLE IF EXISTS Version");
+		db.request("DROP TABLE IF EXISTS Developer");
+		db.request("DROP TABLE IF EXISTS Tag");
+		db.request("DROP INDEX IF EXISTS TagSearch");
+	}
+
+	public static function create( db : sys.db.Connection ) {
 		db.request("
 			CREATE TABLE User (
 				id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
@@ -152,7 +160,6 @@ class SiteDb {
 				email VARCHAR(50) NOT NULL
 			)
 		");
-		db.request("DROP TABLE IF EXISTS Project");
 		db.request("
 			CREATE TABLE Project (
 				id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
@@ -165,7 +172,6 @@ class SiteDb {
 				downloads INT NOT NULL
 			)
 		");
-		db.request("DROP TABLE IF EXISTS Version");
 		db.request("
 			CREATE TABLE Version (
 				id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
@@ -177,22 +183,19 @@ class SiteDb {
 				documentation TEXT NULL
 			)
 		");
-		db.request("DROP TABLE IF EXISTS Developer");
 		db.request("
 			CREATE TABLE Developer (
 				user INTEGER NOT NULL,
 				project INTEGER NOT NULL
 			)
 		");
-		db.request("DROP TABLE IF EXISTS Tag");
 		db.request("
 			CREATE TABLE Tag (
 				id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
 				tag VARCHAR(32) NOT NULL,
 				project INTEGER NOT NULL
 			)
 		");
-		db.request("DROP INDEX IF EXISTS TagSearch");
 		db.request("CREATE INDEX TagSearch ON Tag(tag)");
 	}
 }

www/view/layout.html

@@ -9,7 +9,7 @@
 	<link href="//netdna.bootstrapcdn.com/font-awesome/4.1.0/css/font-awesome.css" rel="stylesheet">
 	<link href="/css/style.css" rel="stylesheet">
 	<link href="/css/haxe-nav.css" rel="stylesheet">
-		
+
 	<link rel="shortcut icon" type="image/x-icon" href="/favicon.ico" />
 	<link href="//fonts.googleapis.com/css?family=Source+Sans+Pro:200,600,600italic,400" rel="stylesheet">
 	<link href="//fonts.googleapis.com/css?family=Open+Sans:400,700,700italic,400italic" rel="stylesheet">
@@ -68,10 +68,10 @@
 						}
 						<li class="divider"></li>
 						<li><a href="/rss/"><i class="fa fa-rss"></i> Recent Updates RSS Feed</a></li>
-						<li><a href="//lib.haxe.org/legacy/"><i class="fa fa-folder-open-o"></i> Haxe 2 Haxelib repository</a></li>
+						<li><a href="/legacy/"><i class="fa fa-folder-open-o"></i> Haxe 2 Haxelib repository</a></li>
 					</ul>
 				</li>
-				
+
 				<li class=" divider"></li>
 				<li class="dropdown">
 					<a class="dropdown-toggle" data-toggle="dropdown" href="https://haxe.org/documentation/">Learn Haxe <b class="caret"></b></a>
@@ -126,7 +126,7 @@
 
 <div class="section info">
 	<div class="container">
-		
+
 		<div class="row">
 			<div class="span4">
 				<h3><i class="fa fa-big fa-rocket"></i> All libraries are free</h3>
@@ -155,7 +155,7 @@ <h3><i class="fa fa-big fa-globe"></i> Join us on GitHub!</h3>
 	<div class="container">
 		<div class="copyright">
 			<p>&copy;@todaysDate.getFullYear()
-				<a href="//haxe.org/foundation/" title="Haxe Foundation Website" class="hf-link">Haxe Foundation</a> | 
+				<a href="//haxe.org/foundation/" title="Haxe Foundation Website" class="hf-link">Haxe Foundation</a> |
 				<a href="https://github.com/HaxeFoundation/haxelib" title="Haxelib GitHub Repository" class="hf-link">Haxelib on GitHub</a>
 			</p>
 		</div>