enigmapython 1.2.2__tar.gz → 1.3.0__tar.gz

{enigmapython-1.2.2 → enigmapython-1.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: enigmapython
-Version: 1.2.2
+Version: 1.3.0
 Summary: A simple yet faithful library to emulate different Enigma machines models using Python
 Home-page: https://github.com/denismaggior8/enigma-python
 Author: Denis Maggiorotto
@@ -190,4 +190,6 @@ In the case you leveraged **enigmapython** API in a project, either public or no
 
     for having helped me testing the correctness of the generated ciphertexts 
 
+## Support
 
+Found it useful/funny/educational? Please consider to [![Buy Me a Coffee](https://img.shields.io/badge/buy_me_a_coffee-FFDD00?style=for-the-badge&logo=buy-me-a-coffee&logoColor=black)](https://www.buymeacoffee.com/denismaggior8)

{enigmapython-1.2.2 → enigmapython-1.3.0}/enigmapython/Enigma.py

@@ -107,7 +107,7 @@ class Enigma(Observer,Journaled,Clonable):
             # Engaging the enigma double step issue, only if the next rotor position is in its notch indexe/s
             if self.rotors[self.rotors.index(observable)+1].position in self.rotors[self.rotors.index(observable)+1].notch_indexes:
                 self.rotors[self.rotors.index(observable)+1].double_step_triggered = True
-        # If the rotor is the last one in the list, but the machine has a rotating reflector, increment it position by 1
+        # If the rotor is the last one in the list, but the machine has a rotating reflector, increment its position by 1
         if observable in self.rotors and self.rotors.index(observable) == len(self.rotors)-1 and isinstance(self.reflector, RotatingReflector):
             self.reflector.increment_position()
             logging.debug("Reflector has been incremented by 1 position")

{enigmapython-1.2.2 → enigmapython-1.3.0}/enigmapython/Etw.py

@@ -16,4 +16,7 @@ class Etw(Scrambler):
         self.alphabet_list = list(alphabet)
 
     def __str__(self):
-        return self.wiring
+        str = Scrambler.__str__(self)
+        str += "\n"
+        str += self.wiring
+        return str

{enigmapython-1.2.2 → enigmapython-1.3.0}/enigmapython/Plugboard.py

@@ -17,4 +17,7 @@ class Plugboard(Scrambler):
 
 
     def __str__(self):
-        return self.wiring
+        str = Scrambler.__str__(self)
+        str += "\n"
+        str += self.wiring
+        return str

enigmapython-1.3.0/enigmapython/Reflector.py

@@ -0,0 +1,10 @@
+from .Scrambler import Scrambler
+
+class Reflector(Scrambler):
+    tag = None
+
+    def __str__(self):
+        str = Scrambler.__str__(self)
+        str += "\n"
+        str += self.wiring
+        return str

{enigmapython-1.2.2 → enigmapython-1.3.0}/enigmapython/Rotor.py

@@ -40,8 +40,13 @@ class Rotor(Scrambler,Observable):
 
 
     def __str__(self):
-        pointer = ' ' * self.position + '^'
-        return self.wiring + '\n' + pointer 
+        str = Scrambler.__str__(self)
+        str += "\n"
+        # Slice the wiring, in order to left-rotate it according to the position
+        n = self.position % len(self.wiring)
+        str += self.wiring[n:] + self.wiring[:n]
+        return str
+        
     
     def __eq__(self, __value: object) -> bool:
         return id(self) == id(object)

{enigmapython-1.2.2 → enigmapython-1.3.0}/enigmapython/Scrambler.py

@@ -60,4 +60,9 @@ class Scrambler(Journaled):
                 return alphabet_list[(i + shift) % len(alphabet_list)]
             
     def __str__(self):
-        return self.wiring
+        str = ""
+        for char in self.alphabet_list:
+            str += char
+        str += "\n"
+        str += "|" * len(self.alphabet_list)
+        return str

{enigmapython-1.2.2 → enigmapython-1.3.0}/enigmapython/XRay.py

@@ -1,6 +1,7 @@
 from rich.console import Console
 from rich.text import Text
-from enigmapython.RotatingReflector import RotatingReflector    
+
+from enigmapython.RotatingReflector import RotatingReflector
 
 class XRay():
     @staticmethod
@@ -21,9 +22,13 @@ class XRay():
 
         rotor_walls_top = "     ".join(["+-----+"] * rotor_count)
 
-        rotors_positions = "          ".join(["{:02}".format(enigma.rotors[i].position) for i in range(rotor_count - 1, -1, -1)])
+        rotors_positions = "      ".join(["{} ({:02})".format(enigma.alphabet_list[enigma.rotors[i].position].upper(),enigma.rotors[i].position) for i in range(rotor_count - 1, -1, -1)])
+
+        rotors_rings = "      ".join(["{} ({:02})".format(enigma.alphabet_list[enigma.rotors[i].ring].upper(),enigma.rotors[i].ring) for i in range(rotor_count - 1, -1, -1)])
+
+        reflector_ring = ""
 
-        rotors_rings = "          ".join(["{:02}".format(enigma.rotors[i].ring) for i in range(rotor_count - 1, -1, -1)])
+        rotor_walls_position = "     ".join(["|  {}  |".format(enigma.alphabet_list[enigma.rotors[i].position].upper()) for i in range(rotor_count - 1, -1, -1)])
 
         rotor_walls = "     ".join(["|     |"] * rotor_count)
 
@@ -42,17 +47,17 @@ class XRay():
                              {rotor_numbers}      
               +-----+     {rotor_walls_top}     +-----+     +-----+
               |     |     {rotor_walls}     |     |     |     |
-              |  +--|--<--{rotor_wiring_top}|-----|--<--|-----|----< {enigma.journal[-1]['input_char'] if len(enigma.journal) >= 1 else ' '} <-- Key
+              |  +--|--<--{rotor_wiring_top}|-----|--<--|-----|----< {enigma.journal[-1]['input_char'] if len(enigma.journal) >= 1 else ' '} <-- Key ⌨️
               |  |  {rotor_walls_forward}     |  {enigma.etw.journal[-2]['output_char'] if len(enigma.etw.journal) >= 2 else ' '}  |     |  {enigma.plugboard.journal[-2]['output_char'] if len(enigma.plugboard.journal) >= 2 else ' '}  |     |
               |  |  |     {rotor_walls}     |     |     |     |
               |  |  |     {rotor_walls}     |     |     |     |
               |  |  |  {enigma.reflector.journal[-1]['output_char'] if len(enigma.reflector.journal) >= 1 else ' '}  |     {rotor_walls_backward}     |  {enigma.etw.journal[-1]['output_char'] if len(enigma.etw.journal) >= 2 else ' '}  |     |     
-              |  +--|-->--{rotor_wiring_bottom}|-----|-->--|-----|----> {enigma.journal[-1]['output_char'] if len(enigma.journal) >= 1 else ' '} --> Lamp
+              |  +--|-->--{rotor_wiring_bottom}|-----|-->--|-----|----> {enigma.journal[-1]['output_char'] if len(enigma.journal) >= 1 else ' '} --> Lamp 💡
               |     |     {rotor_walls}     |     |     |     |
               +-----+     {rotor_walls_bottom}     +-----+     +-----+
 
-        Pos.:    {"{:02}".format(enigma.reflector.position) if isinstance(enigma.reflector, RotatingReflector) else '  '}          {rotors_positions}    
-        Ring:                {rotors_rings}
+    Pos.:      {"{} ({:02})".format(enigma.alphabet_list[enigma.reflector.position].upper(),enigma.reflector.position) if isinstance(enigma.reflector, RotatingReflector) else ' N/A  '}      {rotors_positions}    
+    Ring:      {"{} ({:02})".format(enigma.alphabet_list[enigma.reflector.ring].upper(),enigma.reflector.ring)}      {rotors_rings}
         """
         console.print(Text(diagram, style="bold"))
         return Text(diagram, style="bold")

enigmapython-1.3.0/enigmapython/__init__.py

@@ -0,0 +1 @@
+# Placeholder empty file to make this directory a Python package

{enigmapython-1.2.2 → enigmapython-1.3.0}/enigmapython.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: enigmapython
-Version: 1.2.2
+Version: 1.3.0
 Summary: A simple yet faithful library to emulate different Enigma machines models using Python
 Home-page: https://github.com/denismaggior8/enigma-python
 Author: Denis Maggiorotto
@@ -190,4 +190,6 @@ In the case you leveraged **enigmapython** API in a project, either public or no
 
     for having helped me testing the correctness of the generated ciphertexts 
 
+## Support
 
+Found it useful/funny/educational? Please consider to [![Buy Me a Coffee](https://img.shields.io/badge/buy_me_a_coffee-FFDD00?style=for-the-badge&logo=buy-me-a-coffee&logoColor=black)](https://www.buymeacoffee.com/denismaggior8)

{enigmapython-1.2.2 → enigmapython-1.3.0}/setup.py

@@ -12,7 +12,7 @@ setup(
     long_description_content_type='text/markdown',
     url="https://github.com/denismaggior8/enigma-python",
     name="enigmapython",
-    version="1.2.2",
+    version="1.3.0",
     packages=find_packages(
         # All keyword arguments below are optional:
         where='.',  # '.' by default

enigmapython-1.2.2/enigmapython/Reflector.py

@@ -1,4 +0,0 @@
-from .Scrambler import Scrambler
-
-class Reflector(Scrambler):
-    tag = None