qmsk.irclogs: comparison log

equal deleted inserted replaced

-:a0662cff1d9d
+:745032a57803
 self.charset = charset
 self.sep = sep
 # open
 self.file = open(path, 'rb')
 def __iter__ (self) :
 """
 Yields a series of unicode lines, as read from the top of the file
 """
 given *datetime*, or the the current date, if none given
 """
 # default to now
 if not dt :
-dt = datetime.datetime.now(pytz.utc)
+dtz = self.tz.localize(datetime.datetime.now())
-# convert to target timezone
+else :
-dtz = dt.astimezone(self.tz)
+# convert to target timezone
+dtz = dt.astimezone(self.tz)
 # our timedelta
 ONE_DAY = datetime.timedelta(1)
 # iterate unto infinity
 Reads/probes at most max_files files.
 """
 # start counting at zero...
 file_count = 0
+# have we found any files at all so far?
+have_found = False
 # iterate backwards over days
 for day in self._iter_date_reverse(dt) :
 # stop if we've handled enough files by now
 if file_count > max_files :
 file_count += 1
 logfile = self._get_logfile_date(day)
 # no logfile there?
 if not logfile :
-# if we didn't find any logfiles at all, terminate rudely
+# hit our limit?
 if file_count > max_files :
-raise Exception("No recent logfiles found")
+# if we didn't find any logfiles at all, terminate rudely
+if not have_found :
+raise Exception("No recent logfiles found")
+else :
+# stop looking, deal with what we've got
+return
 else :
 # skip to next day
 continue
+# mark have_found
+have_found = True
 # yield it
 yield logfile
 def get_latest (self, count) :
 """
 Uses _iter_backwards + _get_logfile_date to read the yield the given lines from as many logfiles as needed
 """
-# iterate over logfiles
-iter = self._iter_logfile_reverse()
 # read the events into here
 lines = []
-# loop until done
+# start reading in those logfiles
-while len(lines) < count :
+for logfile in self._iter_logfile_reverse() :
-# next logfile
-logfile = iter.next()
 # read the events
 # XXX: use a queue
 lines = list(logfile.read_latest(count)) + lines
+# done?
+if len(lines) >= count :
+break
 # return the events
 return lines
 def get_date (self, dt) :

changeset 81	745032a57803
parent 78	85345abbd46a
child 82	afd3120ec71e