deleted file mode 100755

@@ -1,77 +0,0 @@

-#!/usr/bin/env python3

-# -*- coding: utf-8 -*-

-# Copyright © 2017-2019 Xavier G. <xavier.boobank@kindwolf.org>

-# This work is free. You can redistribute it and/or modify it under the

-# terms of the Do What The Fuck You Want To Public License, Version 2,

-# as published by Sam Hocevar. See the COPYING file for more details.

-"""

-boobank-graphite takes a JSON file, as created by boobank-cacher when running

-and caching a "boobank list" command, and sends it to a Graphite instance.

-"""

-

-import sys

-import json

-import time

-import socket

-import argparse

-from boobank_utils import DEFAULT_CURRENCY

-

-

-def main():

-    """

-    Main function.

-    """

-    args = parse_args()

-    accounts = json.load(args.json_file)

-    timestamp = time.time()

-    graphite_socket = graphite_connect(args.host, args.port)

-    for account in accounts.get('data', []):

-        send_account(graphite_socket, account, timestamp)

-    graphite_socket.close()

-

-def parse_args():

-    """

-    Parse command-line arguments.

-    """

-    description = 'Send the contents of a boobank-cacher JSON file to Graphite.'

-    args = argparse.ArgumentParser(description=description)

-    args.add_argument('-gh', '--graphite-host', dest='host', default='::1',

-                      help='Graphite host; defaults to ::1.')

-    args.add_argument('-gp', '--graphite-port', dest='port', default='2003', type=int,

-                      help='Graphite port; defaults to 2003.')

-    args.add_argument('json_file', nargs='?', type=argparse.FileType('r'), default=sys.stdin,

-                      help='JSON file to send to Graphite; defaults to "-" (standard input).')

-    return args.parse_args()

-

-def graphite_connect(host, port):

-    """

-    Connect to the Graphite instance listening on host and port.

-    """

-    addr_infos = socket.getaddrinfo(host, port, 0, 0, socket.IPPROTO_TCP)

-    _, _, _, _, sockaddr = addr_infos[0]

-    graphite_socket = socket.socket(socket.AF_INET6, socket.SOCK_STREAM, 0)

-    graphite_socket.connect(sockaddr)

-    return graphite_socket

-

-def get_path(account):

-    """

-    Return the path to send to Graphite for the given bank account.

-    The following scheme is used:

-    bank.<bank id>.<account id>-balance-<currency>

-    """

-    (account_id, bank) = account['id'].split('@')

-    currency = account.get('currency', DEFAULT_CURRENCY).lower()

-    return 'bank.%s.%s-balance-%s' % (bank, account_id, currency)

-

-def send_account(graphite_socket, account, timestamp):

-    """

-    Send the balance of the given bank account to Graphite over the given TCP

-    socket.

-    """

-    pattern = '%s %.2f %d\n'

-    values = (get_path(account), float(account['balance']), int(timestamp))

-    line = pattern % values

-    graphite_socket.send(line.encode('utf-8'))

-

-if __name__ == '__main__':

-    main()

@@ -1,4 +1,4 @@

-#!/usr/bin/env python

+#!/usr/bin/env python3

 # -*- coding: utf-8 -*-

 # Copyright © 2017-2019 Xavier G. <xavier.boobank@kindwolf.org>

 # This work is free. You can redistribute it and/or modify it under the

@@ -71,7 +71,7 @@ def send_account(graphite_socket, account, timestamp):

     pattern = '%s %.2f %d\n'

     values = (get_path(account), float(account['balance']), int(timestamp))

     line = pattern % values

-    graphite_socket.send(line)

+    graphite_socket.send(line.encode('utf-8'))

 if __name__ == '__main__':

     main()

@@ -69,7 +69,7 @@ def send_account(graphite_socket, account, timestamp):

     socket.

     """

     pattern = '%s %.2f %d\n'

-    values = (get_path(account), account['balance'], int(timestamp))

+    values = (get_path(account), float(account['balance']), int(timestamp))

     line = pattern % values

     graphite_socket.send(line)

@@ -1,6 +1,6 @@

 #!/usr/bin/env python

 # -*- coding: utf-8 -*-

-# Copyright © 2017 Xavier G. <xavier.boobank@kindwolf.org>

+# Copyright © 2017-2019 Xavier G. <xavier.boobank@kindwolf.org>

 # This work is free. You can redistribute it and/or modify it under the

 # terms of the Do What The Fuck You Want To Public License, Version 2,

 # as published by Sam Hocevar. See the COPYING file for more details.

@@ -1,5 +1,9 @@

 #!/usr/bin/env python

 # -*- coding: utf-8 -*-

+# Copyright © 2017 Xavier G. <xavier.boobank@kindwolf.org>

+# This work is free. You can redistribute it and/or modify it under the

+# terms of the Do What The Fuck You Want To Public License, Version 2,

+# as published by Sam Hocevar. See the COPYING file for more details.

 """

 boobank-graphite takes a JSON file, as created by boobank-cacher when running

 and caching a "boobank list" command, and sends it to a Graphite instance.

