зеркало из https://github.com/mozilla/gecko-dev.git
Bug 364841: Unify ics provider serialization and parsing with the ics import/export code. r=lilmatt/jminta
This commit is contained in:
mvl%exedo.nl
Родитель
5bbd230b6e
Коммит
caddb2ec4e
|
|
@ -60,6 +60,8 @@ XPIDLSRCS = calIAlarmService.idl \
|
|||
calIDuration.idl \
|
||||
calIErrors.idl \
|
||||
calIEvent.idl \
|
||||
calIIcsParser.idl \
|
||||
calIIcsSerializer.idl \
|
||||
calIICSService.idl \
|
||||
calIItemBase.idl \
|
||||
calIItipItem.idl \
|
||||
|
|
|
|||
|
|
@ -0,0 +1,100 @@
|
|||
/* -*- Mode: idl; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
||||
/* ***** BEGIN LICENSE BLOCK *****
|
||||
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||
*
|
||||
* The contents of this file are subject to the Mozilla Public License Version
|
||||
* 1.1 (the "License"); you may not use this file except in compliance with
|
||||
* the License. You may obtain a copy of the License at
|
||||
* http://www.mozilla.org/MPL/
|
||||
*
|
||||
* Software distributed under the License is distributed on an "AS IS" basis,
|
||||
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||
* for the specific language governing rights and limitations under the
|
||||
* License.
|
||||
*
|
||||
* The Original Code is mozilla calendar code.
|
||||
*
|
||||
* The Initial Developer of the Original Code is
|
||||
* Michiel van Leeuwen <mvl@exedo.nl>.
|
||||
* Portions created by the Initial Developer are Copyright (C) 2006
|
||||
* the Initial Developer. All Rights Reserved.
|
||||
*
|
||||
* Contributor(s):
|
||||
*
|
||||
* Alternatively, the contents of this file may be used under the terms of
|
||||
* either the GNU General Public License Version 2 or later (the "GPL"), or
|
||||
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||
* in which case the provisions of the GPL or the LGPL are applicable instead
|
||||
* of those above. If you wish to allow use of your version of this file only
|
||||
* under the terms of either the GPL or the LGPL, and not to allow others to
|
||||
* use your version of this file under the terms of the MPL, indicate your
|
||||
* decision by deleting the provisions above and replace them with the notice
|
||||
* and other provisions required by the GPL or the LGPL. If you do not delete
|
||||
* the provisions above, a recipient may use your version of this file under
|
||||
* the terms of any one of the MPL, the GPL or the LGPL.
|
||||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
#include "nsISupports.idl"
|
||||
|
||||
interface calIIcalProperty;
|
||||
interface calIIcalComponent;
|
||||
interface calIItemBase;
|
||||
interface nsIInputStream;
|
||||
|
||||
/**
|
||||
* An interface for parsing an ics string or stream into its items.
|
||||
* Note that this is not a service. A new instance must be created for every new
|
||||
* string or stream to be parsed.
|
||||
*/
|
||||
[scriptable, uuid(83e9befe-5e9e-49de-8bc2-d882f464f7e7)]
|
||||
interface calIIcsParser : nsISupports
|
||||
{
|
||||
/**
|
||||
* Parse an ics string into its items, and store top-level properties and
|
||||
* components that are not interpreted.
|
||||
*
|
||||
* @param aICSString
|
||||
* The ICS string to parse
|
||||
*/
|
||||
void parseString(in AString aICSString);
|
||||
|
||||
/**
|
||||
* Parse an input stream.
|
||||
*
|
||||
* @see parseString
|
||||
* @param aICSString
|
||||
* The stream to parse
|
||||
*/
|
||||
void parseFromStream(in nsIInputStream aStream);
|
||||
|
||||
/**
|
||||
* Get the items that were in the string or stream
|
||||
* @param aCount
|
||||
* Will hold the number of items that were parsed
|
||||
* @param aItems
|
||||
* The items
|
||||
*/
|
||||
void getItems(out PRUint32 aCount,
|
||||
[array,size_is(aCount),retval] out calIItemBase aItems);
|
||||
|
||||
/**
|
||||
* Get the top-level properties that were not interpreted as anything special
|
||||
* @param aCount
|
||||
* Will hold the number of properties that were found
|
||||
* @param aProperties
|
||||
* The properties
|
||||
*/
|
||||
void getProperties(out PRUint32 aCount,
|
||||
[array,size_is(aCount),retval] out calIIcalProperty aProperties);
|
||||
|
||||
/**
|
||||
* Get the top-level components that were not interpreted as anything special
|
||||
* @param aCount
|
||||
* Will hold the number of components that were found
|
||||
* @param aComponents
|
||||
* The components
|
||||
*/
|
||||
void getComponents(out PRUint32 aCount,
|
||||
[array,size_is(aCount),retval] out calIIcalComponent aComponents);
|
||||
};
|
||||
|
|
@ -0,0 +1,98 @@
|
|||
/* -*- Mode: idl; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
||||
/* ***** BEGIN LICENSE BLOCK *****
|
||||
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||
*
|
||||
* The contents of this file are subject to the Mozilla Public License Version
|
||||
* 1.1 (the "License"); you may not use this file except in compliance with
|
||||
* the License. You may obtain a copy of the License at
|
||||
* http://www.mozilla.org/MPL/
|
||||
*
|
||||
* Software distributed under the License is distributed on an "AS IS" basis,
|
||||
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||
* for the specific language governing rights and limitations under the
|
||||
* License.
|
||||
*
|
||||
* The Original Code is mozilla calendar code.
|
||||
*
|
||||
* The Initial Developer of the Original Code is
|
||||
* Michiel van Leeuwen <mvl@exedo.nl>.
|
||||
* Portions created by the Initial Developer are Copyright (C) 2006
|
||||
* the Initial Developer. All Rights Reserved.
|
||||
*
|
||||
* Contributor(s):
|
||||
*
|
||||
* Alternatively, the contents of this file may be used under the terms of
|
||||
* either the GNU General Public License Version 2 or later (the "GPL"), or
|
||||
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||
* in which case the provisions of the GPL or the LGPL are applicable instead
|
||||
* of those above. If you wish to allow use of your version of this file only
|
||||
* under the terms of either the GPL or the LGPL, and not to allow others to
|
||||
* use your version of this file under the terms of the MPL, indicate your
|
||||
* decision by deleting the provisions above and replace them with the notice
|
||||
* and other provisions required by the GPL or the LGPL. If you do not delete
|
||||
* the provisions above, a recipient may use your version of this file under
|
||||
* the terms of any one of the MPL, the GPL or the LGPL.
|
||||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
#include "nsISupports.idl"
|
||||
|
||||
interface calIIcalProperty;
|
||||
interface calIIcalComponent;
|
||||
interface calIItemBase;
|
||||
interface nsIOutputStream;
|
||||
|
||||
/**
|
||||
* An interface for serializing calendar items into an ICS string.
|
||||
* Note that this is not a service. A new instance must be created for every new
|
||||
* set of items to be serialized.
|
||||
*/
|
||||
[scriptable, uuid(4dcf6b4e-7322-4a61-a191-8d8cc1aea42e)]
|
||||
interface calIIcsSerializer : nsISupports
|
||||
{
|
||||
/**
|
||||
* Add some items to the items that are to be serialized. Can be called
|
||||
* multiple times, and appends to the set on every call.
|
||||
*
|
||||
* @param aItems
|
||||
* The items to be added
|
||||
* @param aCount
|
||||
* The number of items to add
|
||||
*/
|
||||
void addItems([array, size_is(aCount)] in calIItemBase aItems,
|
||||
in unsigned long aCount);
|
||||
|
||||
/**
|
||||
* Add a property to the top-level properties to be added on serializing. Can
|
||||
* be called multiple times, and appends to the set on every call.
|
||||
*
|
||||
* @param aProperty
|
||||
* The property to be added
|
||||
*/
|
||||
void addProperty(in calIIcalProperty aProperty);
|
||||
|
||||
/**
|
||||
* Add a component to the top-level components to be added on serializing. Can
|
||||
* be called multiple times, and appends to the set on every call.
|
||||
*
|
||||
* @param aComponent
|
||||
* The component to be added
|
||||
*/
|
||||
void addComponent(in calIIcalComponent aComponent);
|
||||
|
||||
/**
|
||||
* Serialize the added items, properties and components into an ICS string
|
||||
*
|
||||
* @returns
|
||||
* A string containing the serialized items, properties and components.
|
||||
*/
|
||||
AString serializeToString();
|
||||
|
||||
/**
|
||||
* Serialize the added items, properties and components into an ICS stream
|
||||
*
|
||||
* @returns
|
||||
* A stream containing the serialized items, properties and components.
|
||||
*/
|
||||
void serializeToStream(in nsIOutputStream aStream);
|
||||
};
|
||||
|
|
@ -85,6 +85,8 @@ EXTRA_SCRIPTS = \
|
|||
calEvent.js \
|
||||
calItemBase.js \
|
||||
calItipItem.js \
|
||||
calIcsParser.js \
|
||||
calIcsSerializer.js \
|
||||
calProtocolHandler.js \
|
||||
calRecurrenceInfo.js \
|
||||
calTodo.js \
|
||||
|
|
|
|||
|
|
@ -0,0 +1,243 @@
|
|||
/* -*- Mode: javascript; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 4 -*-
|
||||
* ***** BEGIN LICENSE BLOCK *****
|
||||
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||
*
|
||||
* The contents of this file are subject to the Mozilla Public License Version
|
||||
* 1.1 (the "License"); you may not use this file except in compliance with
|
||||
* the License. You may obtain a copy of the License at
|
||||
* http://www.mozilla.org/MPL/
|
||||
*
|
||||
* Software distributed under the License is distributed on an "AS IS" basis,
|
||||
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||
* for the specific language governing rights and limitations under the
|
||||
* License.
|
||||
*
|
||||
* The Original Code is Mozilla Calendar code.
|
||||
*
|
||||
* The Initial Developer of the Original Code is
|
||||
* Michiel van Leeuwen <mvl@exedo.nl>.
|
||||
* Portions created by the Initial Developer are Copyright (C) 2006
|
||||
* the Initial Developer. All Rights Reserved.
|
||||
*
|
||||
* Contributor(s):
|
||||
*
|
||||
* Alternatively, the contents of this file may be used under the terms of
|
||||
* either the GNU General Public License Version 2 or later (the "GPL"), or
|
||||
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||
* in which case the provisions of the GPL or the LGPL are applicable instead
|
||||
* of those above. If you wish to allow use of your version of this file only
|
||||
* under the terms of either the GPL or the LGPL, and not to allow others to
|
||||
* use your version of this file under the terms of the MPL, indicate your
|
||||
* decision by deleting the provisions above and replace them with the notice
|
||||
* and other provisions required by the GPL or the LGPL. If you do not delete
|
||||
* the provisions above, a recipient may use your version of this file under
|
||||
* the terms of any one of the MPL, the GPL or the LGPL.
|
||||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
function calIcsParser() {
|
||||
this.wrappedJSObject = this;
|
||||
this.mItems = new Array();
|
||||
this.mComponents = new Array();
|
||||
this.mProperties = new Array();
|
||||
}
|
||||
|
||||
calIcsParser.prototype.QueryInterface =
|
||||
function QueryInterface(aIID) {
|
||||
if (!aIID.equals(Components.interfaces.nsISupports) &&
|
||||
!aIID.equals(Components.interfaces.calIIcsParser)) {
|
||||
throw Components.results.NS_ERROR_NO_INTERFACE;
|
||||
}
|
||||
|
||||
return this;
|
||||
};
|
||||
|
||||
calIcsParser.prototype.parseString =
|
||||
function ip_parseString(aICSString) {
|
||||
icsSvc = Components.classes["@mozilla.org/calendar/ics-service;1"]
|
||||
.getService(Components.interfaces.calIICSService);
|
||||
|
||||
var rootComp = icsSvc.parseICS(aICSString);
|
||||
var calComp;
|
||||
// libical returns the vcalendar component if there is just one vcalendar.
|
||||
// If there are multiple vcalendars, it returns an xroot component, with
|
||||
// those vcalendar children. We need to handle both.
|
||||
if (rootComp.componentType == 'VCALENDAR') {
|
||||
calComp = rootComp;
|
||||
} else {
|
||||
calComp = rootComp.getFirstSubcomponent('VCALENDAR');
|
||||
}
|
||||
|
||||
var unexpandedItems = [];
|
||||
var uid2parent = {};
|
||||
var excItems = [];
|
||||
|
||||
while (calComp) {
|
||||
|
||||
// Get unknown properties
|
||||
var prop = calComp.getFirstProperty("ANY");
|
||||
while (prop) {
|
||||
if (prop.propertyName != "VERSION" &&
|
||||
prop.propertyName != "PRODID") {
|
||||
this.mProperties.push(prop);
|
||||
}
|
||||
prop = calComp.getNextProperty("ANY");
|
||||
}
|
||||
|
||||
var prodId = calComp.getFirstProperty("PRODID");
|
||||
var isFromOldSunbird;
|
||||
if (prodId) {
|
||||
isFromOldSunbird = prodId.value == "-//Mozilla.org/NONSGML Mozilla Calendar V1.0//EN";
|
||||
}
|
||||
|
||||
var subComp = calComp.getFirstSubcomponent("ANY");
|
||||
while (subComp) {
|
||||
var item = null;
|
||||
switch (subComp.componentType) {
|
||||
case "VEVENT":
|
||||
var event = Components.classes["@mozilla.org/calendar/event;1"]
|
||||
.createInstance(Components.interfaces.calIEvent);
|
||||
item = event;
|
||||
break;
|
||||
case "VTODO":
|
||||
var todo = Components.classes["@mozilla.org/calendar/todo;1"]
|
||||
.createInstance(Components.interfaces.calITodo);
|
||||
item = todo;
|
||||
break;
|
||||
case "VTIMEZONE":
|
||||
// this should already be attached to the relevant
|
||||
// events in the calendar, so there's no need to
|
||||
// do anything with it here.
|
||||
break;
|
||||
default:
|
||||
this.mComponents.push(subComp);
|
||||
}
|
||||
|
||||
if (item) {
|
||||
item.icalComponent = subComp;
|
||||
|
||||
// Only try to fix ICS from Sunbird 0.2 (and earlier) if it
|
||||
// has an EXDATE.
|
||||
hasExdate = subComp.getFirstProperty("EXDATE");
|
||||
if (isFromOldSunbird && hasExdate) {
|
||||
item = fixOldSunbirdExceptions(item);
|
||||
}
|
||||
|
||||
var rid = item.recurrenceId;
|
||||
if (!rid) {
|
||||
unexpandedItems.push(item);
|
||||
if (item.recurrenceInfo) {
|
||||
uid2parent[item.id] = item;
|
||||
} else {
|
||||
item.calendar = this;
|
||||
// force no recurrence info:
|
||||
item.recurrenceInfo = null;
|
||||
excItems.push(item);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
subComp = calComp.getNextSubcomponent("ANY");
|
||||
}
|
||||
calComp = rootComp.getNextSubcomponent("VCALENDAR");
|
||||
}
|
||||
|
||||
// tag "exceptions", i.e. items with rid:
|
||||
for each (var item in excItems) {
|
||||
var parent = uid2parent[item.id];
|
||||
if (parent) {
|
||||
item.parentItem = parent;
|
||||
parent.recurrenceInfo.modifyException(item);
|
||||
}
|
||||
}
|
||||
|
||||
for each (var item in unexpandedItems) {
|
||||
this.mItems.push(item);
|
||||
}
|
||||
};
|
||||
|
||||
calIcsParser.prototype.parseFromStream =
|
||||
function ip_parseFromStream(aStream) {
|
||||
// Read in the string. Note that it isn't a real string at this point,
|
||||
// because likely, the file is utf8. The multibyte chars show up as multiple
|
||||
// 'chars' in this string. So call it an array of octets for now.
|
||||
|
||||
var octetArray = [];
|
||||
var binaryIS = Components.classes["@mozilla.org/binaryinputstream;1"]
|
||||
.createInstance(Components.interfaces.nsIBinaryInputStream);
|
||||
binaryIS.setInputStream(aStream);
|
||||
octetArray = binaryIS.readByteArray(binaryIS.available());
|
||||
|
||||
|
||||
// Some other apps (most notably, sunbird 0.2) happily splits an UTF8
|
||||
// character between the octets, and adds a newline and space between them,
|
||||
// for ICS folding. Unfold manually before parsing the file as utf8.This is
|
||||
// UTF8 safe, because octets with the first bit 0 are always one-octet
|
||||
// characters. So the space or the newline never can be part of a multi-byte
|
||||
// char.
|
||||
for (var i = octetArray.length - 2; i >= 0; i--) {
|
||||
if (octetArray[i] == "\n" && octetArray[i+1] == " ") {
|
||||
octetArray = octetArray.splice(i, 2);
|
||||
}
|
||||
}
|
||||
|
||||
// Interpret the byte-array as a UTF8-string, and convert into a
|
||||
// javascript string.
|
||||
var unicodeConverter = Components.classes["@mozilla.org/intl/scriptableunicodeconverter"]
|
||||
.createInstance(Components.interfaces.nsIScriptableUnicodeConverter);
|
||||
// ICS files are always UTF8
|
||||
unicodeConverter.charset = "UTF-8";
|
||||
var str = unicodeConverter.convertFromByteArray(octetArray, octetArray.length);
|
||||
return this.parseString(str);
|
||||
}
|
||||
|
||||
calIcsParser.prototype.getItems =
|
||||
function ip_getItems(aCount) {
|
||||
aCount.value = this.mItems.length;
|
||||
return this.mItems.concat([]); //clone
|
||||
}
|
||||
|
||||
calIcsParser.prototype.getProperties =
|
||||
function ip_getProperties(aCount) {
|
||||
aCount.value = this.mProperties.length;
|
||||
return this.mProperties.concat([]); //clone
|
||||
}
|
||||
|
||||
calIcsParser.prototype.getComponents =
|
||||
function ip_getComponents(aCount) {
|
||||
aCount.value = this.mComponents.length;
|
||||
return this.mComponents.concat([]); //clone
|
||||
}
|
||||
|
||||
// Helper function to deal with the busted exdates from Sunbird 0.2
|
||||
// When Sunbird 0.2 (and earlier) creates EXDATEs, they are set to
|
||||
// 00:00:00 floating rather than to the item's DTSTART. This fixes that.
|
||||
// (bug 354073)
|
||||
function fixOldSunbirdExceptions(aItem) {
|
||||
const kCalIRecurrenceDate = Components.interfaces.calIRecurrenceDate;
|
||||
|
||||
var item = aItem;
|
||||
var ritems = aItem.recurrenceInfo.getRecurrenceItems({});
|
||||
for each (var ritem in ritems) {
|
||||
// EXDATEs are represented as calIRecurrenceDates, which are
|
||||
// negative and finite.
|
||||
if (ritem instanceof kCalIRecurrenceDate &&
|
||||
ritem.isNegative &&
|
||||
ritem.isFinite) {
|
||||
// Only mess with the exception if its time is wrong.
|
||||
var oldDate = aItem.startDate || aItem.entryDate;
|
||||
if (ritem.date.compare(oldDate) != 0) {
|
||||
var newRitem = ritem.clone();
|
||||
// All we want from aItem is the time and timezone.
|
||||
newRitem.date.timezone = oldDate.timezone;
|
||||
newRitem.date.hour = oldDate.hour;
|
||||
newRitem.date.minute = oldDate.minute;
|
||||
newRitem.date.second = oldDate.second;
|
||||
newRitem.date.normalize();
|
||||
item.recurrenceInfo.appendRecurrenceItem(newRitem);
|
||||
item.recurrenceInfo.deleteRecurrenceItem(ritem);
|
||||
}
|
||||
}
|
||||
}
|
||||
return item;
|
||||
}
|
||||
|
|
@ -0,0 +1,121 @@
|
|||
/* -*- Mode: javascript; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 4 -*-
|
||||
* ***** BEGIN LICENSE BLOCK *****
|
||||
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||
*
|
||||
* The contents of this file are subject to the Mozilla Public License Version
|
||||
* 1.1 (the "License"); you may not use this file except in compliance with
|
||||
* the License. You may obtain a copy of the License at
|
||||
* http://www.mozilla.org/MPL/
|
||||
*
|
||||
* Software distributed under the License is distributed on an "AS IS" basis,
|
||||
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||
* for the specific language governing rights and limitations under the
|
||||
* License.
|
||||
*
|
||||
* The Original Code is Mozilla Calendar code.
|
||||
*
|
||||
* The Initial Developer of the Original Code is
|
||||
* Michiel van Leeuwen <mvl@exedo.nl>.
|
||||
* Portions created by the Initial Developer are Copyright (C) 2006
|
||||
* the Initial Developer. All Rights Reserved.
|
||||
*
|
||||
* Contributor(s):
|
||||
*
|
||||
* Alternatively, the contents of this file may be used under the terms of
|
||||
* either the GNU General Public License Version 2 or later (the "GPL"), or
|
||||
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||
* in which case the provisions of the GPL or the LGPL are applicable instead
|
||||
* of those above. If you wish to allow use of your version of this file only
|
||||
* under the terms of either the GPL or the LGPL, and not to allow others to
|
||||
* use your version of this file under the terms of the MPL, indicate your
|
||||
* decision by deleting the provisions above and replace them with the notice
|
||||
* and other provisions required by the GPL or the LGPL. If you do not delete
|
||||
* the provisions above, a recipient may use your version of this file under
|
||||
* the terms of any one of the MPL, the GPL or the LGPL.
|
||||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
// Import
|
||||
|
||||
function calIcsSerializer() {
|
||||
this.wrappedJSObject = this;
|
||||
this.mItems = [];
|
||||
this.mProperties = [];
|
||||
this.mComponents = [];
|
||||
}
|
||||
|
||||
calIcsSerializer.prototype.QueryInterface =
|
||||
function QueryInterface(aIID) {
|
||||
if (!aIID.equals(Components.interfaces.nsISupports) &&
|
||||
!aIID.equals(Components.interfaces.calIIcsSerializer)) {
|
||||
throw Components.results.NS_ERROR_NO_INTERFACE;
|
||||
}
|
||||
|
||||
return this;
|
||||
};
|
||||
|
||||
calIcsSerializer.prototype.addItems =
|
||||
function is_addItems(aItems, aCount) {
|
||||
if (aCount > 0) {
|
||||
this.mItems = this.mItems.concat(aItems);
|
||||
}
|
||||
}
|
||||
|
||||
calIcsSerializer.prototype.addProperty =
|
||||
function is_addProperty(aProperty) {
|
||||
this.mProperties.push(aProperty);
|
||||
}
|
||||
|
||||
calIcsSerializer.prototype.addComponent =
|
||||
function is_addComponent(aComponent) {
|
||||
this.mComponents.push(aComponent);
|
||||
}
|
||||
|
||||
calIcsSerializer.prototype.serializeToString =
|
||||
function is_serializeToString() {
|
||||
icsSvc = Components.classes["@mozilla.org/calendar/ics-service;1"]
|
||||
.getService(Components.interfaces.calIICSService);
|
||||
var calComp = icsSvc.createIcalComponent("VCALENDAR");
|
||||
calComp.version = "2.0";
|
||||
calComp.prodid = "-//Mozilla.org/NONSGML Mozilla Calendar V1.1//EN";
|
||||
|
||||
for each (var prop in this.mProperties) {
|
||||
calComp.addProperty(prop);
|
||||
}
|
||||
for each (var comp in this.mComponents) {
|
||||
calComp.addSubcomponent(comp);
|
||||
}
|
||||
|
||||
for each (var item in this.mItems) {
|
||||
calComp.addSubcomponent(item.icalComponent);
|
||||
var rec = item.recurrenceInfo;
|
||||
if (rec != null) {
|
||||
var exceptions = rec.getExceptionIds({});
|
||||
for each (var exid in exceptions) {
|
||||
var ex = rec.getExceptionFor(exid, false);
|
||||
if (ex != null) {
|
||||
calComp.addSubcomponent(ex.icalComponent);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// do the actual serialization
|
||||
return calComp.serializeToICS();
|
||||
}
|
||||
|
||||
calIcsSerializer.prototype.serializeToStream =
|
||||
function is_serializeToStream(aStream) {
|
||||
var str = this.serializeToString();
|
||||
|
||||
// Convert the javascript string to an array of bytes, using the
|
||||
// UTF8 encoder
|
||||
var convStream = Components.classes["@mozilla.org/intl/converter-output-stream;1"]
|
||||
.getService(Components.interfaces.nsIConverterOutputStream);
|
||||
convStream.init(aStream, 'UTF-8', 0, 0x0000);
|
||||
|
||||
convStream.writeString(str);
|
||||
convStream.close();
|
||||
|
||||
return;
|
||||
};
|
||||
|
|
@ -142,7 +142,17 @@ const componentData =
|
|||
{cid: Components.ID("{1e2fc0e2-bf5f-4d60-9f1e-5e92cf517c0b}"),
|
||||
contractid: "@mozilla.org/network/protocol;1?name=webcal",
|
||||
script: "calProtocolHandler.js",
|
||||
constructor: "calProtocolHandler"}
|
||||
constructor: "calProtocolHandler"},
|
||||
|
||||
{cid: Components.ID("{6fe88047-75b6-4874-80e8-5f5800f14984}"),
|
||||
contractid: "@mozilla.org/calendar/ics-parser;1",
|
||||
script: "calIcsParser.js",
|
||||
constructor: "calIcsParser"},
|
||||
|
||||
{cid: Components.ID("{207a6682-8ff1-4203-9160-729ec28c8766}"),
|
||||
contractid: "@mozilla.org/calendar/ics-serializer;1",
|
||||
script: "calIcsSerializer.js",
|
||||
constructor: "calIcsSerializer"}
|
||||
];
|
||||
|
||||
var calItemModule = {
|
||||
|
|
|
|||
|
|
@ -67,142 +67,10 @@ calIcsImporter.prototype.getFileTypes = getIcsFileTypes;
|
|||
|
||||
calIcsImporter.prototype.importFromStream =
|
||||
function ics_importFromStream(aStream, aCount) {
|
||||
var items = new Array();
|
||||
|
||||
// Read in the string. Note that it isn't a real string at this point, because
|
||||
// likely, the file is utf8. The multibyte chars show up as multiple 'chars'
|
||||
// in this string. So call it an array of octets for now.
|
||||
|
||||
var octetArray = [];
|
||||
var binaryInputStream = Components.classes["@mozilla.org/binaryinputstream;1"]
|
||||
.createInstance(Components.interfaces.nsIBinaryInputStream);
|
||||
binaryInputStream.setInputStream(aStream);
|
||||
octetArray = binaryInputStream.readByteArray(binaryInputStream.available());
|
||||
|
||||
|
||||
// Some other apps (most notably, sunbird 0.2) happily splits an utf8 character
|
||||
// between the octets, and adds a newline and space between them, for ics
|
||||
// folding. Unfold manually before parsing the file as utf8.
|
||||
// This is utf8 safe, because octets with the first bit 0 are always one-octet
|
||||
// characters. So the space or the newline never can be part of a multi-byte
|
||||
// char.
|
||||
for (var i=octetArray.length-2; i>=0; i--) {
|
||||
if (octetArray[i] == "\n" && octetArray[i+1] == " ") {
|
||||
octetArray = octetArray.splice(i, 2);
|
||||
}
|
||||
}
|
||||
|
||||
// Interpret the byte-array as an utf8 string, and convert into a
|
||||
// javascript string.
|
||||
var unicodeConverter = Components.classes["@mozilla.org/intl/scriptableunicodeconverter"]
|
||||
.createInstance(Components.interfaces.nsIScriptableUnicodeConverter);
|
||||
// ics files are always utf8
|
||||
unicodeConverter.charset = "UTF-8";
|
||||
var str = unicodeConverter.convertFromByteArray(octetArray, octetArray.length);
|
||||
|
||||
|
||||
icssrv = Components.classes["@mozilla.org/calendar/ics-service;1"]
|
||||
.getService(Components.interfaces.calIICSService);
|
||||
|
||||
var rootComp = icssrv.parseICS(str);
|
||||
var calComp;
|
||||
// libical returns the vcalendar component if there is just
|
||||
// one vcalendar. If there are multiple vcalendars, it returns
|
||||
// an xroot component, with those vcalendar childs. We need to
|
||||
// handle both.
|
||||
if (rootComp.componentType == 'VCALENDAR') {
|
||||
calComp = rootComp;
|
||||
} else {
|
||||
calComp = rootComp.getFirstSubcomponent('VCALENDAR');
|
||||
}
|
||||
|
||||
while (calComp) {
|
||||
// XXX bug 354073:
|
||||
// When Sunbird 0.2 (and earlier) creates EXDATEs, they are set to
|
||||
// 00:00:00 floating rather than to the item's DTSTART. This fixes that.
|
||||
//
|
||||
// This should really be in the migration code found in bug 349586,
|
||||
// but in the interest of getting 0.3 released, we're putting it here.
|
||||
// When bug 349586 lands, please make sure moving this to the
|
||||
// migrator is part of that checkin.
|
||||
var prodId = calComp.getFirstProperty("PRODID");
|
||||
var isFromOldSunbird;
|
||||
if (prodId) {
|
||||
isFromOldSunbird = (prodId.value.indexOf("NONSGML Mozilla Calendar V1.0") > -1);
|
||||
}
|
||||
|
||||
// Helper function to deal with the busted exdates from Sunbird 0.2
|
||||
function fixOldSunbirdExceptions(aItem) {
|
||||
const kCalIRecurrenceDate = Components.interfaces.calIRecurrenceDate;
|
||||
|
||||
var ritems = aItem.recurrenceInfo.getRecurrenceItems({});
|
||||
for (var i in ritems) {
|
||||
var ritem = ritems[i];
|
||||
|
||||
// EXDATEs are represented as calIRecurrenceDates, which are
|
||||
// negative and finite.
|
||||
if (ritem instanceof kCalIRecurrenceDate &&
|
||||
ritem.isNegative && ritem.isFinite)
|
||||
{
|
||||
// Only mess with the exception if its time is wrong.
|
||||
var oldDate = aItem.startDate || aItem.entryDate;
|
||||
if (ritem.date.compare(oldDate) != 0) {
|
||||
var newRitem = ritem.clone();
|
||||
// All we want from aItem is the time and timezone.
|
||||
newRitem.date.timezone = oldDate.timezone;
|
||||
newRitem.date.hour = oldDate.hour;
|
||||
newRitem.date.minute = oldDate.minute;
|
||||
newRitem.date.second = oldDate.second;
|
||||
newRitem.date.normalize();
|
||||
aItem.recurrenceInfo.appendRecurrenceItem(newRitem);
|
||||
aItem.recurrenceInfo.deleteRecurrenceItem(ritem);
|
||||
}
|
||||
}
|
||||
}
|
||||
return aItem;
|
||||
}
|
||||
|
||||
var subComp = calComp.getFirstSubcomponent("ANY");
|
||||
while (subComp) {
|
||||
switch (subComp.componentType) {
|
||||
case "VEVENT":
|
||||
var event = Components.classes["@mozilla.org/calendar/event;1"]
|
||||
.createInstance(Components.interfaces.calIEvent);
|
||||
event.icalComponent = subComp;
|
||||
|
||||
// Only try to fix ICS from Sunbird 0.2 (and earlier) if it
|
||||
// has an EXDATE.
|
||||
hasExdate = subComp.getFirstProperty("EXDATE");
|
||||
if (isFromOldSunbird && hasExdate) {
|
||||
event = fixOldSunbirdExceptions(event);
|
||||
}
|
||||
|
||||
items.push(event);
|
||||
break;
|
||||
case "VTODO":
|
||||
var todo = Components.classes["@mozilla.org/calendar/todo;1"]
|
||||
.createInstance(Components.interfaces.calITodo);
|
||||
todo.icalComponent = subComp;
|
||||
|
||||
// Only try to fix ICS from Sunbird 0.2 (and earlier) if it
|
||||
// has an EXDATE.
|
||||
hasExdate = subComp.getFirstProperty("EXDATE");
|
||||
if (isFromOldSunbird && hasExdate) {
|
||||
todo = fixOldSunbirdExceptions(todo);
|
||||
}
|
||||
|
||||
items.push(todo);
|
||||
break;
|
||||
default:
|
||||
// Nothing
|
||||
}
|
||||
subComp = calComp.getNextSubcomponent("ANY");
|
||||
}
|
||||
calComp = rootComp.getNextSubcomponent('VCALENDAR');
|
||||
}
|
||||
|
||||
aCount.value = items.length;
|
||||
return items;
|
||||
var parser = Components.classes["@mozilla.org/calendar/ics-parser;1"].
|
||||
createInstance(Components.interfaces.calIIcsParser);
|
||||
parser.parseFromString(aStream);
|
||||
return parser.getItems(aCount);
|
||||
};
|
||||
|
||||
|
||||
|
|
@ -227,35 +95,8 @@ calIcsExporter.prototype.getFileTypes = getIcsFileTypes;
|
|||
// not prototype.export. export is reserved.
|
||||
calIcsExporter.prototype.exportToStream =
|
||||
function ics_exportToStream(aStream, aCount, aItems) {
|
||||
icssrv = Components.classes["@mozilla.org/calendar/ics-service;1"]
|
||||
.getService(Components.interfaces.calIICSService);
|
||||
var calComp = icssrv.createIcalComponent("VCALENDAR");
|
||||
calComp.version = "2.0";
|
||||
calComp.prodid = "-//Mozilla.org/NONSGML Mozilla Calendar V1.1//EN";
|
||||
|
||||
for each (item in aItems) {
|
||||
calComp.addSubcomponent(item.icalComponent);
|
||||
var rec = item.recurrenceInfo;
|
||||
if (rec != null) {
|
||||
var exceptions = rec.getExceptionIds({});
|
||||
for each ( var exid in exceptions ) {
|
||||
var ex = rec.getExceptionFor(exid, false);
|
||||
if (ex != null) {
|
||||
calComp.addSubcomponent(ex.icalComponent);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
var str = calComp.serializeToICS();
|
||||
|
||||
// Convert the javascript string to an array of bytes, using the
|
||||
// utf8 encoder
|
||||
var convStream = Components.classes["@mozilla.org/intl/converter-output-stream;1"]
|
||||
.getService(Components.interfaces.nsIConverterOutputStream);
|
||||
convStream.init(aStream, 'UTF-8', 0, 0x0000);
|
||||
|
||||
convStream.writeString(str);
|
||||
convStream.close();
|
||||
|
||||
return;
|
||||
var serializer = Components.classes["@mozilla.org/calendar/ics-serializer;1"].
|
||||
createInstance(Components.interfaces.calIIcsSerializer);
|
||||
serializer.addItems(aItems, aItems.length);
|
||||
serializer.serializeToStream(aStream);
|
||||
};
|
||||
|
|
|
|||
|
|
@ -218,6 +218,8 @@ bin\js\calDateTimeFormatter.js
|
|||
bin\js\calEvent.js
|
||||
bin\js\calHtmlExport.js
|
||||
bin\js\calIcsImportExport.js
|
||||
bin\js\calIcsParser.js
|
||||
bin\js\calIcsSerializer.js
|
||||
bin\js\calItemBase.js
|
||||
bin\js\calItipItem.js
|
||||
bin\js\calListFormatter.js
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
* The Original Code is mozilla calendar code.
|
||||
*
|
||||
* The Initial Developer of the Original Code is
|
||||
* Michiel van Leeuwen <mvl@exedo.nl>
|
||||
* Michiel van Leeuwen <mvl@exedo.nl>
|
||||
* Portions created by the Initial Developer are Copyright (C) 2004
|
||||
* the Initial Developer. All Rights Reserved.
|
||||
*
|
||||
|
|
@ -243,97 +243,16 @@ calICSCalendar.prototype = {
|
|||
// for non-existing or empty files, but not good for invalid files.
|
||||
// That's why we put them in readOnly mode
|
||||
try {
|
||||
var rootComp = this.mICSService.parseICS(str);
|
||||
|
||||
var calComp;
|
||||
// libical returns the vcalendar component if there is just
|
||||
// one vcalendar. If there are multiple vcalendars, it returns
|
||||
// an xroot component, with those vcalendar childs. We need to
|
||||
// handle both.
|
||||
if (rootComp.componentType == 'VCALENDAR') {
|
||||
calComp = rootComp;
|
||||
} else {
|
||||
calComp = rootComp.getFirstSubcomponent('VCALENDAR');
|
||||
}
|
||||
|
||||
var unexpandedItems = [];
|
||||
var uid2parent = {};
|
||||
var excItems = [];
|
||||
var parser = Components.classes["@mozilla.org/calendar/ics-parser;1"].
|
||||
createInstance(Components.interfaces.calIIcsParser);
|
||||
parser.parseString(str);
|
||||
var items = parser.getItems({});
|
||||
|
||||
while (calComp) {
|
||||
// Get unknown properties
|
||||
var prop = calComp.getFirstProperty("ANY");
|
||||
while (prop) {
|
||||
if (!this.calendarPromotedProps[prop.propertyName]) {
|
||||
this.unmappedProperties.push(prop);
|
||||
LOG(prop.propertyName);
|
||||
}
|
||||
prop = calComp.getNextProperty("ANY");
|
||||
}
|
||||
|
||||
var subComp = calComp.getFirstSubcomponent("ANY");
|
||||
while (subComp) {
|
||||
// Place each subcomp in a try block, to hopefully get as
|
||||
// much of a bad calendar as possible
|
||||
try {
|
||||
var item = null;
|
||||
switch (subComp.componentType) {
|
||||
case "VEVENT":
|
||||
item = createEvent();
|
||||
break;
|
||||
case "VTODO":
|
||||
item = createTodo();
|
||||
break;
|
||||
case "VTIMEZONE":
|
||||
// this should already be attached to the relevant
|
||||
// events in the calendar, so there's no need to
|
||||
// do anything with it here.
|
||||
break;
|
||||
default:
|
||||
this.unmappedComponents.push(subComp);
|
||||
LOG(subComp.componentType);
|
||||
}
|
||||
if (item != null) {
|
||||
item.icalComponent = subComp;
|
||||
var rid = item.recurrenceId;
|
||||
if (rid == null) {
|
||||
unexpandedItems.push( item );
|
||||
if (item.recurrenceInfo != null)
|
||||
uid2parent[item.id] = item;
|
||||
}
|
||||
else {
|
||||
item.calendar = this;
|
||||
// force no recurrence info:
|
||||
item.recurrenceInfo = null;
|
||||
excItems.push(item);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
catch(ex) {
|
||||
this.mObserver.onError(ex.result, ex.toString());
|
||||
}
|
||||
subComp = calComp.getNextSubcomponent("ANY");
|
||||
}
|
||||
calComp = rootComp.getNextSubcomponent('VCALENDAR');
|
||||
}
|
||||
|
||||
// tag "exceptions", i.e. items with rid:
|
||||
for each (var item in excItems) {
|
||||
var parent = uid2parent[item.id];
|
||||
if (parent == null) {
|
||||
debug( "no parent item for rid=" + item.recurrenceId );
|
||||
}
|
||||
else {
|
||||
item.parentItem = parent;
|
||||
parent.recurrenceInfo.modifyException(item);
|
||||
}
|
||||
}
|
||||
|
||||
for each (var item in unexpandedItems) {
|
||||
for each (var item in items) {
|
||||
this.mMemoryCalendar.adoptItem(item, null);
|
||||
}
|
||||
|
||||
this.unmappedComponents = parser.getComponents({});
|
||||
this.unmappedProperties = parser.getProperties({});
|
||||
} catch(e) {
|
||||
LOG("Parsing the file failed:"+e);
|
||||
this.mObserver.onError(e.result, e.toString());
|
||||
|
|
@ -359,8 +278,10 @@ calICSCalendar.prototype = {
|
|||
.getService(Components.interfaces.nsIAppStartup);
|
||||
var listener =
|
||||
{
|
||||
serializer: null,
|
||||
onOperationComplete: function(aCalendar, aStatus, aOperationType, aId, aDetail)
|
||||
{
|
||||
var inLastWindowClosingSurvivalArea = false;
|
||||
try {
|
||||
// All events are returned. Now set up a channel and a
|
||||
// streamloader to upload. onStopRequest will be called
|
||||
|
|
@ -378,15 +299,27 @@ calICSCalendar.prototype = {
|
|||
var uploadChannel = channel.QueryInterface(
|
||||
Components.interfaces.nsIUploadChannel);
|
||||
|
||||
// do the actual serialization
|
||||
var icsStream = calComp.serializeToICSStream();
|
||||
// Create a pipe to convert the output stream from the
|
||||
// serializer into an input stream for the upload channel
|
||||
var pipe = Components.classes["@mozilla.org/pipe;1"].
|
||||
createInstance(Components.interfaces.nsIPipe);
|
||||
const PR_UINT32_MAX = 4294967295; // signals "infinite-length"
|
||||
pipe.init(true, true, 0, PR_UINT32_MAX, null);
|
||||
|
||||
// Serialize
|
||||
var icsStream = this.serializer.serializeToStream(pipe.outputStream);
|
||||
|
||||
// Upload
|
||||
uploadChannel.setUploadStream(pipe.inputStream,
|
||||
"text/calendar", -1);
|
||||
|
||||
uploadChannel.setUploadStream(icsStream, "text/calendar",
|
||||
-1);
|
||||
appStartup.enterLastWindowClosingSurvivalArea();
|
||||
inLastWindowClosingSurvivalArea = true;
|
||||
channel.asyncOpen(savedthis, savedthis);
|
||||
} catch (ex) {
|
||||
appStartup.exitLastWindowClosingSurvivalArea();
|
||||
if (inLastWindowClosingSurvivalArea) {
|
||||
appStartup.exitLastWindowClosingSurvivalArea();
|
||||
}
|
||||
savedthis.mObserver.onError(
|
||||
ex.result, "The calendar could not be saved; there " +
|
||||
"was a failure: 0x" + ex.result.toString(16));
|
||||
|
|
@ -396,35 +329,16 @@ calICSCalendar.prototype = {
|
|||
},
|
||||
onGetResult: function(aCalendar, aStatus, aItemType, aDetail, aCount, aItems)
|
||||
{
|
||||
for (var i=0; i<aCount; i++) {
|
||||
var item = aItems[i];
|
||||
calComp.addSubcomponent(item.icalComponent);
|
||||
var rec = item.recurrenceInfo;
|
||||
if (rec != null) {
|
||||
var exceptions = rec.getExceptionIds({});
|
||||
for each ( var exid in exceptions ) {
|
||||
var ex = rec.getExceptionFor(exid, false);
|
||||
if (ex != null) {
|
||||
calComp.addSubcomponent(ex.icalComponent);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
this.serializer.addItems(aItems, aCount);
|
||||
}
|
||||
};
|
||||
|
||||
var calComp = this.mICSService.createIcalComponent("VCALENDAR");
|
||||
calComp.version = "2.0";
|
||||
calComp.prodid = "-//Mozilla.org/NONSGML Mozilla Calendar V1.1//EN";
|
||||
|
||||
var i;
|
||||
for (i in this.unmappedComponents) {
|
||||
LOG("Adding a "+this.unmappedComponents[i].componentType);
|
||||
calComp.addSubcomponent(this.unmappedComponents[i]);
|
||||
listener.serializer = Components.classes["@mozilla.org/calendar/ics-serializer;1"].
|
||||
createInstance(Components.interfaces.calIIcsSerializer);
|
||||
for each (var comp in this.unmappedComponents) {
|
||||
listener.serializer.addComponent(comp);
|
||||
}
|
||||
for (i in this.unmappedProperties) {
|
||||
LOG("Adding "+this.unmappedProperties[i].propertyName);
|
||||
calComp.addProperty(this.unmappedProperties[i]);
|
||||
for each (var prop in this.unmappedProperties) {
|
||||
listener.serializer.addProperty(prop);
|
||||
}
|
||||
|
||||
this.getItems(calICalendar.ITEM_FILTER_TYPE_ALL | calICalendar.ITEM_FILTER_COMPLETED_ALL,
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче