lots of updates :/

events/scrapers/Working/govt/MNLeg.py

@@ -6,8 +6,8 @@ from datetime import datetime
 from dateutil import relativedelta
 
 import django
-sys.path.append('../../../')
-os.environ['DJANGO_SETTINGS_MODULE'] = 'ds_events.settings'
+sys.path.append('../../../../')
+os.environ['DJANGO_SETTINGS_MODULE'] = 'config.django.local'
 django.setup()
 
 from time import sleep
@@ -18,14 +18,16 @@ from xvfbwrapper import Xvfb
 from lxml import html
 import pytz
 
-from events.models import Event, Organization, Scraper
-from events.digitools import getBrowser, createURL, createBasicEvent, getSource
+from events.models import Event, Organization, Scraper, Calendar
+from events.digitools import getBrowser, createURL, createBasicEvent, getSource, add_calendar
 
 try:
     scraper, created = Scraper.objects.get_or_create(
         name="MN Legislature",
         website="https://www.leg.mn.gov/cal?type=all",
+        calendar = Calendar.objects.get(shortcode='msp'),
         items = 0,
+        new_items = 0,
         last_ran = datetime.now(),
     )
 except Exception as e:
@@ -48,7 +50,7 @@ else:
     quit()
 
 br.get(calendar_url)
-sleep(60)
+sleep(10)
 ps = html.fromstring(br.page_source)
 
 commEvents = ps.xpath('.//*/div[@class="card border-dark comm_item cal_item ml-lg-3"]')
@@ -71,15 +73,21 @@ for hE in houseEvents:
     # print(dateTime, title, link, details['location'])
     venue, created = Organization.objects.get_or_create(name="MN House", city="St. Paul")
     new_event, created = Event.objects.update_or_create(
-        calendar = 'msp'
         event_type = 'Gv',
         show_title = title,
         show_link = link,
         show_date = datetime.strptime(dateTime, DATETIME_FORMAT),
         show_day = datetime.strptime(dateTime, DATETIME_FORMAT).date(),
         more_details = details['location'],
-        venue = venue
+        venue = venue,
+        scraper = scraper
     )
+
+    if type(new_event) is tuple:
+        print("STS: ", new_event)
+        add_calendar(new_event[0], 'msp')
+    else:
+        add_calendar(new_event, 'msp')
     scraper.items+=1
 
 
@@ -108,8 +116,14 @@ for sE in senateEvents:
         show_date = datetime.strptime(dateTime, DATETIME_FORMAT),
         show_day = datetime.strptime(dateTime, DATETIME_FORMAT).date(),
         more_details = details['location'],
-        venue = venue
+        venue = venue,
+        scraper = scraper
     )
+    if type(new_event) is tuple:
+        print("STS: ", new_event)
+        add_calendar(new_event[0], 'msp')
+    else:
+        add_calendar(new_event, 'msp')
     scraper.items+=1
 
 for cE in commEvents:
@@ -136,8 +150,14 @@ for cE in commEvents:
         show_date = datetime.strptime(dateTime, DATETIME_FORMAT),
         show_day = datetime.strptime(dateTime, DATETIME_FORMAT).date(),
         more_details = details['location'],
-        venue = venue
+        venue = venue,
+        scraper = scraper
     )
+    if type(new_event) is tuple:
+        print("STS: ", new_event)
+        add_calendar(new_event[0], 'msp')
+    else:
+        add_calendar(new_event, 'msp')
     scraper.items+=1