Sfoglia il codice sorgente

Move commit to commit less often

Foppe Hemminga 6 anni fa
parent
commit
929e340a3c
1 ha cambiato i file con 39 aggiunte e 39 eliminazioni
  1. 39 39
      main.py

+ 39 - 39
main.py

@@ -51,7 +51,7 @@ if __name__ == '__main__':
 
         cur1 = db.cursor(cursor_factory=psycopg2.extras.NamedTupleCursor)
         cur1.execute(query, (race_day.name, race_day.date))
-        db_data = cur1.fetchall()
+        db_data_query1 = cur1.fetchall()
         # print(' 54. len(db_data): {}'.format(len(db_data)))
         # print(' 55. type(db_data): {}'.format(type(db_data)))
         # pprint(db_data)
@@ -60,41 +60,41 @@ if __name__ == '__main__':
         # compare retrieved scratchings with new data
         for scratching in scratchings:
             found_in_database = False
-            if db_data is None:
-                print(' 62. Caught db_data is None')
-                found_in_database = False
-            else:
-                for row in db_data:
-                    # print('row: ', end = '')
-                    # print(type(row))
-                    # print(row)
-                    # if type(row) == 'datetime.time':
+            # if db_data is None:
+            #     print(' 62. Caught db_data is None')
+            #     found_in_database = False
+            # else:
+            for row in db_data_query1:
+                # print('row: ', end = '')
+                # print(type(row))
+                # print(row)
+                # if type(row) == 'datetime.time':
+                #     continue
+                try:
+                    # if not hasattr(db_data, 'name'):
                     #     continue
-                    try:
-                        # if not hasattr(db_data, 'name'):
-                        #     continue
-                        date_in_db_row_formatted = row.race_date.strftime('%Y-%m-%d')
+                    date_in_db_row_formatted = row.race_date.strftime('%Y-%m-%d')
 
-                        if (
-                                scratching.date == date_in_db_row_formatted and
-                                scratching.venue == row.venue and
-                                int(scratching.race) == int(row.race) and
-                                scratching.horse == row.horse
-                        ):
-                            message_string = 'Horse found: date = {}, venue = {}, race = {}, horse = {}'
-                            message = message_string.format(scratching.date,
-                                                            scratching.venue,
-                                                            scratching.race,
-                                                            scratching.horse)
-                            # print(message)
-                            # print(row)
-                            found_in_database = True
-                    except AttributeError as ae:
-                        print(ae)
-                        print(' 89. row: ', end='')
-                        print(row)
-                        pprint(db_data)
-                        continue
+                    if (
+                            scratching.date == date_in_db_row_formatted and
+                            scratching.venue == row.venue and
+                            int(scratching.race) == int(row.race) and
+                            scratching.horse == row.horse
+                    ):
+                        message_string = 'Horse found: date = {}, venue = {}, race = {}, horse = {}'
+                        message = message_string.format(scratching.date,
+                                                        scratching.venue,
+                                                        scratching.race,
+                                                        scratching.horse)
+                        # print(message)
+                        # print(row)
+                        found_in_database = True
+                except AttributeError as ae:
+                    print(ae)
+                    print(' 89. row: ', end='')
+                    print(row)
+                    pprint(db_data_query1)
+                    continue
             if not found_in_database:
                 # report new scratching
                 date_object = datetime.datetime.strptime(scratching.date, "%Y-%m-%d").date()
@@ -107,9 +107,9 @@ if __name__ == '__main__':
                 """
                 cur2 = db.cursor(cursor_factory=psycopg2.extras.NamedTupleCursor)
                 cur2.execute(query, (scratching.date, scratching.venue, scratching.race))
-                db_data = cur2.fetchone()
+                db_data_query2 = cur2.fetchone()
                 cur2.close()
-                if db_data is None or len(db_data) == 0:
+                if db_data_query2 is None or len(db_data_query2) == 0:
                     print('106. cursor.execute(query, (scratching.date, scratching.venue, scratching.race))')
                     print('107. cursor.execute({}, ({}, {}, {}))'.format(
                         query, scratching.date, scratching.venue, scratching.race
@@ -117,7 +117,7 @@ if __name__ == '__main__':
                     print('110. No race found')
                     continue
                 flag = ''
-                if db_data.torn:
+                if db_data_query2.torn:
                     flag = 'FLAGGED!! '
                 message_string = '{}venue = {} {} {}-{} | race = {} starts at {} | {} UTC | horse = {}'
                 message = message_string.format(flag,
@@ -126,8 +126,8 @@ if __name__ == '__main__':
                                                 scratching.state,
                                                 scratching.venue,
                                                 scratching.race,
-                                                db_data.start_time.strftime('%H:%M'),
-                                                db_data.utctime.strftime('%H:%M'),
+                                                db_data_query2.start_time.strftime('%H:%M'),
+                                                db_data_query2.utctime.strftime('%H:%M'),
                                                 scratching.horse)
                 print(message)
                 if broadcast: