Inspection of "Don't run JSCombiner when not installed" - nextcloud/server - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Pull Request — master (#4049)

by Lukas

created 2017-03-25 14:26 UTC

Status

Indentation +167 added lines, -167 removed lines patch added patch discarded remove patch

@@ -32,171 +32,171 @@
 block discarded – undo
 
 class JSCombiner {
 
-	/** @var IAppData */
-	protected $appData;
-
-	/** @var IURLGenerator */
-	protected $urlGenerator;
-
-	/** @var ICache */
-	protected $depsCache;
-
-	/** @var SystemConfig */
-	protected $config;
-
-	/**
-	 * @param IAppData $appData
-	 * @param IURLGenerator $urlGenerator
-	 * @param ICache $depsCache
-	 * @param SystemConfig $config
-	 */
-	public function __construct(IAppData $appData,
-								IURLGenerator $urlGenerator,
-								ICache $depsCache,
-								SystemConfig $config) {
-		$this->appData = $appData;
-		$this->urlGenerator = $urlGenerator;
-		$this->depsCache = $depsCache;
-		$this->config = $config;
-	}
-
-	/**
-	 * @param string $root
-	 * @param string $file
-	 * @param string $app
-	 * @return bool
-	 */
-	public function process($root, $file, $app) {
-		if ($this->config->getValue('debug') || !$this->config->getValue('installed')) {
-			return false;
-		}
-
-		$path = explode('/', $root . '/' . $file);
-
-		$fileName = array_pop($path);
-		$path = implode('/', $path);
-
-		try {
-			$folder = $this->appData->getFolder($app);
-		} catch(NotFoundException $e) {
-			// creating css appdata folder
-			$folder = $this->appData->newFolder($app);
-		}
-
-		if($this->isCached($fileName, $folder)) {
-			return true;
-		}
-		return $this->cache($path, $fileName, $folder);
-	}
-
-	/**
-	 * @param string $fileName
-	 * @param ISimpleFolder $folder
-	 * @return bool
-	 */
-	protected function isCached($fileName, ISimpleFolder $folder) {
-		$fileName = str_replace('.json', '.js', $fileName) . '.deps';
-		try {
-			$deps = $this->depsCache->get($folder->getName() . '-' . $fileName);
-			if ($deps === null) {
-				$depFile = $folder->getFile($fileName);
-				$deps = $depFile->getContent();
-				$this->depsCache->set($folder->getName() . '-' . $fileName, $deps);
-			}
-			$deps = json_decode($deps, true);
-
-			foreach ($deps as $file=>$mtime) {
-				if (!file_exists($file) || filemtime($file) > $mtime) {
-					return false;
-				}
-			}
-
-			return true;
-		} catch(NotFoundException $e) {
-			return false;
-		}
-	}
-
-	/**
-	 * @param string $path
-	 * @param string $fileName
-	 * @param ISimpleFolder $folder
-	 * @return bool
-	 */
-	protected function cache($path, $fileName, ISimpleFolder $folder) {
-		$deps = [];
-		$fullPath = $path . '/' . $fileName;
-		$data = json_decode(file_get_contents($fullPath));
-		$deps[$fullPath] = filemtime($fullPath);
-
-		$res = '';
-		foreach ($data as $file) {
-			$filePath = $path . '/' . $file;
-
-			if (is_file($filePath)) {
-				$res .= file_get_contents($filePath);
-				$res .= PHP_EOL . PHP_EOL;
-				$deps[$filePath] = filemtime($filePath);
-			}
-		}
-
-		$fileName = str_replace('.json', '.js', $fileName);
-		try {
-			$cachedfile = $folder->getFile($fileName);
-		} catch(NotFoundException $e) {
-			$cachedfile = $folder->newFile($fileName);
-		}
-
-		$depFileName = $fileName . '.deps';
-		try {
-			$depFile = $folder->getFile($depFileName);
-		} catch (NotFoundException $e) {
-			$depFile = $folder->newFile($depFileName);
-		}
-
-		try {
-			$cachedfile->putContent($res);
-			$depFile->putContent(json_encode($deps));
-			return true;
-		} catch (NotPermittedException $e) {
-			return false;
-		}
-	}
-
-	/**
-	 * @param string $appName
-	 * @param string $fileName
-	 * @return string
-	 */
-	public function getCachedJS($appName, $fileName) {
-		$tmpfileLoc = explode('/', $fileName);
-		$fileName = array_pop($tmpfileLoc);
-		$fileName = str_replace('.json', '.js', $fileName);
-
-		return substr($this->urlGenerator->linkToRoute('core.Js.getJs', array('fileName' => $fileName, 'appName' => $appName)), strlen(\OC::$WEBROOT) + 1);
-	}
-
-	/**
-	 * @param string $root
-	 * @param string $file
-	 * @return string[]
-	 */
-	public function getContent($root, $file) {
-		/** @var array $data */
-		$data = json_decode(file_get_contents($root . '/' . $file));
-		if(!is_array($data)) {
-			return [];
-		}
-
-		$path = explode('/', $file);
-		array_pop($path);
-		$path = implode('/', $path);
-
-		$result = [];
-		foreach ($data as $f) {
-			$result[] = $path . '/' . $f;
-		}
-
-		return $result;
-	}
+    /** @var IAppData */
+    protected $appData;
+
+    /** @var IURLGenerator */
+    protected $urlGenerator;
+
+    /** @var ICache */
+    protected $depsCache;
+
+    /** @var SystemConfig */
+    protected $config;
+
+    /**
+     * @param IAppData $appData
+     * @param IURLGenerator $urlGenerator
+     * @param ICache $depsCache
+     * @param SystemConfig $config
+     */
+    public function __construct(IAppData $appData,
+                                IURLGenerator $urlGenerator,
+                                ICache $depsCache,
+                                SystemConfig $config) {
+        $this->appData = $appData;
+        $this->urlGenerator = $urlGenerator;
+        $this->depsCache = $depsCache;
+        $this->config = $config;
+    }
+
+    /**
+     * @param string $root
+     * @param string $file
+     * @param string $app
+     * @return bool
+     */
+    public function process($root, $file, $app) {
+        if ($this->config->getValue('debug') || !$this->config->getValue('installed')) {
+            return false;
+        }
+
+        $path = explode('/', $root . '/' . $file);
+
+        $fileName = array_pop($path);
+        $path = implode('/', $path);
+
+        try {
+            $folder = $this->appData->getFolder($app);
+        } catch(NotFoundException $e) {
+            // creating css appdata folder
+            $folder = $this->appData->newFolder($app);
+        }
+
+        if($this->isCached($fileName, $folder)) {
+            return true;
+        }
+        return $this->cache($path, $fileName, $folder);
+    }
+
+    /**
+     * @param string $fileName
+     * @param ISimpleFolder $folder
+     * @return bool
+     */
+    protected function isCached($fileName, ISimpleFolder $folder) {
+        $fileName = str_replace('.json', '.js', $fileName) . '.deps';
+        try {
+            $deps = $this->depsCache->get($folder->getName() . '-' . $fileName);
+            if ($deps === null) {
+                $depFile = $folder->getFile($fileName);
+                $deps = $depFile->getContent();
+                $this->depsCache->set($folder->getName() . '-' . $fileName, $deps);
+            }
+            $deps = json_decode($deps, true);
+
+            foreach ($deps as $file=>$mtime) {
+                if (!file_exists($file) || filemtime($file) > $mtime) {
+                    return false;
+                }
+            }
+
+            return true;
+        } catch(NotFoundException $e) {
+            return false;
+        }
+    }
+
+    /**
+     * @param string $path
+     * @param string $fileName
+     * @param ISimpleFolder $folder
+     * @return bool
+     */
+    protected function cache($path, $fileName, ISimpleFolder $folder) {
+        $deps = [];
+        $fullPath = $path . '/' . $fileName;
+        $data = json_decode(file_get_contents($fullPath));
+        $deps[$fullPath] = filemtime($fullPath);
+
+        $res = '';
+        foreach ($data as $file) {
+            $filePath = $path . '/' . $file;
+
+            if (is_file($filePath)) {
+                $res .= file_get_contents($filePath);
+                $res .= PHP_EOL . PHP_EOL;
+                $deps[$filePath] = filemtime($filePath);
+            }
+        }
+
+        $fileName = str_replace('.json', '.js', $fileName);
+        try {
+            $cachedfile = $folder->getFile($fileName);
+        } catch(NotFoundException $e) {
+            $cachedfile = $folder->newFile($fileName);
+        }
+
+        $depFileName = $fileName . '.deps';
+        try {
+            $depFile = $folder->getFile($depFileName);
+        } catch (NotFoundException $e) {
+            $depFile = $folder->newFile($depFileName);
+        }
+
+        try {
+            $cachedfile->putContent($res);
+            $depFile->putContent(json_encode($deps));
+            return true;
+        } catch (NotPermittedException $e) {
+            return false;
+        }
+    }
+
+    /**
+     * @param string $appName
+     * @param string $fileName
+     * @return string
+     */
+    public function getCachedJS($appName, $fileName) {
+        $tmpfileLoc = explode('/', $fileName);
+        $fileName = array_pop($tmpfileLoc);
+        $fileName = str_replace('.json', '.js', $fileName);
+
+        return substr($this->urlGenerator->linkToRoute('core.Js.getJs', array('fileName' => $fileName, 'appName' => $appName)), strlen(\OC::$WEBROOT) + 1);
+    }
+
+    /**
+     * @param string $root
+     * @param string $file
+     * @return string[]
+     */
+    public function getContent($root, $file) {
+        /** @var array $data */
+        $data = json_decode(file_get_contents($root . '/' . $file));
+        if(!is_array($data)) {
+            return [];
+        }
+
+        $path = explode('/', $file);
+        array_pop($path);
+        $path = implode('/', $path);
+
+        $result = [];
+        foreach ($data as $f) {
+            $result[] = $path . '/' . $f;
+        }
+
+        return $result;
+    }
 }

Please login to merge, or discard this patch.

Spacing +15 added lines, -15 removed lines patch added patch discarded remove patch

@@ -71,19 +71,19 @@  discard block
 block discarded – undo
 			return false;
 		}
 
