Added '?' command to check the current Pokemon as terminal background for iTerm

pokemonterminal/adapter/base.py

@@ -15,6 +15,13 @@ def set_image_file_path(self, image_file_path):
         """
         raise NotImplementedError()
 
+    def get_image_file_number(self):
+        """
+        Get the number of the background image of the terminal.
+        :rtype str
+        """
+        raise NotImplementedError()
+
     def clear(self):
         """
         Clear the terminal's background image.

pokemonterminal/adapter/implementations/ITerm.py

@@ -11,6 +11,12 @@
 \tend tell
 end tell"""
 
+osa_script_get = """tell application "iTerm"
+\ttell current session of current window
+\t\treturn background image as text
+\tend tell
+end tell"""
+
 
 class ITerm(TerminalAdapterInterface):
     @staticmethod
@@ -20,13 +26,24 @@ def is_available():
     def __run_osascript(self, stream):
         p = subprocess.Popen(['osascript'], stdout=subprocess.PIPE, stdin=subprocess.PIPE)
         p.stdin.write(stream)
-        p.communicate()
+        path = p.communicate()
         p.stdin.close()
+        return path
 
     def set_image_file_path(self, image_file_path):
         stdin = osa_script_fmt.format(image_file_path)
         self.__run_osascript(str.encode(stdin))
 
+    def get_image_file_number(self):
+        stdin = osa_script_get.format()
+        path_tuple = self.__run_osascript(str.encode(stdin))
+        path_element = str(path_tuple[0])
+        # The easiest check to see if we have a Pokemon as a background is checking for the presence of '/'
+        if '/' in path_element:
+            return path_element.split('/')[-1].split('.')[0]
+        else:
+            return 0
+
     def clear(self):
         stdin = osa_script_fmt.format("")
         self.__run_osascript(str.encode(stdin))

pokemonterminal/adapter/implementations/NullAdapter.py

@@ -11,5 +11,8 @@ def is_available():
     def set_image_file_path(self, image_file_path):
         print(self.err)
 
+    def get_image_file_number(self):
+        print(self.err)
+
     def clear(self):
         print(self.err)

pokemonterminal/adapter/implementations/Terminology.py

@@ -11,5 +11,9 @@ def is_available():
     def set_image_file_path(self, image_file_path):
         os.system('tybg "{}"'.format(image_file_path))
 
+    def get_image_file_number(self):
+        # TODO: Check the way to get the background image path in Terminology
+        print(self.err)
+
     def clear(self):
         os.system("tybg")

pokemonterminal/adapter/implementations/Tilix.py

@@ -17,6 +17,10 @@ def set_image_file_path(self, image_file_path):
                                  self.setting_field,
                                  image_file_path))
 
+    def get_image_file_number(self):
+        # TODO: Check the way to get the background image path in Tilinx
+        return 0
+
     def clear(self):
         command = 'gsettings set {} {}'
         os.system(command.format(self.setting_key,

pokemonterminal/main.py

@@ -131,6 +131,23 @@ def change_terminal_background(db, arg):  # arg is a pokemon_name
                 print_columns(suggestions[1:])
 
 
+def get_terminal_background_name(db):
+    """Gets the number of the Pokemon currently set as the terminal background"""
+    pokemon_number = scripter.get_terminal_background_number()
+    if isinstance(pokemon_number, (int, str)):
+        if isinstance(pokemon_number, int) or pokemon_number.isdigit():
+            if pokemon_number != 0:
+                print(db.get_pokemon(pokemon_number).get_name().capitalize())
+            else:
+                print("None")
+        elif isinstance(pokemon_number, str):
+            print(pokemon_number.replace('-', ' ').capitalize())
+        else:
+            print("None")
+    else:
+        print("Not yet implemented")
+
+
 def change_wallpaper(db, arg):  # arg is a pokemon_name
     """Change the wallpaper to the specified Pokemon, if it exists."""
     if arg in db:
@@ -283,8 +300,10 @@ def single_argument_handler(arg, escape_code):
         slideshow(db, 494, 650, rand=arg.startswith("rnd"))
     elif arg.endswith("slideshow-kalos"):
         slideshow(db, 650, 720, rand=arg.startswith("rnd"))
+    elif arg == "current":
+        get_terminal_background_name(db)
     elif arg == "?":
-        print("This function is deprecated.")
+        get_terminal_background_name(db)
     elif escape_code:
         change_wallpaper(db, arg)
     else:

pokemonterminal/scripter.py

@@ -47,6 +47,13 @@ def change_terminal(image_file_path):
     adapter.set_image_file_path(image_file_path)
 
 
+def get_terminal_background_number():
+    adapter = identify()
+    if adapter is None:
+        print("Terminal not supported")
+    return adapter.get_image_file_number()
+
+
 def change_wallpaper(image_file_path):
     if not isinstance(image_file_path, str):
         print("A image path must be passed to the change wallpapper function.")

tests/test_main.py

@@ -101,7 +101,13 @@ def test_all(capsys):
 def test_question_mark(capsys):
     main([__file__, '?'])
     out, err = capsys.readouterr()
-    assert 'deprecated' in out
+    assert isinstance(out, str)
+
+
+def test_current(capsys):
+    main([__file__, 'current'])
+    out, err = capsys.readouterr()
+    assert isinstance(out, str)
 
 
 if __name__ == '__main__':

tests/test_scripter.py

@@ -26,6 +26,7 @@ def test_adapter_methods():
         assert callable(terminal.clear)
         assert callable(terminal.is_available)
         assert callable(terminal.set_image_file_path)
+        assert callable(terminal.get_image_file_number)
 
 
 if __name__ == '__main__':