Major rewrite on folder structure

Author: ciraga

__init__.py

@@ -36,9 +36,9 @@
 import signal
 from time import gmtime, strftime
 
-from core_modules import *
-from basic_modules import *
-from addon_modules import *
+from modules.core_modules import *
+from modules.basic_modules import *
+from modules.addon_modules import *
 from config import *
 from utils import log_raw, log
 

bhottu.py

@@ -1,20 +1,20 @@
-# Config file for bhottu
-# filename: ./config.py
+#Config file for bhottu
+#filename: ./config.py
 
-# Connection options
+#Connection options
 SERVER = 'irc.rizon.net'
 PORT = 6667
-NICK = 'tetbhottu'
-REALNAME = 'tetbhottu'
-IDENT = 'tetbhottu'
+NICK ='bhottu'
+REALNAME = 'bhottu'
+IDENT = 'bhottu'
 CHANNEL = '#/g/sicp_area51'
-MODE = 0  # This is a bitmask for user mode
+MODE = 0 #This is a bitmask for user mode
 VHOST = False
 NICK_PASS = ''
-# Authed users
+#Authed users
 GODS = []
 
-# Logging options
+#Logging options
 RAW_LOGGING = True
 LOG_TO_STDOUT = True
 LOG_TO_FILE = False

config.py

@@ -0,0 +1 @@
+from addon_modules import *

modules/__init__.py

@@ -251,7 +251,10 @@ def outputTitle(parsed):
                     return sendMsg(None, 'Site title: '+ str(dupe_url[0][1]))
             else:
                 try:
-                    response = urllib2.urlopen(url)
+                    headers = { 'User-Agent' : 'JustUs/0.8 (compatible;) urllib2' }
+                    req = urllib2.Request(url, None, headers)
+                    response = urllib2.urlopen(req)
+                    print response #debug print
                     if response.info().gettype() == "text/html":
                         html = response.read(5000)
                         response.close()
@@ -264,10 +267,14 @@ def outputTitle(parsed):
                         title = title.replace('\r', '').rstrip()
                     else:
                         title = response.info().gettype()
-                except:
+                    #print title
+                except urllib2.URLError, e:
                     conn.close()
-                    log('outputTitle(): Failed to fetch ' + url)
-                    return sendMsg(None, 'Failed to fetch url')
+                    if hasattr(e, 'reason'): error = e.reason
+                    elif hasattr(e, 'code'): error = e.code
+                    else: error = 'beyond who the fuck knows'
+                    log('outputTitle(): Failed to fetch url ' + url + ' reason: ' + str(error))
+                    return sendMsg(None, 'Failed to fetch url, reason '+ str(error))
 
                 db.execute("INSERT INTO urls (url, title, time) \
                         VALUES (?, ?, ?)", \

modules/addon_modules/__init__.py

@@ -0,0 +1 @@
+from basic_modules import *

addon_modules.py modules/addon_modules/addon_modules.py

@@ -0,0 +1 @@
+from core_modules import *

modules/basic_modules/__init__.py

@@ -0,0 +1,9 @@
+<chown> wow, finally got VS2010 working on wine
+<chown> I acknowledge RMS as a filthy fat neckbeard
+<chown> I like to suck jam out of the squeezy jam bottle, and pretending I'm sucking feces out of an anus
+<chown> It's just that I'm too dumb to do anything other than glorified shell scripting
+<chown> Visual Studio is a great IDE.
+<chown> I can't really "get" C, pointers or anything lower level than my Windows install's start menu so I'll stick to my inefficient interpreted languages
+<chown> I just run Linux because I'm poor, don't misunderstand me - Windows 7 is much superior to this shit.
+<chown> It's just that I'm too dumb to do anything other than glorified shell scripting
+<chown> RMS is a filthy fatty fat fatfuck filthy neckbeard

basic_modules.py modules/basic_modules/basic_modules.py

@@ -0,0 +1 @@
+from utils import *