-		$path = explode('/', $root . '/' . $file);
+		$path = explode('/', $root.'/'.$file);
 
 		$fileName = array_pop($path);
 		$path = implode('/', $path);
 
 		try {
 			$folder = $this->appData->getFolder($app);
-		} catch(NotFoundException $e) {
+		} catch (NotFoundException $e) {
 			// creating css appdata folder
 			$folder = $this->appData->newFolder($app);
 		}
 
-		if($this->isCached($fileName, $folder)) {
+		if ($this->isCached($fileName, $folder)) {
 			return true;
 		}
 		return $this->cache($path, $fileName, $folder);
@@ -95,13 +95,13 @@  discard block
 block discarded – undo
 	 * @return bool
 	 */
 	protected function isCached($fileName, ISimpleFolder $folder) {
-		$fileName = str_replace('.json', '.js', $fileName) . '.deps';
+		$fileName = str_replace('.json', '.js', $fileName).'.deps';
 		try {
-			$deps = $this->depsCache->get($folder->getName() . '-' . $fileName);
+			$deps = $this->depsCache->get($folder->getName().'-'.$fileName);
 			if ($deps === null) {
 				$depFile = $folder->getFile($fileName);
 				$deps = $depFile->getContent();
-				$this->depsCache->set($folder->getName() . '-' . $fileName, $deps);
+				$this->depsCache->set($folder->getName().'-'.$fileName, $deps);
 			}
 			$deps = json_decode($deps, true);
 
@@ -112,7 +112,7 @@  discard block
 block discarded – undo
 			}
 
 			return true;
-		} catch(NotFoundException $e) {
+		} catch (NotFoundException $e) {
 			return false;
 		}
 	}
