diff --git a/app/views.py b/app/views.py index 5249bd1..1440cbd 100644 --- a/app/views.py +++ b/app/views.py @@ -12,6 +12,29 @@ username = os.getenv('username') password = os.getenv('password') cal_id = os.getenv('cal_id') +def remove_emoji(string): + import re + emoji_pattern = re.compile("[" + u"\U0001F600-\U0001F64F" # emoticons + u"\U0001F300-\U0001F5FF" # symbols & pictographs + u"\U0001F680-\U0001F6FF" # transport & map symbols + u"\U0001F1E0-\U0001F1FF" # flags (iOS) + u"\U00002500-\U00002BEF" # chinese char + u"\U00002702-\U000027B0" + u"\U00002702-\U000027B0" + u"\U000024C2-\U0001F251" + u"\U0001f926-\U0001f937" + u"\U00010000-\U0010ffff" + u"\u2640-\u2642" + u"\u2600-\u2B55" + u"\u200d" + u"\u23cf" + u"\u23e9" + u"\u231a" + u"\ufe0f" # dingbats + u"\u3030" + "]+", flags=re.UNICODE) + return emoji_pattern.sub(r'', string) def daterange(start_date, end_date): for n in range(int((end_date - start_date).days)): @@ -20,9 +43,9 @@ def daterange(start_date, end_date): @app.route('/') def dashboard(): today = datetime.datetime.now(tz=datetime.datetime.now(timezone.utc).astimezone().tzinfo) - # today = datetime.datetime(2022,5,30, tzinfo=datetime.datetime.now(timezone.utc).astimezone().tzinfo) - start_of_week = today - timedelta(days=today.weekday()) # Monday - end_of_week = start_of_week + timedelta(days=7) # Sunday + today = datetime.datetime(2022,6,5, tzinfo=datetime.datetime.now(timezone.utc).astimezone().tzinfo) + start_of_week = today - timedelta(days=(today.weekday()+1)) # Monday + end_of_week = start_of_week + timedelta(days=8) # Sunday events = [] @@ -53,9 +76,13 @@ def dashboard(): days = [] for single_date in daterange(start_of_week, end_of_week): - days_events = [e for e in events if (e.dtstart.date() <= single_date <= e.dtend.date())] - days.append((single_date, days_events)) + days_events = [] + for e in events: + if (e.dtstart.date() <= single_date <= e.dtend.date()): + e.summary = remove_emoji(e.summary) + days_events.append(e) + days.append((single_date, days_events)) # breakpoint() pass