Merge branch 'master' of lmno:dither

3 files changed, 59 insertions, 2 deletions

diff --git a/bin/pep-proxy.py b/bin/pep-proxy.py
new file mode 100755
index 0000000..b44bbbc
--- /dev/null
+++ b/bin/pep-proxy.py
@@ -0,0 +1,31 @@
+#!/usr/bin/env python3
+import http.server
+import urllib.request
+import re
+
+class MyHTTPRequestHandler(http.server.CGIHTTPRequestHandler ):
+  def end_headers(self):
+    self.send_my_headers()
+
+    http.server.CGIHTTPRequestHandler .end_headers(self)
+
+  def send_my_headers(self):
+    self.send_header("Access-Control-Allow-Origin", "*")
+
+  def do_GET(self):
+    if self.path[0:14] == "/cgi-bin/proxy":
+      self.copyfile(urllib.request.urlopen(self.path[15:]), self.wfile)
+    elif re.match(r'.+cgi-bin/im/shader/.+$', self.path):
+      self.path = re.sub(r'(.+cgi-bin/)im/shader/(.+)$', r'\1\2', self.path);
+      super().do_GET();
+    else:
+      super().do_GET()
+
+  def do_POST(self):
+    if re.match(r'.+cgi-bin/im/shader/.+$', self.path):
+      self.path = re.sub(r'(.+cgi-bin/)im/shader/(.+)$', r'\1\2', self.path);
+      super().do_POST();
+
+if __name__ == '__main__':
+  http.server.test(HandlerClass=MyHTTPRequestHandler)
+
diff --git a/bin/proxy.py b/bin/proxy.py
index 6171dab..b44bbbc 100755
--- a/bin/proxy.py
+++ b/bin/proxy.py
@@ -1,12 +1,13 @@
 #!/usr/bin/env python3
 import http.server
 import urllib.request
+import re
 
-class MyHTTPRequestHandler(http.server.SimpleHTTPRequestHandler):
+class MyHTTPRequestHandler(http.server.CGIHTTPRequestHandler ):
   def end_headers(self):
     self.send_my_headers()
 
-    http.server.SimpleHTTPRequestHandler.end_headers(self)
+    http.server.CGIHTTPRequestHandler .end_headers(self)
 
   def send_my_headers(self):
     self.send_header("Access-Control-Allow-Origin", "*")
@@ -14,9 +15,17 @@ class MyHTTPRequestHandler(http.server.SimpleHTTPRequestHandler):
   def do_GET(self):
     if self.path[0:14] == "/cgi-bin/proxy":
       self.copyfile(urllib.request.urlopen(self.path[15:]), self.wfile)
+    elif re.match(r'.+cgi-bin/im/shader/.+$', self.path):
+      self.path = re.sub(r'(.+cgi-bin/)im/shader/(.+)$', r'\1\2', self.path);
+      super().do_GET();
     else:
       super().do_GET()
 
+  def do_POST(self):
+    if re.match(r'.+cgi-bin/im/shader/.+$', self.path):
+      self.path = re.sub(r'(.+cgi-bin/)im/shader/(.+)$', r'\1\2', self.path);
+      super().do_POST();
+
 if __name__ == '__main__':
   http.server.test(HandlerClass=MyHTTPRequestHandler)
 
diff --git a/bin/sql_build.sql b/bin/sql_build.sql
new file mode 100644
index 0000000..8badd66
--- /dev/null
+++ b/bin/sql_build.sql
@@ -0,0 +1,17 @@
+create database IF NOT EXISTS asdfus;
+grant all privileges on asdfus.* to 'asdfus'@'localhost' identified by 'gTYgT&M6q';
+flush privileges;
+use asdfus;
+create table IF NOT EXISTS shaders (id int(11) AUTO_INCREMENT NOT NULL, PRIMARY KEY(id), script blob, image_url blob, thumbnail_url varchar(50), username varchar(30), time bigint(20) NOT NULL, shader_id int(11));
+
+create table IF NOT EXISTS shader_ids (id int(11) AUTO_INCREMENT NOT NULL, PRIMARY KEY(id), username varchar(40));
+alter table shaders modify username varchar(30);
+
+IF EXISTS (
+  SELECT * 
+  FROM   sys.columns 
+  WHERE name = 'shaders'
+)
+begin
+  alter table shaders add name varchar(40);
+end;