From 0252b61bb1dd716127c79161d5872d263d51ad7f Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Thu, 12 Mar 2009 12:56:41 -0700 Subject: [PATCH] IGN:... --- src/calibre/gui2/main.py | 6 +- src/calibre/gui2/viewer/main.py | 2 +- src/calibre/parallel.py | 3 +- upload.py | 118 ++++++++++++++++---------------- 4 files changed, 67 insertions(+), 62 deletions(-) diff --git a/src/calibre/gui2/main.py b/src/calibre/gui2/main.py index 545d70ecef..2f21a3746b 100644 --- a/src/calibre/gui2/main.py +++ b/src/calibre/gui2/main.py @@ -1150,12 +1150,14 @@ class Main(MainWindow, Ui_MainWindow): if ext in config['internally_viewed_formats']: if ext == 'LRF': args = ['lrfviewer', name] - self.job_manager.server.run_free_job('lrfviewer', kwdargs=dict(args=args)) + self.job_manager.server.run_free_job('lrfviewer', + kwdargs=dict(args=args)) else: args = ['ebook-viewer', name] if isosx: args.append('--raise-window') - self.job_manager.server.run_free_job('ebook-viewer', kwdargs=dict(args=args)) + self.job_manager.server.run_free_job('ebook-viewer', + kwdargs=dict(args=args)) else: QDesktopServices.openUrl(QUrl('file:'+name))#launch(name) time.sleep(5) # User feedback diff --git a/src/calibre/gui2/viewer/main.py b/src/calibre/gui2/viewer/main.py index ad1794ca5c..b4512cd0fc 100644 --- a/src/calibre/gui2/viewer/main.py +++ b/src/calibre/gui2/viewer/main.py @@ -577,7 +577,7 @@ def config(defaults=None): else: c = StringConfig(defaults, desc) - c.add_opt('--raise-window', default=False, + c.add_opt('raise_window', ['--raise-window'], default=False, help=_('If specified, viewer window will try to come to the ' 'front when started.')) return c diff --git a/src/calibre/parallel.py b/src/calibre/parallel.py index f9b4513c78..9a812ff028 100644 --- a/src/calibre/parallel.py +++ b/src/calibre/parallel.py @@ -224,7 +224,8 @@ class WorkerMother(object): return env def spawn_free_spirit_osx(self, arg, type='free_spirit'): - script = 'from calibre.parallel import main; main(args=["calibre-parallel", %s]);'%repr(arg) + script = ('from calibre.parallel import main; ' + 'main(args=["calibre-parallel", %s]);')%repr(arg) exe = self.gui_executable if type == 'free_spirit' else self.executable cmdline = [exe, '-c', self.prefix+script] child = WorkerStatus(subprocess.Popen(cmdline, env=self.get_env())) diff --git a/upload.py b/upload.py index 9e7d2a0774..001e34041a 100644 --- a/upload.py +++ b/upload.py @@ -709,65 +709,67 @@ class upload(OptionlessCommand): ('stage3', None) ] -class upload_rss(OptionlessCommand): - - from bzrlib import log as blog - - class ChangelogFormatter(blog.LogFormatter): - supports_tags = True - supports_merge_revisions = False - - def __init__(self, num_of_versions=20): - from calibre.utils.rss_gen import RSS2 - self.num_of_versions = num_of_versions - self.rss = RSS2( - title = 'calibre releases', - link = 'http://calibre.kovidgoyal.net/wiki/Changelog', - description = 'Latest release of calibre', - lastBuildDate = datetime.utcnow() - ) - self.current_entry = None +try: + class upload_rss(OptionlessCommand): + + from bzrlib import log as blog - def log_revision(self, r): - from calibre.utils.rss_gen import RSSItem, Guid - if len(self.rss.items) > self.num_of_versions-1: - return - msg = r.rev.message - match = re.match(r'version\s+(\d+\.\d+.\d+)', msg) - - if match: - if self.current_entry is not None: - mkup = '
' - self.current_entry.description = mkup%(''.join( - self.current_entry.description)) - - self.rss.items.append(self.current_entry) - timestamp = r.rev.timezone + r.rev.timestamp - self.current_entry = RSSItem( - title = 'calibre %s released'%match.group(1), - link = 'http://calibre.kovidgoyal.net/download', - guid = Guid(match.group(), False), - pubDate = datetime(*time.gmtime(timestamp)[:6]), - description = [] - ) - elif self.current_entry is not None: - if re.search(r'[a-zA-Z]', msg) and len(msg.strip()) > 5: - if 'translation' not in msg and not msg.startswith('IGN'): - msg = msg.replace('<', '<').replace('>', '>') - msg = re.sub('#(\d+)', r'#\1', - msg) + class ChangelogFormatter(blog.LogFormatter): + supports_tags = True + supports_merge_revisions = False + + def __init__(self, num_of_versions=20): + from calibre.utils.rss_gen import RSS2 + self.num_of_versions = num_of_versions + self.rss = RSS2( + title = 'calibre releases', + link = 'http://calibre.kovidgoyal.net/wiki/Changelog', + description = 'Latest release of calibre', + lastBuildDate = datetime.utcnow() + ) + self.current_entry = None + + def log_revision(self, r): + from calibre.utils.rss_gen import RSSItem, Guid + if len(self.rss.items) > self.num_of_versions-1: + return + msg = r.rev.message + match = re.match(r'version\s+(\d+\.\d+.\d+)', msg) + + if match: + if self.current_entry is not None: + mkup = '
' + self.current_entry.description = mkup%(''.join( + self.current_entry.description)) - self.current_entry.description.append( - '
  • %s
    • '%msg.strip()) - - - def run(self): - from bzrlib import log, branch - bzr_path = os.path.expanduser('~/work/calibre') - b = branch.Branch.open(bzr_path) - lf = upload_rss.ChangelogFormatter() - log.show_log(b, lf) - lf.rss.write_xml(open('/tmp/releases.xml', 'wb')) - subprocess.check_call('scp /tmp/releases.xml divok:/var/www/calibre.kovidgoyal.net/htdocs/downloads'.split()) + self.rss.items.append(self.current_entry) + timestamp = r.rev.timezone + r.rev.timestamp + self.current_entry = RSSItem( + title = 'calibre %s released'%match.group(1), + link = 'http://calibre.kovidgoyal.net/download', + guid = Guid(match.group(), False), + pubDate = datetime(*time.gmtime(timestamp)[:6]), + description = [] + ) + elif self.current_entry is not None: + if re.search(r'[a-zA-Z]', msg) and len(msg.strip()) > 5: + if 'translation' not in msg and not msg.startswith('IGN'): + msg = msg.replace('<', '<').replace('>', '>') + msg = re.sub('#(\d+)', r'#\1', + msg) + + self.current_entry.description.append( + '
  • %s
    • '%msg.strip()) + + def run(self): + from bzrlib import log, branch + bzr_path = os.path.expanduser('~/work/calibre') + b = branch.Branch.open(bzr_path) + lf = upload_rss.ChangelogFormatter() + log.show_log(b, lf) + lf.rss.write_xml(open('/tmp/releases.xml', 'wb')) + subprocess.check_call('scp /tmp/releases.xml divok:/var/www/calibre.kovidgoyal.net/htdocs/downloads'.split()) +except ImportError: + upload_rss = None