summaryrefslogtreecommitdiff
blob: a763643f78b243fd7f0e514863d96e0c53ff9808 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
Patch by Peter Salvi <vukung@yahoo.com> to conform to MLDonkey 2.9.2,
taken from http://www.emacswiki.org/cgi-bin/wiki/download/mldonkey-vd.patch.gz
and ported to mldonkey-0.0.4b

--- mldonkey-el-0.0.4b-orig/mldonkey-vd.el	2005-01-15 20:54:53.000000000 +0100
+++ mldonkey-el-0.0.4b/mldonkey-vd.el	2008-01-03 10:53:18.000000000 +0100
@@ -107,6 +107,26 @@
   :group 'mldonkey
   :type 'boolean)
 
+(defcustom mldonkey-show-release-status nil
+  "Show the release status of a download."
+  :group 'mldonkey
+  :type 'boolean)
+
+(defcustom mldonkey-show-comments nil
+  "Show the number of comments in a download."
+  :group 'mldonkey
+  :type 'boolean)
+
+(defcustom mldonkey-show-user nil
+  "Show the user of a download."
+  :group 'mldonkey
+  :type 'boolean)
+
+(defcustom mldonkey-show-group nil
+  "Show the group of a download."
+  :group 'mldonkey
+  :type 'boolean)
+
 (defcustom mldonkey-show-filename t
   "Show the filename of a download."
   :group 'mldonkey
@@ -275,6 +295,14 @@
    ;; FIXME: does a network may contain spaces?
    "\\[\\(.*?\\)[ \t]*\\([0-9]+\\)\\]"       ; network and number
    "[ \t]+"
+   "\\(R\\|\\-\\)"                           ; release status
+   "[ \t]+"
+   "\\([0-9]+\\)"                            ; comments
+   "[ \t]+"
+   "\\([^ \t]+\\)"                           ; user
+   "[ \t]+"
+   "\\([^ \t]+\\)"                           ; group
+   "[ \t]+"
    "\\([^\n]+\\)"                            ; filename
    "[ \t]+"
    "\\([0-9\\.]+\\)"                         ; percent
@@ -283,10 +311,9 @@
    "[ \t]+"
    "\\([0-9\\.]+\\(?:gb\\|mb\\|kb\\|b\\)\\)" ; size
    "[ \t]+"
-   ;; "\\([0-9\\.]+\\(?:gb\\|mb\\|kb\\|b\\|[ \t]*chunks\\)\\)" ; left
-   "\\([0-9]+%\\)"                           ; avail
+   "\\([0-9:\\-]+\\)"                        ; last seen
    "[ \t]+"
-   "\\([0-9]+\\):\\([0-9\\-]+\\)"            ; age and last seen
+   "\\([0-9:\\-]+\\)"                        ; age
    "[ \t]+"
    "\\([0-9]+\\)/\\([0-9]+\\)"               ; active sources and total sources
    "[ \t]+"
@@ -454,7 +481,7 @@
     (setq mldonkey-vd-num-downloading (1+ mldonkey-vd-num-downloading))
     (add-to-list
      'mldonkey-vd-downloading-list
-     (vconcat (mapcar 'mldonkey-vd-get-match (number-sequence 1 13))))))
+     (vconcat (mapcar 'mldonkey-vd-get-match (number-sequence 1 16))))))
 
 
 (defun mldonkey-vd-get-finished ()
@@ -523,13 +550,16 @@
 
   (vector "net "
           "# "
+          "rel "
+          "com "
+          "user "
+          "gr "
           "file "
           "% "
           "down "
           "size "
-          "av "
-          "a "
           "l "
+          "a "
           "as "
           "ts "
           "kb/s "
@@ -553,8 +583,11 @@
 
   (vector 'right
           'right
-          'left
+          'right
           'right
+          'left
+          'left
+          'left
           'right
           'right
           'right
@@ -584,13 +617,16 @@
 
   (vector mldonkey-show-network
           mldonkey-show-number
+          mldonkey-show-release-status
+          mldonkey-show-comments
+          mldonkey-show-user
+          mldonkey-show-group
           mldonkey-show-filename
           mldonkey-show-percent
           mldonkey-show-downloaded
           mldonkey-show-size
-          mldonkey-show-avail
-          mldonkey-show-days
           mldonkey-show-last-seen
+          mldonkey-show-days
           mldonkey-show-active-sources
           mldonkey-show-total-sources
           mldonkey-show-rate