1
=== modified file 'lib/canonical/librarian/tests/librarian-report.txt'
2
--- lib/canonical/librarian/tests/librarian-report.txt	2009-12-15 05:29:47 +0000
3
+++ lib/canonical/librarian/tests/librarian-report.txt	2009-12-23 04:36:17 +0000
4
@@ -1,18 +1,31 @@
5
1
We have a report that we run as necessary to see what is using the Librarian
1
We have a report that we run as necessary to see what is using the Librarian
6
2
storage.
2
storage.
7
3
3
22
4
    >>> import os.path
4
    >>> from canonical.launchpad.ftests.script import run_script
23
5
    >>> from canonical.config import config
5
    >>> script = 'scripts/librarian-report.py'
24
6
    >>> path = os.path.join(config.root, 'scripts', 'librarian-report.py')
6
25
7
7
    >>> rv, out, err = run_script(script)
26
8
    >>> import subprocess
8
    >>> print rv
27
9
    >>> proc = subprocess.Popen(
9
    0
28
10
    ...     path, stdout=subprocess.PIPE, stderr=subprocess.STDOUT,
10
    >>> print err
29
11
    ...     stdin=subprocess.PIPE)
11
    >>> print '\n' + out
30
12
    >>> (out, ignored) = proc.communicate()
12
    <BLANKLINE>
31
13
    >>> print '\n' + out
13
    ...
32
14
    <BLANKLINE>
14
    133 bytes    hwsubmission in 2 files
33
15
    ...
15
    ...
34
16
    0 bytes    messageapproval in 0 files
16
35
17
    ...
17
36
18
We can filter on date to produce deltas.
37
19
38
20
    >>> rv, out, err = run_script(
39
21
    ...     script, ['--from=2005/01/01', '--until=2005/12/31'])
40
22
    >>> print rv
41
23
    0
42
24
    >>> print err
43
25
    >>> print '\n' + out
44
26
    <BLANKLINE>
45
27
    ...
46
28
    0 bytes      hwsubmission in 0 files
47
29
    ...
48
30
49
18
31
50
19
32
51
=== modified file 'scripts/librarian-report.py'
52
--- scripts/librarian-report.py	2009-12-15 05:29:30 +0000
53
+++ scripts/librarian-report.py	2009-12-23 04:36:17 +0000
54
@@ -13,17 +13,41 @@
55
13
from optparse import OptionParser
13
from optparse import OptionParser
56
14
import sys
14
import sys
57
15
15
59
16
from canonical.database.sqlbase import connect, quoteIdentifier
16
from canonical.database.sqlbase import connect, quoteIdentifier, sqlvalues
60
17
from canonical.database.postgresql import listReferences
17
from canonical.database.postgresql import listReferences
61
18
from canonical.launchpad.scripts import db_options
18
from canonical.launchpad.scripts import db_options
62
19
19
63
20
20
64
21
def main():
21
def main():
65
22
    parser = OptionParser()
22
    parser = OptionParser()
66
23
67
23
    db_options(parser)
24
    db_options(parser)
68
25
    parser.add_option(
69
26
        "-f", "--from", dest="from_date", default=None,
70
27
        metavar="DATE", help="Only count new files since DATE (yyyy/mm/dd)")
71
28
    parser.add_option(
72
29
        "-u", "--until", dest="until_date", default=None,
73
30
        metavar="DATE", help="Only count new files until DATE (yyyy/mm/dd)")
74
31
75
24
    options, args = parser.parse_args()
32
    options, args = parser.parse_args()
76
25
    if len(args) > 0:
33
    if len(args) > 0:
77
26
        parser.error("Too many command line arguments.")
34
        parser.error("Too many command line arguments.")
78
35
79
36
    # Handle date filters. We use LibraryFileContent.datecreated rather
80
37
    # than LibraryFileAlias.datecreated as this report is about actual
81
38
    # disk space usage. A new row in the database linking to a
82
39
    # previously existing file in the Librarian takes up no new space.
83
40
    if options.from_date is not None:
84
41
        from_date = 'AND LFC.datecreated >= %s' % sqlvalues(
85
42
            options.from_date)
86
43
    else:
87
44
        from_date = ''
88
45
    if options.until_date is not None:
89
46
        until_date = 'AND LFC.datecreated <= %s' % sqlvalues(
90
47
            options.until_date)
91
48
    else:
92
49
        until_date = ''
93
50
94
27
    con = connect(options.dbuser)
51
    con = connect(options.dbuser)
95
28
    cur = con.cursor()
52
    cur = con.cursor()
96
29
53
97
@@ -57,11 +81,12 @@
98
57
                    AND (
81
                    AND (
99
58
                        LFA.expires IS NULL
82
                        LFA.expires IS NULL
100
59
                        OR LFA.expires > CURRENT_TIMESTAMP AT TIME ZONE 'UTC')
83
                        OR LFA.expires > CURRENT_TIMESTAMP AT TIME ZONE 'UTC')
101
84
                    %s %s
102
60
                ORDER BY LFC.id
85
                ORDER BY LFC.id
103
61
                ) AS Whatever
86
                ) AS Whatever
104
62
            """ % (
87
            """ % (
105
63
                quoted_referring_table, quoted_referring_table,
88
                quoted_referring_table, quoted_referring_table,
107
64
                quoted_referring_column))
89
                quoted_referring_column, from_date, until_date))
108
65
        total_bytes, formatted_size, num_files = cur.fetchone()
90
        total_bytes, formatted_size, num_files = cur.fetchone()
109
66
        totals.add((total_bytes, referring_table, formatted_size, num_files))
91
        totals.add((total_bytes, referring_table, formatted_size, num_files))
110
67
92
Reviewer	Review Type	Date Requested	Status
Jeroen T. Vermeulen (community)		2009-12-23	Approve on 2009-12-23
Review via email: mp+16522@code.launchpad.net