From 5110004ac49e4266ffd5fbbad81c9708335c02fa Mon Sep 17 00:00:00 2001
From: Grayson Miller <grayson.miller124@gmail.com>
Date: Tue, 1 Mar 2016 01:37:15 -0700
Subject: [PATCH] Deleted settings.conf. Working State.

---
 core/main.py => Flea/Flea.py | 30 +++++++++++++++++-------------
 {core => Flea}/__init__.py   |  0
 {core => Flea}/config.py     |  0
 {core => Flea}/irclib.py     |  7 ++++---
 Flea.py => bin/Flea          |  5 +++--
 settings.conf                |  8 ++++----
 6 files changed, 28 insertions(+), 22 deletions(-)
 rename core/main.py => Flea/Flea.py (92%)
 rename {core => Flea}/__init__.py (100%)
 rename {core => Flea}/config.py (100%)
 rename {core => Flea}/irclib.py (96%)
 rename Flea.py => bin/Flea (95%)

diff --git a/core/main.py b/Flea/Flea.py
similarity index 92%
rename from core/main.py
rename to Flea/Flea.py
index 8254b5a..b52d335 100644
--- a/core/main.py
+++ b/Flea/Flea.py
@@ -14,8 +14,8 @@
 #   You should have received a copy of the GNU Affero General Public License
 #   along with this program.  If not, see <http://www.gnu.org/licenses/>
 
-from core.config import *
-import core.irclib as irclib
+import config
+import irclib
 
 # Built-in to Python 2.7
 import __builtin__
@@ -85,7 +85,7 @@ def PluginsImport(log=None, plugins_folder="/plugins"):
 
 def init_connection(config_file="settings.conf"):
     irc_conn = irclib.irc()
-    irc_conn.config = cfgParser(config_file)
+    irc_conn.config = config.cfgParser(config_file)
 
     if irc_conn.config["logging"]:
         log = open("log.txt", 'a')
@@ -115,7 +115,7 @@ def init_connection(config_file="settings.conf"):
     server = (irc_conn.config["host"], irc_conn.config["port"])
     try:
         printlog("Connecting to " + server[0] + ':' + str(server[1]))
-        irc_conn.sock.connect(server[0], server[1])
+        irc_conn.sock.connect(server)
     except:
         printlog("Connection failed.", log)
         return (None, None)
@@ -128,14 +128,16 @@ def init_connection(config_file="settings.conf"):
         printlog("[SSL] Bits: " + str(ssl_info[2]), log)
 
     # Establish identity on server
-    identity = (irc_conn.config["ident"], irc_conn.config["mode"], irc_conn.config["unused"], irc_conn.config["realname"])
-    irc_conn.User(identity)
+    identity = (irc_conn.config["ident"], irc_conn.config["mode"],
+                irc_conn.config["unused"], irc_conn.config["realname"])
+    irc_conn.User(*identity)
     irc_conn.Nick(irc_conn.config["nick"])
 
     return (irc_conn, plugins)
 
 
 def client_loop(irc_conn, plugins, log=None):
+    wait = None
     if irc_conn is None:
         print "No connection established."
         sys.exit(0)
@@ -166,18 +168,17 @@ def client_loop(irc_conn, plugins, log=None):
 
             # Ignore empty lines
             if len(line) > 0:
-
-                # Print/log line, parse it and respond
                 printlog(line, log)
                 irc_conn.pack = irc_conn.Parser(line)
 
                 # Run all plugins main() function
-                wait = ''
+                wait = None
                 if irc_conn.config["plugins"]:
-                    for plugin in plugins:
-                        wait = plugin.main.main(irc_conn)
-                        if wait == "QUIT":
-                            break
+                    if plugins is not None:
+                        for plugin in plugins:
+                            wait = plugin.main.main(irc_conn)
+                            if wait == "QUIT":
+                                break
 
                 # Ping Pong, keep the connection alive.
                 if irc_conn.pack["cmd"] == "PING":
@@ -215,3 +216,6 @@ def client_loop(irc_conn, plugins, log=None):
 def main():
     (irc_conn, plugins) = init_connection()
     client_loop(irc_conn, plugins)
+
+if __name__ == "__main__":
+    main()
diff --git a/core/__init__.py b/Flea/__init__.py
similarity index 100%
rename from core/__init__.py
rename to Flea/__init__.py
diff --git a/core/config.py b/Flea/config.py
similarity index 100%
rename from core/config.py
rename to Flea/config.py
diff --git a/core/irclib.py b/Flea/irclib.py
similarity index 96%
rename from core/irclib.py
rename to Flea/irclib.py
index 2a6a1a4..6988ffc 100644
--- a/core/irclib.py
+++ b/Flea/irclib.py
@@ -21,12 +21,13 @@ import re
 class irc:
     # TODO: Wrap in __init__
     debug = False
-    log = False
+    log = None
     config = {}
     pack = {}
     sock = socket.socket()
 
-    # IRC Parser. Parses by line Functions are lowercase, classes uppercase
+    # IRC Parser. Parses by line Functions are
+    # lowercase, classes uppercase
     def Parser(self, line):
         packet = {"nick":None, "ident":None,
               "host":None, "cmd":None,
@@ -95,7 +96,7 @@ class irc:
 
         if self.debug:
             print output
-        if self.log:
+        if self.log is not None:
             self.log.write(output+"\n")
 
     def User(self, nick, mode, unused, owner):
diff --git a/Flea.py b/bin/Flea
similarity index 95%
rename from Flea.py
rename to bin/Flea
index 6be03c4..d040c7c 100644
--- a/Flea.py
+++ b/bin/Flea
@@ -1,3 +1,4 @@
+#!/bin/python
 #   An IRC bot named Flea
 #   Copyright (C) 2016  Kris Lamoureux
 
@@ -18,7 +19,7 @@ import traceback
 import sys
 
 try:
-    from core.main import *
+    import Flea.Flea
 
 except KeyboardInterrupt:
     print "\nGoodbye!"
@@ -39,4 +40,4 @@ except:
     raw_input()
     sys.exit(0)
 
-main()
+Flea.Flea.main()
diff --git a/settings.conf b/settings.conf
index 0cade6d..dec38c1 100644
--- a/settings.conf
+++ b/settings.conf
@@ -5,12 +5,12 @@ plugins = true
 host = irc.foonetic.net
 port = 7001
 
-nick = FleaTest
-password =
-ident =
+nick = DuckBorg
+password = fxcva
+ident = ducksrule
 mode = +B
 unused = *
-realname = your_name
+realname = ducky
 
 control = graygoose124
 channel = #freesoftware