Merge branch 'quiet' of git://github.com/gominoa/poclbm

BitcoinMiner.py

@@ -152,7 +152,8 @@ def __init__(self, device, options):
 			self.setpool(self.servers[0])
 			self.user_servers = list(self.servers)
 
-	def say(self, format, args=()):
+	def say(self, format, args=(), sayQuiet=False):
+		if self.options.quiet and not sayQuiet: return
 		with self.outputLock:
 			p = format % args
 			pool = self.pool[4]+' ' if self.pool else ''
@@ -166,6 +167,9 @@ def sayLine(self, format, args=()):
 		if not self.options.verbose:
 			format = '%s, %s\n' % (datetime.now().strftime(TIME_FORMAT), format)
 		self.say(format, args)
+
+	def sayQuiet(self, format, args=()):
+		self.say(format, args, True)
 
 	def exit(self):
 		self.stop = True
@@ -175,7 +179,7 @@ def sayStatus(self, rate, estRate):
 		estRate = Decimal(estRate) / 1000
 		totShares = self.shareCount[1] + self.shareCount[0]
 		totSharesE = max(totShares, totShares, 1)
-		self.say('[%.03f MH/s (~%d MH/s)] [Rej: %d/%d (%d%%)]', (rate, round(estRate), self.shareCount[0], totShares, self.shareCount[0] * 100 / totSharesE))
+		self.sayQuiet('[%.03f MH/s (~%d MH/s)] [Rej: %d/%d (%d%%)]', (rate, round(estRate), self.shareCount[0], totShares, self.shareCount[0] * 100 / totSharesE))
 
 	def failure(self, message):
 		print '\n%s' % message

README.mkd

@@ -6,6 +6,7 @@ Options:
   --version             show program's version number and exit
   -h, --help            show this help message and exit
   --verbose             verbose output, suitable for redirection to log file
+  -q, --quiet           suppress all output except hash rate display
 
   Miner Options:
     -r RATE, --rate=RATE

poclbm.py

@@ -9,6 +9,7 @@
 usage = "usage: %prog [OPTION]... SERVER[#tag]...\nSERVER is one or more [http[s]://]user:pass@host:port          (required)\n[#tag] is a per SERVER user friendly name displayed in stats   (optional)"
 parser = OptionParser(version=USER_AGENT, usage=usage)
 parser.add_option('--verbose',        dest='verbose',    action='store_true', help='verbose output, suitable for redirection to log file')
+parser.add_option('-q', '--quiet',    dest='quiet',      action='store_true', help='suppress all output except hash rate display')
 
 group = OptionGroup(parser, "Miner Options")
 group.add_option('-r', '--rate',      dest='rate',       default=1,           help='hash rate display interval in seconds, default=1', type='float')