Switch ascii media player to custom treminal graphics

Add option to draw media with box characters
Reduce RAM usage in full version
Optimize media player
Fix failing slow uploads
Fix crash when loading dms
Fix crash when canceling upload
Set user ownership to profiles.json
Add new screenshot
Prevent sending message while attachments are still uploading
Cleanup mess with paths
Remove record audio message binding

Author: sparklost

.github/screenshots.md

@@ -24,6 +24,9 @@
 <b>Viewing user profile:<b><br>
 <img src="./screenshots/05.png" alt="Viewing user profile" width="800">
 <br><br>
-<b>Video in built-in ASCII art media player:<b><br>
+<b>Video in built-in media player using "block" characters:<b><br>
 <img src="./screenshots/06.png" alt="Media with ASCII art" width="800">
+<br><br>
+<b>Video in built-in media player using ASCII art:<b><br>
+<img src="./screenshots/07.png" alt="Media with ASCII art" width="800">
 </div>

.github/screenshots/06.png

@@ -157,6 +157,7 @@ Scroll back to bottom - `Ctrl+H`
 Expand selected categories and servers - `Ctrl+Space` *  
 Enter selected channel - `Ctrl+Space`  
 Reply to selected message - `Ctrl+R`  
+Add reaction to selected message - `Alt+R`  
 Edit selected message - `Ctrl+E`  
 Delete selected message - `Ctrl+D`  
 Toggle reply ping when replying - `Ctrl+P`  
@@ -583,6 +584,6 @@ Go to [TODO](todo.txt).
 
 ### Features that will not be added
 Following features have significant risk of triggering discords spam filter, and may cause account to be limited or even banned:  
-Sending friend request, opening new DM, creating new thread, scriptable command macros, anything payment related.  
+Sending friend request, opening new DM, creating new thread, anything payment related.  
 
 Therefore, they will NOT be implemented in endcord.  

.github/screenshots/07.png

@@ -268,11 +268,15 @@ Note: always put string in `""`. To use `"` inside the string escape it like thi
     Characters used to draw corners in bordered mode.
 - `username_role_colors = True`  
     Allow `%username` and `%global_name` to have color of primary role.
+- `media_use_blocks = False`  
+    Wether to use "block" characters (`▀`) for drawing media instead traditional characters from media_ascii_palette.  
+    This will result in clearer picture with pixel-like characters, vertical resolution will be doubled.  
+    media_ascii_palette and media_saturation have no effect when this is ON.  
 - `media_ascii_palette = "  ..',;:c*loexk#O0XNW"`  
     Characters used to draw in terminal. From darkest to brightest. Same character can be repeated. Number of characters is not fixed.
 - `media_saturation = 1.2`  
     Saturation correction applied to image in order to make colors more visible. Adjust if changing `ascii_palette` or media_color_bg.
-- `media_font_scale = 2.25`  
+- `media_font_aspect_ratio = 2.25`  
     Font height/width ratio. Change only if picture dimensions ratio is wrong in terminal.
 
 ### Colors and attributes

README.md

@@ -151,9 +151,10 @@
     "color_chat_url": [153, -1, "u"],
     "color_chat_spoiler": [245, -1],
     "color_chat_code": [250, 233],
+    "media_use_blocks": True,
     "media_ascii_palette": "  ..',;:c*loexk#O0XNW",
     "media_saturation": 1.2,
-    "media_font_scale": 2.25,
+    "media_font_aspect_ratio": 2.25,
     "media_color_bg": 16,
     "media_bar_ch": "━",
 }
@@ -199,9 +200,8 @@
     "show_summaries": "ALT+115",   # Alt+S
     "copy_message_link": "ALT+117",   # Alt+U
     "go_channel": "ALT+103",   # Alt+G
-    "add_reaction": 12,   # Ctrl+L
+    "add_reaction": "ALT+114",   # Alt+R
     "search_gif": "ALT+102",   # Alt+F
