moving and renaming/breaking everything

1 files changed, 6 insertions, 33 deletions

diff --git a/tibber_prices2pgsql.py b/scripts/tibber_prices.py
index 046072f..81b3afb 100755..100644
--- a/tibber_prices2pgsql.py
+++ b/scripts/tibber_prices.py
@@ -1,14 +1,14 @@
-#!/bin/python3
+#!/usr/bin/env python3
+''' import energy prices from tibber '''
 
 import os
 import sys
-import json
-import psycopg2
-import requests
-
 from datetime import datetime
 from datetime import timedelta
 from tzlocal import get_localzone
+import requests
+
+from common import dbi
 
 
 # variables
@@ -73,31 +73,4 @@ for item in data["data"]["viewer"]["homes"][0]["currentSubscription"]["priceInfo
     prices.append((item["startsAt"],item["total"],item["energy"],item["tax"],item["level"]))
 
 
-# connect to db
-conn = psycopg2.connect(database=pg_db, host=pg_host)
-cur = conn.cursor()
-
-# count rows before we start
-cur.execute("SELECT COUNT(*) FROM " + pg_table)
-before = cur.fetchone()
-
-# insert data
-try:
-    cur.executemany("INSERT INTO " + pg_table + " VALUES(%s,%s,%s,%s,%s) ON CONFLICT (startsat) DO NOTHING", prices)
-    conn.commit()
-except Exception as e:
-    conn.rollback()
-    raise e
-
-# count rows after we finnish
-cur.execute("SELECT COUNT(*) FROM " + pg_table)
-after = cur.fetchone()
-
-# count *new* rows
-newRows = after[0] - before[0]
-
-# close connection
-conn.close()
-
-
-print("Successfully inserted " + str(newRows) + " records into the database")
+dbi("INSERT INTO " + pg_table + " VALUES(%s,%s,%s,%s,%s) ON CONFLICT (startsat) DO NOTHING", prices, verbose=True)