Move licencse header around

Author: tsterbak

openandroidinstaller/tool_utils.py

@@ -260,6 +260,10 @@ def heimdall_flash_recovery(bin_path: Path, recovery: str) -> bool:
 def search_device(platform: str, bin_path: Path) -> Optional[str]:
     """Search for a connected device."""
     logger.info(f"Search devices on {platform} with {bin_path}...")
+    # map some detected device codes to their real code.
+    device_code_mapping = {
+        "C6603": "yuga",
+    }
     try:
         # read device properties
         if platform in ("linux", "darwin"):
@@ -291,7 +295,7 @@ def search_device(platform: str, bin_path: Path) -> Optional[str]:
             raise Exception(f"Unknown platform {platform}.")
         device_code = output.split("[")[-1].strip()[:-1].strip()
         logger.info(device_code)
-        return device_code
+        return device_code_mapping.get(device_code, device_code)
     except CalledProcessError:
         logger.error("Failed to detect a device.")
         return None

openandroidinstaller/views.py

@@ -402,10 +402,6 @@ def close_developer_options_dlg(self, e):
 
     def search_devices(self, e):
         """Search the device when the button is clicked."""
-        # map some detected device codes to their real code.
-        device_code_mapping = {
-            "C6603": "yuga",
-        }
         # search the device
         if self.state.test:
             # this only happens for testing
@@ -418,7 +414,6 @@ def search_devices(self, e):
                 platform=self.state.platform, bin_path=self.state.bin_path
             )
             if device_code:
-                device_code = device_code_mapping.get(device_code, device_code)
                 self.device_name.value = device_code
                 self.device_name.color = colors.BLACK
             else:

tests/conftest.py

@@ -1,3 +1,16 @@
+# This file is part of OpenAndroidInstaller.
+# OpenAndroidInstaller is free software: you can redistribute it and/or modify it under the terms of
+# the GNU General Public License as published by the Free Software Foundation,
+# either version 3 of the License, or (at your option) any later version.
+
+# OpenAndroidInstaller is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License along with OpenAndroidInstaller.
+# If not, see <https://www.gnu.org/licenses/>."""
+# Author: Tobias Sterbak
+
 import pytest
 from pathlib import Path
 

tests/test_configs.py

@@ -1,5 +1,18 @@
 """Test existing config files for schema."""
 
+# This file is part of OpenAndroidInstaller.
+# OpenAndroidInstaller is free software: you can redistribute it and/or modify it under the terms of
+# the GNU General Public License as published by the Free Software Foundation,
+# either version 3 of the License, or (at your option) any later version.
+
+# OpenAndroidInstaller is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License along with OpenAndroidInstaller.
+# If not, see <https://www.gnu.org/licenses/>."""
+# Author: Tobias Sterbak
+
 from pathlib import Path
 
 import pytest