From c1b818d639ab04cf8fd9e6028bc502a0e15f0d04 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Thu, 25 Jun 2009 11:59:52 -0700 Subject: [PATCH] Fix #2698 (ebook-viewer.exe don't recognizes some .cbr files) --- src/calibre/gui2/main.py | 2 -- src/calibre/libunrar.py | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/calibre/gui2/main.py b/src/calibre/gui2/main.py index fdf630c620..7766c61fe5 100644 --- a/src/calibre/gui2/main.py +++ b/src/calibre/gui2/main.py @@ -942,8 +942,6 @@ class Main(MainWindow, Ui_MainWindow, DeviceGUI): error_dialog(self, _('Error'), err, det_msg=x.tb).exec_() - - def edit_metadata(self, checked, bulk=None): ''' Edit metadata of selected books in library. diff --git a/src/calibre/libunrar.py b/src/calibre/libunrar.py index 22f03731e8..40da8e3efc 100644 --- a/src/calibre/libunrar.py +++ b/src/calibre/libunrar.py @@ -12,7 +12,7 @@ from ctypes import Structure as _Structure, c_char_p, c_uint, c_void_p, POINTER, from tempfile import NamedTemporaryFile from StringIO import StringIO -from calibre import iswindows, load_library, CurrentDir +from calibre import iswindows, load_library, CurrentDir, prints from calibre.ptempfile import TemporaryDirectory _librar_name = 'libunrar' @@ -173,7 +173,7 @@ def extract(path, dir): try: if open_archive_data.OpenResult != 0: raise UnRARException(_interpret_open_error(open_archive_data.OpenResult, path)) - print 'Archive:', path + prints('Archive:', path) #print get_archive_info(open_archive_data.Flags) header_data = RARHeaderDataEx(CmtBuf=None) #_libunrar.RARSetCallback(arc_data, callback_func, mode)