From edbdd7e49683626da0c4deb23482fa0fe1ee4d44 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Tue, 21 Nov 2006 04:52:47 +0000 Subject: [PATCH] Added support for progress reporting in libprs500. Only implemented in get_file Created a rudimentary GUI that parses the media list on the device abd displays the books Switched to setuptools --- MANIFEST.in | 6 - ez_setup.py | 222 ++++++++++++ libprs500/__init__.py | 4 +- libprs500/cli/__init__.py | 21 ++ scripts/prs500.py => libprs500/cli/main.py | 47 +-- libprs500/{ => cli}/terminfo.py | 2 + libprs500/communicate.py | 27 +- libprs500/gui/main.py | 318 +++++++++++++++--- libprs500/gui/main.ui | 265 ++++++++++----- libprs500/gui/main_gui.py | 94 ------ libprs500/gui/resources/images.qrc | 8 + libprs500/gui/resources/images/book.png | Bin 0 -> 14477 bytes libprs500/gui/resources/images/clear.png | Bin 0 -> 929 bytes libprs500/gui/resources/images/mycomputer.png | Bin 0 -> 1603 bytes libprs500/gui/resources/images/reader.png | Bin 0 -> 1933 bytes prs-500.e3p | 126 ------- prs-500.e4p | 211 ++++++++++++ setup.py | 38 ++- 18 files changed, 983 insertions(+), 406 deletions(-) delete mode 100644 MANIFEST.in create mode 100644 ez_setup.py create mode 100644 libprs500/cli/__init__.py rename scripts/prs500.py => libprs500/cli/main.py (92%) rename libprs500/{ => cli}/terminfo.py (99%) delete mode 100644 libprs500/gui/main_gui.py create mode 100644 libprs500/gui/resources/images.qrc create mode 100644 libprs500/gui/resources/images/book.png create mode 100644 libprs500/gui/resources/images/clear.png create mode 100644 libprs500/gui/resources/images/mycomputer.png create mode 100644 libprs500/gui/resources/images/reader.png delete mode 100644 prs-500.e3p create mode 100644 prs-500.e4p diff --git a/MANIFEST.in b/MANIFEST.in deleted file mode 100644 index eb49d4cbac..0000000000 --- a/MANIFEST.in +++ /dev/null @@ -1,6 +0,0 @@ -include libprs500 *.py -include libprs500/gui *.py -include scripts *.py -include README -include docs/pdf/api.pdf -recursive-include docs/html * diff --git a/ez_setup.py b/ez_setup.py new file mode 100644 index 0000000000..3031ad0d11 --- /dev/null +++ b/ez_setup.py @@ -0,0 +1,222 @@ +#!python +"""Bootstrap setuptools installation + +If you want to use setuptools in your package's setup.py, just include this +file in the same directory with it, and add this to the top of your setup.py:: + + from ez_setup import use_setuptools + use_setuptools() + +If you want to require a specific version of setuptools, set a download +mirror, or use an alternate download directory, you can do so by supplying +the appropriate options to ``use_setuptools()``. + +This file can also be run as a script to install or upgrade setuptools. +""" +import sys +DEFAULT_VERSION = "0.6c3" +DEFAULT_URL = "http://cheeseshop.python.org/packages/%s/s/setuptools/" % sys.version[:3] + +md5_data = { + 'setuptools-0.6b1-py2.3.egg': '8822caf901250d848b996b7f25c6e6ca', + 'setuptools-0.6b1-py2.4.egg': 'b79a8a403e4502fbb85ee3f1941735cb', + 'setuptools-0.6b2-py2.3.egg': '5657759d8a6d8fc44070a9d07272d99b', + 'setuptools-0.6b2-py2.4.egg': '4996a8d169d2be661fa32a6e52e4f82a', + 'setuptools-0.6b3-py2.3.egg': 'bb31c0fc7399a63579975cad9f5a0618', + 'setuptools-0.6b3-py2.4.egg': '38a8c6b3d6ecd22247f179f7da669fac', + 'setuptools-0.6b4-py2.3.egg': '62045a24ed4e1ebc77fe039aa4e6f7e5', + 'setuptools-0.6b4-py2.4.egg': '4cb2a185d228dacffb2d17f103b3b1c4', + 'setuptools-0.6c1-py2.3.egg': 'b3f2b5539d65cb7f74ad79127f1a908c', + 'setuptools-0.6c1-py2.4.egg': 'b45adeda0667d2d2ffe14009364f2a4b', + 'setuptools-0.6c2-py2.3.egg': 'f0064bf6aa2b7d0f3ba0b43f20817c27', + 'setuptools-0.6c2-py2.4.egg': '616192eec35f47e8ea16cd6a122b7277', + 'setuptools-0.6c3-py2.3.egg': 'f181fa125dfe85a259c9cd6f1d7b78fa', + 'setuptools-0.6c3-py2.4.egg': 'e0ed74682c998bfb73bf803a50e7b71e', + 'setuptools-0.6c3-py2.5.egg': 'abef16fdd61955514841c7c6bd98965e', +} + +import sys, os + +def _validate_md5(egg_name, data): + if egg_name in md5_data: + from md5 import md5 + digest = md5(data).hexdigest() + if digest != md5_data[egg_name]: + print >>sys.stderr, ( + "md5 validation of %s failed! (Possible download problem?)" + % egg_name + ) + sys.exit(2) + return data + + +def use_setuptools( + version=DEFAULT_VERSION, download_base=DEFAULT_URL, to_dir=os.curdir, + download_delay=15 +): + """Automatically find/download setuptools and make it available on sys.path + + `version` should be a valid setuptools version number that is available + as an egg for download under the `download_base` URL (which should end with + a '/'). `to_dir` is the directory where setuptools will be downloaded, if + it is not already available. If `download_delay` is specified, it should + be the number of seconds that will be paused before initiating a download, + should one be required. If an older version of setuptools is installed, + this routine will print a message to ``sys.stderr`` and raise SystemExit in + an attempt to abort the calling script. + """ + try: + import setuptools + if setuptools.__version__ == '0.0.1': + print >>sys.stderr, ( + "You have an obsolete version of setuptools installed. Please\n" + "remove it from your system entirely before rerunning this script." + ) + sys.exit(2) + except ImportError: + egg = download_setuptools(version, download_base, to_dir, download_delay) + sys.path.insert(0, egg) + import setuptools; setuptools.bootstrap_install_from = egg + + import pkg_resources + try: + pkg_resources.require("setuptools>="+version) + + except pkg_resources.VersionConflict, e: + # XXX could we install in a subprocess here? + print >>sys.stderr, ( + "The required version of setuptools (>=%s) is not available, and\n" + "can't be installed while this script is running. Please install\n" + " a more recent version first.\n\n(Currently using %r)" + ) % (version, e.args[0]) + sys.exit(2) + +def download_setuptools( + version=DEFAULT_VERSION, download_base=DEFAULT_URL, to_dir=os.curdir, + delay = 15 +): + """Download setuptools from a specified location and return its filename + + `version` should be a valid setuptools version number that is available + as an egg for download under the `download_base` URL (which should end + with a '/'). `to_dir` is the directory where the egg will be downloaded. + `delay` is the number of seconds to pause before an actual download attempt. + """ + import urllib2, shutil + egg_name = "setuptools-%s-py%s.egg" % (version,sys.version[:3]) + url = download_base + egg_name + saveto = os.path.join(to_dir, egg_name) + src = dst = None + if not os.path.exists(saveto): # Avoid repeated downloads + try: + from distutils import log + if delay: + log.warn(""" +--------------------------------------------------------------------------- +This script requires setuptools version %s to run (even to display +help). I will attempt to download it for you (from +%s), but +you may need to enable firewall access for this script first. +I will start the download in %d seconds. + +(Note: if this machine does not have network access, please obtain the file + + %s + +and place it in this directory before rerunning this script.) +---------------------------------------------------------------------------""", + version, download_base, delay, url + ); from time import sleep; sleep(delay) + log.warn("Downloading %s", url) + src = urllib2.urlopen(url) + # Read/write all in one block, so we don't create a corrupt file + # if the download is interrupted. + data = _validate_md5(egg_name, src.read()) + dst = open(saveto,"wb"); dst.write(data) + finally: + if src: src.close() + if dst: dst.close() + return os.path.realpath(saveto) + +def main(argv, version=DEFAULT_VERSION): + """Install or upgrade setuptools and EasyInstall""" + + try: + import setuptools + except ImportError: + egg = None + try: + egg = download_setuptools(version, delay=0) + sys.path.insert(0,egg) + from setuptools.command.easy_install import main + return main(list(argv)+[egg]) # we're done here + finally: + if egg and os.path.exists(egg): + os.unlink(egg) + else: + if setuptools.__version__ == '0.0.1': + # tell the user to uninstall obsolete version + use_setuptools(version) + + req = "setuptools>="+version + import pkg_resources + try: + pkg_resources.require(req) + except pkg_resources.VersionConflict: + try: + from setuptools.command.easy_install import main + except ImportError: + from easy_install import main + main(list(argv)+[download_setuptools(delay=0)]) + sys.exit(0) # try to force an exit + else: + if argv: + from setuptools.command.easy_install import main + main(argv) + else: + print "Setuptools version",version,"or greater has been installed." + print '(Run "ez_setup.py -U setuptools" to reinstall or upgrade.)' + + + +def update_md5(filenames): + """Update our built-in md5 registry""" + + import re + from md5 import md5 + + for name in filenames: + base = os.path.basename(name) + f = open(name,'rb') + md5_data[base] = md5(f.read()).hexdigest() + f.close() + + data = [" %r: %r,\n" % it for it in md5_data.items()] + data.sort() + repl = "".join(data) + + import inspect + srcfile = inspect.getsourcefile(sys.modules[__name__]) + f = open(srcfile, 'rb'); src = f.read(); f.close() + + match = re.search("\nmd5_data = {\n([^}]+)}", src) + if not match: + print >>sys.stderr, "Internal error!" + sys.exit(2) + + src = src[:match.start(1)] + repl + src[match.end(1):] + f = open(srcfile,'w') + f.write(src) + f.close() + + +if __name__=='__main__': + if len(sys.argv)>2 and sys.argv[1]=='--md5update': + update_md5(sys.argv[2:]) + else: + main(sys.argv[1:]) + + + + + diff --git a/libprs500/__init__.py b/libprs500/__init__.py index 4238af5f12..e217b56bd0 100644 --- a/libprs500/__init__.py +++ b/libprs500/__init__.py @@ -24,7 +24,7 @@ The public interface of libprs500 is in L{libprs500.communicate}. To use it >>> dev.close() There is also a script L{prs500} that provides a command-line interface to libprs500. See the script -for more usage examples. +for more usage examples. A GUI is available via the command prs500-gui. The packet structure used by the SONY Reader USB protocol is defined in the module L{prstypes}. The communication logic is defined in the module L{communicate}. @@ -34,6 +34,6 @@ the following rule in C{/etc/udev/rules.d/90-local.rules} :: BUS=="usb", SYSFS{idProduct}=="029b", SYSFS{idVendor}=="054c", MODE="660", GROUP="plugdev" You may have to adjust the GROUP and the location of the rules file to suit your distribution. """ -VERSION = "0.2.1" +__version__ = "0.2.1" __docformat__ = "epytext" __author__ = "Kovid Goyal " diff --git a/libprs500/cli/__init__.py b/libprs500/cli/__init__.py new file mode 100644 index 0000000000..b20d1ac2d5 --- /dev/null +++ b/libprs500/cli/__init__.py @@ -0,0 +1,21 @@ +## Copyright (C) 2006 Kovid Goyal kovid@kovidgoyal.net +## This program is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published by +## the Free Software Foundation; either version 2 of the License, or +## (at your option) any later version. +## +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License along +## with this program; if not, write to the Free Software Foundation, Inc., +## 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +""" +Provides a command-line interface to the SONY Reader PRS-500. + +For usage information run the script. +""" +__docformat__ = "epytext" +__author__ = "Kovid Goyal " diff --git a/scripts/prs500.py b/libprs500/cli/main.py similarity index 92% rename from scripts/prs500.py rename to libprs500/cli/main.py index 1395bf878e..e06fd64133 100755 --- a/scripts/prs500.py +++ b/libprs500/cli/main.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python ## Copyright (C) 2006 Kovid Goyal kovid@kovidgoyal.net ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -14,7 +13,7 @@ ## with this program; if not, write to the Free Software Foundation, Inc., ## 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. """ -Provides a command-line interface to the SONY Reader PRS-500. +Provides a command-line and optional graphical interface to the SONY Reader PRS-500. For usage information run the script. """ @@ -22,9 +21,9 @@ For usage information run the script. import StringIO, sys, time, os from optparse import OptionParser -from libprs500 import VERSION +from libprs500 import __version__ as VERSION from libprs500.communicate import PRS500Device -from libprs500.terminfo import TerminalController +from terminfo import TerminalController from libprs500.errors import ArgumentError, DeviceError @@ -184,25 +183,13 @@ def main(): parser.add_option("--log-packets", help="print out packet stream to stdout. "+\ "The numbers in the left column are byte offsets that allow the packet size to be read off easily.", dest="log_packets", action="store_true", default=False) - parser.add_option("--gui", help="Run a Graphical User Interface", dest="gui", action="store_true", default=False) parser.remove_option("-h") parser.disable_interspersed_args() # Allow unrecognized options options, args = parser.parse_args() - if options.gui: - try: - from PyQt4.Qt import QApplication, QMainWindow - from libprs500.gui.main import MainWindow - app = QApplication(args) - window = QMainWindow() - mw = MainWindow(window, options.log_packets) - sys.exit(app.exec_()) - except ImportError, e: - print >>sys.stderr, "You dont have PyQt4 installed:", e - sys.exit(1) if len(args) < 1: parser.print_help() - sys.exit(1) + return 1 command = args[0] args = args[1:] @@ -242,7 +229,7 @@ def main(): options, args = parser.parse_args(args) if len(args) != 1: parser.print_help() - sys.exit(1) + return 1 print ls(dev, args[0], term, color=options.color, recurse=options.recurse, ll=options.ll, human_readable_size=options.hrs, cols=cols), elif command == "info": info(dev) @@ -257,7 +244,7 @@ def main(): options, args = parser.parse_args(args) if len(args) != 2: parser.print_help() - sys.exit(1) + return 1 if args[0].startswith("prs500:"): outfile = args[1] path = args[0][7:] @@ -269,7 +256,7 @@ def main(): except IOError, e: print >> sys.stderr, e parser.print_help() - sys.exit(1) + return 1 dev.get_file(path, outfile) outfile.close() elif args[1].startswith("prs500:"): @@ -278,19 +265,19 @@ def main(): except IOError, e: print >> sys.stderr, e parser.print_help() - sys.exit(1) + return 1 dev.put_file(infile, args[1][7:]) infile.close() else: parser.print_help() - sys.exit(1) + return 1 elif command == "cat": outfile = sys.stdout parser = OptionParser(usage="usage: %prog cat path\n\npath should point to a file on the device and must begin with /,a:/ or b:/") options, args = parser.parse_args(args) if len(args) != 1: parser.print_help() - sys.exit(1) + return 1 if args[0].endswith("/"): path = args[0][:-1] else: path = args[0] outfile = sys.stdout @@ -302,7 +289,7 @@ def main(): options, args = parser.parse_args(args) if len(args) != 1: parser.print_help() - sys.exit(1) + return 1 dev.rm(args[0]) elif command == "touch": parser = OptionParser(usage="usage: %prog touch path\n\npath should point to a file on the device and must begin with /,a:/ or b:/\n\n"+ @@ -310,17 +297,13 @@ def main(): options, args = parser.parse_args(args) if len(args) != 1: parser.print_help() - sys.exit(1) + return 1 dev.touch(args[0]) else: parser.print_help() if dev.handle: dev.close() - sys.exit(1) + return 1 except (ArgumentError, DeviceError), e: print >>sys.stderr, e - sys.exit(1) - finally: - if dev.handle: dev.close() - -if __name__ == "__main__": - main() + return 1 + return 0 diff --git a/libprs500/terminfo.py b/libprs500/cli/terminfo.py similarity index 99% rename from libprs500/terminfo.py rename to libprs500/cli/terminfo.py index 7b5e8fba6c..a3504254d7 100644 --- a/libprs500/terminfo.py +++ b/libprs500/cli/terminfo.py @@ -14,6 +14,8 @@ ## 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. import sys, re +""" Get information about the terminal we are running in """ + class TerminalController: """ A class that can be used to portably generate formatted output to diff --git a/libprs500/communicate.py b/libprs500/communicate.py index 38d0c19cdf..354c52c1b5 100755 --- a/libprs500/communicate.py +++ b/libprs500/communicate.py @@ -73,8 +73,9 @@ class FindBooks(ContentHandler): def __init__(self, src): dict.__init__(self, src) if not self.has_key("author") or len(self["author"].rstrip()) == 0: - self["author"] = "Unknown" - self["title"] = self["title"].strip() + self["author"] = u"Unknown" + self["title"] = unicode(self["title"].strip()) + self["author"] = unicode(self["author"]) def __repr__(self): return self["title"] + " by " + self["author"] + " at " + self["path"] @@ -98,7 +99,7 @@ class FindBooks(ContentHandler): def startElement(self, name, attrs): if name == self.book_name: data = FindBooks.Book(attrs) - data["path"] = self.root + data["path"] + data["path"] = unicode(self.root + data["path"]) self.books.append(data) self.in_book = True elif self.in_book and name == self.thumbnail_name: @@ -215,15 +216,23 @@ class PRS500Device(object): return run_session - def __init__(self, log_packets=False) : - """ @param log_packets: If true the packet stream to/from the device is logged """ + def __init__(self, log_packets=False, report_progress=None) : + """ + @param log_packets: If true the packet stream to/from the device is logged + @param: report_progress: Function that is called with a % progress (number between 0 and 100) for various tasks + If it is called with -1 that means that the task does not have any progress information + """ self.device_descriptor = DeviceDescriptor(PRS500Device.SONY_VENDOR_ID, PRS500Device.PRS500_PRODUCT_ID, PRS500Device.PRS500_INTERFACE_ID) self.device = self.device_descriptor.getDevice() #: The actual device (PyUSB object) self.handle = None #: Handle that is used to communicate with device. Setup in L{open} self._log_packets = log_packets + self.report_progress = report_progress + def is_connected(self): + return self.device_descriptor.getDevice() != None + @classmethod def _validate_response(cls, res, type=0x00, number=0x00): """ Raise a ProtocolError if the type and number of C{res} is not the same as C{type} and C{number}. """ @@ -388,8 +397,8 @@ class PRS500Device(object): if res.code != 0: raise PathError("Unable to open " + path + " for reading. Response code: " + hex(res.code)) id = self._bulk_read(20, data_type=IdAnswer, command_number=FileOpen.NUMBER)[0].id - bytes_left, chunk_size, pos = bytes, 0x8000, 0 - while bytes_left > 0: + bytes_left, chunk_size, pos = bytes, 0x8000, 0 + while bytes_left > 0: if chunk_size > bytes_left: chunk_size = bytes_left res = self._send_validated_command(FileIO(id, pos, chunk_size)) if res.code != 0: @@ -405,6 +414,7 @@ class PRS500Device(object): raise ArgumentError("File get operation failed. Could not write to local location: " + str(e)) bytes_left -= chunk_size pos += chunk_size + if self.report_progress: self.report_progress(int(100*((1.*pos)/bytes))) self._send_validated_command(FileClose(id)) # Not going to check response code to see if close was successful as there's not much we can do if it wasnt @@ -478,11 +488,12 @@ class PRS500Device(object): @return: A list of tuples. Each tuple has form ("location", free space, total space) """ data = [] + if self.report_progress: self.report_progress(-1) for path in ("/Data/", "a:/", "b:/"): res = self._send_validated_command(FreeSpaceQuery(path),timeout=5000) # Timeout needs to be increased as it takes time to read card buffer_size = 16 + res.data[2] pkt = self._bulk_read(buffer_size, data_type=FreeSpaceAnswer, command_number=FreeSpaceQuery.NUMBER)[0] - data.append( (path, pkt.free_space, pkt.total) ) + data.append( (path, pkt.free_space, pkt.total) ) return data def _exists(self, path): diff --git a/libprs500/gui/main.py b/libprs500/gui/main.py index 712631f093..5c99228619 100644 --- a/libprs500/gui/main.py +++ b/libprs500/gui/main.py @@ -12,77 +12,295 @@ ## You should have received a copy of the GNU General Public License along ## with this program; if not, write to the Free Software Foundation, Inc., ## 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -from main_gui import Ui_MainWindow from libprs500.communicate import PRS500Device as device from libprs500.errors import * -from PyQt4.Qt import QThread +import images +from PyQt4.QtCore import Qt, SIGNAL +from PyQt4.Qt import QObject, QThread, QCoreApplication, QEventLoop, QString, QStandardItem, QStandardItemModel, QStatusBar, QVariant, QAbstractTableModel, \ + QAbstractItemView, QImage, QPixmap, QIcon, QSize +from PyQt4 import uic +import sys, pkg_resources, re, string +from operator import itemgetter +NONE = QVariant() -class DeviceDetector(QThread): - def __init__(self, detected_slot): - QThread.__init__(self) - self.dev = None - self.detected_slot = detected_slot - self.removed = False +def human_readable(size): + """ Convert a size in bytes into a human readle form """ + if size < 1024: divisor, suffix = 1, "B" + elif size < 1024*1024: divisor, suffix = 1024., "KB" + elif size < 1024*1024*1024: divisor, suffix = 1024*1024, "MB" + elif size < 1024*1024*1024*1024: divisor, suffix = 1024*1024, "GB" + size = str(size/divisor) + if size.find(".") > -1: size = size[:size.find(".")+2] + return size + " " + suffix + +class DeviceBooksModel(QAbstractTableModel): + + def __init__(self, parent, data): + QAbstractTableModel.__init__(self, parent) + self._data = data + self._orig_data = data + + def set_data(self, data): + self.emit(SIGNAL("layoutAboutToBeChanged()")) + self._data = data + self._orig_data = data + self.sort(0, Qt.DescendingOrder) - def run(self): - wait = 1 - while None == self.msleep(wait): - wait = 1000 - if self.removed or not self.dev: - self.dev = device() - self.removed = False - self.detected_slot() - + def rowCount(self, parent): return len(self._data) + def columnCount(self, parent): return 3 + + def headerData(self, section, orientation, role): + if role != Qt.DisplayRole: + return NONE + text = "" + if orientation == Qt.Horizontal: + if section == 0: text = "Title" + elif section == 1: text = "Author(s)" + elif section == 2: text = "Size" + return QVariant(self.trUtf8(text)) + else: return QVariant(str(1+section)) + + def data(self, index, role): + if role == Qt.DisplayRole: + row, col = index.row(), index.column() + book = self._data[row] + if col == 0: text = book["title"] + elif col == 1: text = book["author"] + elif col == 2: text = human_readable(int(book["size"])) + return QVariant(text) + elif role == Qt.TextAlignmentRole and index.column() == 2: + return QVariant(Qt.AlignRight) + elif role == Qt.DecorationRole and index.column() == 0: + book = self._data[index.row()] + if book.has_key("thumbnail"): + return QVariant(book["thumbnail"]) + return NONE + + def info(self, row): + row = self._data[row] + return row["title"], row["author"], human_readable(int(row["size"])), row["mime"], row["thumbnail"].pixmap(60, 80, QIcon.Normal, QIcon.On) + + def sort(self, col, order): + def getter(key, func): return lambda x : func(itemgetter(key)(x)) + if col == 0: key, func = "title", string.lower + if col == 1: key, func = "author", lambda x : x.split()[-1:][0].lower() + if col == 2: key, func = "size", int + descending = order != Qt.AscendingOrder + self.emit(SIGNAL("layoutAboutToBeChanged()")) + self._data.sort(key=getter(key, func)) + if descending: self._data.reverse() + self.emit(SIGNAL("layoutChanged()")) + self.emit(SIGNAL("sorted()")) + + def search(self, query): + queries = unicode(query).lower().split() + self.emit(SIGNAL("layoutAboutToBeChanged()")) + self._data = [] + for book in self._orig_data: + match = True + for q in queries: + if q in book["title"].lower() or q in book["author"].lower(): continue + else: + match = False + break + if match: self._data.append(book) + self.emit(SIGNAL("layoutChanged()")) + self.emit(SIGNAL("searched()")) -class MainWindow(Ui_MainWindow): +Ui_MainWindow, bclass = uic.loadUiType(pkg_resources.resource_stream(__name__, "main.ui")) +class MainWindow(QObject, Ui_MainWindow): - def safe(func): - def call_func(*args, **kwargs): - window = args[0] - res = None - try: - res = func(*args, **kwargs) - except DeviceError: - window.device_removed() - except TimeoutError, e: - print e - window.timeout_error() - return res - return call_func + def tree_clicked(self, index): + item = self.tree.itemFromIndex(index) + text = str(item.text()) + if text == "Library": + print "Library Clicked" + elif text == "SONY Reader": + self.set_data(self.main_books + self.card_books) + elif text == "Main Memory": + self.set_data(self.main_books) + elif text == "Storage Card": + self.set_data(self.card_books) + elif text == "Books": + text = str(item.parent().text()) + if text == "Library": + print "Library --> Books Clicked" + elif text == "Main Memory": + self.set_data(self.main_books) + elif text == "Storage Card": + self.set_data(self.card_books) - @apply - def dev(): - def fget(self): - return self.detector.dev - return property(**locals()) + def set_data(self, data): + self.model.set_data(data) + self.table_view.resizeColumnsToContents() + - def __init__(self, window, log_packets): - Ui_MainWindow.__init__(self) - self.log_packets = log_packets - self.detector = DeviceDetector(self.establish_connection) - self.detector.start() + def data_sorted(self): + self.table_view.resizeRowsToContents() + self.table_view.clearSelection() + self.book_cover.hide() + self.book_info.hide() + + def show_book(self, current, previous): + title, author, size, mime, thumbnail = current.model().info(current.row()) + self.book_info.setText(self.BOOK_TEMPLATE.arg(title).arg(size).arg(author).arg(mime)) + self.book_cover.setPixmap(thumbnail) + self.book_cover.show() + self.book_info.show() + + def searched(self): + self.table_view.clearSelection() + self.book_cover.hide() + self.book_info.hide() + self.table_view.resizeRowsToContents() + + def clear(self, checked): self.search.setText("") + + def __init__(self, window): + QObject.__init__(self) + Ui_MainWindow.__init__(self) + self.dev = device(report_progress=self.progress) + self.is_connected = False self.setupUi(window) + self.card = None + # Create Tree + self.tree = QStandardItemModel() + library = QStandardItem(QString("Library")) + library.setIcon(QIcon(":/images/mycomputer.png")) + font = library.font() + font.setBold(True) + self.tree.appendRow(library) + library.setFont(font) + library.appendRow(QStandardItem(QString("Books"))) + blank = QStandardItem(" ") + blank.setEnabled(False) + self.tree.appendRow(blank) + self.reader = QStandardItem(QString("SONY Reader")) + mm = QStandardItem(QString("Main Memory")) + mm.appendRow(QStandardItem(QString("Books"))) + self.reader.appendRow(mm) + mc = QStandardItem(QString("Storage Card")) + mc.appendRow(QStandardItem(QString("Books"))) + self.reader.appendRow(mc) + self.reader.setIcon(QIcon(":/images/reader.png")) + self.tree.appendRow(self.reader) + self.reader.setFont(font) + + + self.treeView.setModel(self.tree) + self.treeView.header().hide() + self.treeView.setExpanded(library.index(), True) + self.treeView.setExpanded(self.reader.index(), True) + self.treeView.setExpanded(mm.index(), True) + self.treeView.setExpanded(mc.index(), True) + self.treeView.setRowHidden(2, self.tree.invisibleRootItem().index(), True) + QObject.connect(self.treeView, SIGNAL("activated(QModelIndex)"), self.tree_clicked) + QObject.connect(self.treeView, SIGNAL("clicked(QModelIndex)"), self.tree_clicked) + + # Create Table + self.model = DeviceBooksModel(window, []) + QObject.connect(self.model, SIGNAL("sorted()"), self.data_sorted) + self.table_view.setModel(self.model) + self.table_view.setSelectionBehavior(QAbstractItemView.SelectRows) + self.table_view.setSortingEnabled(True) + QObject.connect(self.table_view.selectionModel(), SIGNAL("currentChanged(QModelIndex, QModelIndex)"), self.show_book) + QObject.connect(self.search, SIGNAL("textChanged(QString)"), self.model.search) + QObject.connect(self.model, SIGNAL("searched()"), self.searched) + self.clearButton.setIcon(QIcon(":/images/clear.png")) + QObject.connect(self.clearButton, SIGNAL("clicked(bool)"), self.clear) + + # Setup book display + self.BOOK_TEMPLATE = self.book_info.text() + self.BOOK_IMAGE = QPixmap(":/images/book.png") + self.book_cover.hide() + self.book_info.hide() + + self.device_detector = self.startTimer(1000) + self.splitter.setStretchFactor(0,0) + self.splitter.setStretchFactor(1,100) + self.search.setFocus(Qt.OtherFocusReason) + self.window = window window.show() + def timerEvent(self, e): + if e.timerId() == self.device_detector: + is_connected = self.dev.is_connected() + if is_connected and not self.is_connected: + self.establish_connection() + elif not is_connected and self.is_connected: + self.device_removed() + def device_removed(self, timeout=False): - """ @todo: implement this """ - self.detector.removed = True + """ @todo: only reset stuff if library is not shown """ + self.is_connected = False + self.df.setText("Main memory:

