diff --git a/README.md b/README.md index 2adc390..0bab8f2 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ Install on Mac OS X download this: - https://downloads.openmedialibrary.com/Open%20Media%20Library.dmg + http://downloads.openmedialibrary.com/Open%20Media%20Library.dmg Networking ---------- diff --git a/ctl b/ctl index 805595c..0099064 100755 --- a/ctl +++ b/ctl @@ -78,7 +78,6 @@ if [ $SYSTEM == "Darwin" ]; then fi PYTHONPATH="${PLATFORM_ENV}/lib/python${PLATFORM_PYTHON}/site-packages" -PYTHONPATH="${PYTHONPATH}:${SHARED_ENV}/lib/python${PLATFORM_PYTHON}/site-packages" PYTHONPATH="${PYTHONPATH}:${SHARED_ENV}/lib/python${SHARED_PYTHON}/site-packages" PYTHONPATH="${PYTHONPATH}:${BASE}/${NAME}" export PYTHONPATH diff --git a/install b/install index 056a11a..b476552 100755 --- a/install +++ b/install @@ -33,7 +33,7 @@ def get_platform(): class Install(Thread): - base_url = 'https://downloads.openmedialibrary.com/' + base_url = 'http://downloads.openmedialibrary.com/' status = {} failed = False diff --git a/oml/__main__.py b/oml/__main__.py index f888dd5..f7112f3 100644 --- a/oml/__main__.py +++ b/oml/__main__.py @@ -12,7 +12,6 @@ if sys.platform == 'win32': for site_packages in ( join(base, 'openmedialibrary'), join(base, 'platform', 'Shared', 'lib', 'python3.4', 'site-packages'), - join(base, 'platform', 'Shared', 'lib', 'python3.7', 'site-packages'), join(base, 'platform_win32', 'Lib', 'site-packages'), ): site.addsitedir(site_packages) diff --git a/oml/api.py b/oml/api.py index 3253645..f2f5448 100644 --- a/oml/api.py +++ b/oml/api.py @@ -2,11 +2,9 @@ # vi:si:et:sw=4:sts=4:ts=4 -from os.path import normpath, dirname, abspath, join +import subprocess import json import os -import subprocess -import sys import ox from oxtornado import actions @@ -18,14 +16,6 @@ import update import logging logger = logging.getLogger(__name__) -def win32_ui(type): - base = normpath(dirname(dirname(dirname(abspath(__file__))))) - cmd = [ - join(base, 'platform_win32', 'python.exe'), - join(base, 'openmediablirary', 'oml', 'ui.py'), type - ] - return cmd - def selectFolder(data): ''' returns { @@ -33,8 +23,6 @@ def selectFolder(data): } ''' cmd = ['./ctl', 'ui', 'folder'] - if sys.platform == 'win32': - cmd = win32_ui('folder') p = subprocess.Popen(cmd, stdout=subprocess.PIPE, close_fds=True) stdout, stderr = p.communicate() path = stdout.decode('utf-8').strip() @@ -51,8 +39,6 @@ def selectFile(data): } ''' cmd = ['./ctl', 'ui', 'file'] - if sys.platform == 'win32': - cmd = win32_ui('file') p = subprocess.Popen(cmd, stdout=subprocess.PIPE) stdout, stderr = p.communicate() path = stdout.decode('utf-8').strip() diff --git a/oml/server.py b/oml/server.py index f98ed7b..7a3f08d 100644 --- a/oml/server.py +++ b/oml/server.py @@ -22,7 +22,6 @@ import setup import state import tasks import websocket -import ui_websocket import update import logging @@ -131,7 +130,6 @@ def run(): handlers = common_handlers + [ (r'/api/upload/', UploadHandler, dict(context=db.session)), (r'/api/', oxtornado.ApiHandler, dict(context=db.session)), - (r'/ui_socket', ui_websocket.Handler), (r'/ws', websocket.Handler), (r"(.*)", MainHandler), ] diff --git a/oml/settings.py b/oml/settings.py index 631b398..8b11142 100644 --- a/oml/settings.py +++ b/oml/settings.py @@ -48,7 +48,7 @@ server_defaults = { 'node_address': '', 'extract_text': True, 'localnode_discovery': True, - 'release_url': 'https://downloads.openmedialibrary.com/release.json', + 'release_url': 'http://downloads.openmedialibrary.com/release.json', 'pull_interval': 60000 } diff --git a/oml/state.py b/oml/state.py index 606a22b..4768e7b 100644 --- a/oml/state.py +++ b/oml/state.py @@ -13,7 +13,6 @@ tor = False update = False shutdown = False websockets = [] -uisockets = [] peers = {} changelog_size = None diff --git a/oml/tor.py b/oml/tor.py index f7aa595..f902b87 100644 --- a/oml/tor.py +++ b/oml/tor.py @@ -25,7 +25,6 @@ logger = logging.getLogger(__name__) class TorDaemon(Thread): installing = False running = True - p = None def __init__(self): self._status = [] @@ -49,7 +48,7 @@ CookieAuthentication 1 '''.strip()) tor_data = os.path.join(settings.data_path, 'TorData') if sys.platform == 'win32': - tor_data = os.path.normpath(tor_data).replace('\\', '/') + tor_data = os.path.normpath(tor_data).replace(os.SEP, '/') if not os.path.exists(torrc): with open(torrc, 'w') as fd: fd.write(''' diff --git a/oml/ui.py b/oml/ui.py index 5c516c5..e7982e9 100644 --- a/oml/ui.py +++ b/oml/ui.py @@ -1,6 +1,6 @@ # encoding: utf-8 # vi:si:et:sw=4:sts=4:ts=4 -import sys +DEBUG = False try: from gi.repository import Gtk, GObject GObject.threads_init() @@ -10,8 +10,6 @@ except: import tkinter.filedialog use_Gtk = False -DEBUG = False - class GtkUI: def selectFolder(self, data): dialog = Gtk.FileChooserDialog(data.get("title", "Select Folder"), @@ -64,11 +62,6 @@ class GtkUI: class TkUI: def __init__(self): self.root = Tk() - if sys.platform == 'darwin': - self.root.lift() - self.root.call('wm', 'attributes', '.', '-topmost', True) - self.root.update() - self.root.after_idle(self.root.call, 'wm', 'attributes', '.', '-topmost', False) self.root.withdraw() # hiding tkinter window def selectFolder(self, data): diff --git a/oml/ui_websocket.py b/oml/ui_websocket.py deleted file mode 100644 index 7efdddd..0000000 --- a/oml/ui_websocket.py +++ /dev/null @@ -1,67 +0,0 @@ -# -*- coding: utf-8 -*- -# vi:si:et:sw=4:sts=4:ts=4 -import json - - -from tornado.websocket import WebSocketHandler -from tornado.ioloop import IOLoop - -from oxtornado import json_dumps - -import state -import settings -from websocket import trigger_event - -import logging -logger = logging.getLogger(__name__) - - -class Handler(WebSocketHandler): - - queue = [] - - def initialize(self, public=False): - self._public = public - - def check_origin(self, origin): - # allow access to websocket from site, installer and loader (local file) - return self.request.host in origin or \ - origin in ( - 'http://127.0.0.1:9841', - 'http://127.0.0.1:9842', - 'file://', - 'null' - ) - - def open(self): - if self.request.headers['origin'] not in ('null', 'file://', 'http://127.0.0.1:9842') \ - and self.request.host not in self.request.headers['origin']: - logger.debug('reject cross site attempt to open websocket %s', self.request) - self.close() - if self not in state.uisockets: - state.uisockets.append(self) - - #websocket calls - def on_message(self, message): - if self.queue: - action = self.queue.pop(0) - trigger_event(action, {'path': message}) - else: - print('no queue got:', message) - - def on_close(self): - if self in state.uisockets: - state.uisockets.remove(self) - - def post(self, message): - if self.ws_connection is None: - self.on_close() - else: - state.main.add_callback(lambda: self.write_message(message)) - -def trigger_ui(message): - for ws in state.uisockets: - try: - ws.post(message) - except: - logger.debug('failed to send to UI ws %s %s', ws, message, exc_info=True) diff --git a/oml/update.py b/oml/update.py index 8ab472c..6a0c834 100644 --- a/oml/update.py +++ b/oml/update.py @@ -82,7 +82,7 @@ def get(url, filename=None): def check(): if settings.release: release_data = get(settings.server.get('release_url', - 'https://downloads.openmedialibrary.com/release.json')) + 'http://downloads.openmedialibrary.com/release.json')) release = json.loads(release_data.decode('utf-8')) old = current_version('openmedialibrary') new = release['modules']['openmedialibrary']['version'] diff --git a/oml/user/api.py b/oml/user/api.py index d8fecfa..d4bf89a 100644 --- a/oml/user/api.py +++ b/oml/user/api.py @@ -309,12 +309,10 @@ def addListItems(data): i = Item.get(item_id) i.queue_download() i.update() - elif data['list'] and (data['list'].startswith(':') or - data['list'].endswith(':Public') or - data['list'].enswtih(':')): + elif data['list'] and (data['list'].startswith(':') or data['list'].endswith(':Public')): l = models.List.get_or_create(data['list']) if l: - if l.name in ('Public', '') and l.user_id != settings.USER_ID: + if l.name == 'Public' and l.user_id != settings.USER_ID: state.tasks.queue('upload', { 'user': l.user_id, 'items': data['items'] diff --git a/static/html/load.html b/static/html/load.html index 40bba9f..69b7b3a 100644 --- a/static/html/load.html +++ b/static/html/load.html @@ -97,7 +97,7 @@ stopAnimation(); document.getElementById('loadingIcon').style.display = 'none'; document.getElementById('error').style.display = 'block'; - }, 60000); + }, 20000); }());