From 921988df2e2414c9af76a689044cf5eb848af36e Mon Sep 17 00:00:00 2001
From: Emir Efe Karahan <55572417+ReachedSW@users.noreply.github.com>
Date: Mon, 11 Sep 2023 05:15:10 +0300
Subject: [PATCH] Update crypto.py

-> I create the shift_char func. to handle the shifting of invidual chars, making the code more modular and readable.

-> Now code can encrypt and decrypt digits.

-> Modified the decode function to iterate through all possible keys (0 to 25) and print the decrypted messages for each key.

-> New input validation for the key input to ensure it is an int (1-25)

->  User's choice converted to lowercase for case-insensitive comparing.
---
 src/freegames/crypto.py | 72 +++++++++++++++--------------------------
 1 file changed, 26 insertions(+), 46 deletions(-)

diff --git a/src/freegames/crypto.py b/src/freegames/crypto.py
index a59affda..68e3188c 100644
--- a/src/freegames/crypto.py
+++ b/src/freegames/crypto.py
@@ -11,68 +11,47 @@
 Adapted from code in https://inventwithpython.com/chapter14.html
 """
 
+def shift_char(char, shift):
+    if char.isalpha():
+        is_upper = char.isupper()
+        base = ord('A') if is_upper else ord('a')
+        shifted_char = chr(((ord(char) - base + shift) % 26) + base)
+        return shifted_char
+    elif char.isdigit():
+        # Encrypt digits as well
+        return str((int(char) + shift) % 10)
+    else:
+        return char
 
 def encrypt(message, key):
     """Encrypt message with key."""
-    result = ''
-
-    # Iterate letters in message and encrypt each individually.
-
-    for letter in message:
-        if letter.isalpha():
-
-            # Letters are numbered like so:
-            # A, B, C - Z is 65, 66, 67 - 90
-            # a, b, c - z is 97, 98, 99 - 122
-
-            num = ord(letter)
-
-            if letter.isupper():
-                base = ord('A')
-            else:
-                assert letter.islower()
-                base = ord('a')
-
-            # The encryption equation:
-
-            num = (num - base + key) % 26 + base
-
-            result += chr(num)
-
-        elif letter.isdigit():
-
-            # TODO: Encrypt digits.
-            result += letter
-
-        else:
-            result += letter
-
+    result = ''.join([shift_char(char, key) for char in message])
     return result
 
-
 def decrypt(message, key):
     """Decrypt message with key."""
     return encrypt(message, -key)
 
-
 def decode(message):
     """Decode message without key."""
-    pass  # TODO
-
+    for key in range(26):
+        decrypted_message = decrypt(message, key)
+        print(f"Key {key}: {decrypted_message}")
 
 def get_key():
     """Get key from user."""
-    try:
-        text = input('Enter a key (1 - 25): ')
-        key = int(text)
-        return key
-    except:
-        print('Invalid key. Using key: 0.')
-        return 0
-
+    while True:
+        try:
+            key = int(input('Enter a key (1 - 25): '))
+            if 1 <= key <= 25:
+                return key
+            else:
+                print('Invalid key. Key must be between 1 and 25.')
+        except ValueError:
+            print('Invalid input. Please enter a valid integer.')
 
 print('Do you wish to encrypt, decrypt, or decode a message?')
-choice = input()
+choice = input().lower()
 
 if choice == 'encrypt':
     phrase = input('Message: ')
@@ -88,3 +67,4 @@ def get_key():
     decode(phrase)
 else:
     print('Error: Unrecognized Command')
+