diff options
Diffstat (limited to 'client')
| -rw-r--r-- | client/modules/HN.py | 2 | ||||
| -rw-r--r-- | client/modules/Weather.py | 2 | ||||
| -rw-r--r-- | client/populate.py | 32 | ||||
| -rw-r--r-- | client/requirements.txt | 2 |
4 files changed, 18 insertions, 20 deletions
diff --git a/client/modules/HN.py b/client/modules/HN.py index 16aeab8..692abea 100644 --- a/client/modules/HN.py +++ b/client/modules/HN.py @@ -108,7 +108,7 @@ def handle(text, mic, profile): else: mic.say("OK I will not send any articles") - if profile['phone_number']: + if not profile['prefers_email'] and profile['phone_number']: mic.say("Here are some front-page articles. " + all_titles + ". Would you like me to send you these? If so, which?") handleResponse(mic.activeListen()) diff --git a/client/modules/Weather.py b/client/modules/Weather.py index 7bb86ec..ad1ac29 100644 --- a/client/modules/Weather.py +++ b/client/modules/Weather.py @@ -56,7 +56,7 @@ def handle(text, mic, profile): tz = getTimezone(profile) service = DateService(tz=tz) - date = service.parseDay(text) + date = service.extractDay(text) if not date: date = datetime.datetime.now(tz=tz) weekday = service.__daysOfWeek__[date.weekday()] diff --git a/client/populate.py b/client/populate.py index 0887648..48b8670 100644 --- a/client/populate.py +++ b/client/populate.py @@ -29,24 +29,22 @@ def run(): # phone number clean_number = lambda s: re.sub(r'[^0-9]', '', s) phone_number = clean_number(raw_input( - "Phone number. No country code. Any dashes or spaces will be removed for you: ")) - if phone_number: - profile['phone_number'] = phone_number + "\nPhone number (no country code). Any dashes or spaces will be removed for you: ")) + profile['phone_number'] = phone_number # carrier - print("Phone carrier (for sending text notifications).") + print("\nPhone carrier (for sending text notifications).") print( - "Enter one of the following: 'AT&T', 'Verizon', 'T-Mobile' OR go to http://www.emailtextmessages.com and enter the email suffix for your carrier (e.g., for Virgin Mobile, enter 'vmobl.com').") + "If you have a US phone number, you can enter one of the following: 'AT&T', 'Verizon', 'T-Mobile' (without the quotes). If your carrier isn't listed or you have an international number, go to http://www.emailtextmessages.com and enter the email suffix for your carrier (e.g., for Virgin Mobile, enter 'vmobl.com'; for T-Mobile Germany, enter 't-d1-sms.de').") carrier = raw_input('Carrier: ') - if carrier: - if carrier == 'AT&T': - profile['carrier'] = 'txt.att.net' - elif carrier == 'Verizon': - profile['carrier'] = 'vtext.com' - elif carrier == 'T-Mobile': - profile['carrier'] = 'tmomail.net' - else: - profile['carrier'] = carrier + if carrier == 'AT&T': + profile['carrier'] = 'txt.att.net' + elif carrier == 'Verizon': + profile['carrier'] = 'vtext.com' + elif carrier == 'T-Mobile': + profile['carrier'] = 'tmomail.net' + else: + profile['carrier'] = carrier # location def verifyLocation(place): @@ -59,7 +57,7 @@ def run(): return True print( - "Location should be a 5-digit US zipcode (e.g., 08544). If you are outside the US, insert the name of your nearest big town/city. For weather requests.") + "\nLocation should be a 5-digit US zipcode (e.g., 08544). If you are outside the US, insert the name of your nearest big town/city. For weather requests.") location = raw_input("Location: ") while location and (verifyLocation(location)==False): print("Weather not found. Please try another location.") @@ -69,7 +67,7 @@ def run(): # timezone print( - "Please enter a timezone from the list located in the TZ* column at http://en.wikipedia.org/wiki/List_of_tz_database_time_zones, or none at all.") + "\nPlease enter a timezone from the list located in the TZ* column at http://en.wikipedia.org/wiki/List_of_tz_database_time_zones, or none at all.") tz = raw_input("Timezone: ") while tz: try: @@ -81,7 +79,7 @@ def run(): tz = raw_input("Timezone: ") response = raw_input( - "Would you prefer to have notifications sent by email (E) or text message (T)? ") + "\nWould you prefer to have notifications sent by email (E) or text message (T)? ") while not response or (response != 'E' and response != 'T'): response = raw_input("Please choose email (E) or text message (T): ") profile['prefers_email'] = (response == 'E') diff --git a/client/requirements.txt b/client/requirements.txt index e86e574..729cfbb 100644 --- a/client/requirements.txt +++ b/client/requirements.txt @@ -11,7 +11,7 @@ python-dateutil==2.1 python-mpd==0.3.0 pytz==2013b quantities==0.10.1 -semantic==1.0.1 +semantic==1.0.3 six==1.6.1 ws4py==0.3.2 requests==2.1.0 |