Storage card:") + self.card = None + self.treeView.setRowHidden(2, self.tree.invisibleRootItem().index(), True) + self.model.set_data([]) + self.book_cover.hide() + self.book_info.hide() + def timeout_error(self): - """ @todo: update status bar """ - self.detector.sleep(10) - self.device_removed(timeout=True) + """ @todo: display error dialog """ + pass + + def progress(self, val): + if val < 0: + self.progress_bar.setMaximum(0) + else: self.progress_bar.setValue(val) + QCoreApplication.processEvents(QEventLoop.ExcludeUserInputEvents) + + def status(self, msg): + self.progress_bar.setMaximum(100) + self.progress_bar.reset() + self.progress_bar.setFormat(msg + ": %p%") + QCoreApplication.processEvents(QEventLoop.ExcludeUserInputEvents) - @safe def establish_connection(self): - mb, cb, mx, cx = self.dev.books() + self.status("Connecting to device") + try: + space = self.dev.available_space() + except TimeoutError: + c = 0 + self.status("Waiting for device to initialize") + while c < 100: # Delay for 10s while device is initializing + if c % 10 == c/10: + self.progress(c) + QThread.currentThread().msleep(100) + c += 1 + space = self.dev.available_space() + sc = space[1][1] if space[1][1] else space[2][1] + self.df.setText("Main memory: " + human_readable(space[0][1]) + "

Storage card: " + human_readable(sc)) + self.is_connected = True + if space[1][2] > 0: self.card = "a:/" + elif space[2][2] > 0: self.card = "b:/" + else: self.card = None + if self.card: self.treeView.setRowHidden(1, self.reader.index(), False) + else: self.treeView.setRowHidden(1, self.reader.index(), True) + self.treeView.setRowHidden(2, self.tree.invisibleRootItem().index(), False) + self.status("Loading media list") + mb, cb, mx, cx = self.dev.books() + + for x in (mb, cb): + for book in x: + if book.has_key("thumbnail"): + book["thumbnail"] = QIcon(QPixmap.fromImage(QImage.fromData(book["thumbnail"]))) + else: book["thumbnail"] = QIcon(self.BOOK_IMAGE) + if "&" in book["author"]: + book["author"] = re.sub(r"&\s*", r"\n", book["author"]) + self.main_books = mb self.card_books = cb self.main_xml = mx self.cache_xml = cx - print self.main_books + self.card_books - +def main(): + from PyQt4.Qt import QApplication, QMainWindow + app = QApplication(sys.argv) + window = QMainWindow() + gui = MainWindow(window) + return app.exec_() diff --git a/libprs500/gui/main.ui b/libprs500/gui/main.ui index 652474e0ed..51ff3dc125 100644 --- a/libprs500/gui/main.ui +++ b/libprs500/gui/main.ui @@ -1,49 +1,41 @@ -## Copyright (C) 2006 Kovid Goyal kovid@kovidgoyal.net -## This program is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published by -## the Free Software Foundation; either version 2 of the License, or -## (at your option) any later version. -## -## This program is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License along -## with this program; if not, write to the Free Software Foundation, Inc., -## 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + Kovid Goyal MainWindow 0 0 - 885 + 871 631 + + + 5 + 5 + 0 + 0 + + SONY Reader - + 9 6 - - - - 0 + + + + Qt::Horizontal - - 6 - - - + + 0 @@ -51,77 +43,195 @@ 6 - - - ... + + + + 1 + 7 + 0 + 0 + - - - - + true + + + QFrame::Plain + + + Qt::ScrollBarAsNeeded + + false - - false + + true - - Search title and author + + 15 - + true + + + + false + + + Main Memory:<br><br>Storage card: + + + Qt::RichText + + + - - - - - - 5 - 7 - 0 - 0 - + + + + + 0 - - QFrame::Plain + + 6 - - false - - - - + + + + 0 + + + 6 + + + + + 0 + + + 6 + + + + + &Search: + + + search + + + + + + + true + + + false + + + Search the list of books by title or author<br><br>Words separated by spaces are ANDed + + + Search the list of books by title or author<br><br>Words separated by spaces are ANDed + + + false + + + + + + true + + + + + + + Reset Quick Search + + + ... + + + + + + + + + + 7 + 7 + 0 + 0 + + + + true + + + false + + + + + + + + + 0 + + + 6 + + + + + TextLabel + + + + + + + + 5 + 5 + 10 + 0 + + + + <table><tr><td><b>Title: </b>%1</td><td><b>&nbsp;Size:</b> %2</td></tr><tr><td><b>Author: </b>%3</td><td><b>&nbsp;Type: </b>%4</td></tr> + + + Qt::RichText + + + + + + + + - - - - 0 + + + + 100 - - 6 + + Qt::Horizontal - - - - QFrame::Plain - - - - - - - TextLabel - - - - + - Qt::Horizontal @@ -131,6 +241,7 @@ + diff --git a/libprs500/gui/main_gui.py b/libprs500/gui/main_gui.py deleted file mode 100644 index a00ee5cf6e..0000000000 --- a/libprs500/gui/main_gui.py +++ /dev/null @@ -1,94 +0,0 @@ -# -*- coding: utf-8 -*- - -# Form implementation generated from reading ui file 'main.ui' -# -# Created: Thu Nov 16 20:48:21 2006 -# by: PyQt4 UI code generator 4-snapshot-20061112 -# -# WARNING! All changes made in this file will be lost! - -import sys -from PyQt4 import QtCore, QtGui - -class Ui_MainWindow(object): - def setupUi(self, MainWindow): - MainWindow.setObjectName("MainWindow") - MainWindow.resize(QtCore.QSize(QtCore.QRect(0,0,885,631).size()).expandedTo(MainWindow.minimumSizeHint())) - - self.centralwidget = QtGui.QWidget(MainWindow) - self.centralwidget.setObjectName("centralwidget") - - self.gridlayout = QtGui.QGridLayout(self.centralwidget) - self.gridlayout.setMargin(9) - self.gridlayout.setSpacing(6) - self.gridlayout.setObjectName("gridlayout") - - self.vboxlayout = QtGui.QVBoxLayout() - self.vboxlayout.setMargin(0) - self.vboxlayout.setSpacing(6) - self.vboxlayout.setObjectName("vboxlayout") - - self.hboxlayout = QtGui.QHBoxLayout() - self.hboxlayout.setMargin(0) - self.hboxlayout.setSpacing(6) - self.hboxlayout.setObjectName("hboxlayout") - - self.clear = QtGui.QToolButton(self.centralwidget) - self.clear.setObjectName("clear") - self.hboxlayout.addWidget(self.clear) - - self.search = QtGui.QLineEdit(self.centralwidget) - self.search.setAcceptDrops(False) - self.search.setAutoFillBackground(False) - self.search.setFrame(True) - self.search.setObjectName("search") - self.hboxlayout.addWidget(self.search) - self.vboxlayout.addLayout(self.hboxlayout) - - self.listView = QtGui.QListView(self.centralwidget) - - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Policy(5),QtGui.QSizePolicy.Policy(7)) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.listView.sizePolicy().hasHeightForWidth()) - self.listView.setSizePolicy(sizePolicy) - self.listView.setFrameShadow(QtGui.QFrame.Plain) - self.listView.setAutoScroll(False) - self.listView.setObjectName("listView") - self.vboxlayout.addWidget(self.listView) - self.gridlayout.addLayout(self.vboxlayout,0,1,1,1) - - self.vboxlayout1 = QtGui.QVBoxLayout() - self.vboxlayout1.setMargin(0) - self.vboxlayout1.setSpacing(6) - self.vboxlayout1.setObjectName("vboxlayout1") - - self.treeView = QtGui.QTreeView(self.centralwidget) - self.treeView.setFrameShadow(QtGui.QFrame.Plain) - self.treeView.setObjectName("treeView") - self.vboxlayout1.addWidget(self.treeView) - - self.df = QtGui.QLabel(self.centralwidget) - self.df.setObjectName("df") - self.vboxlayout1.addWidget(self.df) - self.gridlayout.addLayout(self.vboxlayout1,0,0,1,1) - MainWindow.setCentralWidget(self.centralwidget) - - self.statusbar = QtGui.QStatusBar(MainWindow) - self.statusbar.setObjectName("statusbar") - MainWindow.setStatusBar(self.statusbar) - - self.toolBar = QtGui.QToolBar(MainWindow) - self.toolBar.setOrientation(QtCore.Qt.Horizontal) - self.toolBar.setObjectName("toolBar") - MainWindow.addToolBar(self.toolBar) - - self.retranslateUi(MainWindow) - QtCore.QMetaObject.connectSlotsByName(MainWindow) - - def retranslateUi(self, MainWindow): - MainWindow.setWindowTitle(QtGui.QApplication.translate("MainWindow", "MainWindow", None, QtGui.QApplication.UnicodeUTF8)) - self.clear.setText(QtGui.QApplication.translate("MainWindow", "...", None, QtGui.QApplication.UnicodeUTF8)) - self.search.setText(QtGui.QApplication.translate("MainWindow", "Search title and author", None, QtGui.QApplication.UnicodeUTF8)) - self.df.setText(QtGui.QApplication.translate("MainWindow", "TextLabel", None, QtGui.QApplication.UnicodeUTF8)) - diff --git a/libprs500/gui/resources/images.qrc b/libprs500/gui/resources/images.qrc new file mode 100644 index 0000000000..3ff7474005 --- /dev/null +++ b/libprs500/gui/resources/images.qrc @@ -0,0 +1,8 @@ + + + images/book.png + images/mycomputer.png + images/reader.png + images/clear.png + + diff --git a/libprs500/gui/resources/images/book.png b/libprs500/gui/resources/images/book.png new file mode 100644 index 0000000000000000000000000000000000000000..603c20f451d3561fb1dac7e2cb8d17e94a81a62a GIT binary patch literal 14477 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 literal 0 HcmV?d00001 diff --git a/libprs500/gui/resources/images/clear.png b/libprs500/gui/resources/images/clear.png new file mode 100644 index 0000000000000000000000000000000000000000..0d29007cd82b7d3d7ed3711e7491c50febb793e8 GIT binary patch literal 929 zcmV;S177@zP)_8NT-|Ut4+s_)8(Hi{u(wdl zY%&{@AVk(RITmt;WV6xiTwPrmyR`sV{O;}!Ns>TH38j>o`Cu@Bl+uU}heKGFWdIm7%QB>CTCn{s z0E=H=U*qNF1-5O2h#;lJ%*+gg5Rg(DK>(0aLI{B@%Z#^(2tq72dy>Q?RMeW zy}dnXt>Jkdf*`>5_I6?1aU5u^5d;CW)))*1UjwjsyWNKG`*2+suIs|{JoI`!bUK|9 z@X^r`wAMH{I4F&soSZ;w4XrhN-^bhATTw3`pDez$wFS$v%$h5uVB59{J*5=R&d$a; zuTVOj4wO>JvJ6CoG)-}Fae;@2huu;lV)3=LH3UImb~fJ`hU+^!JGi{OtQ6nh-#1|? zr9_rx08m;2l^0)GSwR#<1!1n|L3p=sZf@e{=B6axYPC!#auOmU2qDG;5Rni-L%;gL{!=XW(gP~iXtp5EEo|sz(yFR-|tttANb6g ztE;Q#9rnOz7#0!{LnKK8+qMf3`FoNiCBa6cfhdX!eUFciSYBQ>Z9Xe10rC*}e4aNj zIs*Who123W0`v3pczt~>jQPHg#l=O_u5}hLM4G0Bqn7h}-iT7li~)dc+Xcwk+1Y{( zj)pG*@(}qv!RyFj#rq-;2*5xxTz-7?EBwpDh#^M$3Sw2p^P6_`-P!f3!{lDM`VCn!Lds?t_4LMd(00000NkvXXu0mjf Dm2H>` literal 0 HcmV?d00001 diff --git a/libprs500/gui/resources/images/mycomputer.png b/libprs500/gui/resources/images/mycomputer.png new file mode 100644 index 0000000000000000000000000000000000000000..24e3dca0e9155f46bfbe5caa0e831a668aeab2b4 GIT binary patch literal 1603 zcmV-J2E6%+P)z@;j(q!3lK=n!AY({UO#lFTB>(_`g8%^e{{R4h=>PzA zFaQARU;qF*m;eA5Z<1fdMgRZ>xk*GpRCwBAWMpJyv9hv?CfrYr&qms^X3{r05RCw+C_f&@ZrVh&!7JM`0@46_wQdI_!|U&`}+CMR~Y{C z35a2ABpQgneE$6B=g*%%rca-~7H9_>Kmd-%SOq{JhM}=-x=1H+KM{xi|M#58?f!%H zh6hQ8kXUQS84-KGhdkqjJ7H#pg5>n1%}hn0Dz$8x{JI_&08OyEYi3?mynOw~} zbyI8Ox*vKUW)capkn*IolOqp;F;_DQvAtR7QuJMhHnSz~EdL>&0927n4!|G?L?^8& z>B9Tp(==!Zilbe*pC7#RQ|kNFM}(pGE^0KWHY}d*0j)-ul*fQ@W#StmE|@v=E68s? zKu!TzB%>4nK_ChaNU%nE|3gOhW7vw)Zgzor!|*=v7~PC!FMoo)gQm)vFVc~TB9wBQ zU0~nDhF}$M?(HLCQR>sC@eh6l5XgTFfB*gkB^3rxXn}&^*UztD%UHj&GQ4>4f`Of# z4H!i14Da8*W)Kk(1O^)m&=MxFC7?)VX5|Dr>@Nc}EWi{%05O3GxWPco&BMnaDJ>7w zz{&tjJ-{IO2{il_(98dT;mgMG=;0%Vw{PDwyaD2uuigNI>nBhzDCMvN9rFhs6aWDP z4T}HZu>Jdkk>S_({|pjR;tVpfN(`@FJ_QEBXJ91#0vjeFAqotJUkuNlJ!25y=VAB= zjE)yCUIHD)%pfYn!r*Kv01ieF00X_x8Yp|vwR7L3stWeRJGL^)HMwl zK74q~@a6MIu#4Zl`@$e7Bn=EtCWecbuQGfG`sVw$?+owXe`ByPkph~d4R0KtO- z6u$1kDGYb^-(qV5;F}`2B~8fnQLXL0n1=9EpE^ z{{eQZERxR|KD>O!z{L2Afrp2c z;q#{#49}k4WO(`PCc~@ew}IaL${;H%1r8oTAs%2va)Ql)0e}DkB}`z_`pqCJ%FAG* z@RQ-?10@E=D?$tgQpyY*(%cNJY`+);goGHFwFDWSK7PRP=JiW(l4Rs$1V=cVoER{T z^D!vP^Fe&h2uX1O0mQ=1&CSWc$ofxGjF~AXR)&G`X9m!!e+>T(euHUHWc&wa3PuKC zI%SjrxE4W*&gKD*RNmy23q!y16X*lFtdQ{0DFR+o#n^& z?K@rq4gLraKp<;bfVKn+2nZ+uUH2d8onOH0&1h+9>279brs3}HF8A);J4PNJ9tL%F zbzp@3Vc58FY2b%u>)vH%Wfb0_h0fbRli;9ZM@7}%p zHP8Z(y8ka+R+dOeNHECA$S^EixbR~_LV^IgIRF8~j4tr@?OP^c zVc}qDX=!F)!~)9+cCf)P3=CHWK|xS?!O3v`{CS4X&dxKBA3t6QjYl{D2p~or)t9TT zu5P)bqob+5zCI7ob&SAB1QsPs|AEyH!~OgBe{bKu{ppS!JGOrL@}&o;{vo;n00G2E zpng;YVl5z+0+uB_KpL0_{(gWObQ6eQ;?f8ZU;qVST|s8SAm9K1002ovPDHLkV1mre B+y?*v literal 0 HcmV?d00001 diff --git a/libprs500/gui/resources/images/reader.png b/libprs500/gui/resources/images/reader.png new file mode 100644 index 0000000000000000000000000000000000000000..18dd011495595f11d3856842152469423952be97 GIT binary patch literal 1933 zcmV;82Xgp{P)zL^jp@1y zrtMCwqD?7!(9|VTB8|93o{;2uzL(EuzwB?=>m@$CclRfI zCs}*UKmP3LU69I8t@UR^@O|)W^EQ~S=4W;pm_w%6PKUN*+pcQ;D#WT|lVau2e5?7g z-y58x&H-l==)pQ)cYyTs>08q(K+RU&79X~Q#+G8Qd7X&;g#ti}y;} zM-Z=$UyWCT>YxV72_UP<1|wa{#-x9cOje^&J6zyI-wIf0kVtiBL5C{jU8iWfXEjQh=Y(dG;3$p3m^;C z*CGIML#z?|A#HW6W9&Z=9gZeNI{=rZ_Ce5Qp9#$#u$Ot?`Vg!Q#sqO_%xlbR%mX!F z%~yW{bKP7wwGeNPH^-a6{?i_?*T5a-{=yjre(%PYgCU?xwN$kbD|BnpJ_5N{)KUnt zLM)JzLDG&zi~zGET4ySNxy%)FK@C&G)G*Ks^+LS_VjMucBwi9%;K%*AuOS*8jgH1a)0L(xO;uo~m?>ry z)Spdk2xdZyO_nSQH<0FOd&2GkCqsR&wm_I2 zW{24jW`>!e3uy&u1!>Pg@Ko?r@FduBTW-sMr+J!ZAoFh-^D-5LTf(=(T#!}rfSe5C z4YcS3vXxvRGJuWtH+C54XkfT9ItRQY&WKwe3uU1!1RL1EHb8JHIOYEfyv5#P4-kXJ zU@-*P&wh@8Dptj61xQ!65#^wE>wDCvU^{Y~8NfEXnVn#Bd6Wd`;GUq|-vv!xb79yO zoQuvSCj>QKjaMT;<*7Wi1N2h8RBr+Q1OEg62spJ)ty2v_Zjc+Kf!e5dt1O^~Eare3 zE)U8gpn^8^glJvVD(Vc{c;=W{0{-IEzSL##m-&1BHK3|gl?uQNH^a?PNaiQ=llh$Y-KB3K-S4R*$5~U3c`co!SE9>&ztAXc#!q7UN(d5Bs6h30Ug7Awl8T|pYJg;7paR^I-0nrdpN7M@41H7JIU#ApEk{|#aB$q+tid?ZC zxFEF10r`>`B_zm3`JF5RIZrN^jgZ`&EKbb?6n(h`W$XJYI@_XL=vIc=xHeXrfyy>ox)Fsxl!>jDT(xW)8` zaDLR@_5x8OYE)lfC*7TGpnExc(@VfDcK_|Qhdccm7Tj11(cbW@ruh)t9v|hE0rhr? z7zEM_y|~v6yt?$&UOUK3dwkxb6TtK^-$WgOXY6m;4W@&cWyV6QJ}vuadJwNm+wOW0 zj`cSOKLvlWKPWf`8G-jZXDc*pO&q$h6oSG2asNwj<~ZNzX&^qX`}pevNoxr$nVn&m&1On`n}_S4tl`Y&%*)prCtN=y*9LAIB(R5yq{>=w8S!P}JaTxK4m zACB)4BcbKw7MC*jL*|_p?Xu=Uzd?N)a#n+|HMYTCwU$g0`~WxvbOHa+w+la=d&iZ&OnHZ1`LLlz+I}j0BG9ta}f4__&@nCtsFfd T4Y5Gj00000NkvXXu0mjf3NwNC literal 0 HcmV?d00001 diff --git a/prs-500.e3p b/prs-500.e3p deleted file mode 100644 index fe66e413e6..0000000000 --- a/prs-500.e3p +++ /dev/null @@ -1,126 +0,0 @@ - - - - - - - Python - Console - Library to communicate with the Sony Reader PRS-500 via USB - - Kovid Goyal - kovid@kovidgoyal.net - - - libprs500 - communicate.py - - - libprs500 - terminfo.py - - - libprs500 - prstypes.py - - - libprs500 - errors.py - - - libprs500 - __init__.py - - - setup.py - - - scripts - prs500.py - - - - - - - - - - - epydoc.conf - - - epydoc-pdf.conf - - - - scripts - prs500.py - - - Subversion - (dp0 -S'status' -p1 -(lp2 -S'' -p3 -asS'log' -p4 -(lp5 -g3 -asS'global' -p6 -(lp7 -g3 -asS'update' -p8 -(lp9 -g3 -asS'remove' -p10 -(lp11 -g3 -asS'add' -p12 -(lp13 -g3 -asS'tag' -p14 -(lp15 -g3 -asS'export' -p16 -(lp17 -g3 -asS'commit' -p18 -(lp19 -g3 -asS'diff' -p20 -(lp21 -g3 -asS'checkout' -p22 -(lp23 -g3 -asS'history' -p24 -(lp25 -g3 -as. - (dp0 -S'standardLayout' -p1 -I01 -s. - - - - - - - - - diff --git a/prs-500.e4p b/prs-500.e4p new file mode 100644 index 0000000000..f7506d9261 --- /dev/null +++ b/prs-500.e4p @@ -0,0 +1,211 @@ + + + + + + + Python + Qt4 + Library to communicate with the Sony Reader PRS-500 via USB + + Kovid Goyal + kovid@kovidgoyal.net + + + libprs500 + communicate.py + + + libprs500 + prstypes.py + + + libprs500 + errors.py + + + libprs500 + __init__.py + + + setup.py + + + libprs500 + cli + terminfo.py + + + libprs500 + cli + main.py + + + libprs500 + cli + __init__.py + + + libprs500 + gui + main.py + + + libprs500 + gui + __init__.py + + + +
+ libprs500 + gui + main.ui +
+ + + + + + + + + + epydoc.conf + + + epydoc-pdf.conf + + + libprs500 + gui + resources + images.qrc + + + + libprs500 + gui + main.py + + + Subversion + + + + status + + + + + + + + log + + + + + + + + global + + + + + + + + update + + + + + + + + remove + + + + + + + + add + + + + + + + + tag + + + + + + + + export + + + + + + + + commit + + + + + + + + diff + + + + + + + + checkout + + + + + + + + history + + + + + + + + + + + + standardLayout + + + True + + + + + + + + + + + + diff --git a/setup.py b/setup.py index a51af9ab4d..05f3dfb36b 100644 --- a/setup.py +++ b/setup.py @@ -13,26 +13,42 @@ ## with this program; if not, write to the Free Software Foundation, Inc., ## 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #!/usr/bin/env python -from distutils.core import setup -from libprs500 import VERSION +import ez_setup +ez_setup.use_setuptools() + +from setuptools import setup, find_packages +from libprs500 import __version__ as VERSION + +# TODO: Dependencies setup(name='libprs500', + entry_points = { + 'console_scripts': [ 'prs500 = libprs500.cli.main:main' ], + 'gui_scripts' : [ 'prs500-gui = libprs500.gui.main:main'] + }, + include_package_data = True, version=VERSION, description='Library to interface with the Sony Portable Reader 500 over USB.', long_description = """ - libprs500 is library to interface with the _Sony Portable Reader:http://Sony.com/reader over USB. - It provides methods to list the contents of the file system on the device as well as - copy files from and to the device. It also provides a command line and a graphical user interface via the script prs500.py. - """, + libprs500 is library to interface with the `SONY Portable Reader`_ over USB_. + It provides methods to list the contents of the file system on the device, + as well as copy files from and to the device. + It also provides a command line and a graphical user interface via the script prs500.py. + + For SVN access: svn co https://kovidgoyal.net/svn/code/prs-500 + + .. _SONY Portable Reader: http://Sony.com/reader + .. _USB: http://www.usb.org + """, author='Kovid Goyal', author_email='kovid@kovidgoyal.net', - provides=['libprs500'], - requires=['pyusb'], - packages = ['libprs500', 'libprs500.gui'], - scripts = ['scripts/prs500.py'], + provides=['libprs500'], + packages = find_packages(), + license = 'GPL', + url = 'http://www.python.org/pypi/libprs500/', classifiers = [ - 'Development Status :: 3 - Alpha', + 'Development Status :: 2 - Pre-Alpha', 'Environment :: Console', 'Environment :: X11 Applications :: Qt', 'Intended Audience :: Developers',