diff --git a/ctl b/ctl index c45e82b..4c05511 100755 --- a/ctl +++ b/ctl @@ -37,7 +37,7 @@ if [ ! -e "$PID" ]; then fi PLATFORM_PYTHON=3.4 -SHARED_PYTHON=3.7 +SHARED_PYTHON=3.4 if [ -e "$BASE/platform_local" ]; then export PLATFORM_ENV="$BASE/platform_local" else @@ -56,16 +56,10 @@ else ARCH="_armv7l" fi PLATFORM="linux$ARCH" - if [ -e $BASE/platform_${PLATFORM}/lib/libunrar.so ]; then - export UNRAR_LIB_PATH="$BASE/platform_${PLATFORM}/lib/libunrar.so" - fi fi if [ $SYSTEM == "Darwin" ]; then PLATFORM="darwin64" PLATFORM_PYTHON=3.7 - if [ -e $BASE/platform_${PLATFORM}/lib/libunrar.dylib ]; then - export UNRAR_LIB_PATH="$BASE/platform_${PLATFORM}/lib/libunrar.dylib" - fi fi export PLATFORM_ENV="$BASE/platform_${PLATFORM}" fi diff --git a/oml/__main__.py b/oml/__main__.py index 3c54ef6..f5e2b5e 100644 --- a/oml/__main__.py +++ b/oml/__main__.py @@ -17,9 +17,6 @@ if sys.platform == 'win32': site.addsitedir(site_packages) sys.path.append(join(base, 'platform_win32')) os.environ['oxCACHE'] = join(base, 'data', 'ox') - unrar_dll = join(base, 'platform_win32', 'unrar.dll') - if os.path.exists(unrar_dll): - os.environ['UNRAR_LIB_PATH'] = unrar_dll import api import commands diff --git a/oml/media/__init__.py b/oml/media/__init__.py index d77b11b..dd9d32b 100644 --- a/oml/media/__init__.py +++ b/oml/media/__init__.py @@ -10,7 +10,7 @@ import ox from . import pdf from . import cbr -from . import cbz +cbz = cbr from . import epub from . import txt from . import opf @@ -34,10 +34,8 @@ def metadata(f, from_=None): data['size'] = os.stat(f).st_size try: - if ext in ('cbr', ): + if ext in ('cbr', 'cbz'): info = cbr.info(f) - elif ext in ('cbz', ): - info = cbz.info(f) elif ext in ('epub', 'kepub'): info = epub.info(f) data['extension'] = 'epub' diff --git a/oml/media/cbr.py b/oml/media/cbr.py index fdade82..66e1324 100644 --- a/oml/media/cbr.py +++ b/oml/media/cbr.py @@ -2,23 +2,11 @@ import os -import ox + def cover(path): data = None #open rar file and extract first page here - try: - from unrar import rarfile - rar = rarfile.RarFile(path) - for cover in ox.sorted_strings(rar.namelist()): - try: - data = rar.read(cover) - except: - data = None - finally: - return data - except: - data = None return data def info(path): diff --git a/oml/media/cbz.py b/oml/media/cbz.py deleted file mode 100644 index 83fba49..0000000 --- a/oml/media/cbz.py +++ /dev/null @@ -1,32 +0,0 @@ -# -*- coding: utf-8 -*- -import os -import zipfile - -import ox - -def cover(path): - data = None - logger.debug('cover %s', path) - data = None - try: - z = zipfile.ZipFile(path) - except zipfile.BadZipFile: - logger.debug('invalid zbc file %s', path) - return data - files = [f.filename for f in z.filelist] - if files: - for cover in ox.sortedstrings(files): - try: - data = z.read(cover) - except: - data = None - finally: - return data - - -def info(path): - data = {} - data['title'] = os.path.splitext(os.path.basename(path))[0] - #data['pages'] = fixme read rar to count pages - return data - diff --git a/requirements-shared.txt b/requirements-shared.txt index ced1c73..2edce59 100644 --- a/requirements-shared.txt +++ b/requirements-shared.txt @@ -10,4 +10,3 @@ pysocks stem sqlitedict==1.6.0 zeroconf -unrar diff --git a/static/js/folders.js b/static/js/folders.js index f413156..f4e84a3 100644 --- a/static/js/folders.js +++ b/static/js/folders.js @@ -338,7 +338,7 @@ oml.ui.folders = function() { that.updateOwnLists = function(callback) { oml.getLists(function(lists) { var items = lists.filter(function(list) { - return list.user == '' && list.type != 'library' && list.name != 'Inbox'; + return list.user == '' && list.type != 'library'; }); oml.$ui.folder[0].$content .css({height: 16 + items.length * 16 + 'px'});