0x2620/openmedialibrary
1
0
Fork 0
Code Issues 131 Pull requests Releases Wiki Activity

Compare commits

base: 0x2620:7fbc0f7a7686a446b62e358e1495f869e0ec62e2
Branches Tags
0x2620:master
..
compare: 0x2620:63b7f0882516c86dbbe2bfe0eb48d472fd70970f
Branches Tags
0x2620:master

No commits in common. "7fbc0f7a7686a446b62e358e1495f869e0ec62e2" and "63b7f0882516c86dbbe2bfe0eb48d472fd70970f" have entirely different histories.
7fbc0f7a76 ... 63b7f08825

4 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ctl
View file

@ -58,7 +58,7 @@ else
fi fi
if [ $SYSTEM == "Darwin" ]; then if [ $SYSTEM == "Darwin" ]; then
PLATFORM="darwin64" PLATFORM="darwin64"
PLATFORM_PYTHON=3.7 PLATFORM_PYTHON=3.5
fi fi
export PLATFORM_ENV="$BASE/platform_${PLATFORM}" export PLATFORM_ENV="$BASE/platform_${PLATFORM}"
fi fi

4
oml/library.py
View file

@ -217,7 +217,7 @@ class Peer(object):
getpreview = [] getpreview = []
t0 = time.time() t0 = time.time()
if remove: if remove:
logger.debug('remove %s items from %s', len(remove), self.id) logger.debug('remove %s items', len(remove))
q = item.models.user_items.delete().where(c_user_id.is_(self.id)).where(c_item_id.in_(remove)) q = item.models.user_items.delete().where(c_user_id.is_(self.id)).where(c_item_id.in_(remove))
state.db.session.execute(q) state.db.session.execute(q)
q = user.models.list_items.delete().where(l_list_id.in_(lists)).where(l_item_id.in_(remove)) 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']) listitems[row['list_id']].add(row['item_id'])
t0 = maybe_commit(t0) t0 = maybe_commit(t0)
if add: if add:
logger.debug('add %s items from %s', len(add), self.id) logger.debug('add %s items', len(add))
t0 = time.time() t0 = time.time()
q = item.models.user_items.select().where(c_user_id.is_(self.id)) 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)} useritems = {r['item_id'] for r in state.db.session.execute(q)}

2
oml/localnodes.py
View file

@ -155,4 +155,4 @@ class LocalNodes(dict):
def get(self, user_id): def get(self, user_id):
if user_id in self and can_connect(self[user_id]): if user_id in self and can_connect(self[user_id]):
return self.get(user_id) return self[user_id]

6
oml/utils.py
View file

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