ファイル名の引用を改善

yangpeng-coder · yangpeng-coder · commit a1298f9bc342 · 2021-06-07T21:49:58.000+09:00
diff --git a/txtToCsv.py b/txtToCsv.py
@@ -97,8 +97,9 @@ def create_data_from_file(file_name, keyword, device_code):
     data_json = {'TIME': []}
     keys = []
     i = 0
+    index = KEYWORD_LIST.index(keyword);
 
-    if keyword == '':
+    if index == -1:
         print('can not found keyword from file name...')
         sys.exit()
 
@@ -107,7 +108,7 @@ def create_data_from_file(file_name, keyword, device_code):
             if row.find(device_code) > -1 and row.find('add device') == -1:
                 key = str.strip(row[KEY_FROM:KEY_TO])
                 # pixel4aの特別のデータを集めないように
-                if keyword == 'pixel4a':
+                if index == 1:
                     if (key == 'ABS_MT_PRESSURE' and row[VALUE_FROM:VALUE_TO] == '00000000') or (
                             key == 'ABS_MT_TRACKING_ID' and row[VALUE_FROM:VALUE_TO] == 'ffffffff'):
                         continue
