From f1a34e3fcd0e218810dd481d68355baf49ec0a59 Mon Sep 17 00:00:00 2001 From: Luke Rogers Date: Thu, 3 Oct 2013 22:28:06 +1300 Subject: [PATCH] movestuff --- .gitignore | 8 ++++++-- core/bot.py | 2 +- {plugins/data => data}/8ball_responses.txt | 0 {plugins/data => data}/flirts.txt | 0 {plugins/data => data}/fortunes.txt | 0 {plugins/data => data}/geoip_regions.json | 0 {plugins/data => data}/insults.txt | 0 {plugins/data => data}/itemids.txt | 0 {plugins/data => data}/kills.json | 0 {plugins/data => data}/kills.txt | 0 {plugins/data => data}/larts.txt | 0 {plugins/data => data}/name_files/dragons.json | 0 {plugins/data => data}/name_files/dwarves.json | 0 {plugins/data => data}/name_files/elves_female.json | 0 {plugins/data => data}/name_files/elves_male.json | 0 {plugins/data => data}/name_files/fantasy.json | 0 {plugins/data => data}/name_files/female.json | 0 {plugins/data => data}/name_files/general.json | 0 {plugins/data => data}/name_files/hobbits.json | 0 {plugins/data => data}/name_files/inns.json | 0 {plugins/data => data}/name_files/items.json | 0 {plugins/data => data}/name_files/male.json | 0 {plugins/data => data}/name_files/narn.json | 0 {plugins/data => data}/name_files/warrior_cats.json | 0 {plugins/data => data}/recipes.txt | 0 {plugins/data => data}/slaps.json | 0 {plugins/data => data}/slogans.txt | 0 plugins/attacks.py | 6 +++--- plugins/eightball.py | 2 +- plugins/fortune.py | 2 +- plugins/geoip.py | 10 +++++----- plugins/kill.py | 2 +- plugins/minecraft_items.py | 4 ++-- plugins/slap.py | 2 +- plugins/slogan.py | 2 +- 35 files changed, 22 insertions(+), 18 deletions(-) rename {plugins/data => data}/8ball_responses.txt (100%) rename {plugins/data => data}/flirts.txt (100%) mode change 100755 => 100644 rename {plugins/data => data}/fortunes.txt (100%) mode change 100755 => 100644 rename {plugins/data => data}/geoip_regions.json (100%) rename {plugins/data => data}/insults.txt (100%) mode change 100755 => 100644 rename {plugins/data => data}/itemids.txt (100%) mode change 100755 => 100644 rename {plugins/data => data}/kills.json (100%) rename {plugins/data => data}/kills.txt (100%) mode change 100755 => 100644 rename {plugins/data => data}/larts.txt (100%) mode change 100755 => 100644 rename {plugins/data => data}/name_files/dragons.json (100%) rename {plugins/data => data}/name_files/dwarves.json (100%) rename {plugins/data => data}/name_files/elves_female.json (100%) rename {plugins/data => data}/name_files/elves_male.json (100%) rename {plugins/data => data}/name_files/fantasy.json (100%) rename {plugins/data => data}/name_files/female.json (100%) rename {plugins/data => data}/name_files/general.json (100%) rename {plugins/data => data}/name_files/hobbits.json (100%) rename {plugins/data => data}/name_files/inns.json (100%) rename {plugins/data => data}/name_files/items.json (100%) rename {plugins/data => data}/name_files/male.json (100%) rename {plugins/data => data}/name_files/narn.json (100%) rename {plugins/data => data}/name_files/warrior_cats.json (100%) rename {plugins/data => data}/recipes.txt (100%) mode change 100755 => 100644 rename {plugins/data => data}/slaps.json (100%) rename {plugins/data => data}/slogans.txt (100%) mode change 100755 => 100644 diff --git a/.gitignore b/.gitignore index cd23db8..719b47b 100755 --- a/.gitignore +++ b/.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 diff --git a/core/bot.py b/core/bot.py index 98fbf45..f742297 100644 --- a/core/bot.py +++ b/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) diff --git a/plugins/data/8ball_responses.txt b/data/8ball_responses.txt similarity index 100% rename from plugins/data/8ball_responses.txt rename to data/8ball_responses.txt diff --git a/plugins/data/flirts.txt b/data/flirts.txt old mode 100755 new mode 100644 similarity index 100% rename from plugins/data/flirts.txt rename to data/flirts.txt diff --git a/plugins/data/fortunes.txt b/data/fortunes.txt old mode 100755 new mode 100644 similarity index 100% rename from plugins/data/fortunes.txt rename to data/fortunes.txt diff --git a/plugins/data/geoip_regions.json b/data/geoip_regions.json similarity index 100% rename from plugins/data/geoip_regions.json rename to data/geoip_regions.json diff --git a/plugins/data/insults.txt b/data/insults.txt old mode 100755 new mode 100644 similarity index 100% rename from plugins/data/insults.txt rename to data/insults.txt diff --git a/plugins/data/itemids.txt b/data/itemids.txt old mode 100755 new mode 100644 similarity index 100% rename from plugins/data/itemids.txt rename to data/itemids.txt diff --git a/plugins/data/kills.json b/data/kills.json similarity index 100% rename from plugins/data/kills.json rename to data/kills.json diff --git a/plugins/data/kills.txt b/data/kills.txt old mode 100755 new mode 100644 similarity index 100% rename from plugins/data/kills.txt rename to data/kills.txt diff --git a/plugins/data/larts.txt b/data/larts.txt old mode 100755 new mode 100644 similarity index 100% rename from plugins/data/larts.txt rename to data/larts.txt diff --git a/plugins/data/name_files/dragons.json b/data/name_files/dragons.json similarity index 100% rename from plugins/data/name_files/dragons.json rename to data/name_files/dragons.json diff --git a/plugins/data/name_files/dwarves.json b/data/name_files/dwarves.json similarity index 100% rename from plugins/data/name_files/dwarves.json rename to data/name_files/dwarves.json diff --git a/plugins/data/name_files/elves_female.json b/data/name_files/elves_female.json similarity index 100% rename from plugins/data/name_files/elves_female.json rename to data/name_files/elves_female.json diff --git a/plugins/data/name_files/elves_male.json b/data/name_files/elves_male.json similarity index 100% rename from plugins/data/name_files/elves_male.json rename to data/name_files/elves_male.json diff --git a/plugins/data/name_files/fantasy.json b/data/name_files/fantasy.json similarity index 100% rename from plugins/data/name_files/fantasy.json rename to data/name_files/fantasy.json diff --git a/plugins/data/name_files/female.json b/data/name_files/female.json similarity index 100% rename from plugins/data/name_files/female.json rename to data/name_files/female.json diff --git a/plugins/data/name_files/general.json b/data/name_files/general.json similarity index 100% rename from plugins/data/name_files/general.json rename to data/name_files/general.json diff --git a/plugins/data/name_files/hobbits.json b/data/name_files/hobbits.json similarity index 100% rename from plugins/data/name_files/hobbits.json rename to data/name_files/hobbits.json diff --git a/plugins/data/name_files/inns.json b/data/name_files/inns.json similarity index 100% rename from plugins/data/name_files/inns.json rename to data/name_files/inns.json diff --git a/plugins/data/name_files/items.json b/data/name_files/items.json similarity index 100% rename from plugins/data/name_files/items.json rename to data/name_files/items.json diff --git a/plugins/data/name_files/male.json b/data/name_files/male.json similarity index 100% rename from plugins/data/name_files/male.json rename to data/name_files/male.json diff --git a/plugins/data/name_files/narn.json b/data/name_files/narn.json similarity index 100% rename from plugins/data/name_files/narn.json rename to data/name_files/narn.json diff --git a/plugins/data/name_files/warrior_cats.json b/data/name_files/warrior_cats.json similarity index 100% rename from plugins/data/name_files/warrior_cats.json rename to data/name_files/warrior_cats.json diff --git a/plugins/data/recipes.txt b/data/recipes.txt old mode 100755 new mode 100644 similarity index 100% rename from plugins/data/recipes.txt rename to data/recipes.txt diff --git a/plugins/data/slaps.json b/data/slaps.json similarity index 100% rename from plugins/data/slaps.json rename to data/slaps.json diff --git a/plugins/data/slogans.txt b/data/slogans.txt old mode 100755 new mode 100644 similarity index 100% rename from plugins/data/slogans.txt rename to data/slogans.txt diff --git a/plugins/attacks.py b/plugins/attacks.py index 3ba4883..cb459bd 100644 --- a/plugins/attacks.py +++ b/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("//")] diff --git a/plugins/eightball.py b/plugins/eightball.py index 929a890..b7f4fa4 100755 --- a/plugins/eightball.py +++ b/plugins/eightball.py @@ -7,7 +7,7 @@ color_codes = { "": "\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("//")] diff --git a/plugins/fortune.py b/plugins/fortune.py index c32efcb..7a76def 100755 --- a/plugins/fortune.py +++ b/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("//")] diff --git a/plugins/geoip.py b/plugins/geoip.py index b0d05a4..724bccf 100755 --- a/plugins/geoip.py +++ b/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 diff --git a/plugins/kill.py b/plugins/kill.py index 37be4ba..2ed14d8 100644 --- a/plugins/kill.py +++ b/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 diff --git a/plugins/minecraft_items.py b/plugins/minecraft_items.py index 97a6420..44d6c81 100755 --- a/plugins/minecraft_items.py +++ b/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 diff --git a/plugins/slap.py b/plugins/slap.py index 89936c3..d285817 100644 --- a/plugins/slap.py +++ b/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 diff --git a/plugins/slogan.py b/plugins/slogan.py index 50ccbc1..8891279 100755 --- a/plugins/slogan.py +++ b/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("//")]