@@ -1,49 +1,73 @@

 #!/usr/bin/env python

 # -*- coding: utf-8 -*-

+"""

+boobank-graphite takes a JSON file, as created by boobank-cacher when running

+and caching a "boobank list" command, and sends it to a Graphite instance.

+"""

 import sys

 import json

 import time

 import socket

 import argparse

+from boobank_utils import DEFAULT_CURRENCY

 def main():

+    """

+    Main function.

+    """

     args = parse_args()

-    accounts = get_accounts(args.json_file)

+    accounts = json.load(args.json_file)

     timestamp = time.time()

-    socket = graphite_connect(args.host, args.port)

+    graphite_socket = graphite_connect(args.host, args.port)

     for account in accounts.get('data', []):

-        send_account(socket, account, timestamp)

-    socket.close()

+        send_account(graphite_socket, account, timestamp)

+    graphite_socket.close()

 def parse_args():

-    args_parser = argparse.ArgumentParser(description='Send the contents of a boobank-cacher JSON file to Graphite.')

-    args_parser.add_argument('-gh', '--graphite-host', dest='host', default='::1', help='Graphite host; defaults to ::1.')

-    args_parser.add_argument('-gp', '--graphite-port', dest='port', default='2003', type=int, help='Graphite port; defaults to 2003.')

-    args_parser.add_argument('json_file', nargs='?', type=argparse.FileType('r'), default=sys.stdin, help='JSON file to send to Graphite; defaults to "-" (standard input).')

-    return args_parser.parse_args()

+    """

+    Parse command-line arguments.

+    """

+    description = 'Send the contents of a boobank-cacher JSON file to Graphite.'

+    args = argparse.ArgumentParser(description=description)

+    args.add_argument('-gh', '--graphite-host', dest='host', default='::1',

+                      help='Graphite host; defaults to ::1.')

+    args.add_argument('-gp', '--graphite-port', dest='port', default='2003', type=int,

+                      help='Graphite port; defaults to 2003.')

+    args.add_argument('json_file', nargs='?', type=argparse.FileType('r'), default=sys.stdin,

+                      help='JSON file to send to Graphite; defaults to "-" (standard input).')

+    return args.parse_args()

 def graphite_connect(host, port):

+    """

+    Connect to the Graphite instance listening on host and port.

+    """

     addr_infos = socket.getaddrinfo(host, port, 0, 0, socket.IPPROTO_TCP)

     _, _, _, _, sockaddr = addr_infos[0]

     graphite_socket = socket.socket(socket.AF_INET6, socket.SOCK_STREAM, 0)

     graphite_socket.connect(sockaddr)

     return graphite_socket

-def get_accounts(filedesc):

-    return json.load(filedesc)

-

 def get_path(account):

-    (id, bank) = account['id'].split('@')

-    currency = account.get('currency', 'EUR').lower()

-    return 'bank.%s.%s-balance-%s' % (bank, id, currency)

+    """

+    Return the path to send to Graphite for the given bank account.

+    The following scheme is used:

+    bank.<bank id>.<account id>-balance-<currency>

+    """

+    (account_id, bank) = account['id'].split('@')

+    currency = account.get('currency', DEFAULT_CURRENCY).lower()

+    return 'bank.%s.%s-balance-%s' % (bank, account_id, currency)

-def send_account(socket, account, timestamp):

+def send_account(graphite_socket, account, timestamp):

+    """

+    Send the balance of the given bank account to Graphite over the given TCP

+    socket.

+    """

     pattern = '%s %.2f %d\n'

     values = (get_path(account), account['balance'], int(timestamp))

     line = pattern % values

-    socket.send(line)

+    graphite_socket.send(line)

 if __name__ == '__main__':

     main()

@@ -5,38 +5,34 @@ import sys

 import json

 import time

 import socket

+import argparse

 def main():

-    accounts = get_accounts()

+    args = parse_args()

+    accounts = get_accounts(args.json_file)

     timestamp = time.time()

