@@ -32,171 +32,171 @@ |
||
32 | 32 | |
33 | 33 | class JSCombiner { |
34 | 34 | |
35 | - /** @var IAppData */ |
|
36 | - protected $appData; |
|
37 | - |
|
38 | - /** @var IURLGenerator */ |
|
39 | - protected $urlGenerator; |
|
40 | - |
|
41 | - /** @var ICache */ |
|
42 | - protected $depsCache; |
|
43 | - |
|
44 | - /** @var SystemConfig */ |
|
45 | - protected $config; |
|
46 | - |
|
47 | - /** |
|
48 | - * @param IAppData $appData |
|
49 | - * @param IURLGenerator $urlGenerator |
|
50 | - * @param ICache $depsCache |
|
51 | - * @param SystemConfig $config |
|
52 | - */ |
|
53 | - public function __construct(IAppData $appData, |
|
54 | - IURLGenerator $urlGenerator, |
|
55 | - ICache $depsCache, |
|
56 | - SystemConfig $config) { |
|
57 | - $this->appData = $appData; |
|
58 | - $this->urlGenerator = $urlGenerator; |
|
59 | - $this->depsCache = $depsCache; |
|
60 | - $this->config = $config; |
|
61 | - } |
|
62 | - |
|
63 | - /** |
|
64 | - * @param string $root |
|
65 | - * @param string $file |
|
66 | - * @param string $app |
|
67 | - * @return bool |
|
68 | - */ |
|
69 | - public function process($root, $file, $app) { |
|
70 | - if ($this->config->getValue('debug') || !$this->config->getValue('installed')) { |
|
71 | - return false; |
|
72 | - } |
|
73 | - |
|
74 | - $path = explode('/', $root . '/' . $file); |
|
75 | - |
|
76 | - $fileName = array_pop($path); |
|
77 | - $path = implode('/', $path); |
|
78 | - |
|
79 | - try { |
|
80 | - $folder = $this->appData->getFolder($app); |
|
81 | - } catch(NotFoundException $e) { |
|
82 | - // creating css appdata folder |
|
83 | - $folder = $this->appData->newFolder($app); |
|
84 | - } |
|
85 | - |
|
86 | - if($this->isCached($fileName, $folder)) { |
|
87 | - return true; |
|
88 | - } |
|
89 | - return $this->cache($path, $fileName, $folder); |
|
90 | - } |
|
91 | - |
|
92 | - /** |
|
93 | - * @param string $fileName |
|
94 | - * @param ISimpleFolder $folder |
|
95 | - * @return bool |
|
96 | - */ |
|
97 | - protected function isCached($fileName, ISimpleFolder $folder) { |
|
98 | - $fileName = str_replace('.json', '.js', $fileName) . '.deps'; |
|
99 | - try { |
|
100 | - $deps = $this->depsCache->get($folder->getName() . '-' . $fileName); |
|
101 | - if ($deps === null) { |
|
102 | - $depFile = $folder->getFile($fileName); |
|
103 | - $deps = $depFile->getContent(); |
|
104 | - $this->depsCache->set($folder->getName() . '-' . $fileName, $deps); |
|
105 | - } |
|
106 | - $deps = json_decode($deps, true); |
|
107 | - |
|
108 | - foreach ($deps as $file=>$mtime) { |
|
109 | - if (!file_exists($file) || filemtime($file) > $mtime) { |
|
110 | - return false; |
|
111 | - } |
|
112 | - } |
|
113 | - |
|
114 | - return true; |
|
115 | - } catch(NotFoundException $e) { |
|
116 | - return false; |
|
117 | - } |
|
118 | - } |
|
119 | - |
|
120 | - /** |
|
121 | - * @param string $path |
|
122 | - * @param string $fileName |
|
123 | - * @param ISimpleFolder $folder |
|
124 | - * @return bool |
|
125 | - */ |
|
126 | - protected function cache($path, $fileName, ISimpleFolder $folder) { |
|
127 | - $deps = []; |
|
128 | - $fullPath = $path . '/' . $fileName; |
|
129 | - $data = json_decode(file_get_contents($fullPath)); |
|
130 | - $deps[$fullPath] = filemtime($fullPath); |
|
131 | - |
|
132 | - $res = ''; |
|
133 | - foreach ($data as $file) { |
|
134 | - $filePath = $path . '/' . $file; |
|
135 | - |
|
136 | - if (is_file($filePath)) { |
|
137 | - $res .= file_get_contents($filePath); |
|
138 | - $res .= PHP_EOL . PHP_EOL; |
|
139 | - $deps[$filePath] = filemtime($filePath); |
|
140 | - } |
|
141 | - } |
|
142 | - |
|
143 | - $fileName = str_replace('.json', '.js', $fileName); |
|
144 | - try { |
|
145 | - $cachedfile = $folder->getFile($fileName); |
|
146 | - } catch(NotFoundException $e) { |
|
147 | - $cachedfile = $folder->newFile($fileName); |
|
148 | - } |
|
149 | - |
|
150 | - $depFileName = $fileName . '.deps'; |
|
151 | - try { |
|
152 | - $depFile = $folder->getFile($depFileName); |
|
153 | - } catch (NotFoundException $e) { |
|
154 | - $depFile = $folder->newFile($depFileName); |
|
155 | - } |
|
156 | - |
|
157 | - try { |
|
158 | - $cachedfile->putContent($res); |
|
159 | - $depFile->putContent(json_encode($deps)); |
|
160 | - return true; |
|
161 | - } catch (NotPermittedException $e) { |
|
162 | - return false; |
|
163 | - } |
|
164 | - } |
|
165 | - |
|
166 | - /** |
|
167 | - * @param string $appName |
|
168 | - * @param string $fileName |
|
169 | - * @return string |
|
170 | - */ |
|
171 | - public function getCachedJS($appName, $fileName) { |
|
172 | - $tmpfileLoc = explode('/', $fileName); |
|
173 | - $fileName = array_pop($tmpfileLoc); |
|
174 | - $fileName = str_replace('.json', '.js', $fileName); |
|
175 | - |
|
176 | - return substr($this->urlGenerator->linkToRoute('core.Js.getJs', array('fileName' => $fileName, 'appName' => $appName)), strlen(\OC::$WEBROOT) + 1); |
|
177 | - } |
|
178 | - |
|
179 | - /** |
|
180 | - * @param string $root |
|
181 | - * @param string $file |
|
182 | - * @return string[] |
|
183 | - */ |
|
184 | - public function getContent($root, $file) { |
|
185 | - /** @var array $data */ |
|
186 | - $data = json_decode(file_get_contents($root . '/' . $file)); |
|
187 | - if(!is_array($data)) { |
|
188 | - return []; |
|
189 | - } |
|
190 | - |
|
191 | - $path = explode('/', $file); |
|
192 | - array_pop($path); |
|
193 | - $path = implode('/', $path); |
|
194 | - |
|
195 | - $result = []; |
|
196 | - foreach ($data as $f) { |
|
197 | - $result[] = $path . '/' . $f; |
|
198 | - } |
|
199 | - |
|
200 | - return $result; |
|
201 | - } |
|
35 | + /** @var IAppData */ |
|
36 | + protected $appData; |
|
37 | + |
|
38 | + /** @var IURLGenerator */ |
|
39 | + protected $urlGenerator; |
|
40 | + |
|
41 | + /** @var ICache */ |
|
42 | + protected $depsCache; |
|
43 | + |
|
44 | + /** @var SystemConfig */ |
|
45 | + protected $config; |
|
46 | + |
|
47 | + /** |
|
48 | + * @param IAppData $appData |
|
49 | + * @param IURLGenerator $urlGenerator |
|
50 | + * @param ICache $depsCache |
|
51 | + * @param SystemConfig $config |
|
52 | + */ |
|
53 | + public function __construct(IAppData $appData, |
|
54 | + IURLGenerator $urlGenerator, |
|
55 | + ICache $depsCache, |
|
56 | + SystemConfig $config) { |
|
57 | + $this->appData = $appData; |
|
58 | + $this->urlGenerator = $urlGenerator; |
|
59 | + $this->depsCache = $depsCache; |
|
60 | + $this->config = $config; |
|
61 | + } |
|
62 | + |
|
63 | + /** |
|
64 | + * @param string $root |
|
65 | + * @param string $file |
|
66 | + * @param string $app |
|
67 | + * @return bool |
|
68 | + */ |
|
69 | + public function process($root, $file, $app) { |
|
70 | + if ($this->config->getValue('debug') || !$this->config->getValue('installed')) { |
|
71 | + return false; |
|
72 | + } |
|
73 | + |
|
74 | + $path = explode('/', $root . '/' . $file); |
|
75 | + |
|
76 | + $fileName = array_pop($path); |
|
77 | + $path = implode('/', $path); |
|
78 | + |
|
79 | + try { |
|
80 | + $folder = $this->appData->getFolder($app); |
|
81 | + } catch(NotFoundException $e) { |
|
82 | + // creating css appdata folder |
|
83 | + $folder = $this->appData->newFolder($app); |
|
84 | + } |
|
85 | + |
|
86 | + if($this->isCached($fileName, $folder)) { |
|
87 | + return true; |
|
88 | + } |
|
89 | + return $this->cache($path, $fileName, $folder); |
|
90 | + } |
|
91 | + |
|
92 | + /** |
|
93 | + * @param string $fileName |
|
94 | + * @param ISimpleFolder $folder |
|
95 | + * @return bool |
|
96 | + */ |
|
97 | + protected function isCached($fileName, ISimpleFolder $folder) { |
|
98 | + $fileName = str_replace('.json', '.js', $fileName) . '.deps'; |
|
99 | + try { |
|
100 | + $deps = $this->depsCache->get($folder->getName() . '-' . $fileName); |
|
101 | + if ($deps === null) { |
|
102 | + $depFile = $folder->getFile($fileName); |
|
103 | + $deps = $depFile->getContent(); |
|
104 | + $this->depsCache->set($folder->getName() . '-' . $fileName, $deps); |
|
105 | + } |
|
106 | + $deps = json_decode($deps, true); |
|
107 | + |
|
108 | + foreach ($deps as $file=>$mtime) { |
|
109 | + if (!file_exists($file) || filemtime($file) > $mtime) { |
|
110 | + return false; |
|
111 | + } |
|
112 | + } |
|
113 | + |
|
114 | + return true; |
|
115 | + } catch(NotFoundException $e) { |
|
116 | + return false; |
|
117 | + } |
|
118 | + } |
|
119 | + |
|
120 | + /** |
|
121 | + * @param string $path |
|
122 | + * @param string $fileName |
|
123 | + * @param ISimpleFolder $folder |
|
124 | + * @return bool |
|
125 | + */ |
|
126 | + protected function cache($path, $fileName, ISimpleFolder $folder) { |
|
127 | + $deps = []; |
|
128 | + $fullPath = $path . '/' . $fileName; |
|
129 | + $data = json_decode(file_get_contents($fullPath)); |
|
130 | + $deps[$fullPath] = filemtime($fullPath); |
|
131 | + |
|
132 | + $res = ''; |
|
133 | + foreach ($data as $file) { |
|
134 | + $filePath = $path . '/' . $file; |
|
135 | + |
|
136 | + if (is_file($filePath)) { |
|
137 | + $res .= file_get_contents($filePath); |
|
138 | + $res .= PHP_EOL . PHP_EOL; |
|
139 | + $deps[$filePath] = filemtime($filePath); |
|
140 | + } |
|
141 | + } |
|
142 | + |
|
143 | + $fileName = str_replace('.json', '.js', $fileName); |
|
144 | + try { |
|
145 | + $cachedfile = $folder->getFile($fileName); |
|
146 | + } catch(NotFoundException $e) { |
|
147 | + $cachedfile = $folder->newFile($fileName); |
|
148 | + } |
|
149 | + |
|
150 | + $depFileName = $fileName . '.deps'; |
|
151 | + try { |
|
152 | + $depFile = $folder->getFile($depFileName); |
|
153 | + } catch (NotFoundException $e) { |
|
154 | + $depFile = $folder->newFile($depFileName); |
|
155 | + } |
|
156 | + |
|
157 | + try { |
|
158 | + $cachedfile->putContent($res); |
|
159 | + $depFile->putContent(json_encode($deps)); |
|
160 | + return true; |
|
161 | + } catch (NotPermittedException $e) { |
|
162 | + return false; |
|
163 | + } |
|
164 | + } |
|
165 | + |
|
166 | + /** |
|
167 | + * @param string $appName |
|
168 | + * @param string $fileName |
|
169 | + * @return string |
|
170 | + */ |
|
171 | + public function getCachedJS($appName, $fileName) { |
|
172 | + $tmpfileLoc = explode('/', $fileName); |
|
173 | + $fileName = array_pop($tmpfileLoc); |
|
174 | + $fileName = str_replace('.json', '.js', $fileName); |
|
175 | + |
|
176 | + return substr($this->urlGenerator->linkToRoute('core.Js.getJs', array('fileName' => $fileName, 'appName' => $appName)), strlen(\OC::$WEBROOT) + 1); |
|
177 | + } |
|
178 | + |
|
179 | + /** |
|
180 | + * @param string $root |
|
181 | + * @param string $file |
|
182 | + * @return string[] |
|
183 | + */ |
|
184 | + public function getContent($root, $file) { |
|
185 | + /** @var array $data */ |
|
186 | + $data = json_decode(file_get_contents($root . '/' . $file)); |
|
187 | + if(!is_array($data)) { |
|
188 | + return []; |
|
189 | + } |
|
190 | + |
|
191 | + $path = explode('/', $file); |
|
192 | + array_pop($path); |
|
193 | + $path = implode('/', $path); |
|
194 | + |
|
195 | + $result = []; |
|
196 | + foreach ($data as $f) { |
|
197 | + $result[] = $path . '/' . $f; |
|
198 | + } |
|
199 | + |
|
200 | + return $result; |
|
201 | + } |
|
202 | 202 | } |