medicafe 0.250725.1__tar.gz → 0.250725.4__tar.gz

{medicafe-0.250725.1 → medicafe-0.250725.4}/MediBot/MediBot.py

@@ -1,5 +1,5 @@
 #MediBot.py
-import subprocess, os, tempfile, traceback, re, sys, time
+import subprocess, os, tempfile, traceback, re, sys, time, msvcrt, ctypes
 from collections import OrderedDict
 import MediBot_dataformat_library
 import MediBot_Preprocessor
@@ -12,6 +12,47 @@ sys.path.append(project_dir)
 
 from MediLink import MediLink_ConfigLoader
 
+def flush_console_input_buffer():
+    """
+    Remove any keystrokes already sitting in the console input buffer.
+    Necessary on Windows XP where a stray CR/LF can remain after the
+    script is launched.
+    """
+    if sys.platform != "win32":
+        return                      # no-op on non-Windows
+
+    try:
+        kernel32 = ctypes.WinDLL('kernel32', use_last_error=True)
+        STD_INPUT_HANDLE = -10
+        h_stdin = kernel32.GetStdHandle(STD_INPUT_HANDLE)
+        kernel32.FlushConsoleInputBuffer(h_stdin)
+    except Exception:
+        # Fallback: drain any leading newlines manually
+        while msvcrt.kbhit():
+            msvcrt.getch()
+
+def discard_leading_blank():
+    """
+    Alternative fallback that reads from stdin and discards leading newlines,
+    then puts back the first non-newline character for the real input() call.
+    """
+    if sys.platform != "win32":
+        return                      # no-op on non-Windows
+        
+    try:
+        while True:
+            ch = sys.stdin.read(1)
+            if ch not in ('\r', '\n'):
+                # put it back for the real input() call
+                msvcrt.ungetch(ch.encode())
+                break
+            elif not ch:  # EOF
+                break
+    except Exception:
+        # If stdin.read fails, fall back to msvcrt approach
+        while msvcrt.kbhit():
+            msvcrt.getch()
+
 try:
     from MediBot_Crosswalk_Library import crosswalk_update
 except ImportError:
@@ -400,22 +441,24 @@ if __name__ == "__main__":
                 sys.stdout.flush()
                 time.sleep(0.2)  # Increased delay for Windows XP
                 
-                # Try raw_input first (Python 2.x compatibility), fall back to input
-                try:
-                    proceed = raw_input().lower().strip() in ['yes', 'y']
-                except NameError:
-                    proceed = input().lower().strip() in ['yes', 'y']
+                # Flush console input buffer to remove any stray CR/LF
+                flush_console_input_buffer()
+                discard_leading_blank()
+                
+                # Use sys.stdin.readline() for more reliable input on Windows XP
+                proceed = sys.stdin.readline().lower().strip() in ['yes', 'y']
             else:
                 print("\nDo you want to proceed with the {} remaining patient(s)? (yes/no): ".format(len(patients_to_process)), end='', flush=True)
                 # Force flush and wait for Windows XP console buffer synchronization
                 sys.stdout.flush()
                 time.sleep(0.2)  # Increased delay for Windows XP
                 
-                # Try raw_input first (Python 2.x compatibility), fall back to input
-                try:
-                    proceed = raw_input().lower().strip() in ['yes', 'y']
-                except NameError:
-                    proceed = input().lower().strip() in ['yes', 'y']
+                # Flush console input buffer to remove any stray CR/LF
+                flush_console_input_buffer()
+                discard_leading_blank()
+                
+                # Use sys.stdin.readline() for more reliable input on Windows XP
+                proceed = sys.stdin.readline().lower().strip() in ['yes', 'y']
 
             # TODO: Here is where we need to add the step where we move to MediBot_Charges. 
             # The return is an enriched dataset to be picked up by MediBot which means we need to return: 

{medicafe-0.250725.1 → medicafe-0.250725.4}/MediBot/MediBot_UI.py

@@ -1,5 +1,5 @@
 #MediBot_UI.py
-import ctypes, time, re, os, sys
+import ctypes, time, re, os, sys, msvcrt
 from ctypes import wintypes
 from sys import exit
 project_dir = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
@@ -18,6 +18,47 @@ config, crosswalk = MediLink_ConfigLoader.load_configuration()
 VK_END = int(config.get('VK_END', ""), 16) # Try F12 (7B). Virtual key code for 'End' (23)
 VK_PAUSE = int(config.get('VK_PAUSE', ""), 16) # Try F11 (7A). Virtual-key code for 'Home' (24)
 
