movestuff

.gitignore

@@ -1,4 +1,4 @@
-data
+persist
 config.json
 gitflow
 *.db
@@ -11,4 +11,8 @@ gitflow
 *.sublime-project
 *.sublime-workspace
 .idea/
-plugins/data/GeoLiteCity.dat
+data/GeoLiteCity.dat
+plugins/New Text Document.txt
+plugins/srvv.py
+run.cmd
+config

core/bot.py

@@ -87,7 +87,7 @@ class Bot(object):
         self.logger.debug("Logging engine started.")
 
         # data folder
-        self.data_dir = os.path.abspath('data')
+        self.data_dir = os.path.abspath('persist')
         if not os.path.exists(self.data_dir):
             self.logger.debug("Data folder not found, creating.")
             os.mkdir(self.data_dir)

plugins/attacks.py

@@ -1,15 +1,15 @@
 from util import hook
 import random
 
-with open("plugins/data/larts.txt") as f:
+with open("data/larts.txt") as f:
     larts = [line.strip() for line in f.readlines()
              if not line.startswith("//")]
 
-with open("plugins/data/insults.txt") as f:
+with open("data/insults.txt") as f:
     insults = [line.strip() for line in f.readlines()
                if not line.startswith("//")]
 
-with open("plugins/data/flirts.txt") as f:
+with open("data/flirts.txt") as f:
     flirts = [line.strip() for line in f.readlines()
               if not line.startswith("//")]
 

plugins/eightball.py

@@ -7,7 +7,7 @@ color_codes = {
     "<y>": "\x02"
 }
 
-with open("plugins/data/8ball_responses.txt") as f:
+with open("./data/8ball_responses.txt") as f:
     responses = [line.strip() for line in
                  f.readlines() if not line.startswith("//")]
 

plugins/fortune.py

@@ -1,7 +1,7 @@
 from util import hook
 import random
 
-with open("plugins/data/fortunes.txt") as f:
+with open("./data/fortunes.txt") as f:
     fortunes = [line.strip() for line in f.readlines()
                 if not line.startswith("//")]
 

plugins/geoip.py

@@ -7,22 +7,22 @@ from StringIO import StringIO
 
 
 # load region database
-with open("./plugins/data/geoip_regions.json", "rb") as f:
+with open("./data/geoip_regions.json", "rb") as f:
     regions = json.loads(f.read())
 
-if os.path.isfile(os.path.abspath("./plugins/data/GeoLiteCity.dat")):
+if os.path.isfile(os.path.abspath("./data/GeoLiteCity.dat")):
     # initalise geolocation database
-    geo = pygeoip.GeoIP(os.path.abspath("./plugins/data/GeoLiteCity.dat"))
+    geo = pygeoip.GeoIP(os.path.abspath("./data/GeoLiteCity.dat"))
 else:
     download = http.get("http://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz")
     string_io = StringIO(download)
     geoip_file = gzip.GzipFile(fileobj=string_io, mode='rb')
 
-    output = open(os.path.abspath("./plugins/data/GeoLiteCity.dat"), 'wb')
+    output = open(os.path.abspath("./data/GeoLiteCity.dat"), 'wb')
     output.write(geoip_file.read())
     output.close()
 
-    geo = pygeoip.GeoIP(os.path.abspath("./plugins/data/GeoLiteCity.dat"))
+    geo = pygeoip.GeoIP(os.path.abspath("./data/GeoLiteCity.dat"))
 
 
 @hook.command

plugins/kill.py

@@ -25,7 +25,7 @@ def kill(inp, action=None, nick=None, conn=None, notice=None):
     	"user": target
     }
 
-    with open("plugins/data/kills.json") as f:
+    with open("./data/kills.json") as f:
         generator = get_generator(f.read(), variables)
 
     # act out the message

plugins/minecraft_items.py

@@ -22,7 +22,7 @@ class Recipe(object):
         return self.line
 
 
-with open("plugins/data/recipes.txt") as f:
+with open("./data/recipes.txt") as f:
     for line in f.readlines():
         if line.startswith("//"):
             continue
@@ -37,7 +37,7 @@ with open("plugins/data/recipes.txt") as f:
 
 ids = []
 
-with open("plugins/data/itemids.txt") as f:
+with open("./data/itemids.txt") as f:
     for line in f.readlines():
         if line.startswith("//"):
             continue

plugins/slap.py

@@ -25,7 +25,7 @@ def slap(inp, action=None, nick=None, conn=None, notice=None):
     	"user": target
     }
 
-    with open("plugins/data/slaps.json") as f:
+    with open("./data/slaps.json") as f:
         generator = get_generator(f.read(), variables)
 
     # act out the message

plugins/slogan.py

@@ -2,7 +2,7 @@ from util import hook, text
 import random
 
 
-with open("plugins/data/slogans.txt") as f:
+with open("./data/slogans.txt") as f:
     slogans = [line.strip() for line in f.readlines()
                if not line.startswith("//")]