-    "record_audio": "ALT+114",   # Alt+R
     "show_reactions": "ALT+119",   # Alt+W
     "show_pinned": "ALT+110",   # Alt+N
     # extra line

configuration.md

@@ -149,7 +149,7 @@ def get_file_id(self, url):
         return None
 
 
-    def get_connection(self, host, port):
+    def get_connection(self, host, port, timeout=10):
         """Get connection object and handle proxying"""
         if self.proxy.scheme:
             if self.proxy.scheme.lower() == "http":
@@ -164,12 +164,12 @@ def get_connection(self, host, port):
                 ssl_context.minimum_version = ssl.TLSVersion.TLSv1_2
                 proxy_sock = ssl_context.wrap_socket(proxy_sock, server_hostname=host)
                 # proxy_sock.do_handshake()   # seems like its not needed
-                connection = http.client.HTTPSConnection(host, port, timeout=10)
+                connection = http.client.HTTPSConnection(host, port, timeout=timeout + 5)
                 connection.sock = proxy_sock
             else:
                 connection = http.client.HTTPSConnection(host, port)
         else:
-            connection = http.client.HTTPSConnection(host, port, timeout=5)
+            connection = http.client.HTTPSConnection(host, port, timeout=timeout)
         return connection
 
 
@@ -1646,13 +1646,16 @@ def upload_attachment(self, upload_url, path):
         upload_url_path = f"{url.path}?{url.query}"
         with open(path, "rb") as f:
             try:
-                connection = self.get_connection(url.netloc, 443)
+                connection = self.get_connection(url.netloc, 443, timeout=120)
                 self.uploading.append((upload_url, connection))
                 connection.request("PUT", upload_url_path, f, header)
                 response = connection.getresponse()
-                self.uploading.remove((upload_url, connection))
+                if (upload_url, connection) in self.uploading:
+                    self.uploading.remove((upload_url, connection))
             except (socket.gaierror, TimeoutError):
                 connection.close()
+                return False
+            except OSError:   # canceled upload
                 return None
             if response.status == 200:
                 connection.close()
@@ -1674,7 +1677,7 @@ def cancel_uploading(self, url=None):
             for upload in self.uploading:
                 upload_url, connection = upload
                 try:
-                    connection.sock.shutdown()
+                    connection.sock.shutdown(socket.SHUT_RDWR)
                     connection.sock.close()
                 except Exception:
                     logger.debug("Cancel upload: upload socket already closed.")

endcord/app.py

@@ -37,7 +37,7 @@ def __init__(self, proxy=None):
     def download(self, url, file_id=None):
         """Thread that downloads file and stores it in temp folder"""
         if not os.path.exists(os.path.expanduser(peripherals.temp_path)):
-            os.makedirs(os.path.expanduser(os.path.dirname(os.path.expanduser(peripherals.temp_path))), exist_ok=True)
+            os.makedirs(os.path.dirname(os.path.expanduser(peripherals.temp_path)), exist_ok=True)
         url_object = urllib.parse.urlsplit(url)
         filename = os.path.basename(url_object.path)
         proxy = urllib.parse.urlsplit(self.proxy)

endcord/defaults.py

@@ -219,7 +219,7 @@ def get_user_processes_diff_darwin():
 
 def find_detectable_apps_file(directory):
     """Find detectable_apps_[etag].ndjson path and extract etag"""
-    pattern = os.path.join(directory, "detectable_apps_*.ndjson")
+    pattern = os.path.expanduser(os.path.join(directory, "detectable_apps_*.ndjson"))
     matches = glob.glob(pattern)
     if not matches:
         return None, None
@@ -296,7 +296,7 @@ def main(self):
             return
 
         # download new detectable apps list if resource changed on the server
-        old_path, old_etag = find_detectable_apps_file(os.path.expanduser(peripherals.config_path))
+        old_path, old_etag = find_detectable_apps_file(peripherals.config_path)
         path, etag = self.discord.get_detectable_apps(peripherals.config_path, old_etag)
         if not path:
             logger.info("Could not start game detection service: failed to download detectable applications list")