From c27ddd41709574c3232d0fa18d2bc8ef7bdff6c7 Mon Sep 17 00:00:00 2001
From: j <j@mailb.org>
Date: Tue, 25 Dec 2018 18:24:23 +0100
Subject: [PATCH 1/4] log peer id

---
 oml/library.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/oml/library.py b/oml/library.py
index 3fdf8dc..5590944 100644
--- a/oml/library.py
+++ b/oml/library.py
@@ -217,7 +217,7 @@ class Peer(object):
         getpreview = []
         t0 = time.time()
         if remove:
-            logger.debug('remove %s items', len(remove))
+            logger.debug('remove %s items from %s', len(remove), self.id)
             q = item.models.user_items.delete().where(c_user_id.is_(self.id)).where(c_item_id.in_(remove))
             state.db.session.execute(q)
             q = user.models.list_items.delete().where(l_list_id.in_(lists)).where(l_item_id.in_(remove))
@@ -231,7 +231,7 @@ class Peer(object):
             listitems[row['list_id']].add(row['item_id'])
         t0 = maybe_commit(t0)
         if add:
-            logger.debug('add %s items', len(add))
+            logger.debug('add %s items from %s', len(add), self.id)
             t0 = time.time()
             q = item.models.user_items.select().where(c_user_id.is_(self.id))
             useritems = {r['item_id'] for r in state.db.session.execute(q)}

From fd6bba5004f6acb79e681974eac27f9c281d66e0 Mon Sep 17 00:00:00 2001
From: j <j@mailb.org>
Date: Tue, 1 Jan 2019 00:19:55 +0100
Subject: [PATCH 2/4] load truncated images

---
 oml/utils.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/oml/utils.py b/oml/utils.py
index 50e2e9e..99433ba 100644
--- a/oml/utils.py
+++ b/oml/utils.py
@@ -4,7 +4,7 @@
 
 from datetime import datetime
 from io import StringIO, BytesIO
-from PIL import Image
+from PIL import Image, ImageFile
 import base64
 import hashlib
 import json
@@ -34,6 +34,7 @@ import logging
 logging.getLogger('PIL').setLevel(logging.ERROR)
 logger = logging.getLogger(__name__)
 
+ImageFile.LOAD_TRUNCATED_IMAGES = True
 ENCODING = 'base64'
 
 def valid_olid(id):
@@ -69,7 +70,8 @@ def resize_image(data, width=None, size=None):
         data = StringIO(data)
     source = Image.open(data)
     #if source.mode not in ('1', 'CMYK', 'L', 'RGB', 'RGBA', 'RGBX', 'YCbCr'):
-    source = source.convert('RGB')
+    if source.mode != 'RGB':
+        source = source.convert('RGB')
     source_width = source.size[0]
     source_height = source.size[1]
     if size:

From a73b93b6ec59209ebda7a86856406fdf460c3af2 Mon Sep 17 00:00:00 2001
From: j <j@mailb.org>
Date: Tue, 1 Jan 2019 00:20:25 +0100
Subject: [PATCH 3/4] client might have disconnected just now

---
 oml/localnodes.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/oml/localnodes.py b/oml/localnodes.py
index ae9cbb0..f1a890f 100644
--- a/oml/localnodes.py
+++ b/oml/localnodes.py
@@ -155,4 +155,4 @@ class LocalNodes(dict):
 
     def get(self, user_id):
         if user_id in self and can_connect(self[user_id]):
-            return self[user_id]
+            return self.get(user_id)

From 7fbc0f7a7686a446b62e358e1495f869e0ec62e2 Mon Sep 17 00:00:00 2001
From: j <j@mailb.org>
Date: Tue, 1 Jan 2019 00:26:03 +0100
Subject: [PATCH 4/4] osx is 3.7 now

---
 ctl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ctl b/ctl
index 3cd0f6c..fd00a02 100755
--- a/ctl
+++ b/ctl
@@ -58,7 +58,7 @@ else
     fi
     if [ $SYSTEM == "Darwin" ]; then
         PLATFORM="darwin64"
-        PLATFORM_PYTHON=3.5
+        PLATFORM_PYTHON=3.7
     fi
     export PLATFORM_ENV="$BASE/platform_${PLATFORM}"
 fi