From 56f7e9f1526687aba95a748ff2f177818602c1c8 Mon Sep 17 00:00:00 2001
From: Denys Savchenko <56398430+dsavchenko@users.noreply.github.com>
Date: Tue, 10 Oct 2023 21:28:39 +0200
Subject: [PATCH] Drop python2. PIL everywhere. Bootstrap serve local (#1)

* all local

* local ref

* typo

* proper local

* remove static
---
 .gitignore            |  3 ++-
 screen.py             | 12 ++----------
 screenshare.py        |  2 ++
 templates/screen.html |  3 +++
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7fa2790..94a7128 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 __pycache__/
-*.pem
\ No newline at end of file
+*.pem
+.venv
\ No newline at end of file
diff --git a/screen.py b/screen.py
index 65a3fa5..3d489d1 100755
--- a/screen.py
+++ b/screen.py
@@ -23,12 +23,7 @@ if ver==2:
 elif ver==3:
     import io
 
-if sys.platform in ["win32", "darwin"]:
-    from PIL import ImageGrab as ig
-else:
-    import pyscreenshot as ig
-    bkend = "pygdk3"
-
+from PIL import ImageGrab as ig
 
 class Screen():
     def __init__(self):
@@ -46,10 +41,7 @@ class Screen():
 
     def getframes(self):
         while True:
-            if sys.platform in ["win32", "darwin"]:
-                im = ig.grab()
-            else:
-                im = ig.grab(childprocess=False,backend=bkend)
+            im = ig.grab()
             self.screenfile.seek(0)
             self.screenfile.truncate(0)
             im_converted = im.convert("RGB")
diff --git a/screenshare.py b/screenshare.py
index a12e7e9..bc0c702 100755
--- a/screenshare.py
+++ b/screenshare.py
@@ -26,8 +26,10 @@ secret_key = u'f71b10b68b1bc00019cfc50d6ee817e75d5441bd5db0bd83453b398225cede69'
 
 app = Flask(__name__)
 app.secret_key = secret_key
+app.config['BOOTSTRAP_SERVE_LOCAL'] = True
 Bootstrap(app)
 
+
 ###### general ##########################################
 @app.route('/')
 def welcome():
diff --git a/templates/screen.html b/templates/screen.html
index 3f32c9b..d1d2095 100755
--- a/templates/screen.html
+++ b/templates/screen.html
@@ -32,13 +32,16 @@ along with Screenshare. If not, see <https://www.gnu.org/licenses/>.
 <link rel="stylesheet" href="{{url_for('static', filename='css/jquery-confirm.min.css')}}"/>
 
 <link rel="stylesheet" href="{{url_for('static', filename='css/common.css')}}?ver=2"/>
+
 {% endblock %}
 
 {% block scripts %}
 {{super()}}
+
 <script src="{{url_for('static', filename='js/jquery-confirm.min.js')}}"></script>
 
 <script src="{{url_for('static', filename='js/screen.js')}}?ver=3"></script>
+
 {% endblock %}
 
 {% block body_attribs %}