@@ -237,45 +237,4 @@ |
||
237 | 237 | return<<<EOF |
238 | 238 | "$software$counter": { |
239 | 239 | "display" : "Apache Access #$counter", |
240 | - "path" : $file_json_encoded, |
|
241 | - "refresh" : 0, |
|
242 | - "max" : 10, |
|
243 | - "notify" : false, |
|
244 | - "format" : { |
|
245 | - "type" : "NCSA", |
|
246 | - "regex" : "|^((\\\\S*) )*(\\\\S*) (\\\\S*) (\\\\S*) \\\\[(.*)\\\\] \"(\\\\S*) (.*) (\\\\S*)\" ([0-9]*) (.*)( \\"(.*)\\" \\"(.*)\\"( [0-9]*/([0-9]*))*)*\$|U", |
|
247 | - "export_title" : "URL", |
|
248 | - "match" : { |
|
249 | - "Date" : 6, |
|
250 | - "IP" : 3, |
|
251 | - "CMD" : 7, |
|
252 | - "URL" : 8, |
|
253 | - "Code" : 10, |
|
254 | - "Size" : 11, |
|
255 | - "Referer" : 13, |
|
256 | - "UA" : 14, |
|
257 | - "User" : 5, |
|
258 | - "\u03bcs" : 16 |
|
259 | - }, |
|
260 | - "types": { |
|
261 | - "Date" : "date:H:i:s", |
|
262 | - "IP" : "ip:geo", |
|
263 | - "URL" : "txt", |
|
264 | - "Code" : "badge:http", |
|
265 | - "Size" : "numeral:0b", |
|
266 | - "Referer" : "link", |
|
267 | - "UA" : "ua:{os.name} {os.version} | {browser.name} {browser.version}\/100", |
|
268 | - "\u03bcs" : "numeral:0,0" |
|
269 | - }, |
|
270 | - "exclude": { |
|
271 | - "URL": ["\/favicon.ico\/", "\/\\\\.pml\\\\.php.*\$\/"], |
|
272 | - "CMD": ["\/OPTIONS\/"] |
|
273 | - } |
|
274 | - } |
|
275 | - } |
|
276 | - EOF; |
|
277 | - |
|
278 | - } |
|
279 | - } |
|
280 | - |
|
281 | -} |
|
282 | 240 | \ No newline at end of file |
241 | + "path" : $file_json_encoded |
|
283 | 242 | \ No newline at end of file |
@@ -237,45 +237,4 @@ |
||
237 | 237 | return<<<EOF |
238 | 238 | "$software$counter": { |
239 | 239 | "display" : "Apache Access #$counter", |
240 | - "path" : $file_json_encoded, |
|
241 | - "refresh" : 0, |
|
242 | - "max" : 10, |
|
243 | - "notify" : false, |
|
244 | - "format" : { |
|
245 | - "type" : "NCSA", |
|
246 | - "regex" : "|^((\\\\S*) )*(\\\\S*) (\\\\S*) (\\\\S*) \\\\[(.*)\\\\] \"(\\\\S*) (.*) (\\\\S*)\" ([0-9]*) (.*)( \\"(.*)\\" \\"(.*)\\"( [0-9]*/([0-9]*))*)*\$|U", |
|
247 | - "export_title" : "URL", |
|
248 | - "match" : { |
|
249 | - "Date" : 6, |
|
250 | - "IP" : 3, |
|
251 | - "CMD" : 7, |
|
252 | - "URL" : 8, |
|
253 | - "Code" : 10, |
|
254 | - "Size" : 11, |
|
255 | - "Referer" : 13, |
|
256 | - "UA" : 14, |
|
257 | - "User" : 5, |
|
258 | - "\u03bcs" : 16 |
|
259 | - }, |
|
260 | - "types": { |
|
261 | - "Date" : "date:H:i:s", |
|
262 | - "IP" : "ip:geo", |
|
263 | - "URL" : "txt", |
|
264 | - "Code" : "badge:http", |
|
265 | - "Size" : "numeral:0b", |
|
266 | - "Referer" : "link", |
|
267 | - "UA" : "ua:{os.name} {os.version} | {browser.name} {browser.version}\/100", |
|
268 | - "\u03bcs" : "numeral:0,0" |
|
269 | - }, |
|
270 | - "exclude": { |
|
271 | - "URL": ["\/favicon.ico\/", "\/\\\\.pml\\\\.php.*\$\/"], |
|
272 | - "CMD": ["\/OPTIONS\/"] |
|
273 | - } |
|
274 | - } |
|
275 | - } |
|
276 | - EOF; |
|
277 | - |
|
278 | - } |
|
279 | - } |
|
280 | - |
|
281 | -} |
|
282 | 240 | \ No newline at end of file |
241 | + "path" : $file_json_encoded |
|
283 | 242 | \ No newline at end of file |
@@ -247,38 +247,4 @@ |
||
247 | 247 | return<<<EOF |
248 | 248 | "$software$counter": { |
249 | 249 | "display" : "IIS Access #$counter", |
250 | - "path" : $file_json_encoded, |
|
251 | - "refresh" : 0, |
|
252 | - "max" : 10, |
|
253 | - "notify" : false, |
|
254 | - "format" : { |
|
255 | - "type" : "NCSA Common", |
|
256 | - "regex" : "|^((\\\\S*) )*(\\\\S*) (\\\\S*) (\\\\S*) \\\\[(.*)\\\\] \"(\\\\S*) (.*) (\\\\S*)\" ([0-9]*) (.*)( \\"(.*)\\" \\"(.*)\\"( [0-9]*/([0-9]*))*)*\$|U", |
|
257 | - "export_title" : "URL", |
|
258 | - "match" : { |
|
259 | - "Date" : 6, |
|
260 | - "IP" : 3, |
|
261 | - "CMD" : 7, |
|
262 | - "URL" : 8, |
|
263 | - "Code" : 10, |
|
264 | - "Size" : 11, |
|
265 | - "User" : 5 |
|
266 | - }, |
|
267 | - "types" : { |
|
268 | - "Date" : "date:H:i:s", |
|
269 | - "IP" : "ip:geo", |
|
270 | - "URL" : "txt", |
|
271 | - "Code" : "badge:http", |
|
272 | - "Size" : "numeral:0b" |
|
273 | - }, |
|
274 | - "exclude" : { |
|
275 | - "URL": ["\/favicon.ico\/", "\/\\\\.pml\\\\.php\\\\.*\$\/"], |
|
276 | - "CMD": ["\/OPTIONS\/"] |
|
277 | - } |
|
278 | - } |
|
279 | - } |
|
280 | - EOF; |
|
281 | - |
|
282 | - } |
|
283 | - |
|
284 | -} |
|
285 | 250 | \ No newline at end of file |
251 | + "path" : $file_json_encoded |
|
286 | 252 | \ No newline at end of file |
@@ -247,38 +247,4 @@ |
||
247 | 247 | return<<<EOF |
248 | 248 | "$software$counter": { |
249 | 249 | "display" : "IIS Access #$counter", |
250 | - "path" : $file_json_encoded, |
|
251 | - "refresh" : 0, |
|
252 | - "max" : 10, |
|
253 | - "notify" : false, |
|
254 | - "format" : { |
|
255 | - "type" : "NCSA Common", |
|
256 | - "regex" : "|^((\\\\S*) )*(\\\\S*) (\\\\S*) (\\\\S*) \\\\[(.*)\\\\] \"(\\\\S*) (.*) (\\\\S*)\" ([0-9]*) (.*)( \\"(.*)\\" \\"(.*)\\"( [0-9]*/([0-9]*))*)*\$|U", |
|
257 | - "export_title" : "URL", |
|
258 | - "match" : { |
|
259 | - "Date" : 6, |
|
260 | - "IP" : 3, |
|
261 | - "CMD" : 7, |
|
262 | - "URL" : 8, |
|
263 | - "Code" : 10, |
|
264 | - "Size" : 11, |
|
265 | - "User" : 5 |
|
266 | - }, |
|
267 | - "types" : { |
|
268 | - "Date" : "date:H:i:s", |
|
269 | - "IP" : "ip:geo", |
|
270 | - "URL" : "txt", |
|
271 | - "Code" : "badge:http", |
|
272 | - "Size" : "numeral:0b" |
|
273 | - }, |
|
274 | - "exclude" : { |
|
275 | - "URL": ["\/favicon.ico\/", "\/\\\\.pml\\\\.php\\\\.*\$\/"], |
|
276 | - "CMD": ["\/OPTIONS\/"] |
|
277 | - } |
|
278 | - } |
|
279 | - } |
|
280 | - EOF; |
|
281 | - |
|
282 | - } |
|
283 | - |
|
284 | -} |
|
285 | 250 | \ No newline at end of file |
251 | + "path" : $file_json_encoded |
|
286 | 252 | \ No newline at end of file |
@@ -114,43 +114,4 @@ |
||
114 | 114 | return<<<EOF |
115 | 115 | "$software$counter": { |
116 | 116 | "display" : "NGINX Access #$counter", |
117 | - "path" : $file_json_encoded, |
|
118 | - "refresh" : 0, |
|
119 | - "max" : 10, |
|
120 | - "notify" : false, |
|
121 | - "format" : { |
|
122 | - "type" : "NCSA Extended", |
|
123 | - "regex" : "|^((\\\\S*) )*(\\\\S*) (\\\\S*) (\\\\S*) \\\\[(.*)\\\\] \"(\\\\S*) (.*) (\\\\S*)\" ([0-9]*) (.*)( \\"(.*)\\" \\"(.*)\\"( [0-9]*/([0-9]*))*)*\$|U", |
|
124 | - "export_title" : "URL", |
|
125 | - "match" : { |
|
126 | - "Date" : 6, |
|
127 | - "IP" : 3, |
|
128 | - "CMD" : 7, |
|
129 | - "URL" : 8, |
|
130 | - "Code" : 10, |
|
131 | - "Size" : 11, |
|
132 | - "Referer" : 13, |
|
133 | - "UA" : 14, |
|
134 | - "User" : 5 |
|
135 | - }, |
|
136 | - "types": { |
|
137 | - "Date" : "date:H:i:s", |
|
138 | - "IP" : "ip:geo", |
|
139 | - "URL" : "txt", |
|
140 | - "Code" : "badge:http", |
|
141 | - "Size" : "numeral:0b", |
|
142 | - "Referer" : "link", |
|
143 | - "UA" : "ua:{os.name} {os.version} | {browser.name} {browser.version}\/100" |
|
144 | - }, |
|
145 | - "exclude": { |
|
146 | - "URL": ["\/favicon.ico\/", "\/\\\\.pml\\\\.php\\\\.*\$\/"], |
|
147 | - "CMD": ["\/OPTIONS\/"] |
|
148 | - } |
|
149 | - } |
|
150 | - } |
|
151 | - EOF; |
|
152 | - |
|
153 | - } |
|
154 | - } |
|
155 | - |
|
156 | -} |
|
157 | 117 | \ No newline at end of file |
118 | + "path" : $file_json_encoded |
|
158 | 119 | \ No newline at end of file |
@@ -114,43 +114,4 @@ |
||
114 | 114 | return<<<EOF |
115 | 115 | "$software$counter": { |
116 | 116 | "display" : "NGINX Access #$counter", |
117 | - "path" : $file_json_encoded, |
|
118 | - "refresh" : 0, |
|
119 | - "max" : 10, |
|
120 | - "notify" : false, |
|
121 | - "format" : { |
|
122 | - "type" : "NCSA Extended", |
|
123 | - "regex" : "|^((\\\\S*) )*(\\\\S*) (\\\\S*) (\\\\S*) \\\\[(.*)\\\\] \"(\\\\S*) (.*) (\\\\S*)\" ([0-9]*) (.*)( \\"(.*)\\" \\"(.*)\\"( [0-9]*/([0-9]*))*)*\$|U", |
|
124 | - "export_title" : "URL", |
|
125 | - "match" : { |
|
126 | - "Date" : 6, |
|
127 | - "IP" : 3, |
|
128 | - "CMD" : 7, |
|
129 | - "URL" : 8, |
|
130 | - "Code" : 10, |
|
131 | - "Size" : 11, |
|
132 | - "Referer" : 13, |
|
133 | - "UA" : 14, |
|
134 | - "User" : 5 |
|
135 | - }, |
|
136 | - "types": { |
|
137 | - "Date" : "date:H:i:s", |
|
138 | - "IP" : "ip:geo", |
|
139 | - "URL" : "txt", |
|
140 | - "Code" : "badge:http", |
|
141 | - "Size" : "numeral:0b", |
|
142 | - "Referer" : "link", |
|
143 | - "UA" : "ua:{os.name} {os.version} | {browser.name} {browser.version}\/100" |
|
144 | - }, |
|
145 | - "exclude": { |
|
146 | - "URL": ["\/favicon.ico\/", "\/\\\\.pml\\\\.php\\\\.*\$\/"], |
|
147 | - "CMD": ["\/OPTIONS\/"] |
|
148 | - } |
|
149 | - } |
|
150 | - } |
|
151 | - EOF; |
|
152 | - |
|
153 | - } |
|
154 | - } |
|
155 | - |
|
156 | -} |
|
157 | 117 | \ No newline at end of file |
118 | + "path" : $file_json_encoded |
|
158 | 119 | \ No newline at end of file |
@@ -63,34 +63,4 @@ |
||
63 | 63 | return<<<EOF |
64 | 64 | "$software$counter": { |
65 | 65 | "display" : "PHP Error #$counter", |
66 | - "path" : $file_json_encoded, |
|
67 | - "refresh" : 5, |
|
68 | - "max" : 10, |
|
69 | - "notify" : true, |
|
70 | - "format" : { |
|
71 | - "type" : "PHP", |
|
72 | - "regex" : "@^\\\\[(.*)-(.*)-(.*) (.*):(.*):(.*)( (.*))*\\\\] ((PHP (.*): (.*) in (.*) on line (.*))|(.*))\$@U", |
|
73 | - "export_title" : "Error", |
|
74 | - "match" : { |
|
75 | - "Date" : [ 2 , " " , 1 , " " , 4 , ":" , 5 , ":" , 6 , " " , 3 ], |
|
76 | - "Severity" : 11, |
|
77 | - "Error" : [ 12 , 15 ], |
|
78 | - "File" : 13, |
|
79 | - "Line" : 14 |
|
80 | - }, |
|
81 | - "types" : { |
|
82 | - "Date" : "date:H:i:s", |
|
83 | - "Severity" : "badge:severity", |
|
84 | - "File" : "pre:\/-69", |
|
85 | - "Line" : "numeral", |
|
86 | - "Error" : "pre" |
|
87 | - }, |
|
88 | - "exclude": { |
|
89 | - "Log": ["\\\\/PHP Stack trace:\\\\/", "\\\\/PHP *[0-9]*\\\\. \\\\/"] |
|
90 | - } |
|
91 | - } |
|
92 | - } |
|
93 | - EOF; |
|
94 | - } |
|
95 | - |
|
96 | -} |
|
97 | 66 | \ No newline at end of file |
67 | + "path" : $file_json_encoded |
|
98 | 68 | \ No newline at end of file |
@@ -63,34 +63,4 @@ |
||
63 | 63 | return<<<EOF |
64 | 64 | "$software$counter": { |
65 | 65 | "display" : "PHP Error #$counter", |
66 | - "path" : $file_json_encoded, |
|
67 | - "refresh" : 5, |
|
68 | - "max" : 10, |
|
69 | - "notify" : true, |
|
70 | - "format" : { |
|
71 | - "type" : "PHP", |
|
72 | - "regex" : "@^\\\\[(.*)-(.*)-(.*) (.*):(.*):(.*)( (.*))*\\\\] ((PHP (.*): (.*) in (.*) on line (.*))|(.*))\$@U", |
|
73 | - "export_title" : "Error", |
|
74 | - "match" : { |
|
75 | - "Date" : [ 2 , " " , 1 , " " , 4 , ":" , 5 , ":" , 6 , " " , 3 ], |
|
76 | - "Severity" : 11, |
|
77 | - "Error" : [ 12 , 15 ], |
|
78 | - "File" : 13, |
|
79 | - "Line" : 14 |
|
80 | - }, |
|
81 | - "types" : { |
|
82 | - "Date" : "date:H:i:s", |
|
83 | - "Severity" : "badge:severity", |
|
84 | - "File" : "pre:\/-69", |
|
85 | - "Line" : "numeral", |
|
86 | - "Error" : "pre" |
|
87 | - }, |
|
88 | - "exclude": { |
|
89 | - "Log": ["\\\\/PHP Stack trace:\\\\/", "\\\\/PHP *[0-9]*\\\\. \\\\/"] |
|
90 | - } |
|
91 | - } |
|
92 | - } |
|
93 | - EOF; |
|
94 | - } |
|
95 | - |
|
96 | -} |
|
97 | 66 | \ No newline at end of file |
67 | + "path" : $file_json_encoded |
|
98 | 68 | \ No newline at end of file |
@@ -5,11 +5,9 @@ |
||
5 | 5 | |
6 | 6 | namespace Finder\Components\Worker\Sync; |
7 | 7 | |
8 | -use Fabrica\Tools\Databases\Mysql\Mysql as MysqlTool; |
|
9 | -use Fabrica\Models\Infra\Token; |
|
8 | +use Fabrica\Models\Code\Project as ProjectModel; |
|
10 | 9 | use Fabrica\Models\Infra\SshKey; |
11 | 10 | use Fabrica\Tools\Programs\Git\Admin as GitManiputor; |
12 | -use Fabrica\Models\Code\Project as ProjectModel; |
|
13 | 11 | class Project |
14 | 12 | { |
15 | 13 |
@@ -3,18 +3,13 @@ |
||
3 | 3 | namespace Finder\Console\Commands\Prepare; |
4 | 4 | |
5 | 5 | use Illuminate\Console\Command; |
6 | -use Telefonica\Models\Actors\Person; |
|
7 | -use Finder\Pipelines\Track\PersonTrack; |
|
8 | 6 | use Illuminate\Support\Facades\Storage; |
9 | -use Stalker\Models\Imagen; |
|
10 | 7 | |
11 | 8 | use Rap2hpoutre\FastExcel\FastExcel; |
12 | 9 | |
13 | 10 | use Finder\Pipelines\Identify\RespectiveModel; |
14 | 11 | |
15 | 12 | use Muleta\Utils\Extratores\FileExtractor; |
16 | -use Muleta\Utils\Extratores\StringExtractor; |
|
17 | -use Muleta\Utils\Modificators\StringModificator; |
|
18 | 13 | |
19 | 14 | class ExcelPrepare extends Command |
20 | 15 | { |
@@ -61,6 +61,7 @@ discard block |
||
61 | 61 | |
62 | 62 | /** |
63 | 63 | * Tirardaqui |
64 | + * @param string $folder |
|
64 | 65 | */ |
65 | 66 | public function importFromFolder($folder) |
66 | 67 | { |
@@ -74,6 +75,10 @@ discard block |
||
74 | 75 | // $collections = (new FastExcel) |
75 | 76 | ->import( |
76 | 77 | storage_path('app/'.$file), |
78 | + |
|
79 | + /** |
|
80 | + * @param string $line |
|
81 | + */ |
|
77 | 82 | function ($line) use ($fileName, $assuntosDaPasta) { |
78 | 83 | $modelClass = RespectiveModel::run( |
79 | 84 | $assuntosDaPasta, |
@@ -47,6 +47,7 @@ |
||
47 | 47 | |
48 | 48 | /** |
49 | 49 | * Tirardaqui |
50 | + * @param string $folder |
|
50 | 51 | */ |
51 | 52 | public function export($folder) |
52 | 53 | { |
@@ -3,10 +3,6 @@ |
||
3 | 3 | namespace Finder\Console\Commands\Prepare; |
4 | 4 | |
5 | 5 | use Illuminate\Console\Command; |
6 | -use Telefonica\Models\Actors\Person; |
|
7 | -use Finder\Pipelines\Track\PersonTrack; |
|
8 | -use Illuminate\Support\Facades\Storage; |
|
9 | -use Stalker\Models\Imagen; |
|
10 | 6 | |
11 | 7 | class Export extends Command |
12 | 8 | { |
@@ -56,6 +56,7 @@ |
||
56 | 56 | /** |
57 | 57 | * Execute the console command. |
58 | 58 | * |
59 | + * @param string $folder |
|
59 | 60 | * @return mixed |
60 | 61 | */ |
61 | 62 | public function midiaFinder($folder) |
@@ -3,10 +3,9 @@ |
||
3 | 3 | namespace Finder\Console\Commands\Prepare; |
4 | 4 | |
5 | 5 | use Illuminate\Console\Command; |
6 | -use Telefonica\Models\Actors\Person; |
|
7 | -use Finder\Pipelines\Track\PersonTrack; |
|
8 | 6 | use Illuminate\Support\Facades\Storage; |
9 | 7 | use Stalker\Models\Imagen; |
8 | +use Telefonica\Models\Actors\Person; |
|
10 | 9 | |
11 | 10 | use Muleta\Utils\Modificators\StringModificator; |
12 | 11 |
@@ -2,9 +2,9 @@ |
||
2 | 2 | |
3 | 3 | namespace Finder\Console\Commands\Sync; |
4 | 4 | |
5 | +use Finder\Pipelines\Track\PersonTrack; |
|
5 | 6 | use Illuminate\Console\Command; |
6 | 7 | use Telefonica\Models\Actors\Person; |
7 | -use Finder\Pipelines\Track\PersonTrack; |
|
8 | 8 | |
9 | 9 | class PersonsSync extends Command |
10 | 10 | { |