-    socket = graphite_connect()

+    socket = graphite_connect(args.host, args.port)

     for account in accounts.get('data', []):

         send_account(socket, account, timestamp)

     socket.close()

-def graphite_connect():

-    (host, port) = ('::1', 2003)

-    if len(sys.argv) == 4:

-        (host, port) = (sys.argv[2], int(sys.argv[3]))

-    elif len(sys.argv) == 3:

-        host = sys.argv[2]

+def parse_args():

+    args_parser = argparse.ArgumentParser(description='Send the contents of a boobank-cacher JSON file to Graphite.')

+    args_parser.add_argument('-gh', '--graphite-host', dest='host', default='::1', help='Graphite host; defaults to ::1.')

+    args_parser.add_argument('-gp', '--graphite-port', dest='port', default='2003', type=int, help='Graphite port; defaults to 2003.')

+    args_parser.add_argument('json_file', nargs='?', type=argparse.FileType('r'), default=sys.stdin, help='JSON file to send to Graphite; defaults to "-" (standard input).')

+    return args_parser.parse_args()

+

+def graphite_connect(host, port):

     addr_infos = socket.getaddrinfo(host, port, 0, 0, socket.IPPROTO_TCP)

     _, _, _, _, sockaddr = addr_infos[0]

     graphite_socket = socket.socket(socket.AF_INET6, socket.SOCK_STREAM, 0)

     graphite_socket.connect(sockaddr)

     return graphite_socket

-def get_accounts():

-    try:

-        accounts_json_path = sys.argv[1]

-    except IndexError:

-        accounts_json_path = '-'

-    if accounts_json_path == '-':

-        return json.load(sys.stdin)

-    else:

-        with open(accounts_json_path, 'r') as filedesc:

-            return json.load(filedesc)

+def get_accounts(filedesc):

+    return json.load(filedesc)

 def get_path(account):

     (id, bank) = account['id'].split('@')

@@ -16,14 +16,15 @@ def main():

     socket.close()

 def graphite_connect():

+    (host, port) = ('::1', 2003)

     if len(sys.argv) == 4:

-        socket_args = (sys.argv[2], int(sys.argv[3]))

+        (host, port) = (sys.argv[2], int(sys.argv[3]))

     elif len(sys.argv) == 3:

-        socket_args = (sys.argv[2], 2003)

-    else:

-        socket_args = ('::1', 2003)

-    graphite_socket = socket.socket()

-    graphite_socket.connect(socket_args)

+        host = sys.argv[2]

+    addr_infos = socket.getaddrinfo(host, port, 0, 0, socket.IPPROTO_TCP)

+    _, _, _, _, sockaddr = addr_infos[0]

+    graphite_socket = socket.socket(socket.AF_INET6, socket.SOCK_STREAM, 0)

+    graphite_socket.connect(sockaddr)

     return graphite_socket

 def get_accounts():

new file mode 100755

@@ -0,0 +1,52 @@

+#!/usr/bin/env python

+# -*- coding: utf-8 -*-

+

+import sys

+import json

+import time

+import socket

+

+

+def main():

+    accounts = get_accounts()

+    timestamp = time.time()

+    socket = graphite_connect()

+    for account in accounts.get('data', []):

+        send_account(socket, account, timestamp)

+    socket.close()

+

+def graphite_connect():

+    if len(sys.argv) == 4:

+        socket_args = (sys.argv[2], int(sys.argv[3]))

+    elif len(sys.argv) == 3:

+        socket_args = (sys.argv[2], 2003)

+    else:

+        socket_args = ('::1', 2003)

+    graphite_socket = socket.socket()

+    graphite_socket.connect(socket_args)

+    return graphite_socket

+

+def get_accounts():

+    try:

+        accounts_json_path = sys.argv[1]

+    except IndexError:

+        accounts_json_path = '-'

+    if accounts_json_path == '-':

+        return json.load(sys.stdin)

+    else:

+        with open(accounts_json_path, 'r') as filedesc:

+            return json.load(filedesc)

+

+def get_path(account):

+    (id, bank) = account['id'].split('@')

+    currency = account.get('currency', 'EUR').lower()

+    return 'bank.%s.%s-balance-%s' % (bank, id, currency)

+

+def send_account(socket, account, timestamp):

+    pattern = '%s %.2f %d\n'

+    values = (get_path(account), account['balance'], int(timestamp))

+    line = pattern % values

+    socket.send(line)

+

+if __name__ == '__main__':

+    main()