Provided two variants of Flatten filter, -S and -F.

README.md

@@ -31,6 +31,7 @@ Export from OmniFocus to various other formats:
     - [Output and Formats](#output-and-formats)
     - [Sorting](#sorting)
     - [Pruning](#pruning)
+    - [Simplifying](#simplifying) 
     - [Flattening](#flattening) 
     - [Inbox and No Context](#inbox-and-no-context)
     - [Command Line Options](#command-line-options)
@@ -471,18 +472,58 @@ Sometimes the output is cluttered with empty Contexts, Folders or Projects that
 
 Using the **-p** option eliminates them.
 
-### Flattening ###
+### Simplifying ###
 
 Sometimes what is a useful Folder/Context hierarchy in OmniFocus ends up making reports look cluttered.
 
-The **-F** option flattens nested the hierarchy to just leaf Folder/Projects/Contexts and lifts sub tasks up to the level of their parent.
+The **-S** option simplifies the nested the hierarchy to just leaf Folder/Projects/Contexts and lifts sub tasks up to the level of their parent.
 
 All projects and contexts are moved to the root level, and sub tasks moved up to the level of their parent.
 
+For example if you have:
+
+    FolderF1
+      FolderF2
+        ProjectP
+          TaskT1
+            TaskT2
+            TaskT3
+
+You will get:
+
+    ProjectP
+      TaskT1
+      TaskT2
+      TaskT3
+
 This can make sorting more useful. If you have a deeply nested hierarchy, compare the following:
 
     of2 -ti 'remaining && due.soon' -ts r:flagged -ts due
-    of2 -ti 'remaining && due.soon' -ts r:flagged -ts due -F
+    of2 -ti 'remaining && due.soon' -ts r:flagged -ts due -S
+
+### Flattening
+
+Flattening with **-F** is an extreme form of simplifying.
+
+For example if you have:
+
+    FolderF1
+      FolderF2
+        ProjectP
+          TaskT1
+            TaskT2
+            TaskT3
+        ProjectP2
+          TaskT4
+
+You will get:
+
+    Tasks
+      TaskT1
+      TaskT2
+      TaskT3
+
+The name of the resultant root node can be modified by changing the **flattenedRootName** configuration value.
 
 ### Inbox and No Context
 
@@ -597,6 +638,8 @@ a large export rather than about a second when accessing the database directly.
 
 ## Known Issues ##
 
-- Task/Project notes are stripped back to ASCII on export because wide characters seem corrupted when I retrieve them. This could be down to the encoding OmniFocus uses or it could be an issue with the SQLite Java driver. I experimented with various obvious specific encodings but that didn't help.
+- Task/Project notes are stripped back to ASCII on export because wide characters seem corrupted when I retrieve them. This could be down to the encoding OmniFocus uses or it could be an issue with the SQLite Java driver.
 - Perspective data is something I haven't managed to decode.
 - In  OmniFocus, child Contexts/Tasks are interleaved, as are child Projects/Folders. In ofexport they are not.
+- There is no way to detect if Projects are **stalled** or **pending**.
+- The **modified** and **added** times are missing from the attributes. 

RELEASE-NOTES.md

@@ -3,6 +3,7 @@
 **[Development Version](https://github.com/psidnell/ofexport2/archive/master.zip)**
 
 - Documentation Improvements
+- Provided two variants of Flatten filter, -S and -F.
 
 **[1.0.10 (2014-12-09)](https://github.com/psidnell/ofexport2/archive/ofexport-v2-1.0.10.zip)**
 

bin/ofexport2

@@ -97,7 +97,7 @@ then
   REPO="$BASEDIR"/repo
 fi
 
-CLASSPATH="$BASEDIR"/config:"$REPO"/com/fasterxml/jackson/core/jackson-core/2.4.3/jackson-core-2.4.3.jar:"$REPO"/com/fasterxml/jackson/core/jackson-databind/2.4.3/jackson-databind-2.4.3.jar:"$REPO"/com/fasterxml/jackson/core/jackson-annotations/2.4.0/jackson-annotations-2.4.0.jar:"$REPO"/com/fasterxml/jackson/dataformat/jackson-dataformat-xml/2.4.3/jackson-dataformat-xml-2.4.3.jar:"$REPO"/com/fasterxml/jackson/module/jackson-module-jaxb-annotations/2.4.3/jackson-module-jaxb-annotations-2.4.3.jar:"$REPO"/org/codehaus/woodstox/stax2-api/3.1.4/stax2-api-3.1.4.jar:"$REPO"/org/codehaus/woodstox/woodstox-core-asl/4.1.4/woodstox-core-asl-4.1.4.jar:"$REPO"/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar:"$REPO"/commons-cli/commons-cli/1.2/commons-cli-1.2.jar:"$REPO"/ognl/ognl/3.0.8/ognl-3.0.8.jar:"$REPO"/javassist/javassist/3.11.0.GA/javassist-3.11.0.GA.jar:"$REPO"/org/slf4j/slf4j-api/1.7.7/slf4j-api-1.7.7.jar:"$REPO"/org/slf4j/slf4j-log4j12/1.7.7/slf4j-log4j12-1.7.7.jar:"$REPO"/log4j/log4j/1.2.17/log4j-1.2.17.jar:"$REPO"/commons-io/commons-io/2.4/commons-io-2.4.jar:"$REPO"/org/xerial/sqlite-jdbc/3.8.7/sqlite-jdbc-3.8.7.jar:"$REPO"/org/freemarker/freemarker/2.3.21/freemarker-2.3.21.jar:"$REPO"/org/springframework/spring-context/4.1.2.RELEASE/spring-context-4.1.2.RELEASE.jar:"$REPO"/org/springframework/spring-aop/4.1.2.RELEASE/spring-aop-4.1.2.RELEASE.jar:"$REPO"/aopalliance/aopalliance/1.0/aopalliance-1.0.jar:"$REPO"/org/springframework/spring-core/4.1.2.RELEASE/spring-core-4.1.2.RELEASE.jar:"$REPO"/commons-logging/commons-logging/1.1.3/commons-logging-1.1.3.jar:"$REPO"/org/springframework/spring-expression/4.1.2.RELEASE/spring-expression-4.1.2.RELEASE.jar:"$REPO"/org/springframework/spring-beans/4.1.2.RELEASE/spring-beans-4.1.2.RELEASE.jar:"$REPO"/org/psidnell/ofexport-v2/1.0.10-SNAPSHOT/ofexport-v2-1.0.10-SNAPSHOT.jar
+CLASSPATH="$BASEDIR"/config:"$REPO"/com/fasterxml/jackson/core/jackson-core/2.4.3/jackson-core-2.4.3.jar:"$REPO"/com/fasterxml/jackson/core/jackson-databind/2.4.3/jackson-databind-2.4.3.jar:"$REPO"/com/fasterxml/jackson/core/jackson-annotations/2.4.0/jackson-annotations-2.4.0.jar:"$REPO"/com/fasterxml/jackson/dataformat/jackson-dataformat-xml/2.4.3/jackson-dataformat-xml-2.4.3.jar:"$REPO"/com/fasterxml/jackson/module/jackson-module-jaxb-annotations/2.4.3/jackson-module-jaxb-annotations-2.4.3.jar:"$REPO"/org/codehaus/woodstox/stax2-api/3.1.4/stax2-api-3.1.4.jar:"$REPO"/org/codehaus/woodstox/woodstox-core-asl/4.1.4/woodstox-core-asl-4.1.4.jar:"$REPO"/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar:"$REPO"/commons-cli/commons-cli/1.2/commons-cli-1.2.jar:"$REPO"/ognl/ognl/3.0.8/ognl-3.0.8.jar:"$REPO"/javassist/javassist/3.11.0.GA/javassist-3.11.0.GA.jar:"$REPO"/org/slf4j/slf4j-api/1.7.7/slf4j-api-1.7.7.jar:"$REPO"/org/slf4j/slf4j-log4j12/1.7.7/slf4j-log4j12-1.7.7.jar:"$REPO"/log4j/log4j/1.2.17/log4j-1.2.17.jar:"$REPO"/commons-io/commons-io/2.4/commons-io-2.4.jar:"$REPO"/org/xerial/sqlite-jdbc/3.8.7/sqlite-jdbc-3.8.7.jar:"$REPO"/org/freemarker/freemarker/2.3.21/freemarker-2.3.21.jar:"$REPO"/org/springframework/spring-context/4.1.2.RELEASE/spring-context-4.1.2.RELEASE.jar:"$REPO"/org/springframework/spring-aop/4.1.2.RELEASE/spring-aop-4.1.2.RELEASE.jar:"$REPO"/aopalliance/aopalliance/1.0/aopalliance-1.0.jar:"$REPO"/org/springframework/spring-core/4.1.2.RELEASE/spring-core-4.1.2.RELEASE.jar:"$REPO"/commons-logging/commons-logging/1.1.3/commons-logging-1.1.3.jar:"$REPO"/org/springframework/spring-expression/4.1.2.RELEASE/spring-expression-4.1.2.RELEASE.jar:"$REPO"/org/springframework/spring-beans/4.1.2.RELEASE/spring-beans-4.1.2.RELEASE.jar:"$REPO"/org/psidnell/ofexport-v2/1.0.11-SNAPSHOT/ofexport-v2-1.0.11-SNAPSHOT.jar
 
 ENDORSED_DIR=
 if [ -n "$ENDORSED_DIR" ] ; then

config/config.properties

@@ -3,6 +3,9 @@
 # The default value when filtering for dueSoon Tasks/Projects
 dueSoon:7d
 
+# Name of the root node when flattening hierarchies
+flattenedRootName:Tasks
+
 # --- Template Config:
 # Custom properties can be added here and they can be accessed from the
 # FreeMarker templates using ${config.propName}

config/config.xml

@@ -31,7 +31,9 @@
 	</bean>
 
 	<bean name="configparams" class="org.psidnell.omnifocus.ConfigParams">
+	    <!-- Copy values we need from property file into the bean -->
 		<property name="dueSoon" value="${dueSoon}"/>
+		<property name="flattenedRootName" value="${flattenedRootName}"/>
 	</bean>
 
 	<!-- Node Types -->

config/version.properties

@@ -1,2 +1,2 @@
 version:1.0.11
-date:2014-12-09
+date:2014-12-10

doc/Options.md

@@ -3,7 +3,7 @@
     OFEXPORT2
 
     Version: 1.0.11
-    Build Date: 2014-12-09
+    Build Date: 2014-12-10
 
     usage: ofexport2
      -h                print help.
@@ -34,7 +34,8 @@
      -an <arg>         include items specified by name.
      -m <arg>          modify a node value.
      -p                prune empty folders, projects and contexts.
-     -F                Flatten hierarchies.
+     -S                Flatten hierarchies.
+     -F                Simplify hierarchies.
      -c                context mode: filter and display context hierarchy instead of project hierarchy.
      -f <arg>          output in this format.
      -o <arg>          write output to the file.

src/main/java/org/psidnell/omnifocus/CommandLine.java

@@ -26,23 +26,28 @@
 import org.psidnell.omnifocus.model.Folder;
 import org.psidnell.omnifocus.model.Project;
 import org.psidnell.omnifocus.model.Task;
+import org.psidnell.omnifocus.visitor.SimplifyFilter;
 import org.psidnell.omnifocus.visitor.FlattenFilter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.BeanFactory;
+import org.springframework.beans.factory.BeanFactoryAware;
 
 /**
  * @author psidnell
  *
  * Command line processing. Contains the options themselves and the values
  * the options affect.
  */
-public class CommandLine {
+public class CommandLine implements BeanFactoryAware {
 
     protected static final String PRINT_HELP = "printHelp";
     protected static final String PRINT_INFO = "printInfo";
 
     protected final static Logger LOGGER = LoggerFactory.getLogger(CommandLine.class);
 
+    protected BeanFactory beanFactory;
+
     final static Options OPTIONS = new Options();
 
     protected static final int STARTUP = 0;
@@ -57,6 +62,7 @@ public class CommandLine {
     protected OFExport ofexport = null;
     protected String format = null;
     protected boolean open = false;
+    private ConfigParams config; // NOPMD it can't see into lambdas
 
     static {
 
@@ -209,6 +215,7 @@ public class CommandLine {
                 "m", true, "modify a node value.",
                 (m,o)->m.ofexport.addModifyExpression(o.nextValue()),
                 AFTER_LOAD));
+
         // MODES
 
         OPTIONS.addOption(new ActiveOption<CommandLine>(
@@ -217,10 +224,14 @@ public class CommandLine {
                 AFTER_LOAD));
 
         OPTIONS.addOption(new ActiveOption<CommandLine>(
-                "F", false, "Flatten hierarchies.",
-                (m,o)->m.ofexport.addFilter (new FlattenFilter()),
+                "S", false, "Simplify hierarchies.",
+                (m,o)->m.ofexport.addFilter (new SimplifyFilter()),
                 AFTER_LOAD));
 
+        OPTIONS.addOption(new ActiveOption<CommandLine>(
+                "F", false, "Flatten hierarchies.",
+                (m,o)->m.ofexport.addFilter (new FlattenFilter(m.config)),
+                AFTER_LOAD));
 
         OPTIONS.addOption(new ActiveOption<CommandLine> (
                 "c", false, "context mode: filter and display context hierarchy instead of project hierarchy.",
@@ -311,4 +322,10 @@ public void setOfexport(OFExport ofexport) {
     public void setProcessor (ActiveOptionProcessor<CommandLine> processor) {
         this.processor = processor;
     }
+
+    @Override
+    public void setBeanFactory(BeanFactory beanFactory) {
+        this.beanFactory = beanFactory;
+        config = beanFactory.getBean("configparams", ConfigParams.class);
+    }
 }

src/main/java/org/psidnell/omnifocus/ConfigParams.java

@@ -24,6 +24,7 @@
 public class ConfigParams {
 
     private String dueSoon;
+    private String flattenedRootName;
 
     public void setDueSoon(String dueSoon) {
         this.dueSoon = dueSoon;
@@ -32,4 +33,12 @@ public void setDueSoon(String dueSoon) {
     public String getDueSoon() {
         return dueSoon;
     }
+
+    public void setFlattenedRootName(String name) {
+        this.flattenedRootName = name;
+    }
+
+    public String getFlattenedRootName() {
+        return flattenedRootName;
+    }
 }

src/main/java/org/psidnell/omnifocus/Main.java

@@ -32,23 +32,19 @@
 import org.psidnell.omnifocus.model.Project;
 import org.psidnell.omnifocus.sqlite.SQLiteDAO;
 import org.psidnell.omnifocus.util.IOUtils;
-import org.springframework.beans.factory.BeanFactory;
-import org.springframework.beans.factory.BeanFactoryAware;
 import org.springframework.context.ApplicationContext;
 
 /**
  * @author psidnell
  *
  *         The main(...) of the program. There had to be one somewhere. Well here it is.
  */
-public class Main extends CommandLine implements BeanFactoryAware {
+public class Main extends CommandLine {
 
     private DataCache data;
 
     private SQLiteDAO sqliteDAO;
 
-    private BeanFactory beanFactory;
-
     private void loadData() throws IllegalAccessException, InvocationTargetException, InstantiationException, SQLException, IOException {
         if (jsonInputFile != null) {
             data = DataCache.importData(new File(jsonInputFile), beanFactory);
@@ -63,21 +59,21 @@ private void loadData() throws IllegalAccessException, InvocationTargetException
             // Add root projects/folders to the fabricated root folder
             for (Folder child : data.getFolders().values()) {
                 if (child.getProjectModeParent() == null) {
-                    projectRoot.getFolders().add(child);
+                    projectRoot.add(child);
                 }
             }
 
             for (Project child : data.getProjects().values()) {
                 if (child.getProjectModeParent() == null) {
-                    projectRoot.getProjects().add(child);
+                    projectRoot.add(child);
                 }
             }
         } else {
             Context contextRoot = ofexport.getContextRoot();
             // Add root contexts to the fabricated root context
             for (Context child : data.getContexts().values()) {
                 if (child.getContextModeParent() == null) {
-                    contextRoot.getContexts().add(child);
+                    contextRoot.add(child);
                 }
             }
         }
@@ -159,9 +155,4 @@ public static void main(String[] args) throws Exception {
     public void setSqliteDAO(SQLiteDAO sqliteDAO) {
         this.sqliteDAO = sqliteDAO;
     }
-
-    @Override
-    public void setBeanFactory(BeanFactory beanFactory) {
-        this.beanFactory = beanFactory;
-    }
 }

src/main/java/org/psidnell/omnifocus/OFExport.java

@@ -70,12 +70,10 @@ public class OFExport {
     public OFExport() {
         projectRoot = new Folder();
         projectRoot.setName("RootFolder");
-        projectRoot.setIsRoot(true);
         projectRoot.setId("__%%RootFolder"); // to give deterministic JSON/XML output
 
         contextRoot = new Context();
         contextRoot.setName("RootContext");
-        contextRoot.setIsRoot(true);
         contextRoot.setId("__%%RootContext"); // to give deterministic JSON/XML output
     }
 

src/main/java/org/psidnell/omnifocus/model/Node.java

@@ -40,8 +40,6 @@ public interface Node {
 
     boolean isRoot();
 
-    void setIsRoot(boolean isRoot);
-
     boolean isMarked();
 
     void setMarked(boolean marked);

src/main/java/org/psidnell/omnifocus/model/NodeImpl.java

@@ -39,8 +39,6 @@ public abstract class NodeImpl extends ExpressionFunctions implements Node {
 
     private int rank;
 
-    private boolean isRoot;
-
     private boolean marked = false;
 
     @Override
@@ -88,12 +86,12 @@ public int hashCode() {
     @Override
     @JsonIgnore
     public boolean isRoot() {
-        return isRoot;
-    }
-
-    @Override
-    public void setIsRoot(boolean isRoot) {
-        this.isRoot = isRoot;
+        if (getType().equals(Folder.TYPE) && ((Folder) this).getProjectModeParent() == null) {
+            return true;
+        } else if (getType().equals(Context.TYPE) && ((Context) this).getContextModeParent() == null) {
+            return true;
+        }
+        return false;
     }
 
     @Override