@@ -125,17 +125,17 @@  discard block
 block discarded – undo
 	 */
 	protected function cache($path, $fileName, ISimpleFolder $folder) {
 		$deps = [];
-		$fullPath = $path . '/' . $fileName;
+		$fullPath = $path.'/'.$fileName;
 		$data = json_decode(file_get_contents($fullPath));
 		$deps[$fullPath] = filemtime($fullPath);
 
 		$res = '';
 		foreach ($data as $file) {
-			$filePath = $path . '/' . $file;
+			$filePath = $path.'/'.$file;
 
 			if (is_file($filePath)) {
 				$res .= file_get_contents($filePath);
-				$res .= PHP_EOL . PHP_EOL;
+				$res .= PHP_EOL.PHP_EOL;
 				$deps[$filePath] = filemtime($filePath);
 			}
 		}
@@ -143,11 +143,11 @@  discard block
 block discarded – undo
 		$fileName = str_replace('.json', '.js', $fileName);
 		try {
 			$cachedfile = $folder->getFile($fileName);
-		} catch(NotFoundException $e) {
+		} catch (NotFoundException $e) {
 			$cachedfile = $folder->newFile($fileName);
 		}
 
-		$depFileName = $fileName . '.deps';
+		$depFileName = $fileName.'.deps';
 		try {
 			$depFile = $folder->getFile($depFileName);
 		} catch (NotFoundException $e) {
@@ -183,8 +183,8 @@  discard block
 block discarded – undo
 	 */
 	public function getContent($root, $file) {
 		/** @var array $data */
-		$data = json_decode(file_get_contents($root . '/' . $file));
-		if(!is_array($data)) {
+		$data = json_decode(file_get_contents($root.'/'.$file));
+		if (!is_array($data)) {
 			return [];
 		}
 
@@ -194,7 +194,7 @@  discard block
 block discarded – undo
 
 		$result = [];
 		foreach ($data as $f) {
-			$result[] = $path . '/' . $f;
+			$result[] = $path.'/'.$f;
 		}
 
 		return $result;

Please login to merge, or discard this patch.

		@@ -71,19 +71,19 @@ discard block
		block discarded – undo
71	71	return false;
72	72	}
73	73
74		- $path = explode('/', $root . '/' . $file);
	74	+ $path = explode('/', $root.'/'.$file);
75	75
76	76	$fileName = array_pop($path);
77	77	$path = implode('/', $path);
78	78
79	79	try {
80	80	$folder = $this->appData->getFolder($app);
81		- } catch(NotFoundException $e) {
	81	+ } catch (NotFoundException $e) {
82	82	// creating css appdata folder
83	83	$folder = $this->appData->newFolder($app);
84	84	}
85	85
86		- if($this->isCached($fileName, $folder)) {
	86	+ if ($this->isCached($fileName, $folder)) {
87	87	return true;
88	88	}
89	89	return $this->cache($path, $fileName, $folder);
		@@ -95,13 +95,13 @@ discard block
		block discarded – undo
95	95	* @return bool
96	96	*/
97	97	protected function isCached($fileName, ISimpleFolder $folder) {
98		- $fileName = str_replace('.json', '.js', $fileName) . '.deps';
	98	+ $fileName = str_replace('.json', '.js', $fileName).'.deps';
99	99	try {
100		- $deps = $this->depsCache->get($folder->getName() . '-' . $fileName);
	100	+ $deps = $this->depsCache->get($folder->getName().'-'.$fileName);
101	101	if ($deps === null) {
102	102	$depFile = $folder->getFile($fileName);
103	103	$deps = $depFile->getContent();
104		- $this->depsCache->set($folder->getName() . '-' . $fileName, $deps);
	104	+ $this->depsCache->set($folder->getName().'-'.$fileName, $deps);
105	105	}
106	106	$deps = json_decode($deps, true);
107	107
		@@ -112,7 +112,7 @@ discard block
		block discarded – undo
112	112	}
113	113
114	114	return true;
115		- } catch(NotFoundException $e) {
	115	+ } catch (NotFoundException $e) {
116	116	return false;
117	117	}
118	118	}
		@@ -125,17 +125,17 @@ discard block
		block discarded – undo
125	125	*/
126	126	protected function cache($path, $fileName, ISimpleFolder $folder) {
127	127	$deps = [];
128		- $fullPath = $path . '/' . $fileName;
	128	+ $fullPath = $path.'/'.$fileName;
129	129	$data = json_decode(file_get_contents($fullPath));
130	130	$deps[$fullPath] = filemtime($fullPath);
131	131
132	132	$res = '';
133	133	foreach ($data as $file) {
134		- $filePath = $path . '/' . $file;
	134	+ $filePath = $path.'/'.$file;
135	135
136	136	if (is_file($filePath)) {
137	137	$res .= file_get_contents($filePath);
138		- $res .= PHP_EOL . PHP_EOL;
	138	+ $res .= PHP_EOL.PHP_EOL;
139	139	$deps[$filePath] = filemtime($filePath);
140	140	}
141	141	}
		@@ -143,11 +143,11 @@ discard block
		block discarded – undo
143	143	$fileName = str_replace('.json', '.js', $fileName);
144	144	try {
145	145	$cachedfile = $folder->getFile($fileName);
146		- } catch(NotFoundException $e) {
	146	+ } catch (NotFoundException $e) {
147	147	$cachedfile = $folder->newFile($fileName);
148	148	}
149	149
150		- $depFileName = $fileName . '.deps';
	150	+ $depFileName = $fileName.'.deps';
151	151	try {
152	152	$depFile = $folder->getFile($depFileName);
153	153	} catch (NotFoundException $e) {
		@@ -183,8 +183,8 @@ discard block
		block discarded – undo
183	183	*/
184	184	public function getContent($root, $file) {
185	185	/** @var array $data */
186		- $data = json_decode(file_get_contents($root . '/' . $file));
187		- if(!is_array($data)) {
	186	+ $data = json_decode(file_get_contents($root.'/'.$file));
	187	+ if (!is_array($data)) {
188	188	return [];
189	189	}
190	190
		@@ -194,7 +194,7 @@ discard block
		block discarded – undo
194	194
195	195	$result = [];
196	196	foreach ($data as $f) {
197		- $result[] = $path . '/' . $f;
	197	+ $result[] = $path.'/'.$f;
198	198	}
199	199
200	200	return $result;

		@@ -32,171 +32,171 @@
		block discarded – undo
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	}

nextcloud / server

Pull Request — master (#4049)

Status

Category

Indentation +167 added lines, -167 removed lines patch added patch discarded remove patch

Spacing +15 added lines, -15 removed lines patch added patch discarded remove patch