engine: support VJOURNAL and VJOURNAL+text/plain
The "text/calendar" type now also contains rules for parsing and generating VJOURNAL in iCalendar 2.0 and vCalendar 1.0. When using "text/calendar+plain", the internal format is iCalendar 2.0 with plain text used as alternative if the sync peer does not support VJOURNAL for memos. These types can be used as "databaseFormat" of the file backend and by other backends which want to replace plain text as exchange format for memos.
This commit is contained in:
Patrick Ohly
parent
1b233f845e
commit
92d7e7cc48
|
|
@ -662,7 +662,8 @@ void SyncSourceSerialize::getSynthesisInfo(SynthesisInfo &info,
|
|||
*/
|
||||
info.m_afterReadScript = "$VCALENDAR10_AFTERREAD_SCRIPT;\n";
|
||||
info.m_beforeWriteScript = "$VCALENDAR10_BEFOREWRITE_SCRIPT;\n";
|
||||
} else if (type == "text/calendar") {
|
||||
} else if (type == "text/calendar" ||
|
||||
boost::starts_with(type, "text/calendar+")) {
|
||||
info.m_native = "iCalendar20";
|
||||
info.m_fieldlist = "calendar";
|
||||
info.m_profile = "\"vCalendar\", 2";
|
||||
|
|
@ -717,6 +718,11 @@ std::string SyncSourceBase::getDataTypeSupport(const std::string &type,
|
|||
datatypes +=
|
||||
" <use datatype='vcalendar10' mode='rw'/>\n";
|
||||
}
|
||||
} else if (type == "text/calendar+plain") {
|
||||
datatypes =
|
||||
" <use datatype='icalendar20' mode='rw' preferred='yes'/>\n"
|
||||
" <use datatype='journaltext10' mode='rw'/>\n"
|
||||
" <use datatype='journaltext11' mode='rw'/>\n";
|
||||
} else if (type == "text/plain:1.0" || type == "text/plain") {
|
||||
// note10 are the same as note11, so ignore force format
|
||||
datatypes =
|
||||
|
|
|
|||
|
|
@ -556,6 +556,140 @@
|
|||
|
||||
</subprofile>
|
||||
|
||||
<!-- sub-profile for journal: recurrences are allowed by the standard, but
|
||||
intentionally not supported here -->
|
||||
<subprofile name="VJOURNAL" nummandatory="1" showifselectedonly="yes" field="ISEVENT" value="2">
|
||||
|
||||
<property name="LAST-MODIFIED" suppressempty="yes">
|
||||
<value field="DMODIFIED"/>
|
||||
</property>
|
||||
|
||||
<property name="DTSTAMP" suppressempty="yes" onlyformode="standard">
|
||||
<value field="DGENERATED"/>
|
||||
</property>
|
||||
|
||||
<property name="DCREATED" suppressempty="yes" onlyformode="old">
|
||||
<value field="DCREATED"/>
|
||||
</property>
|
||||
<property name="CREATED" suppressempty="yes" onlyformode="standard">
|
||||
<value field="DCREATED"/>
|
||||
</property>
|
||||
|
||||
<property name="UID" suppressempty="yes">
|
||||
<value field="UID"/>
|
||||
</property>
|
||||
|
||||
<property name="SEQUENCE" suppressempty="yes">
|
||||
<value field="SEQNO"/>
|
||||
</property>
|
||||
|
||||
<property onlyformode="standard" name="CATEGORIES" values="list" valueseparator="," suppressempty="yes">
|
||||
<value field="CATEGORIES" />
|
||||
<position field="CATEGORIES" repeat="array" minshow="0"/>
|
||||
</property>
|
||||
|
||||
<property onlyformode="old" name="CATEGORIES" values="list" valueseparator=";" altvalueseparator="," suppressempty="yes">
|
||||
<value field="CATEGORIES" />
|
||||
<position field="CATEGORIES" repeat="array" minshow="0"/>
|
||||
</property>
|
||||
|
||||
<property name="CLASS" suppressempty="yes">
|
||||
<value field="CLASS">
|
||||
<enum name="PUBLIC" value="0"/>
|
||||
<enum name="PRIVATE" value="1"/>
|
||||
<enum name="CONFIDENTIAL" value="2"/>
|
||||
</value>
|
||||
</property>
|
||||
|
||||
<property name="SUMMARY" mandatory="yes">
|
||||
<value field="SUMMARY"/>
|
||||
</property>
|
||||
|
||||
<!-- DESCRIPTION is an optional property and libical does not like
|
||||
empty properties, so suppress it here. -->
|
||||
<property name="DESCRIPTION" suppressempty="yes" mandatory="no">
|
||||
<value field="DESCRIPTION"/>
|
||||
</property>
|
||||
|
||||
<property name="URL" suppressempty="yes" mandatory="no">
|
||||
<value field="URL"/>
|
||||
</property>
|
||||
|
||||
<property name="DTSTART" suppressempty="yes" delayedparsing="1">
|
||||
<value field="DTSTART" conversion="autodate"/>
|
||||
<parameter onlyformode="standard" name="TZID" default="no" show="yes">
|
||||
<value field="DTSTART" conversion="TZID"/>
|
||||
</parameter>
|
||||
<parameter onlyformode="standard" name="VALUE" default="no" show="yes">
|
||||
<value field="DTSTART" conversion="VALUETYPE"/>
|
||||
</parameter>
|
||||
</property>
|
||||
|
||||
<property name="STATUS" onlyformode="standard" suppressempty="yes">
|
||||
<value field="STATUS" conversion="emptyonly">
|
||||
<enum name="COMPLETED" value="0"/>
|
||||
<enum name="NEEDS-ACTION" value="1"/>
|
||||
<enum name="IN-PROCESS" value="2"/>
|
||||
<enum name="CANCELLED" value="3"/>
|
||||
<enum name="ACCEPTED" value="4"/>
|
||||
<enum name="TENTATIVE" value="5"/>
|
||||
<enum name="DELEGATED" value="6"/>
|
||||
<enum name="DECLINED" value="7"/>
|
||||
<enum name="SENT" value="8"/>
|
||||
<enum name="CONFIRMED" value="9"/>
|
||||
<enum name="DRAFT" value="10"/>
|
||||
<enum name="FINAL" value="11"/>
|
||||
</value>
|
||||
</property>
|
||||
|
||||
<property name="STATUS" onlyformode="old" suppressempty="yes">
|
||||
<value field="STATUS" conversion="emptyonly">
|
||||
<enum name="COMPLETED" value="0"/>
|
||||
<enum name="NEEDS ACTION" value="1"/>
|
||||
<enum mode="defaultvalue" value="1"/> <!-- catch unknown, but also non-conformant NEEDS_ACTION -->
|
||||
<enum name="IN PROCESS" value="2"/>
|
||||
<enum name="CANCELLED" value="3"/>
|
||||
<enum name="ACCEPTED" value="4"/>
|
||||
<enum name="TENTATIVE" value="5"/>
|
||||
<enum name="DELEGATED" value="6"/>
|
||||
<enum name="DECLINED" value="7"/>
|
||||
<enum name="SENT" value="8"/>
|
||||
<enum name="CONFIRMED" value="9"/>
|
||||
<enum name="DRAFT" value="10"/>
|
||||
<enum name="FINAL" value="11"/>
|
||||
</value>
|
||||
</property>
|
||||
|
||||
<property onlyformode="old" name="RELATED-TO" suppressempty="yes">
|
||||
<value field="PARENT_UID"/>
|
||||
</property>
|
||||
|
||||
<property onlyformode="standard" name="RELATED-TO" suppressempty="yes">
|
||||
<value field="PARENT_UID"/>
|
||||
<parameter onlyformode="standard" name="RELTYPE" default="no" positional="yes" show="yes">
|
||||
<value>
|
||||
<enum name="PARENT"/>
|
||||
<enum mode="defaultvalue" name="other"/>
|
||||
</value>
|
||||
<position hasnot="other" shows="PARENT" field="PARENT_UID"/>
|
||||
</parameter>
|
||||
</property>
|
||||
|
||||
</subprofile>
|
||||
|
||||
</profile>
|
||||
</mimeprofile>
|
||||
|
||||
<textprofile name="JournalText" fieldlist="calendar">
|
||||
<linemap field="SUMMARY">
|
||||
<numlines>1</numlines>
|
||||
<inheader>false</inheader>
|
||||
<allowempty>true</allowempty>
|
||||
<filterkeyword>SUMMARY</filterkeyword>
|
||||
</linemap>
|
||||
<linemap field="DESCRIPTION">
|
||||
<numlines>0</numlines>
|
||||
<inheader>false</inheader>
|
||||
<allowempty>true</allowempty>
|
||||
</linemap>
|
||||
</textprofile>
|
||||
|
|
|
|||
|
|
@ -35,3 +35,22 @@
|
|||
]]></comparescript>
|
||||
</datatype>
|
||||
|
||||
<datatype name="journaltext10" basetype="text">
|
||||
<use profile="JournalText"/>
|
||||
<typestring>text/plain</typestring>
|
||||
<versionstring>1.0</versionstring>
|
||||
|
||||
<incomingscript><![CDATA[
|
||||
ISEVENT = 2;
|
||||
]]></incomingscript>
|
||||
</datatype>
|
||||
|
||||
<datatype name="journaltext11" basetype="text">
|
||||
<use profile="JournalText"/>
|
||||
<typestring>text/plain</typestring>
|
||||
<versionstring>1.1</versionstring>
|
||||
|
||||
<incomingscript><![CDATA[
|
||||
ISEVENT = 2;
|
||||
]]></incomingscript>
|
||||
</datatype>
|
||||
|
|
|
|||
Loading…
Reference in New Issue