3.2 (#58)

* Remove unwanted fonts, add network support init
* Add object type Network Manager
* Add network manager window
* Connect slots and signals, working Network Manager
* Add network files
* Add open source fonts OFL
* Add wifi and settings icon
* Updates settings panel
* Update the list settings manager
* More changes to settings API
* Update setup.py
* Code hierarchy
* Final fix for networking and settings, connect slots etc
* Fix connect signals
* Update version

Author: srevinsaju

guiscrcpy/install/__init__.py

@@ -55,8 +55,6 @@
 from guiscrcpy.lib.check import scrcpy
 from guiscrcpy.theme.style import darkstylesheet
 from guiscrcpy.ui.main import Ui_MainWindow
-from guiscrcpy.ui.toolkit import Ui_ToolbarPanel
-from guiscrcpy.ui.panel import Ui_HorizontalPanel
 from guiscrcpy.lib.toolkit import UXMapper
 from guiscrcpy.ux.panel import Panel
 from guiscrcpy.ux.swipe import SwipeUX
@@ -148,6 +146,7 @@ def __init__(self, Ui_MainWindow):
         Ui_MainWindow.__init__()
         self.setupUi(Ui_MainWindow)
         super(InterfaceGuiscrcpy, self).__init__()
+        self.cmx = None
         logging.debug(
             "Options received by class are : {} {} {} {} {} ".format(
                 config['bitrate'],
@@ -206,7 +205,6 @@ def __init__(self, Ui_MainWindow):
         self.swipe_instance = SwipeUX()  # Load swipe UI
         self.panel_instance = Panel()
         self.side_instance = InterfaceToolkit()
-
         self.quit.clicked.connect(self.quitAct)
         self.dimensionText.setText("DEFAULT")
         config['bitrate'] = int(self.dial.value())
@@ -217,6 +215,20 @@ def __init__(self, Ui_MainWindow):
         self.abtgit.clicked.connect(self.opengit)
         self.usbaud.clicked.connect(self.usbaudi)
         self.mapnow.clicked.connect(self.mapp)
+        self.network_button.clicked.connect(self.network_mgr)
+        self.settings_button.clicked.connect(self.settings_mgr)
+
+    def settings_mgr(self):
+        from guiscrcpy.ux.settings import InterfaceSettings
+        self.sm = InterfaceSettings(self)
+        self.sm.init()
+        self.sm.show()
+
+    def network_mgr(self):
+        from guiscrcpy.ux.network import InterfaceNetwork
+        self.nm = InterfaceNetwork(adb.path)
+        self.nm.init()
+        self.nm.show()
 
     def mapp(self):
         if (os.path.exists(
@@ -419,9 +431,11 @@ def start_act(self):
         self.swipe_instance.init()  # show Swipe UI
         self.panel_instance.init()
         self.side_instance.init()
+        if self.cmx is not None:
+            config['cmx'] = ' '.join(map(str, self.cmx))
 
         # run scrcpy usng subprocess
-        args = "{} {}".format(self.options, config['extra'])
+        args = "{} {} {}".format(self.options, config['extra'], config['cmx'])
         scrcpy.start(scrcpy.path, args)
 
         timef = time.time()
@@ -430,6 +444,7 @@ def start_act(self):
         self.progressBar.setValue(100)
 
         # handle config files
+
         cfgmgr.update_config(config)
         cfgmgr.write_file()
 

guiscrcpy/install/installer.py

@@ -107,6 +107,16 @@ def shell(path, command):
         )
         return True
 
+    @staticmethod
+    def command(path, command):
+        shellx = Popen(
+            _("{} {}".format(path, command)),
+            stdout=PIPE,
+            stderr=PIPE,
+        )
+        return shellx
+
+
     @staticmethod
     def devices(increment=''):
         if increment is None:

guiscrcpy/launcher.py

@@ -40,7 +40,8 @@ def __init__(self, mode='w'):
             'bitrate': 8000,
             'fullscreen': False,
             'dispRO': False,
-            'extra': ""
+            'extra': "",
+            'cmx': []
         }
         self.jsonfile = 'guiscrcpy.json'
         self.check_file()

guiscrcpy/lib/check.py

@@ -18,7 +18,7 @@
 """
 
 
-__version__ = '3.0-raw'
+__version__ = '3.2-raw'
 import logging
 try:
     import git

guiscrcpy/lib/config.py

@@ -0,0 +1,91 @@
+
+import socket
+import multiprocessing
+import subprocess
+import os
+
+
+class NetworkManager:
+
+    def __init__(self):
+        pass
+
+    def pinger(self, job_q, results_q):
+        """
+        Do Ping
+        :param job_q:
+        :param results_q:
+        :return:
+        """
+        DEVNULL = open(os.devnull, 'w')
+        while True:
+
+            ip = job_q.get()
+
+            if ip is None:
+                break
+
+            try:
+                subprocess.check_call(['ping', '-c1', ip], stdout=DEVNULL)
+                results_q.put(ip)
+            except:
+                pass
+
+
+    def get_my_ip(self):
+        """
+        Find my IP address
+        :return:
+        """
+        s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+        s.connect(("8.8.8.8", 80))
+        ip = s.getsockname()[0]
+        s.close()
+        return ip
+
+
+    def map_network(self, pool_size=255):
+        """
+        Maps the network
+        :param pool_size: amount of parallel ping processes
+        :return: list of valid ip addresses
+        """
+
+        ip_list = list()
+
+        # get my IP and compose a base like 192.168.1.xxx
+        ip_parts = self.get_my_ip().split('.')
+        base_ip = ip_parts[0] + '.' + ip_parts[1] + '.' + ip_parts[2] + '.'
+
+        # prepare the jobs queue
+        jobs = multiprocessing.Queue()
+        results = multiprocessing.Queue()
+
+        pool = [multiprocessing.Process(target=self.pinger, args=(jobs, results)) for i in range(pool_size)]
+
+        for p in pool:
+            p.start()
+
+        # cue hte ping processes
+        for i in range(1, 255):
+            jobs.put(base_ip + '{0}'.format(i))
+
+        for p in pool:
+            jobs.put(None)
+
+        for p in pool:
+            p.join()
+
+        # collect he results
+        while not results.empty():
+            ip = results.get()
+            ip_list.append(ip)
+
+        return ip_list
+
+
+if __name__ == '__main__':
+    print('Mapping...')
+    nm = NetworkManager()
+    lst = nm.map_network()
+    print(lst)

guiscrcpy/lib/ver.py

@@ -0,0 +1,10 @@
+
+class SettingsManager:
+    def __init__(self):
+        pass
+
+    def check_updates(self):
+        pass
+
+    def install_src(self):
+        pass

guiscrcpy/network/network.py

@@ -0,0 +1,93 @@
+Copyright (c) 2009-2011 by Accademia di Belle Arti di Urbino and students of MA course of Visual design. Some rights reserved.
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.