annotate MoinMoin/logfile/__init__.py @ 1856:72ef28ba79b1

logfile: bugfixes and improved handling of some special cases
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Thu, 08 Mar 2007 14:28:32 +0100
parents 472566340cd8
children bb2e053067fb
rev   line source
0
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0
Thomas Waldmann <tw-public@gmx.de>
parents:
diff changeset
1 # -*- coding: iso-8859-1 -*-
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0
Thomas Waldmann <tw-public@gmx.de>
parents:
diff changeset
2 """
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0
Thomas Waldmann <tw-public@gmx.de>
parents:
diff changeset
3 MoinMoin - LogFile package
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0
Thomas Waldmann <tw-public@gmx.de>
parents:
diff changeset
4
1818
df984fe11783 logfile: cleanup/fix base class, fixes also EditLog.news result
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1646
diff changeset
5 This module supports buffered log reads, iterating forward and backward line-by-line, etc.
df984fe11783 logfile: cleanup/fix base class, fixes also EditLog.news result
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1646
diff changeset
6
df984fe11783 logfile: cleanup/fix base class, fixes also EditLog.news result
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1646
diff changeset
7 @copyright: 2005-2007 by Thomas Waldmann (MoinMoin:ThomasWaldmann)
0
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0
Thomas Waldmann <tw-public@gmx.de>
parents:
diff changeset
8 @license: GNU GPL, see COPYING for details.
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0
Thomas Waldmann <tw-public@gmx.de>
parents:
diff changeset
9 """
1855
472566340cd8 logfile: more flexible logging
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1838
diff changeset
10 import logging
0
77665d8e2254 tag of nonpublic@localhost--archive/moin--enterprise--1.5--base-0
Thomas Waldmann <tw-public@gmx.de>
parents:
diff changeset
11
749
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
12 import os, codecs, errno
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
13 from MoinMoin import config, wikiutil
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
14
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
15 class LogError(Exception):
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
16 """ Base class for log errors """
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
17
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
18 class LogMissing(LogError):
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
19 """ Raised when the log is missing """
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
20
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
21
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
22 class LineBuffer:
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
23 """
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
24 Reads lines from a file
1818
df984fe11783 logfile: cleanup/fix base class, fixes also EditLog.news result
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1646
diff changeset
25 self.len number of lines in self.lines
df984fe11783 logfile: cleanup/fix base class, fixes also EditLog.news result
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1646
diff changeset
26 self.lines list of lines (unicode)
df984fe11783 logfile: cleanup/fix base class, fixes also EditLog.news result
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1646
diff changeset
27 self.offsets list of file offsets for each line. additionally the position
df984fe11783 logfile: cleanup/fix base class, fixes also EditLog.news result
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1646
diff changeset
28 after the last read line is stored into self.offsets[-1]
749
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
29 """
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
30 def __init__(self, file, offset, size, forward=True):
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
31 """
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
32 @param file: open file object
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
33 @param offset: position in file to start from
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
34 @param size: aproximate number of bytes to read
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
35 @param forward : read from offset on or from offset-size to offset
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
36 @type forward: boolean
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
37 """
1855
472566340cd8 logfile: more flexible logging
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1838
diff changeset
38 self.loglevel = logging.NOTSET
749
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
39 if forward:
1818
df984fe11783 logfile: cleanup/fix base class, fixes also EditLog.news result
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1646
diff changeset
40 begin = offset
1855
472566340cd8 logfile: more flexible logging
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1838
diff changeset
41 logging.log(self.loglevel, "LineBuffer.init: forward seek %d read %d" % (begin, size))
1818
df984fe11783 logfile: cleanup/fix base class, fixes also EditLog.news result
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1646
diff changeset
42 file.seek(begin)
df984fe11783 logfile: cleanup/fix base class, fixes also EditLog.news result
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1646
diff changeset
43 lines = file.readlines(size)
749
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
44 else:
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
45 if offset < 2 * size:
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
46 begin = 0
1818
df984fe11783 logfile: cleanup/fix base class, fixes also EditLog.news result
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1646
diff changeset
47 size = offset
749
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
48 else:
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
49 begin = offset - size
1855
472566340cd8 logfile: more flexible logging
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1838
diff changeset
50 logging.log(self.loglevel, "LineBuffer.init: backward seek %d read %d" % (begin, size))
749
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
51 file.seek(begin)
1818
df984fe11783 logfile: cleanup/fix base class, fixes also EditLog.news result
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1646
diff changeset
52 lines = file.read(size).splitlines(True)
749
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
53 if begin != 0:
1818
df984fe11783 logfile: cleanup/fix base class, fixes also EditLog.news result
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1646
diff changeset
54 # remove potentially incomplete first line
df984fe11783 logfile: cleanup/fix base class, fixes also EditLog.news result
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1646
diff changeset
55 begin += len(lines[0])
df984fe11783 logfile: cleanup/fix base class, fixes also EditLog.news result
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1646
diff changeset
56 lines = lines[1:]
749
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
57 # XXX check for min one line read
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
58
1818
df984fe11783 logfile: cleanup/fix base class, fixes also EditLog.news result
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1646
diff changeset
59 linecount = len(lines)
df984fe11783 logfile: cleanup/fix base class, fixes also EditLog.news result
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1646
diff changeset
60
df984fe11783 logfile: cleanup/fix base class, fixes also EditLog.news result
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1646
diff changeset
61 # now calculate the file offsets of all read lines
df984fe11783 logfile: cleanup/fix base class, fixes also EditLog.news result
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1646
diff changeset
62 offsets = [len(line) for line in lines]
df984fe11783 logfile: cleanup/fix base class, fixes also EditLog.news result
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1646
diff changeset
63 offsets.append(0) # later this element will have the file offset after the last read line
df984fe11783 logfile: cleanup/fix base class, fixes also EditLog.news result
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1646
diff changeset
64
df984fe11783 logfile: cleanup/fix base class, fixes also EditLog.news result
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1646
diff changeset
65 lengthpreviousline = 0
df984fe11783 logfile: cleanup/fix base class, fixes also EditLog.news result
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1646
diff changeset
66 offset = begin
df984fe11783 logfile: cleanup/fix base class, fixes also EditLog.news result
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1646
diff changeset
67 for i in xrange(linecount+1):
df984fe11783 logfile: cleanup/fix base class, fixes also EditLog.news result
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1646
diff changeset
68 offset += lengthpreviousline
df984fe11783 logfile: cleanup/fix base class, fixes also EditLog.news result
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1646
diff changeset
69 lengthpreviousline = offsets[i]
df984fe11783 logfile: cleanup/fix base class, fixes also EditLog.news result
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1646
diff changeset
70 offsets[i] = offset
df984fe11783 logfile: cleanup/fix base class, fixes also EditLog.news result
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1646
diff changeset
71
df984fe11783 logfile: cleanup/fix base class, fixes also EditLog.news result
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1646
diff changeset
72 self.offsets = offsets
df984fe11783 logfile: cleanup/fix base class, fixes also EditLog.news result
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1646
diff changeset
73 self.len = linecount
df984fe11783 logfile: cleanup/fix base class, fixes also EditLog.news result
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1646
diff changeset
74 # Decode lines after offset in file is calculated
df984fe11783 logfile: cleanup/fix base class, fixes also EditLog.news result
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1646
diff changeset
75 self.lines = [unicode(line, config.charset) for line in lines]
749
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
76
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
77
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
78 class LogFile:
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
79 """
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
80 .filter: function that gets the values from .parser.
1818
df984fe11783 logfile: cleanup/fix base class, fixes also EditLog.news result
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1646
diff changeset
81 must return True to keep it or False to remove it
df984fe11783 logfile: cleanup/fix base class, fixes also EditLog.news result
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1646
diff changeset
82 Overwrite .parser() and .add() to customize this class to special log files
749
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
83 """
1000
6f6fcbe200b5 whitespace-only cleanup and minor style changes
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 749
diff changeset
84
1838
e1d4cc010dec Reduced log file buffer to 4 kB.
Alexander Schremmer <alex AT alexanderweb DOT de>
parents: 1825
diff changeset
85 def __init__(self, filename, buffer_size=4096):
749
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
86 """
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
87 @param filename: name of the log file
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
88 @param buffer_size: approx. size of one buffer in bytes
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
89 """
1855
472566340cd8 logfile: more flexible logging
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1838
diff changeset
90 self.loglevel = logging.NOTSET
749
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
91 self.__filename = filename
1818
df984fe11783 logfile: cleanup/fix base class, fixes also EditLog.news result
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1646
diff changeset
92 self.__buffer = None # currently used buffer, points to one of the following:
749
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
93 self.__buffer1 = None
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
94 self.__buffer2 = None
1818
df984fe11783 logfile: cleanup/fix base class, fixes also EditLog.news result
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1646
diff changeset
95 self.buffer_size = buffer_size
df984fe11783 logfile: cleanup/fix base class, fixes also EditLog.news result
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1646
diff changeset
96 self.__lineno = 0
df984fe11783 logfile: cleanup/fix base class, fixes also EditLog.news result
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1646
diff changeset
97 self.filter = None
749
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
98
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
99 def __iter__(self):
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
100 return self
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
101
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
102 def reverse(self):
1818
df984fe11783 logfile: cleanup/fix base class, fixes also EditLog.news result
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1646
diff changeset
103 """ yield log entries in reverse direction starting from last one
df984fe11783 logfile: cleanup/fix base class, fixes also EditLog.news result
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1646
diff changeset
104
df984fe11783 logfile: cleanup/fix base class, fixes also EditLog.news result
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1646
diff changeset
105 @rtype: iterator
749
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
106 """
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
107 self.to_end()
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
108 while 1:
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
109 try:
1855
472566340cd8 logfile: more flexible logging
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1838
diff changeset
110 logging.log(self.loglevel, "LogFile.reverse %s" % self.__filename)
749
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
111 result = self.previous()
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
112 except StopIteration:
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
113 return
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
114 yield result
1000
6f6fcbe200b5 whitespace-only cleanup and minor style changes
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 749
diff changeset
115
749
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
116 def sanityCheck(self):
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
117 """ Check for log file write access.
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
118
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
119 @rtype: string (error message) or None
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
120 """
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
121 if not os.access(self.__filename, os.W_OK):
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
122 return "The log '%s' is not writable!" % (self.__filename,)
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
123 return None
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
124
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
125 def __getattr__(self, name):
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
126 """
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
127 generate some attributes when needed
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
128 """
1825
738bb2ec6b7f partially reverted changeset 1820, the code WAS used
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1820
diff changeset
129 if name == "_LogFile__rel_index": # Python black magic: this is the real name of the __rel_index attribute
738bb2ec6b7f partially reverted changeset 1820, the code WAS used
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1820
diff changeset
130 # starting iteration from begin
738bb2ec6b7f partially reverted changeset 1820, the code WAS used
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1820
diff changeset
131 self.__buffer1 = LineBuffer(self._input, 0, self.buffer_size)
738bb2ec6b7f partially reverted changeset 1820, the code WAS used
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1820
diff changeset
132 self.__buffer2 = LineBuffer(self._input,
738bb2ec6b7f partially reverted changeset 1820, the code WAS used
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1820
diff changeset
133 self.__buffer1.offsets[-1],
738bb2ec6b7f partially reverted changeset 1820, the code WAS used
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1820
diff changeset
134 self.buffer_size)
738bb2ec6b7f partially reverted changeset 1820, the code WAS used
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1820
diff changeset
135 self.__buffer = self.__buffer1
738bb2ec6b7f partially reverted changeset 1820, the code WAS used
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1820
diff changeset
136 self.__rel_index = 0
738bb2ec6b7f partially reverted changeset 1820, the code WAS used
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1820
diff changeset
137 return 0
738bb2ec6b7f partially reverted changeset 1820, the code WAS used
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1820
diff changeset
138 elif name == "_input":
749
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
139 try:
1818
df984fe11783 logfile: cleanup/fix base class, fixes also EditLog.news result
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1646
diff changeset
140 # Open the file (NOT using codecs.open, it breaks our offset calculation. We decode it later.).
df984fe11783 logfile: cleanup/fix base class, fixes also EditLog.news result
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1646
diff changeset
141 # Use binary mode in order to retain \r - otherwise the offset calculation would fail.
749
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
142 self._input = file(self.__filename, "rb",)
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
143 except IOError:
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
144 raise StopIteration
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
145 return self._input
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
146 elif name == "_output":
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
147 self._output = codecs.open(self.__filename, 'a', config.charset)
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
148 return self._output
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
149 else:
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
150 raise AttributeError(name)
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
151
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
152 def size(self):
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
153 """ Return log size in bytes
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
154
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
155 Return 0 if the file does not exists. Raises other OSError.
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
156
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
157 @return: size of log file in bytes
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
158 @rtype: Int
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
159 """
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
160 try:
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
161 return os.path.getsize(self.__filename)
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
162 except OSError, err:
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
163 if err.errno == errno.ENOENT:
1000
6f6fcbe200b5 whitespace-only cleanup and minor style changes
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 749
diff changeset
164 return 0
749
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
165 raise
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
166
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
167 def lines(self):
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
168 """ Return number of lines in the log file
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
169
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
170 Return 0 if the file does not exists. Raises other OSError.
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
171
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
172 Expensive for big log files - O(n)
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
173
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
174 @return: size of log file in lines
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
175 @rtype: Int
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
176 """
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
177 try:
1818
df984fe11783 logfile: cleanup/fix base class, fixes also EditLog.news result
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1646
diff changeset
178 f = file(self.__filename, 'r')
749
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
179 try:
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
180 count = 0
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
181 for line in f:
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
182 count += 1
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
183 return count
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
184 finally:
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
185 f.close()
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
186 except (OSError, IOError), err:
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
187 if err.errno == errno.ENOENT:
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
188 return 0
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
189 raise
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
190
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
191 def date(self):
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
192 """ Return timestamp of log file in usecs """
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
193 try:
1000
6f6fcbe200b5 whitespace-only cleanup and minor style changes
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 749
diff changeset
194 mtime = os.path.getmtime(self.__filename)
749
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
195 except OSError, err:
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
196 if err.errno == errno.ENOENT:
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
197 # This can happen on fresh wiki when building the index
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
198 # Usually the first request will create an event log
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
199 raise LogMissing(str(err))
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
200 raise
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
201 return wikiutil.timestamp2version(mtime)
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
202
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
203 def peek(self, lines):
1818
df984fe11783 logfile: cleanup/fix base class, fixes also EditLog.news result
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1646
diff changeset
204 """ Move position in file forward or backwards by "lines" count
df984fe11783 logfile: cleanup/fix base class, fixes also EditLog.news result
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1646
diff changeset
205
df984fe11783 logfile: cleanup/fix base class, fixes also EditLog.news result
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1646
diff changeset
206 It adjusts .__lineno if set.
df984fe11783 logfile: cleanup/fix base class, fixes also EditLog.news result
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1646
diff changeset
207 This function is not aware of filters!
749
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
208
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
209 @param lines: number of lines, may be negative to move backward
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
210 @rtype: boolean
1818
df984fe11783 logfile: cleanup/fix base class, fixes also EditLog.news result
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1646
diff changeset
211 @return: True if moving more than to the beginning and moving
df984fe11783 logfile: cleanup/fix base class, fixes also EditLog.news result
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1646
diff changeset
212 to the end or beyond
749
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
213 """
1855
472566340cd8 logfile: more flexible logging
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1838
diff changeset
214 logging.log(self.loglevel, "LogFile.peek %s" % self.__filename)
1818
df984fe11783 logfile: cleanup/fix base class, fixes also EditLog.news result
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1646
diff changeset
215 self.__rel_index += lines
749
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
216 while self.__rel_index < 0:
1646
2fbb179f3518 use filepos in (not mtime of) edit-log for editlog.news, fix some bugs in logfile
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1317
diff changeset
217 if self.__buffer is self.__buffer2:
1856
72ef28ba79b1 logfile: bugfixes and improved handling of some special cases
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1855
diff changeset
218 if self.__buffer.offsets[0] == 0:
72ef28ba79b1 logfile: bugfixes and improved handling of some special cases
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1855
diff changeset
219 # already at the beginning of the file
72ef28ba79b1 logfile: bugfixes and improved handling of some special cases
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1855
diff changeset
220 self.__rel_index = 0
72ef28ba79b1 logfile: bugfixes and improved handling of some special cases
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1855
diff changeset
221 self.__lineno = 0
72ef28ba79b1 logfile: bugfixes and improved handling of some special cases
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1855
diff changeset
222 return True
72ef28ba79b1 logfile: bugfixes and improved handling of some special cases
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1855
diff changeset
223 else:
72ef28ba79b1 logfile: bugfixes and improved handling of some special cases
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1855
diff changeset
224 # change to buffer 1
72ef28ba79b1 logfile: bugfixes and improved handling of some special cases
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1855
diff changeset
225 self.__buffer = self.__buffer1
72ef28ba79b1 logfile: bugfixes and improved handling of some special cases
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1855
diff changeset
226 self.__rel_index += self.__buffer.len
1818
df984fe11783 logfile: cleanup/fix base class, fixes also EditLog.news result
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1646
diff changeset
227 else: # self.__buffer is self.__buffer1
749
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
228 if self.__buffer.offsets[0] == 0:
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
229 # already at the beginning of the file
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
230 self.__rel_index = 0
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
231 self.__lineno = 0
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
232 return True
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
233 else:
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
234 # load previous lines
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
235 self.__buffer2 = self.__buffer1
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
236 self.__buffer1 = LineBuffer(self._input,
1818
df984fe11783 logfile: cleanup/fix base class, fixes also EditLog.news result
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1646
diff changeset
237 self.__buffer.offsets[0],
749
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
238 self.buffer_size,
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
239 forward=False)
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
240 self.__buffer = self.__buffer1
1818
df984fe11783 logfile: cleanup/fix base class, fixes also EditLog.news result
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1646
diff changeset
241 self.__rel_index += self.__buffer.len
1000
6f6fcbe200b5 whitespace-only cleanup and minor style changes
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 749
diff changeset
242
749
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
243 while self.__rel_index >= self.__buffer.len:
1646
2fbb179f3518 use filepos in (not mtime of) edit-log for editlog.news, fix some bugs in logfile
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1317
diff changeset
244 if self.__buffer is self.__buffer1:
749
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
245 # change to buffer 2
1818
df984fe11783 logfile: cleanup/fix base class, fixes also EditLog.news result
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1646
diff changeset
246 self.__rel_index -= self.__buffer.len
749
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
247 self.__buffer = self.__buffer2
1818
df984fe11783 logfile: cleanup/fix base class, fixes also EditLog.news result
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1646
diff changeset
248 else: # self.__buffer is self.__buffer2
749
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
249 # try to load next buffer
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
250 tmpbuff = LineBuffer(self._input,
1818
df984fe11783 logfile: cleanup/fix base class, fixes also EditLog.news result
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1646
diff changeset
251 self.__buffer.offsets[-1],
749
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
252 self.buffer_size)
1000
6f6fcbe200b5 whitespace-only cleanup and minor style changes
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 749
diff changeset
253 if tmpbuff.len == 0:
749
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
254 # end of file
1818
df984fe11783 logfile: cleanup/fix base class, fixes also EditLog.news result
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1646
diff changeset
255 if self.__lineno is not None:
df984fe11783 logfile: cleanup/fix base class, fixes also EditLog.news result
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1646
diff changeset
256 self.__lineno += (lines -
df984fe11783 logfile: cleanup/fix base class, fixes also EditLog.news result
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1646
diff changeset
257 (self.__rel_index - self.__buffer.len))
1646
2fbb179f3518 use filepos in (not mtime of) edit-log for editlog.news, fix some bugs in logfile
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1317
diff changeset
258 self.__rel_index = self.__buffer.len # point to after last read line
749
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
259 return True
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
260 # shift buffers
1818
df984fe11783 logfile: cleanup/fix base class, fixes also EditLog.news result
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1646
diff changeset
261 self.__rel_index -= self.__buffer.len
749
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
262 self.__buffer1 = self.__buffer2
1000
6f6fcbe200b5 whitespace-only cleanup and minor style changes
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 749
diff changeset
263 self.__buffer2 = tmpbuff
1818
df984fe11783 logfile: cleanup/fix base class, fixes also EditLog.news result
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1646
diff changeset
264 self.__buffer = self.__buffer2
df984fe11783 logfile: cleanup/fix base class, fixes also EditLog.news result
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1646
diff changeset
265
df984fe11783 logfile: cleanup/fix base class, fixes also EditLog.news result
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1646
diff changeset
266 if self.__lineno is not None:
df984fe11783 logfile: cleanup/fix base class, fixes also EditLog.news result
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1646
diff changeset
267 self.__lineno += lines
749
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
268 return False
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
269
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
270 def __next(self):
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
271 """get next line already parsed"""
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
272 if self.peek(0):
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
273 raise StopIteration
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
274 result = self.parser(self.__buffer.lines[self.__rel_index])
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
275 self.peek(1)
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
276 return result
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
277
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
278 def next(self):
1818
df984fe11783 logfile: cleanup/fix base class, fixes also EditLog.news result
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1646
diff changeset
279 """get next line that passes through the filter
749
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
280 @return: next entry
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
281 raises StopIteration at file end
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
282 """
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
283 result = None
1000
6f6fcbe200b5 whitespace-only cleanup and minor style changes
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 749
diff changeset
284 while result is None:
6f6fcbe200b5 whitespace-only cleanup and minor style changes
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 749
diff changeset
285 while result is None:
1855
472566340cd8 logfile: more flexible logging
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1838
diff changeset
286 logging.log(self.loglevel, "LogFile.next %s" % self.__filename)
749
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
287 result = self.__next()
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
288 if self.filter and not self.filter(result):
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
289 result = None
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
290 return result
1000
6f6fcbe200b5 whitespace-only cleanup and minor style changes
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 749
diff changeset
291
749
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
292 def __previous(self):
1818
df984fe11783 logfile: cleanup/fix base class, fixes also EditLog.news result
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1646
diff changeset
293 """get previous line already parsed"""
1000
6f6fcbe200b5 whitespace-only cleanup and minor style changes
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 749
diff changeset
294 if self.peek(-1):
6f6fcbe200b5 whitespace-only cleanup and minor style changes
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 749
diff changeset
295 raise StopIteration
749
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
296 return self.parser(self.__buffer.lines[self.__rel_index])
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
297
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
298 def previous(self):
1818
df984fe11783 logfile: cleanup/fix base class, fixes also EditLog.news result
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1646
diff changeset
299 """get previous line that passes through the filter
df984fe11783 logfile: cleanup/fix base class, fixes also EditLog.news result
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1646
diff changeset
300 @return: previous entry
749
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
301 raises StopIteration at file begin
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
302 """
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
303 result = None
1000
6f6fcbe200b5 whitespace-only cleanup and minor style changes
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 749
diff changeset
304 while result is None:
6f6fcbe200b5 whitespace-only cleanup and minor style changes
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 749
diff changeset
305 while result is None:
1855
472566340cd8 logfile: more flexible logging
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1838
diff changeset
306 logging.log(self.loglevel, "LogFile.previous %s" % self.__filename)
749
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
307 result = self.__previous()
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
308 if self.filter and not self.filter(result):
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
309 result = None
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
310 return result
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
311
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
312 def to_begin(self):
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
313 """moves file position to the begin"""
1855
472566340cd8 logfile: more flexible logging
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1838
diff changeset
314 logging.log(self.loglevel, "LogFile.to_begin %s" % self.__filename)
1820
9595d9d5e5ae logfile: removed some unused code, added some checks
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1818
diff changeset
315 if self.__buffer1 is None or self.__buffer1.offsets[0] != 0:
749
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
316 self.__buffer1 = LineBuffer(self._input,
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
317 0,
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
318 self.buffer_size)
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
319 self.__buffer2 = LineBuffer(self._input,
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
320 self.__buffer1.offsets[-1],
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
321 self.buffer_size)
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
322 self.__buffer = self.__buffer1
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
323 self.__rel_index = 0
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
324 self.__lineno = 0
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
325
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
326 def to_end(self):
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
327 """moves file position to the end"""
1855
472566340cd8 logfile: more flexible logging
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1838
diff changeset
328 logging.log(self.loglevel, "LogFile.to_end %s" % self.__filename)
749
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
329 self._input.seek(0, 2) # to end of file
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
330 size = self._input.tell()
1820
9595d9d5e5ae logfile: removed some unused code, added some checks
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1818
diff changeset
331 if self.__buffer2 is None or size > self.__buffer2.offsets[-1]:
749
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
332 self.__buffer2 = LineBuffer(self._input,
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
333 size,
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
334 self.buffer_size,
1000
6f6fcbe200b5 whitespace-only cleanup and minor style changes
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 749
diff changeset
335 forward=False)
6f6fcbe200b5 whitespace-only cleanup and minor style changes
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 749
diff changeset
336
749
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
337 self.__buffer1 = LineBuffer(self._input,
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
338 self.__buffer2.offsets[0],
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
339 self.buffer_size,
1000
6f6fcbe200b5 whitespace-only cleanup and minor style changes
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 749
diff changeset
340 forward=False)
749
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
341 self.__buffer = self.__buffer2
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
342 self.__rel_index = self.__buffer2.len
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
343 self.__lineno = None
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
344
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
345 def position(self):
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
346 """ Return the current file position
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
347
1818
df984fe11783 logfile: cleanup/fix base class, fixes also EditLog.news result
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1646
diff changeset
348 This can be converted into a String using back-ticks and then be rebuild.
749
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
349 For this plain file implementation position is an Integer.
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
350 """
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
351 return self.__buffer.offsets[self.__rel_index]
1000
6f6fcbe200b5 whitespace-only cleanup and minor style changes
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 749
diff changeset
352
749
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
353 def seek(self, position, line_no=None):
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
354 """ moves file position to an value formerly gotten from .position().
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
355 To enable line counting line_no must be provided.
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
356 .seek is much more efficient for moving long distances than .peek.
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
357 raises ValueError if position is invalid
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
358 """
1855
472566340cd8 logfile: more flexible logging
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1838
diff changeset
359 logging.log(self.loglevel, "LogFile.seek %s pos %d" % (self.__filename, position))
472566340cd8 logfile: more flexible logging
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1838
diff changeset
360 if self.__buffer1:
472566340cd8 logfile: more flexible logging
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1838
diff changeset
361 logging.log(self.loglevel, "b1 %r %r" % (self.__buffer1.offsets[0], self.__buffer1.offsets[-1]))
472566340cd8 logfile: more flexible logging
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1838
diff changeset
362 if self.__buffer2:
472566340cd8 logfile: more flexible logging
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1838
diff changeset
363 logging.log(self.loglevel, "b2 %r %r" % (self.__buffer2.offsets[0], self.__buffer2.offsets[-1]))
1646
2fbb179f3518 use filepos in (not mtime of) edit-log for editlog.news, fix some bugs in logfile
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1317
diff changeset
364 if self.__buffer1 and self.__buffer1.offsets[0] <= position < self.__buffer1.offsets[-1]:
749
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
365 # position is in .__buffer1
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
366 self.__rel_index = self.__buffer1.offsets.index(position)
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
367 self.__buffer = self.__buffer1
1646
2fbb179f3518 use filepos in (not mtime of) edit-log for editlog.news, fix some bugs in logfile
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1317
diff changeset
368 elif self.__buffer2 and self.__buffer2.offsets[0] <= position < self.__buffer2.offsets[-1]:
749
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
369 # position is in .__buffer2
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
370 self.__rel_index = self.__buffer2.offsets.index(position)
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
371 self.__buffer = self.__buffer2
1856
72ef28ba79b1 logfile: bugfixes and improved handling of some special cases
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1855
diff changeset
372 elif self.__buffer1 and self.__buffer1.offsets[-1] == position:
72ef28ba79b1 logfile: bugfixes and improved handling of some special cases
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1855
diff changeset
373 # we already have one buffer directly before where we want to go
72ef28ba79b1 logfile: bugfixes and improved handling of some special cases
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1855
diff changeset
374 self.__buffer2 = LineBuffer(self._input,
72ef28ba79b1 logfile: bugfixes and improved handling of some special cases
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1855
diff changeset
375 position,
72ef28ba79b1 logfile: bugfixes and improved handling of some special cases
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1855
diff changeset
376 self.buffer_size)
72ef28ba79b1 logfile: bugfixes and improved handling of some special cases
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1855
diff changeset
377 self.__buffer = self.__buffer2
72ef28ba79b1 logfile: bugfixes and improved handling of some special cases
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1855
diff changeset
378 self.__rel_index = 0
72ef28ba79b1 logfile: bugfixes and improved handling of some special cases
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1855
diff changeset
379 elif self.__buffer2 and self.__buffer2.offsets[-1] == position:
72ef28ba79b1 logfile: bugfixes and improved handling of some special cases
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1855
diff changeset
380 # we already have one buffer directly before where we want to go
72ef28ba79b1 logfile: bugfixes and improved handling of some special cases
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1855
diff changeset
381 self.__buffer1 = self.__buffer2
72ef28ba79b1 logfile: bugfixes and improved handling of some special cases
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1855
diff changeset
382 self.__buffer2 = LineBuffer(self._input,
72ef28ba79b1 logfile: bugfixes and improved handling of some special cases
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1855
diff changeset
383 position,
72ef28ba79b1 logfile: bugfixes and improved handling of some special cases
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1855
diff changeset
384 self.buffer_size)
72ef28ba79b1 logfile: bugfixes and improved handling of some special cases
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1855
diff changeset
385 self.__buffer = self.__buffer2
72ef28ba79b1 logfile: bugfixes and improved handling of some special cases
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 1855
diff changeset
386 self.__rel_index = 0
749
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
387 else:
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
388 # load buffers around position
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
389 self.__buffer1 = LineBuffer(self._input,
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
390 position,
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
391 self.buffer_size,
1000
6f6fcbe200b5 whitespace-only cleanup and minor style changes
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 749
diff changeset
392 forward=False)
749
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
393 self.__buffer2 = LineBuffer(self._input,
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
394 position,
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
395 self.buffer_size)
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
396 self.__buffer = self.__buffer2
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
397 self.__rel_index = 0
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
398 # XXX test for valid position
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
399 self.__lineno = line_no
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
400
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
401 def line_no(self):
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
402 """@return: the current line number or None if line number is unknown"""
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
403 return self.__lineno
1000
6f6fcbe200b5 whitespace-only cleanup and minor style changes
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 749
diff changeset
404
749
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
405 def calculate_line_no(self):
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
406 """ Calculate the current line number from buffer offsets
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
407
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
408 If line number is unknown it is calculated by parsing the whole file.
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
409 This may be expensive.
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
410 """
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
411 self._input.seek(0, 0)
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
412 lines = self._input.read(self.__buffer.offsets[self.__rel_index])
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
413 self.__lineno = len(lines.splitlines())
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
414 return self.__lineno
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
415
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
416 def parser(self, line):
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
417 """
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
418 @param line: line as read from file
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
419 @return: parsed line or None on error
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
420 Converts the line from file to program representation
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
421 This implementation uses TAB separated strings.
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
422 This method should be overwritten by the sub classes.
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
423 """
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
424 return line.split("\t")
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
425
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
426 def add(self, *data):
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
427 """
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
428 add line to log file
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
429 This implementation save the values as TAB separated strings.
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
430 This method should be overwritten by the sub classes.
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
431 """
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
432 line = "\t".join(data)
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
433 self._add(line)
1000
6f6fcbe200b5 whitespace-only cleanup and minor style changes
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 749
diff changeset
434
749
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
435 def _add(self, line):
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
436 """
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
437 @param line: flat line
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
438 @type line: String
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
439 write on entry in the log file
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
440 """
1000
6f6fcbe200b5 whitespace-only cleanup and minor style changes
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 749
diff changeset
441 if line is not None:
749
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
442 if line[-1] != '\n':
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
443 line += '\n'
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
444 self._output.write(line)
3dba26fcfde0 moved logfile/logfile.py to logfile/__init__.py
Thomas Waldmann <tw AT waldmann-edv DOT de>
parents: 0
diff changeset
445