[CalendarServer-changes] [14019] CalendarServer/trunk/twistedcaldav
source_changes at macosforge.org
source_changes at macosforge.org
Mon Sep 29 16:31:24 PDT 2014
Revision: 14019
http://trac.calendarserver.org//changeset/14019
Author: sagen at apple.com
Date: 2014-09-29 16:31:24 -0700 (Mon, 29 Sep 2014)
Log Message:
-----------
Convert old auto-schedule augments XML elements to new format
Modified Paths:
--------------
CalendarServer/trunk/twistedcaldav/directory/augment.py
CalendarServer/trunk/twistedcaldav/directory/test/test_principal.py
CalendarServer/trunk/twistedcaldav/test/test_upgrade.py
CalendarServer/trunk/twistedcaldav/upgrade.py
Modified: CalendarServer/trunk/twistedcaldav/directory/augment.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/augment.py 2014-09-29 15:51:07 UTC (rev 14018)
+++ CalendarServer/trunk/twistedcaldav/directory/augment.py 2014-09-29 23:31:24 UTC (rev 14019)
@@ -596,11 +596,11 @@
"""
# Query for the record information
- results = (yield self.query("select UID, ENABLED, SERVERID, CALENDARING, ADDRESSBOOKS, AUTOSCHEDULE, AUTOSCHEDULEMODE, AUTOACCEPTGROUP, LOGINENABLED from AUGMENTS where UID = :1", (uid,)))
+ results = (yield self.query("select UID, ENABLED, SERVERID, CALENDARING, ADDRESSBOOKS, AUTOSCHEDULEMODE, AUTOACCEPTGROUP, LOGINENABLED from AUGMENTS where UID = :1", (uid,)))
if not results:
returnValue(None)
else:
- uid, enabled, serverid, enabledForCalendaring, enabledForAddressBooks, autoSchedule, autoScheduleMode, autoAcceptGroup, enabledForLogin = results[0]
+ uid, enabled, serverid, enabledForCalendaring, enabledForAddressBooks, autoScheduleMode, autoAcceptGroup, enabledForLogin = results[0]
record = AugmentRecord(
uid=uid,
@@ -609,7 +609,6 @@
enabledForCalendaring=enabledForCalendaring == "T",
enabledForAddressBooks=enabledForAddressBooks == "T",
enabledForLogin=enabledForLogin == "T",
- autoSchedule=autoSchedule == "T",
autoScheduleMode=autoScheduleMode,
autoAcceptGroup=autoAcceptGroup,
)
@@ -685,7 +684,6 @@
("SERVERID", "text"),
("CALENDARING", "text(1)"),
("ADDRESSBOOKS", "text(1)"),
- ("AUTOSCHEDULE", "text(1)"),
("AUTOSCHEDULEMODE", "text"),
("AUTOACCEPTGROUP", "text"),
("LOGINENABLED", "text(1)"),
@@ -715,15 +713,14 @@
def _addRecord(self, record):
yield self.execute(
"""insert or replace into AUGMENTS
- (UID, ENABLED, SERVERID, CALENDARING, ADDRESSBOOKS, AUTOSCHEDULE, AUTOSCHEDULEMODE, AUTOACCEPTGROUP, LOGINENABLED)
- values (:1, :2, :3, :4, :5, :6, :7, :8, :9)""",
+ (UID, ENABLED, SERVERID, CALENDARING, ADDRESSBOOKS, AUTOSCHEDULEMODE, AUTOACCEPTGROUP, LOGINENABLED)
+ values (:1, :2, :3, :4, :5, :6, :7, :8)""",
(
record.uid,
"T" if record.enabled else "F",
record.serverID,
"T" if record.enabledForCalendaring else "F",
"T" if record.enabledForAddressBooks else "F",
- "T" if record.autoSchedule else "F",
record.autoScheduleMode if record.autoScheduleMode else "",
record.autoAcceptGroup,
"T" if record.enabledForLogin else "F",
@@ -751,15 +748,14 @@
def _addRecord(self, record):
yield self.execute(
"""insert into AUGMENTS
- (UID, ENABLED, SERVERID, CALENDARING, ADDRESSBOOKS, AUTOSCHEDULE, AUTOSCHEDULEMODE, AUTOACCEPTGROUP, LOGINENABLED)
- values (:1, :2, :3, :4, :5, :6, :7, :8, :9)""",
+ (UID, ENABLED, SERVERID, CALENDARING, ADDRESSBOOKS, AUTOSCHEDULEMODE, AUTOACCEPTGROUP, LOGINENABLED)
+ values (:1, :2, :3, :4, :5, :6, :7, :8)""",
(
record.uid,
"T" if record.enabled else "F",
record.serverID,
"T" if record.enabledForCalendaring else "F",
"T" if record.enabledForAddressBooks else "F",
- "T" if record.autoSchedule else "F",
record.autoScheduleMode if record.autoScheduleMode else "",
record.autoAcceptGroup,
"T" if record.enabledForLogin else "F",
@@ -771,15 +767,14 @@
def _modifyRecord(self, record):
yield self.execute(
"""update AUGMENTS set
- (UID, ENABLED, SERVERID, CALENDARING, ADDRESSBOOKS, AUTOSCHEDULE, AUTOSCHEDULEMODE, AUTOACCEPTGROUP, LOGINENABLED) =
- (:1, :2, :3, :4, :5, :6, :7, :8, :9) where UID = :10""",
+ (UID, ENABLED, SERVERID, CALENDARING, ADDRESSBOOKS, AUTOSCHEDULEMODE, AUTOACCEPTGROUP, LOGINENABLED) =
+ (:1, :2, :3, :4, :5, :6, :7, :8) where UID = :9""",
(
record.uid,
"T" if record.enabled else "F",
record.serverID,
"T" if record.enabledForCalendaring else "F",
"T" if record.enabledForAddressBooks else "F",
- "T" if record.autoSchedule else "F",
record.autoScheduleMode if record.autoScheduleMode else "",
record.autoAcceptGroup,
"T" if record.enabledForLogin else "F",
Modified: CalendarServer/trunk/twistedcaldav/directory/test/test_principal.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/test/test_principal.py 2014-09-29 15:51:07 UTC (rev 14018)
+++ CalendarServer/trunk/twistedcaldav/directory/test/test_principal.py 2014-09-29 23:31:24 UTC (rev 14019)
@@ -429,9 +429,6 @@
yield hasProperty(
(calendarserver_namespace, "calendar-proxy-write-for")
)
- # yield hasProperty(
- # (calendarserver_namespace, "auto-schedule")
- # )
else:
yield doesNotHaveProperty(
(caldav_namespace, "calendar-home-set")
@@ -454,9 +451,6 @@
yield doesNotHaveProperty(
(calendarserver_namespace, "calendar-proxy-write-for")
)
- # yield doesNotHaveProperty(
- # (calendarserver_namespace, "auto-schedule")
- # )
if record.hasContacts:
yield hasProperty(carddavxml.AddressBookHomeSet.qname())
Modified: CalendarServer/trunk/twistedcaldav/test/test_upgrade.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/test/test_upgrade.py 2014-09-29 15:51:07 UTC (rev 14018)
+++ CalendarServer/trunk/twistedcaldav/test/test_upgrade.py 2014-09-29 23:31:24 UTC (rev 14019)
@@ -28,7 +28,7 @@
xattrname, upgradeData, updateFreeBusySet,
removeIllegalCharacters, normalizeCUAddrs,
loadDelegatesFromXMLintoProxyDB, migrateDelegatesToStore,
- upgradeResourcesXML
+ upgradeResourcesXML, upgradeAugmentsXML
)
from txdav.caldav.datastore.index_file import db_basename
from txdav.caldav.datastore.scheduling.imip.mailgateway import MailGatewayTokensDatabase
@@ -1514,6 +1514,17 @@
self.assertEquals(fp.getContent(), newResourcesFormat)
+ def test_augmentsXML(self):
+ """
+ Verify conversion of old augments.xml auto-schedule related elements to twext.who format
+ """
+ fileName = self.mktemp()
+ fp = FilePath(fileName)
+ fp.setContent(oldAugmentsFormat)
+ upgradeAugmentsXML(fp)
+ self.assertEquals(fp.getContent(), newAugmentsFormat)
+
+
oldResourcesFormat = """<accounts realm="/Search">
<location>
<uid>location1</uid>
@@ -1536,6 +1547,58 @@
newResourcesFormat = """<directory realm="/Search"><record type="location"><short-name>location1</short-name><guid>C4F46062-9094-4D34-8591-61A42D993FAA</guid><uid>C4F46062-9094-4D34-8591-61A42D993FAA</uid><full-name>location name</full-name></record><record type="location"><short-name>5456580A-08EE-4288-8A87-2B4204A62A12</short-name><guid>5456580A-08EE-4288-8A87-2B4204A62A12</guid><uid>5456580A-08EE-4288-8A87-2B4204A62A12</uid><full-name>Fake Room</full-name></record><record type="resource"><short-name>resource1</short-name><guid>60B771CC-D727-4453-ACE0-0FE13CD7445A</guid><uid>60B771CC-D727-4453-ACE0-0FE13CD7445A</uid><full-name>resource name</full-name></record></directory>"""
+
+
+oldAugmentsFormat = """<augments>
+ <record>
+ <uid>9F3603DD-65D0-480D-A1D1-5D33CAC41A13</uid>
+ <enable>true</enable>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+ <enable-login>true</enable-login>
+ <auto-schedule>false</auto-schedule>
+ <auto-schedule-mode>default</auto-schedule-mode>
+ </record>
+ <record>
+ <uid>6A49C436-4CDB-4184-AD87-6F945040E37A</uid>
+ <enable>true</enable>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+ <enable-login>true</enable-login>
+ <auto-schedule>true</auto-schedule>
+ </record>
+ <record>
+ <uid>60B771CC-D727-4453-ACE0-0FE13CD7445A</uid>
+ <enable>true</enable>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+ <enable-login>true</enable-login>
+ <auto-schedule-mode>none</auto-schedule-mode>
+ </record>
+ <record>
+ <uid>E173AADC-4642-43CB-9745-8CE436A6FE4A</uid>
+ <enable>false</enable>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+ <enable-login>true</enable-login>
+ <auto-schedule>false</auto-schedule>
+ <auto-schedule-mode>automatic</auto-schedule-mode>
+ </record>
+ <record>
+ <uid>FC9A7F56-CCCA-4401-9160-903902880A37</uid>
+ <enable>false</enable>
+ <enable-calendar>true</enable-calendar>
+ <enable-addressbook>true</enable-addressbook>
+ <enable-login>true</enable-login>
+ <auto-schedule>true</auto-schedule>
+ <auto-schedule-mode>accept-if-free</auto-schedule-mode>
+ </record>
+</augments>
+"""
+
+newAugmentsFormat = """<augments>\n <record>\n <uid>9F3603DD-65D0-480D-A1D1-5D33CAC41A13</uid>\n <enable>true</enable>\n <enable-calendar>true</enable-calendar>\n <enable-addressbook>true</enable-addressbook>\n <enable-login>true</enable-login>\n <auto-schedule-mode>none</auto-schedule-mode>\n </record>\n <record>\n <uid>6A49C436-4CDB-4184-AD87-6F945040E37A</uid>\n <enable>true</enable>\n <enable-calendar>true</enable-calendar>\n <enable-addressbook>true</enable-addressbook>\n <enable-login>true</enable-login>\n </record>\n <record>\n <uid>60B771CC-D727-4453-ACE0-0FE13CD7445A</uid>\n <enable>true</enable>\n <enable-calendar>true</enable-calendar>\n <enable-addressbook>true</enable-addressbook>\n <enable-login>true</enable-login>\n <auto-schedule-mode>none</auto-schedule-mode>\n </record>\n <record>\n <uid>E173AADC-4642-43CB-9745-8CE436A6FE4A</uid>\n <enable>false</enable>\n <enable-calendar>true</enable-calendar>\n <enable-addressbook>true</enable-addressbook>\n <enable-login>true</enable-login>\n <auto-schedule-mode>none</auto-schedule-mode>\n </record>\n <record>\n <uid>FC9A7F56-CCCA-4401-9160-903902880A37</uid>\n <enable>false</enable>\n <enable-calendar>true</enable-calendar>\n <enable-addressbook>true</enable-addressbook>\n <enable-login>true</enable-login>\n <auto-schedule-mode>accept-if-free</auto-schedule-mode>\n </record>\n</augments>"""
+
+
normalizeEvent = """BEGIN:VCALENDAR
VERSION:2.0
BEGIN:VEVENT
Modified: CalendarServer/trunk/twistedcaldav/upgrade.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/upgrade.py 2014-09-29 15:51:07 UTC (rev 14018)
+++ CalendarServer/trunk/twistedcaldav/upgrade.py 2014-09-29 23:31:24 UTC (rev 14019)
@@ -707,6 +707,42 @@
resourcesFilePath.setContent(etreeToString(directoryNode, "utf-8"))
+def upgradeAugmentsXML(augmentsFilePath):
+ """
+ Convert the old augments XML auto-schedule related elements to the twext.who.xml format
+
+ @param augmentsFilePath: the file to convert
+ @type augmentsFilePath: L{FilePath}
+ """
+ try:
+ with augmentsFilePath.open() as fh:
+ try:
+ etree = parseXML(fh)
+ except XMLParseError:
+ log.error("Cannot parse {path}", path=augmentsFilePath.path)
+ return
+ except (OSError, IOError):
+ # Can't read the file
+ log.error("Cannot read {path}", path=augmentsFilePath.path)
+ return
+
+ augmentsNode = etree.getroot()
+ if augmentsNode.tag != "augments":
+ return
+
+ log.info("Converting augments.xml")
+ for recordNode in augmentsNode:
+ autoScheduleElement = recordNode.find("auto-schedule")
+ if autoScheduleElement is not None:
+ if autoScheduleElement.text == "false":
+ autoScheduleModeElement = recordNode.find("auto-schedule-mode")
+ if autoScheduleModeElement is not None:
+ autoScheduleModeElement.text = "none"
+ recordNode.remove(autoScheduleElement)
+
+ augmentsFilePath.setContent(etreeToString(augmentsNode, "utf-8"))
+
+
# The on-disk version number (which defaults to zero if .calendarserver_version
# doesn't exist), is compared with each of the numbers in the upgradeMethods
# array. If it is less than the number, the associated method is called.
@@ -728,6 +764,14 @@
if resourcesFilePath.exists():
upgradeResourcesXML(resourcesFilePath)
+ if config.AugmentService.type == "twistedcaldav.directory.augment.AugmentXMLDB":
+ for fileName in config.AugmentService.params.xmlFiles:
+ if fileName[0] not in ("/", "."):
+ fileName = os.path.join(config.DataRoot, fileName)
+ filePath = FilePath(fileName)
+ if filePath.exists():
+ upgradeAugmentsXML(filePath)
+
triggerPath = os.path.join(config.ServerRoot, TRIGGER_FILE)
if os.path.exists(triggerPath):
try:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140929/24840417/attachment-0001.html>
More information about the calendarserver-changes
mailing list