Move commit to commit less often

main.py

@@ -139,44 +139,44 @@ if __name__ == '__main__':
                 scratchings_for_database.append((scratching.venue, scratching.date,
                                                  scratching.race, scratching.horse))
 
-        long_message = ''
-        leftover_message = ''
-        for this_message in messages:
-            leftover_message = this_message
-            # Append message if possible
-            if len(long_message) + len(this_message) < 5997:
-                if len(long_message) == 0:
-                    long_message = this_message
-                else:
-                    long_message += '\n' + this_message
-                leftover_message = ''
-            else:
-                # Send long message (max 6k characters)
-                view.broadcast(long_message)
-                # Best would be to now store horses that were just broadcast
+    long_message = ''
+    leftover_message = ''
+    for this_message in messages:
+        leftover_message = this_message
+        # Append message if possible
+        if len(long_message) + len(this_message) < 5997:
+            if len(long_message) == 0:
                 long_message = this_message
-
-        # Send all messages
-        if len(long_message) > 0:
+            else:
+                long_message += '\n' + this_message
+            leftover_message = ''
+        else:
+            # Send long message (max 6k characters)
             view.broadcast(long_message)
-            long_message = ''
+            # Best would be to now store horses that were just broadcast
+            long_message = this_message
 
-        # Send only or last message
-        if len(leftover_message) > 0:
-            view.broadcast(leftover_message)
-            leftover_message = ''
+    # Send all messages
+    if len(long_message) > 0:
+        view.broadcast(long_message)
+        long_message = ''
 
-        query = """INSERT INTO horses(venue, race_date, race, horse) 
-        VALUES(%s, %s, %s, %s)
-        ON CONFLICT(venue, race_date, race, horse) DO NOTHING;"""
+    # Send only or last message
+    if len(leftover_message) > 0:
+        view.broadcast(leftover_message)
+        leftover_message = ''
 
-        cur3 = db.cursor(cursor_factory=psycopg2.extras.NamedTupleCursor)
-        for database_entry in scratchings_for_database:
-            cur3.execute(query, database_entry)
-            print('Stored: {}'.format(database_entry))
-        cur3.close()
+    query = """INSERT INTO horses(venue, race_date, race, horse) 
+    VALUES(%s, %s, %s, %s)
+    ON CONFLICT(venue, race_date, race, horse) DO NOTHING;"""
 
-        db.commit()
+    cur3 = db.cursor(cursor_factory=psycopg2.extras.NamedTupleCursor)
+    for database_entry in scratchings_for_database:
+        cur3.execute(query, database_entry)
+        print('Stored: {}'.format(database_entry))
+    cur3.close()
+
+    db.commit()
     db.close()
 
     interim = time.time()

view.py

@@ -16,7 +16,7 @@ def broadcast(this_message):
     load_dotenv()
     url = os.environ["BROADCAST_URL"]
     this_time = datetime.datetime.utcnow().strftime('%Y-%m-%d %H:%M')
-    json = {'content': this_time + ': ' + this_message.lstrip()}
+    json = {'content': this_time + ': ' + this_message}
     response = requests.post(url, json=json)
     if response.status_code in [200, 204]:
         print("Webhook executed")