From b4b5ac4f93fe7cc238689fba15f0ee61a5694508 Mon Sep 17 00:00:00 2001
From: Ben Kurtovic <ben.kurtovic@verizon.net>
Date: Sun, 22 Jul 2012 03:04:15 -0400
Subject: [PATCH] Restructure into an actual package that makes sense.

---
 build.py                                      | 4 +++-
 pages/copyvios.mako                           | 4 ++--
 {pages/support => toolserver}/__init__.py     | 0
 {pages => toolserver}/copyvios/__init__.py    | 2 +-
 {pages => toolserver}/copyvios/checker.py     | 2 +-
 {pages => toolserver}/copyvios/highlighter.py | 0
 {pages/support => toolserver}/misc.py         | 0
 {pages/support => toolserver}/sites.py        | 0
 8 files changed, 7 insertions(+), 5 deletions(-)
 rename {pages/support => toolserver}/__init__.py (100%)
 rename {pages => toolserver}/copyvios/__init__.py (95%)
 rename {pages => toolserver}/copyvios/checker.py (98%)
 rename {pages => toolserver}/copyvios/highlighter.py (100%)
 rename {pages/support => toolserver}/misc.py (100%)
 rename {pages/support => toolserver}/sites.py (100%)

diff --git a/build.py b/build.py
index cee1b2a..8444990 100755
--- a/build.py
+++ b/build.py
@@ -11,7 +11,7 @@ import os
 import sys
 
 os.chdir("..")
-sys.path.insert(0, os.path.join(".", "{{pages_dir}}"))
+sys.path.insert(0, os.path.join(".", "{{source_dir}}"))
 
 from mako.template import Template
 from mako.lookup import TemplateLookup
@@ -42,6 +42,7 @@ class Builder(object):
         self.static_dir = "static"
         self.pages_dir = "pages"
         self.support_dir = "pages/support"
+        self.source_dir = "toolserver"
         self.temp_dir = "temp"
         self.rs_file = "rewrite.script"
 
@@ -68,6 +69,7 @@ class Builder(object):
         logger.debug("build {0} -> {1}".format(src, dest))
         content = page_src.replace("{{src}}", src)
         content = content.replace("{{pages_dir}}", self.pages_dir)
+        content = content.replace("{{source_dir}}", self.source_dir)
         content = content.replace("{{temp_dir}}", self.temp_dir)
         with open(dest, "w") as fp:
             fp.write(content)
diff --git a/pages/copyvios.mako b/pages/copyvios.mako
index 4cb793f..25e147f 100644
--- a/pages/copyvios.mako
+++ b/pages/copyvios.mako
@@ -1,6 +1,6 @@
 <%include file="/support/header.mako" args="environ=environ, title='Copyvio Detector', add_css=('copyvios.css',), add_js=('copyvios.js',)"/>\
-<%namespace module="copyvios" import="main, highlight_delta"/>\
-<%namespace module="support.misc" import="urlstrip"/>\
+<%namespace module="toolserver.copyvios" import="main, highlight_delta"/>\
+<%namespace module="toolserver.misc" import="urlstrip"/>\
 <% lang, project, name, title, url, site, page, result = main(environ) %>
             <h1>Copyvio Detector</h1>
             <p>This tool attempts to detect <a href="//en.wikipedia.org/wiki/WP:COPYVIO">copyright violations</a> in articles. Simply give the title of the page you want to check and hit Submit. The tool will then search for its content elsewhere on the web and display a report if a similar webpage is found. If you also provide a URL, it will not query any search engines and instead display a report comparing the article to that particular webpage, like the <a href="//toolserver.org/~dcoetzee/duplicationdetector/">Duplication Detector</a>. Check out the <a href="//en.wikipedia.org/wiki/User:EarwigBot/Copyvios/FAQ">FAQ</a> for more information and technical details.</p>
diff --git a/pages/support/__init__.py b/toolserver/__init__.py
similarity index 100%
rename from pages/support/__init__.py
rename to toolserver/__init__.py
diff --git a/pages/copyvios/__init__.py b/toolserver/copyvios/__init__.py
similarity index 95%
rename from pages/copyvios/__init__.py
rename to toolserver/copyvios/__init__.py
index 7a78c8c..9d2d27f 100644
--- a/pages/copyvios/__init__.py
+++ b/toolserver/copyvios/__init__.py
@@ -5,7 +5,7 @@ from earwigbot.bot import Bot
 
 from .checker import get_results
 from .highlighter import highlight_delta
-from ..support.sites import get_site, get_sites
+from ..sites import get_site, get_sites
 
 def main(context, environ):
     lang = orig_lang = project = name = title = url = None
diff --git a/pages/copyvios/checker.py b/toolserver/copyvios/checker.py
similarity index 98%
rename from pages/copyvios/checker.py
rename to toolserver/copyvios/checker.py
index a8c6020..ea39627 100644
--- a/pages/copyvios/checker.py
+++ b/toolserver/copyvios/checker.py
@@ -6,7 +6,7 @@ from time import time
 
 from earwigbot import exceptions
 
-from ..support.misc import open_sql_connection
+from ..misc import open_sql_connection
 
 def get_results(bot, site, title, url, query):
     page = site.get_page(title)
diff --git a/pages/copyvios/highlighter.py b/toolserver/copyvios/highlighter.py
similarity index 100%
rename from pages/copyvios/highlighter.py
rename to toolserver/copyvios/highlighter.py
diff --git a/pages/support/misc.py b/toolserver/misc.py
similarity index 100%
rename from pages/support/misc.py
rename to toolserver/misc.py
diff --git a/pages/support/sites.py b/toolserver/sites.py
similarity index 100%
rename from pages/support/sites.py
rename to toolserver/sites.py