refactor profiler to support http with html crawling in additional to local filesystem #798

Author: Haehnchen

META-INF/plugin.xml

@@ -285,6 +285,13 @@
                              nonDefaultProject="true"
         />
 
+        <projectConfigurable instance="fr.adrienbrault.idea.symfony2plugin.profiler.ui.ProfilerSettingsDialog"
+                             displayName="Profiler"
+                             parentId="Symfony2.SettingsForm"
+                             id="Symfony.ProfilerSettingsForm"
+                             nonDefaultProject="true"
+        />
+
         <php.typeProvider2 implementation="fr.adrienbrault.idea.symfony2plugin.dic.SymfonyContainerTypeProvider"/>
         <php.typeProvider2 implementation="fr.adrienbrault.idea.symfony2plugin.doctrine.ObjectRepositoryTypeProvider"/>
         <php.typeProvider2 implementation="fr.adrienbrault.idea.symfony2plugin.doctrine.ObjectRepositoryResultTypeProvider"/>

src/fr/adrienbrault/idea/symfony2plugin/Settings.java

@@ -88,6 +88,12 @@ public class Settings implements PersistentStateComponent<Settings> {
 
     public boolean dismissEnableNotification = false;
 
+    public boolean profilerLocalEnabled = false;
+    public String profilerLocalUrl = "http://127.0.0.1:8000";
+
+    public boolean profilerHttpEnabled = false;
+    public String profilerHttpUrl = "http://127.0.0.1:8000";
+
     @Nullable
     public List<TwigNamespaceSetting> twigNamespaces = new ArrayList<>();
 

src/fr/adrienbrault/idea/symfony2plugin/profiler/HttpProfilerIndex.java

@@ -0,0 +1,44 @@
+package fr.adrienbrault.idea.symfony2plugin.profiler;
+
+import com.intellij.openapi.project.Project;
+import fr.adrienbrault.idea.symfony2plugin.profiler.dict.ProfilerRequestInterface;
+import org.apache.commons.lang.StringUtils;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * @author Daniel Espendiller <daniel@espendiller.net>
+ */
+public class HttpProfilerIndex implements ProfilerIndexInterface {
+    /**
+     * http://127.0.0.1:8080/_profiler
+     */
+    private static String PROFILER_PATH = "_profiler";
+
+    @NotNull
+    private final Project project;
+
+    @NotNull
+    private final String url;
+
+    public HttpProfilerIndex(@NotNull Project project, @NotNull String url) {
+        this.project = project;
+        this.url = StringUtils.stripEnd(url, "/");
+    }
+
+    @NotNull
+    @Override
+    public List<ProfilerRequestInterface> getRequests() {
+        String content = ProfilerUtil.getProfilerUrlContent(String.format("%s/%s/empty/search/results?ip=&limit=10", this.url, PROFILER_PATH));
+        if(content == null) {
+            return Collections.emptyList();
+        }
+
+        return new ArrayList<>(ProfilerUtil.collectHttpDataForRequest(
+            project, ProfilerUtil.createRequestsFromIndexHtml(this.project, content, this.url))
+        );
+    }
+}

src/fr/adrienbrault/idea/symfony2plugin/profiler/ProfilerIndex.java src/fr/adrienbrault/idea/symfony2plugin/profiler/LocalProfilerIndex.java

@@ -1,52 +1,53 @@
 package fr.adrienbrault.idea.symfony2plugin.profiler;
 
 import fr.adrienbrault.idea.symfony2plugin.profiler.dict.ProfilerRequest;
+import fr.adrienbrault.idea.symfony2plugin.profiler.dict.ProfilerRequestInterface;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.List;
 
-public class ProfilerIndex {
-
+/**
+ * @author Daniel Espendiller <daniel@espendiller.net>
+ */
+public class LocalProfilerIndex implements ProfilerIndexInterface {
+    @NotNull
     private File file;
 
-    public ProfilerIndex(File file) {
+    public LocalProfilerIndex(@NotNull File file) {
         this.file = file;
     }
 
-    public ArrayList<ProfilerRequest> getRequests() {
-        ArrayList<ProfilerRequest> list = new ArrayList<>();
-
-        String trennzeichen = ",";
-
+    @NotNull
+    public List<ProfilerRequestInterface> getRequests() {
+        List<ProfilerRequestInterface> list = new ArrayList<>();
         try {
             BufferedReader in = new BufferedReader(new FileReader(this.file));
             String readString;
             while ((readString = in.readLine()) != null) {
-                list.add(new ProfilerRequest(readString.split(trennzeichen), this));
+                list.add(new ProfilerRequest(readString.split(","), this));
             }
 
             in.close();
         } catch (IOException ignored) {
-
         }
 
-
         return list;
     }
 
-    public String getPath(ProfilerRequest profilerRequest) {
+    @NotNull
+    public String getPath(@NotNull ProfilerRequestInterface profilerRequest) {
         String[] hash = profilerRequest.getHash().split("(?<=\\G.{2})");
-
         return hash[2] + "/" + hash[1] + "/" + profilerRequest.getHash();
-
     }
 
     @Nullable
-    public File getFile(ProfilerRequest profilerRequest) {
+    public File getFile(@NotNull ProfilerRequestInterface profilerRequest) {
         String path = this.getPath(profilerRequest);
 
         File file = new File(this.file.getParentFile().getAbsolutePath() + "/" + path);
@@ -59,8 +60,8 @@ public File getFile(ProfilerRequest profilerRequest) {
     }
 
     @Nullable
-    public ProfilerRequest getRequestOnHash(String hash) {
-        for(ProfilerRequest profilerRequest :this.getRequests()) {
+    public ProfilerRequestInterface getRequestOnHash(@NotNull String hash) {
+        for(ProfilerRequestInterface profilerRequest :this.getRequests()) {
             if(profilerRequest.getHash().equals(hash)) {
                 return profilerRequest;
             }
@@ -70,7 +71,7 @@ public ProfilerRequest getRequestOnHash(String hash) {
     }
 
     @Nullable
-    public String getContent(ProfilerRequest profilerRequest) {
+    public String getContent(@NotNull ProfilerRequestInterface profilerRequest) {
         File file = this.getFile(profilerRequest);
         if(file == null) {
             return  null;
@@ -88,8 +89,6 @@ public String getContent(ProfilerRequest profilerRequest) {
         } catch (IOException ignored) {
         }
 
-
         return content.toString();
     }
-
 }

src/fr/adrienbrault/idea/symfony2plugin/profiler/ProfilerIndexInterface.java

@@ -0,0 +1,14 @@
+package fr.adrienbrault.idea.symfony2plugin.profiler;
+
+import fr.adrienbrault.idea.symfony2plugin.profiler.dict.ProfilerRequestInterface;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+
+/**
+ * @author Daniel Espendiller <daniel@espendiller.net>
+ */
+public interface ProfilerIndexInterface {
+    @NotNull
+    List<ProfilerRequestInterface> getRequests();
+}