refactoring
Vladimir Bauer
6 years ago
| 12 | 12 | style string |
| 13 | 13 | total, current int64 |
| 14 | 14 | barWidth int |
| 15 | trimSpace bool | |
| 15 | trim bool | |
| 16 | 16 | reverse bool |
| 17 | 17 | refill int64 |
| 18 | 18 | want string |
| 25 | 25 | want: "… ", |
| 26 | 26 | }, |
| 27 | 27 | { |
| 28 | name: "t,c{60,20}trim", | |
| 29 | total: 60, | |
| 30 | current: 20, | |
| 31 | trimSpace: true, | |
| 32 | want: "", | |
| 28 | name: "t,c{60,20}trim", | |
| 29 | total: 60, | |
| 30 | current: 20, | |
| 31 | trim: true, | |
| 32 | want: "", | |
| 33 | 33 | }, |
| 34 | 34 | }, |
| 35 | 35 | 1: { |
| 40 | 40 | want: "… ", |
| 41 | 41 | }, |
| 42 | 42 | { |
| 43 | name: "t,c{60,20}trim", | |
| 44 | total: 60, | |
| 45 | current: 20, | |
| 46 | trimSpace: true, | |
| 47 | want: "", | |
| 43 | name: "t,c{60,20}trim", | |
| 44 | total: 60, | |
| 45 | current: 20, | |
| 46 | trim: true, | |
| 47 | want: "", | |
| 48 | 48 | }, |
| 49 | 49 | }, |
| 50 | 50 | 2: { |
| 55 | 55 | want: " ", |
| 56 | 56 | }, |
| 57 | 57 | { |
| 58 | name: "t,c{60,20}trim", | |
| 59 | total: 60, | |
| 60 | current: 20, | |
| 61 | trimSpace: true, | |
| 62 | want: "[]", | |
| 58 | name: "t,c{60,20}trim", | |
| 59 | total: 60, | |
| 60 | current: 20, | |
| 61 | trim: true, | |
| 62 | want: "[]", | |
| 63 | 63 | }, |
| 64 | 64 | }, |
| 65 | 65 | 3: { |
| 70 | 70 | want: " ", |
| 71 | 71 | }, |
| 72 | 72 | { |
| 73 | name: "t,c{60,20}trim", | |
| 74 | total: 60, | |
| 75 | current: 20, | |
| 76 | trimSpace: true, | |
| 77 | want: "[-]", | |
| 73 | name: "t,c{60,20}trim", | |
| 74 | total: 60, | |
| 75 | current: 20, | |
| 76 | trim: true, | |
| 77 | want: "[-]", | |
| 78 | 78 | }, |
| 79 | 79 | }, |
| 80 | 80 | 4: { |
| 85 | 85 | want: " [] ", |
| 86 | 86 | }, |
| 87 | 87 | { |
| 88 | name: "t,c{60,20}trim", | |
| 89 | total: 60, | |
| 90 | current: 20, | |
| 91 | trimSpace: true, | |
| 92 | want: "[>-]", | |
| 88 | name: "t,c{60,20}trim", | |
| 89 | total: 60, | |
| 90 | current: 20, | |
| 91 | trim: true, | |
| 92 | want: "[>-]", | |
| 93 | 93 | }, |
| 94 | 94 | }, |
| 95 | 95 | 5: { |
| 100 | 100 | want: " [-] ", |
| 101 | 101 | }, |
| 102 | 102 | { |
| 103 | name: "t,c{60,20}trim", | |
| 104 | total: 60, | |
| 105 | current: 20, | |
| 106 | trimSpace: true, | |
| 107 | want: "[>--]", | |
| 103 | name: "t,c{60,20}trim", | |
| 104 | total: 60, | |
| 105 | current: 20, | |
| 106 | trim: true, | |
| 107 | want: "[>--]", | |
| 108 | 108 | }, |
| 109 | 109 | }, |
| 110 | 110 | 6: { |
| 115 | 115 | want: " [>-] ", |
| 116 | 116 | }, |
| 117 | 117 | { |
| 118 | name: "t,c{60,20}trim", | |
| 119 | total: 60, | |
| 120 | current: 20, | |
| 121 | trimSpace: true, | |
| 122 | want: "[>---]", | |
| 118 | name: "t,c{60,20}trim", | |
| 119 | total: 60, | |
| 120 | current: 20, | |
| 121 | trim: true, | |
| 122 | want: "[>---]", | |
| 123 | 123 | }, |
| 124 | 124 | }, |
| 125 | 125 | 7: { |
| 130 | 130 | want: " [>--] ", |
| 131 | 131 | }, |
| 132 | 132 | { |
| 133 | name: "t,c{60,20}trim", | |
| 134 | total: 60, | |
| 135 | current: 20, | |
| 136 | trimSpace: true, | |
| 137 | want: "[=>---]", | |
| 133 | name: "t,c{60,20}trim", | |
| 134 | total: 60, | |
| 135 | current: 20, | |
| 136 | trim: true, | |
| 137 | want: "[=>---]", | |
| 138 | 138 | }, |
| 139 | 139 | }, |
| 140 | 140 | 8: { |
| 145 | 145 | want: " [>---] ", |
| 146 | 146 | }, |
| 147 | 147 | { |
| 148 | name: "t,c{60,20}trim", | |
| 149 | total: 60, | |
| 150 | current: 20, | |
| 151 | trimSpace: true, | |
| 152 | want: "[=>----]", | |
| 148 | name: "t,c{60,20}trim", | |
| 149 | total: 60, | |
| 150 | current: 20, | |
| 151 | trim: true, | |
| 152 | want: "[=>----]", | |
| 153 | 153 | }, |
| 154 | 154 | }, |
| 155 | 155 | 80: { |
| 160 | 160 | want: " [========================>---------------------------------------------------] ", |
| 161 | 161 | }, |
| 162 | 162 | { |
| 163 | name: "t,c{60,20}trim", | |
| 164 | total: 60, | |
| 165 | current: 20, | |
| 166 | trimSpace: true, | |
| 167 | want: "[=========================>----------------------------------------------------]", | |
| 163 | name: "t,c{60,20}trim", | |
| 164 | total: 60, | |
| 165 | current: 20, | |
| 166 | trim: true, | |
| 167 | want: "[=========================>----------------------------------------------------]", | |
| 168 | 168 | }, |
| 169 | 169 | { |
| 170 | 170 | name: "t,c,bw{60,20,60}", |
| 174 | 174 | want: " [==================>---------------------------------------] ", |
| 175 | 175 | }, |
| 176 | 176 | { |
| 177 | name: "t,c,bw{60,20,60}trim", | |
| 178 | total: 60, | |
| 179 | current: 20, | |
| 180 | barWidth: 60, | |
| 181 | trimSpace: true, | |
| 182 | want: "[==================>---------------------------------------]", | |
| 177 | name: "t,c,bw{60,20,60}trim", | |
| 178 | total: 60, | |
| 179 | current: 20, | |
| 180 | barWidth: 60, | |
| 181 | trim: true, | |
| 182 | want: "[==================>---------------------------------------]", | |
| 183 | 183 | }, |
| 184 | 184 | }, |
| 185 | 185 | 100: { |
| 190 | 190 | want: " [------------------------------------------------------------------------------------------------] ", |
| 191 | 191 | }, |
| 192 | 192 | { |
| 193 | name: "t,c{100,0}trim", | |
| 194 | total: 100, | |
| 195 | current: 0, | |
| 196 | trimSpace: true, | |
| 197 | want: "[--------------------------------------------------------------------------------------------------]", | |
| 193 | name: "t,c{100,0}trim", | |
| 194 | total: 100, | |
| 195 | current: 0, | |
| 196 | trim: true, | |
| 197 | want: "[--------------------------------------------------------------------------------------------------]", | |
| 198 | 198 | }, |
| 199 | 199 | { |
| 200 | 200 | name: "t,c{100,1}", |
| 203 | 203 | want: " [>-----------------------------------------------------------------------------------------------] ", |
| 204 | 204 | }, |
| 205 | 205 | { |
| 206 | name: "t,c{100,1}trim", | |
| 207 | total: 100, | |
| 208 | current: 1, | |
| 209 | trimSpace: true, | |
| 210 | want: "[>-------------------------------------------------------------------------------------------------]", | |
| 206 | name: "t,c{100,1}trim", | |
| 207 | total: 100, | |
| 208 | current: 1, | |
| 209 | trim: true, | |
| 210 | want: "[>-------------------------------------------------------------------------------------------------]", | |
| 211 | 211 | }, |
| 212 | 212 | { |
| 213 | 213 | name: "t,c{100,33}", |
| 216 | 216 | want: " [===============================>----------------------------------------------------------------] ", |
| 217 | 217 | }, |
| 218 | 218 | { |
| 219 | name: "t,c{100,33}trim", | |
| 220 | total: 100, | |
| 221 | current: 33, | |
| 222 | trimSpace: true, | |
| 223 | want: "[===============================>------------------------------------------------------------------]", | |
| 224 | }, | |
| 225 | { | |
| 226 | name: "t,c{100,33}trim,rev", | |
| 227 | total: 100, | |
| 228 | current: 33, | |
| 229 | trimSpace: true, | |
| 230 | reverse: true, | |
| 231 | want: "[------------------------------------------------------------------<===============================]", | |
| 232 | }, | |
| 233 | { | |
| 234 | name: "t,c,refill{100,33,33}", | |
| 219 | name: "t,c{100,33}trim", | |
| 220 | total: 100, | |
| 221 | current: 33, | |
| 222 | trim: true, | |
| 223 | want: "[===============================>------------------------------------------------------------------]", | |
| 224 | }, | |
| 225 | { | |
| 226 | name: "t,c{100,33}trim,rev", | |
| 227 | total: 100, | |
| 228 | current: 33, | |
| 229 | trim: true, | |
| 230 | reverse: true, | |
| 231 | want: "[------------------------------------------------------------------<===============================]", | |
| 232 | }, | |
| 233 | { | |
| 234 | name: "t,c,r{100,33,33}", | |
| 235 | 235 | total: 100, |
| 236 | 236 | current: 33, |
| 237 | 237 | refill: 33, |
| 238 | 238 | want: " [+++++++++++++++++++++++++++++++>----------------------------------------------------------------] ", |
| 239 | 239 | }, |
| 240 | 240 | { |
| 241 | name: "t,c,refill{100,33,33}trim", | |
| 242 | total: 100, | |
| 243 | current: 33, | |
| 244 | refill: 33, | |
| 245 | trimSpace: true, | |
| 246 | want: "[+++++++++++++++++++++++++++++++>------------------------------------------------------------------]", | |
| 247 | }, | |
| 248 | { | |
| 249 | name: "t,c,refill{100,33,33}trim,rev", | |
| 250 | total: 100, | |
| 251 | current: 33, | |
| 252 | refill: 33, | |
| 253 | trimSpace: true, | |
| 254 | reverse: true, | |
| 255 | want: "[------------------------------------------------------------------<+++++++++++++++++++++++++++++++]", | |
| 256 | }, | |
| 257 | { | |
| 258 | name: "t,c,refill{100,40,33}", | |
| 241 | name: "t,c,r{100,33,33}trim", | |
| 242 | total: 100, | |
| 243 | current: 33, | |
| 244 | refill: 33, | |
| 245 | trim: true, | |
| 246 | want: "[+++++++++++++++++++++++++++++++>------------------------------------------------------------------]", | |
| 247 | }, | |
| 248 | { | |
| 249 | name: "t,c,r{100,33,33}trim,rev", | |
| 250 | total: 100, | |
| 251 | current: 33, | |
| 252 | refill: 33, | |
| 253 | trim: true, | |
| 254 | reverse: true, | |
| 255 | want: "[------------------------------------------------------------------<+++++++++++++++++++++++++++++++]", | |
| 256 | }, | |
| 257 | { | |
| 258 | name: "t,c,r{100,40,33}", | |
| 259 | 259 | total: 100, |
| 260 | 260 | current: 40, |
| 261 | 261 | refill: 33, |
| 262 | 262 | want: " [++++++++++++++++++++++++++++++++=====>----------------------------------------------------------] ", |
| 263 | 263 | }, |
| 264 | 264 | { |
| 265 | name: "t,c,refill{100,40,33}trim", | |
| 266 | total: 100, | |
| 267 | current: 40, | |
| 268 | refill: 33, | |
| 269 | trimSpace: true, | |
| 270 | want: "[++++++++++++++++++++++++++++++++======>-----------------------------------------------------------]", | |
| 265 | name: "t,c,r{100,40,33}trim", | |
| 266 | total: 100, | |
| 267 | current: 40, | |
| 268 | refill: 33, | |
| 269 | trim: true, | |
| 270 | want: "[++++++++++++++++++++++++++++++++======>-----------------------------------------------------------]", | |
| 271 | 271 | }, |
| 272 | 272 | { |
| 273 | 273 | name: "t,c{100,99}", |
| 276 | 276 | want: " [==============================================================================================>-] ", |
| 277 | 277 | }, |
| 278 | 278 | { |
| 279 | name: "t,c{100,99}trim", | |
| 280 | total: 100, | |
| 281 | current: 99, | |
| 282 | trimSpace: true, | |
| 283 | want: "[================================================================================================>-]", | |
| 279 | name: "t,c{100,99}trim", | |
| 280 | total: 100, | |
| 281 | current: 99, | |
| 282 | trim: true, | |
| 283 | want: "[================================================================================================>-]", | |
| 284 | 284 | }, |
| 285 | 285 | { |
| 286 | 286 | name: "t,c{100,100}", |
| 289 | 289 | want: " [================================================================================================] ", |
| 290 | 290 | }, |
| 291 | 291 | { |
| 292 | name: "t,c{100,100}trim", | |
| 293 | total: 100, | |
| 294 | current: 100, | |
| 295 | trimSpace: true, | |
| 296 | want: "[==================================================================================================]", | |
| 292 | name: "t,c{100,100}trim", | |
| 293 | total: 100, | |
| 294 | current: 100, | |
| 295 | trim: true, | |
| 296 | want: "[==================================================================================================]", | |
| 297 | 297 | }, |
| 298 | 298 | { |
| 299 | 299 | name: "[=の-] t,c{100,1}", |
| 312 | 312 | s.reqWidth = tc.barWidth |
| 313 | 313 | s.total = tc.total |
| 314 | 314 | s.current = tc.current |
| 315 | s.trimSpace = tc.trimSpace | |
| 315 | s.trimSpace = tc.trim | |
| 316 | 316 | if tc.refill > 0 { |
| 317 | 317 | if f, ok := s.filler.(interface{ SetRefill(int64) }); ok { |
| 318 | 318 | f.SetRefill(tc.refill) |