+def flush_console_input_buffer():
+    """
+    Remove any keystrokes already sitting in the console input buffer.
+    Necessary on Windows XP where a stray CR/LF can remain after the
+    script is launched.
+    """
+    if sys.platform != "win32":
+        return                      # no-op on non-Windows
+
+    try:
+        kernel32 = ctypes.WinDLL('kernel32', use_last_error=True)
+        STD_INPUT_HANDLE = -10
+        h_stdin = kernel32.GetStdHandle(STD_INPUT_HANDLE)
+        kernel32.FlushConsoleInputBuffer(h_stdin)
+    except Exception:
+        # Fallback: drain any leading newlines manually
+        while msvcrt.kbhit():
+            msvcrt.getch()
+
+def discard_leading_blank():
+    """
+    Alternative fallback that reads from stdin and discards leading newlines,
+    then puts back the first non-newline character for the real input() call.
+    """
+    if sys.platform != "win32":
+        return                      # no-op on non-Windows
+        
+    try:
+        while True:
+            ch = sys.stdin.read(1)
+            if ch not in ('\r', '\n'):
+                # put it back for the real input() call
+                msvcrt.ungetch(ch.encode())
+                break
+            elif not ch:  # EOF
+                break
+    except Exception:
+        # If stdin.read fails, fall back to msvcrt approach
+        while msvcrt.kbhit():
+            msvcrt.getch()
+
 class AppControl:
     def __init__(self):
         self.script_paused = False
@@ -152,11 +193,12 @@ def display_patient_selection_menu(csv_data, reverse_mapping, proceed_as_medicar
     sys.stdout.flush()
     time.sleep(0.2)  # Increased delay for Windows XP
     
-    # Try raw_input first (Python 2.x compatibility), fall back to input
-    try:
-        proceed = raw_input().lower().strip() in ['yes', 'y']
-    except NameError:
-        proceed = input().lower().strip() in ['yes', 'y']
+    # Flush console input buffer to remove any stray CR/LF
+    flush_console_input_buffer()
+    discard_leading_blank()
+    
+    # Use sys.stdin.readline() for more reliable input on Windows XP
+    proceed = sys.stdin.readline().lower().strip() in ['yes', 'y']
 
     if not proceed:
         display_menu_header("Patient Selection for Today's Data Entry")
@@ -170,11 +212,12 @@ def display_patient_selection_menu(csv_data, reverse_mapping, proceed_as_medicar
                 sys.stdout.flush()
                 time.sleep(0.2)  # Increased delay for Windows XP
                 
-                # Try raw_input first (Python 2.x compatibility), fall back to input
-                try:
-                    selection = raw_input().strip()
-                except NameError:
-                    selection = input().strip()
+                # Flush console input buffer to remove any stray CR/LF
+                flush_console_input_buffer()
+                discard_leading_blank()
+                
+                # Use sys.stdin.readline() for more reliable input on Windows XP
+                selection = sys.stdin.readline().strip()
                 if not selection:
                     print("Invalid entry. Please provide at least one number.")
                     continue
@@ -253,11 +296,12 @@ def handle_user_interaction(interaction_mode, error_message):
         sys.stdout.flush()
         time.sleep(0.2)  # Increased delay for Windows XP
         
-        # Try raw_input first (Python 2.x compatibility), fall back to input
-        try:
-            choice = raw_input().strip()
-        except NameError:
-            choice = input().strip()
+        # Flush console input buffer to remove any stray CR/LF
+        flush_console_input_buffer()
+        discard_leading_blank()
+        
+        # Use sys.stdin.readline() for more reliable input on Windows XP
+        choice = sys.stdin.readline().strip()
         
         if choice == '1':
             print("Selected: 'Retry last entry'. Please press 'F12' to continue.")
@@ -286,6 +330,10 @@ def user_interaction(csv_data, interaction_mode, error_message, reverse_mapping)
         
         # Force flush for Windows XP compatibility
         sys.stdout.flush()
+        
+        # Flush console input buffer to remove any stray CR/LF from script launch
+        flush_console_input_buffer()
+        discard_leading_blank()
 
         while True:
             try:
@@ -295,11 +343,8 @@ def user_interaction(csv_data, interaction_mode, error_message, reverse_mapping)
                 sys.stdout.flush()
                 time.sleep(0.2)  # Increased delay for Windows XP
                 
-                # Try raw_input first (Python 2.x compatibility), fall back to input
-                try:
-                    response = raw_input().lower().strip()
-                except NameError:
-                    response = input().lower().strip()
+                # Use sys.stdin.readline() for more reliable input on Windows XP
+                response = sys.stdin.readline().lower().strip()
                 
                 if response:
                     if response in ['yes', 'y']:

{medicafe-0.250725.1 → medicafe-0.250725.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: medicafe
-Version: 0.250725.1
+Version: 0.250725.4
 Summary: MediCafe
 Home-page: https://github.com/katanada2
 Author: Daniel Vidaud

{medicafe-0.250725.1 → medicafe-0.250725.4}/medicafe.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: medicafe
-Version: 0.250725.1
+Version: 0.250725.4
 Summary: MediCafe
 Home-page: https://github.com/katanada2
 Author: Daniel Vidaud

{medicafe-0.250725.1 → medicafe-0.250725.4}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='medicafe',
-    version="0.250725.1",
+    version="0.250725.4",
     description='MediCafe',
     long_description="""
     # Project Overview: MediCafe