add support for contest name directory structure

[chaz/vimcoder] / src / com / dogcows / Editor.java

diff --git a/src/com/dogcows/Editor.java b/src/com/dogcows/Editor.java
index 203d8ec2eb5ac4dc159205d765f0b628c5cb528c..ea4744240fed71e050bf725ca33e11dd0f2b0e2a 100644 (file)
--- a/src/com/dogcows/Editor.java
+++ b/src/com/dogcows/Editor.java
@@ -31,6 +31,16 @@ public class Editor
         */
        private String name;
 
+       /**
+        * The name of the contest.
+        */
+       private String contestName;
+
+       /**
+        * The point value.
+        */
+       private String points;
+
        /**
         * The path of the current source file.
         */
@@ -68,6 +78,8 @@ public class Editor
        {
                this.id = String.valueOf(component.getProblem().getProblemID());
                this.name = component.getClassName();
+               this.contestName = component.getProblem().getRound().getContestName().replaceAll(" ", "-");
+               this.points = String.valueOf(component.getPoints().intValue());
 
                // Make sure the top-level vimcoder directory exists.
                File topDir = VimCoder.getStorageDirectory();
@@ -77,9 +89,24 @@ public class Editor
                }
 
                // Make sure the problem directory exists.
-               this.directory = new File(topDir, id);
-               if (!directory.isDirectory())
+               File newStyleDirectory = new File(new File(topDir, contestName), points);
+               File oldStyleDirectory = new File(topDir, id);
+               if (newStyleDirectory.isDirectory())
+               {
+                       this.directory = newStyleDirectory;
+               }
+               else if (oldStyleDirectory.isDirectory())
+               {
+                       this.directory = oldStyleDirectory;
+               }
+               else if (VimCoder.isContestDirNames())
+               {
+                       this.directory = newStyleDirectory;
+                       if (!directory.mkdirs()) throw new IOException(directory.getPath());
+               }
+               else
                {
+                       this.directory = oldStyleDirectory;
                        if (!directory.mkdirs()) throw new IOException(directory.getPath());
                }
 
@@ -116,7 +143,7 @@ public class Editor
 
                // Expand the template for the main class and write it to the current
                // source file.
-               sourceFile = new File(directory, name + "." + ext);
+               this.sourceFile = new File(directory, name + "." + ext);
                if (!sourceFile.canRead())
                {
                        String text = Util.expandTemplate(readTemplate(lang + "Template"), terms);
@@ -236,7 +263,7 @@ public class Editor
                 * before the timeout, we will assume it is not backgrounding and
                 * that everything worked.  This works as long as the Vim server is
                 * able to start within the stall period. */
-               long expire = System.currentTimeMillis() + 1000;
+               long expire = System.currentTimeMillis() + 2500;
                while (System.currentTimeMillis() < expire)
                {
                        Thread.yield();
@@ -327,3 +354,4 @@ public class Editor
        }
 }
 
+// vim:noet:ts=8