diff options
| -rwxr-xr-x | ircbot/bot.py | 18 | ||||
| -rwxr-xr-x | minikrebs/profiles/init | 8 | ||||
| -rwxr-xr-x | retiolum/bin/find-supernodes (renamed from retiolum/scripts/adv_graphgen/find_super) | 0 | ||||
| -rwxr-xr-x | retiolum/bin/my-ip | 2 | ||||
| -rw-r--r-- | retiolum/bin/nodes-to-json.py | 37 |
5 files changed, 59 insertions, 6 deletions
diff --git a/ircbot/bot.py b/ircbot/bot.py index 607e65c7..25a1014f 100755 --- a/ircbot/bot.py +++ b/ircbot/bot.py @@ -18,7 +18,11 @@ class TestBot(irc.bot.SingleServerIRCBot): self.oldnews = [] self.sendqueue = [] for entry in self.feed.entries: - self.sendqueue.append(entry.title + " " + entry.link) + try: + self.sendqueue.append(entry.title + " " + entry.link + " com: " + entry.comments) + except AttributeError: + self.sendqueue.append(entry.title + " " + entry.link) + self.oldnews.append(entry.link) def start(self): @@ -32,7 +36,10 @@ class TestBot(irc.bot.SingleServerIRCBot): self.feed = feedparser.parse(self.url) for entry in self.feed.entries: if not entry.link in self.oldnews: - self.send(entry.title + " " + entry.link) + try: + self.send(entry.title + " " + entry.link + " com: " + entry.comments) + except AttributeError: + self.send(entry.title + " " + entry.link) self.oldnews.append(entry.link) def sendall(self): @@ -44,8 +51,11 @@ class TestBot(irc.bot.SingleServerIRCBot): if len(string) < 450: self.connection.privmsg(self.chan, string) else: - for x in range(math.ceil(len(string)/450)): - self.connection.privmsg(self.chan, string[x*450:(x+1)*450]) + space = 0 + for x in range(math.ceil(len(string)/400)): + oldspace = space + space = string.find(" ", (x+1)*400, (x+1)*400+50) + self.connection.privmsg(self.chan, string[oldspace:space]) sleep(1) diff --git a/minikrebs/profiles/init b/minikrebs/profiles/init index df9fcfcd..0add700e 100755 --- a/minikrebs/profiles/init +++ b/minikrebs/profiles/init @@ -29,6 +29,14 @@ You can use the following images: Factory : $PWD/bin/ar71xx/openwrt-ar71xx-generic-tl-wr703n-v1-squashfs-factory.bin System Upgrade: $PWD/bin/ar71xx/openwrt-ar71xx-generic-tl-wr703n-v1-squashfs-sysupgrade.bin EOF +elif [ -e bin/ar71xx/openwrt-ar71xx-generic-tl-mr3020-v1-squashfs-factory.bin ]; +then + cat << EOF +finished building +You can use the following images: + Factory : $PWD/bin/ar71xx/openwrt-ar71xx-generic-tl-mr3020-v1-squashfs-factory.bin + System Upgrade: $PWD/bin/ar71xx/openwrt-ar71xx-generic-tl-mr3020-v1-squashfs-sysupgrade.bin +EOF else cat << EOF It seems like the factory image has not been created, it is most diff --git a/retiolum/scripts/adv_graphgen/find_super b/retiolum/bin/find-supernodes index 2c316d0e..2c316d0e 100755 --- a/retiolum/scripts/adv_graphgen/find_super +++ b/retiolum/bin/find-supernodes diff --git a/retiolum/bin/my-ip b/retiolum/bin/my-ip deleted file mode 100755 index fcfbba05..00000000 --- a/retiolum/bin/my-ip +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -curl http://euer.krebsco.de/live/ip.php diff --git a/retiolum/bin/nodes-to-json.py b/retiolum/bin/nodes-to-json.py new file mode 100644 index 00000000..ca9d3c8c --- /dev/null +++ b/retiolum/bin/nodes-to-json.py @@ -0,0 +1,37 @@ +#!/usr/bin/python + +def parse_hosts_path(path="/etc/tinc/retiolum/hosts"): + import os + import re + + needle_addr = re.compile("Subnet\s*=\s*(.*)/[0-9]+") + needle_port = re.compile("Port\s*=\s*(.*)") + for f in os.listdir(path): + with open(path+"/"+f) as of: + addrs = [] + port = "655" + + for line in of.readlines(): + + addr_found = needle_addr.match(line) + if addr_found: + addrs.append(addr_found.group(1)) + + port_found = needle_port.match(line) + if port_found: + port = port_found.group(1) + + if addrs : yield (f ,[(addr ,int(port)) for addr in addrs]) + + + +if __name__ == "__main__": + """ + usage + """ + import json + import sys + db={} + for host,addrs in parse_hosts_path(sys.argv[1] if len(sys.argv) > 2 else "/etc/tinc/retiolum/hosts"): + db[host] = addrs + print(json.dumps(db)) |