Attachment #59679 for bug #93148




            nextCopies = ', '.join(["%d:%.1f%%" % (a,int(b*1000)/10) for a,b in
                    zip(xrange(numCopies+1, 1000), statistics['numCopyList'])])
            if not self.done:
                self.seedStatus = _("%d seen now, plus %d distributed copies") % \
			(statistics['numSeeds'], statistics['numCopies']) +\
                        	'(%s)' % (nextCopies)
            else:
                self.seedStatus = _("%d distributed copies (next: %s)") % (
                    statistics['numCopies'], nextCopies)

            if config['save_as']:
                if config['save_in']:
                    raise BTFailure(_("You cannot specify both --save_as and "
                                      "--save_in"))
                saveas = config['save_as']
            elif config['save_in']:
                saveas = os.path.join(config['save_in'], torrent_name)

Lines 134-142 Link Here

(-)btdownloadheadless.py.orig (-3 / +3 lines)
134	nextCopies = ', '.join(["%d:%.1f%%" % (a,int(b*1000)/10) for a,b in	134	nextCopies = ', '.join(["%d:%.1f%%" % (a,int(b*1000)/10) for a,b in
135	zip(xrange(numCopies+1, 1000), statistics['numCopyList'])])	135	zip(xrange(numCopies+1, 1000), statistics['numCopyList'])])
136	if not self.done:	136	if not self.done:
137	self.seedStatus = _("%d seen now, plus %d distributed copies ") \	137	self.seedStatus = _("%d seen now, plus %d distributed copies") % \
138	'(%s)' % (statistics['numSeeds'],	138	(statistics['numSeeds'], statistics['numCopies']) +\
139	statistics['numCopies'], nextCopies)	139	'(%s)' % (nextCopies)
140	else:	140	else:
141	self.seedStatus = _("%d distributed copies (next: %s)") % (	141	self.seedStatus = _("%d distributed copies (next: %s)") % (
142	statistics['numCopies'], nextCopies)	142	statistics['numCopies'], nextCopies)

Return to bug 93148

Lines 219-227 Link Here

(-)btdownloadcurses.py.orig (-4 / +4 lines)
219	nextCopies = ', '.join(["%d:%.1f%%" % (a,int(b*1000)/10) for a,b in	219	nextCopies = ', '.join(["%d:%.1f%%" % (a,int(b*1000)/10) for a,b in
220	zip(xrange(numCopies+1, 1000), statistics['numCopyList'])])	220	zip(xrange(numCopies+1, 1000), statistics['numCopyList'])])
221	if not self.done:	221	if not self.done:
222	self.seedStatus = _("%d seen now, plus %d distributed copies") +\	222	self.seedStatus = _("%d seen now, plus %d distributed copies") % \
223	'(%s)' % (statistics['numSeeds'],	223	(statistics['numSeeds'], statistics['numCopies']) +\
224	statistics['numCopies'], nextCopies)	224	'(%s)' % (nextCopies)
225	else:	225	else:
226	self.seedStatus = _("%d distributed copies (next: %s)") % (	226	self.seedStatus = _("%d distributed copies (next: %s)") % (
227	statistics['numCopies'], nextCopies)	227	statistics['numCopies'], nextCopies)
Lines 333-339 Link Here
333	if config['save_as']:	333	if config['save_as']:
334	if config['save_in']:	334	if config['save_in']:
335	raise BTFailure(_("You cannot specify both --save_as and "	335	raise BTFailure(_("You cannot specify both --save_as and "
336	"--save_in")	336	"--save_in"))
337	saveas = config['save_as']	337	saveas = config['save_as']
338	elif config['save_in']:	338	elif config['save_in']:
339	saveas = os.path.join(config['save_in'], torrent_name)	339	saveas = os.path.join(config['save_in'], torrent_name)