Skip to content
This repository was archived by the owner on Sep 1, 2024. It is now read-only.

Commit 9fb7b3b

Browse files
committed
年、月の要素数でエラーが起こってしまう問題を修正
1 parent 9735e0f commit 9fb7b3b

File tree

3 files changed

+25
-2
lines changed

3 files changed

+25
-2
lines changed

addschedules.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,13 @@ def add_schedules(values):
4949
print(f'endmonths = {endmonths} ')
5050
print(f'startdates = {startdates}')
5151
print(f'enddates = {enddates} ')
52+
53+
5254
# 開始日・終了日の要素数が違ったら終了日を開始日と同一とする
5355
if len(startdates) != len(enddates):
5456
enddates = startdates
5557
# forで回しながら予定を追加
56-
for i in range(0, len(startdates)):
58+
for i in range(0, len(startdates)-1):
5759
values['startYear'] = startyears[i]
5860
values['endYear'] = endyears[i]
5961
values['startMonth'] = startmonths[i]

main.py

+3
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,9 @@ def main():
209209
print(date)
210210
window['startDate'].update(date)
211211
window['endDate'].update(date)
212+
#年情報の更新
213+
window['startYear'].update(eventdate['year'])
214+
window['endYear'].update(eventdate['year'])
212215
else:
213216
print('音声認識失敗')
214217
window['result'].update('音声の認識に失敗しました')

take_month_and_date_from_text.py

+19-1
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,14 @@ def take_month_and_date_from_text(text):
22
from datetime import datetime
33
material = text
44

5+
# リターンする情報用の辞書(ここにイベントの情報を投入していく)
56
eventdata = {
7+
'year': '',
68
'month': '',
79
'date': ''
810
}
911
one_to_nine = ['1', '2', '3', '4', '5', '6', '7', '8', '9']
12+
1013
# 月情報の抽出
1114
for i in text:
1215
if i == '月' and text[text.index(i)-1] in one_to_nine:
@@ -18,7 +21,6 @@ def take_month_and_date_from_text(text):
1821
month = text[month_index-1]
1922
print(month[0])
2023
if month[0] not in one_to_nine:
21-
print(76457657)
2224
month = month[1:]
2325
print(month)
2426
eventdata['month'] = str(month)
@@ -54,8 +56,24 @@ def take_month_and_date_from_text(text):
5456
if eventdata['month'] == '' and '来月' in material:
5557
eventdata['month'] = str((datetime.today().month+1) % 12)
5658

59+
# monthを日付の要素数と同一になるよう複製
60+
addtemp = ','+eventdata['month']
61+
addcount = len(eventdata['date'])-1
62+
for i in range(0, addcount):
63+
eventdata['month'] += addtemp
64+
65+
# yearを日付の要素数と同じになるよう生成(今年)
66+
thisyear = str(datetime.today().year)
67+
addtemp = ','+thisyear
68+
year = thisyear
69+
for i in range(0,len(eventdata['date'])-1):
70+
year += addtemp
71+
72+
eventdata['year'] = year
73+
5774
return eventdata
5875

5976

77+
6078
if __name__ == '__main__':
6179
print(take_month_and_date_from_text('11月のアルバイトは1日9日10日25日です'))

0 commit comments

Comments
 (0)