Use tz data from @nextcloud/calendar-js v1.1
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
This commit is contained in:
parent
a6fb9cb151
commit
ecdd794832
|
@ -17,7 +17,7 @@
|
|||
"@fullcalendar/vue": "5.8.0",
|
||||
"@nextcloud/auth": "^1.3.0",
|
||||
"@nextcloud/axios": "^1.6.0",
|
||||
"@nextcloud/calendar-js": "^1.0.0",
|
||||
"@nextcloud/calendar-js": "^1.1.0",
|
||||
"@nextcloud/dialogs": "^3.1.2",
|
||||
"@nextcloud/event-bus": "^2.0.0",
|
||||
"@nextcloud/initial-state": "^1.2.0",
|
||||
|
@ -58,6 +58,7 @@
|
|||
"babel-core": "^7.0.0-bridge.0",
|
||||
"babel-jest": "^27.0.6",
|
||||
"babel-loader-exclude-node-modules-except": "^1.2.1",
|
||||
"ical.js": "^1.4.0",
|
||||
"iconfont-plugin-webpack": "^1.1.4",
|
||||
"jest": "^27.0.6",
|
||||
"jest-serializer-vue": "^2.0.2",
|
||||
|
@ -2676,9 +2677,9 @@
|
|||
"dev": true
|
||||
},
|
||||
"node_modules/@nextcloud/calendar-js": {
|
||||
"version": "1.0.0",
|
||||
"resolved": "https://registry.npmjs.org/@nextcloud/calendar-js/-/calendar-js-1.0.0.tgz",
|
||||
"integrity": "sha512-dte94wcdlc9Uf4ABwZtZizMkM+dy8Wc+P8031HVKHzPV6SXTTtcwETExWAKmnNeuAn+Eydm2W9dc7aEE+ZANUA==",
|
||||
"version": "1.1.0",
|
||||
"resolved": "https://registry.npmjs.org/@nextcloud/calendar-js/-/calendar-js-1.1.0.tgz",
|
||||
"integrity": "sha512-Hr3UA75nK3hTBX4C7MerlKA/ddITiLcX+D7A/xMtjR/sTbZY4bOM9XRuVJ0KoDfDRMtPYsdzR47rTB+mofIvIg==",
|
||||
"dependencies": {
|
||||
"ical.js": "^1.4.0",
|
||||
"uuid": "^8.3.2"
|
||||
|
@ -21744,9 +21745,9 @@
|
|||
"dev": true
|
||||
},
|
||||
"@nextcloud/calendar-js": {
|
||||
"version": "1.0.0",
|
||||
"resolved": "https://registry.npmjs.org/@nextcloud/calendar-js/-/calendar-js-1.0.0.tgz",
|
||||
"integrity": "sha512-dte94wcdlc9Uf4ABwZtZizMkM+dy8Wc+P8031HVKHzPV6SXTTtcwETExWAKmnNeuAn+Eydm2W9dc7aEE+ZANUA==",
|
||||
"version": "1.1.0",
|
||||
"resolved": "https://registry.npmjs.org/@nextcloud/calendar-js/-/calendar-js-1.1.0.tgz",
|
||||
"integrity": "sha512-Hr3UA75nK3hTBX4C7MerlKA/ddITiLcX+D7A/xMtjR/sTbZY4bOM9XRuVJ0KoDfDRMtPYsdzR47rTB+mofIvIg==",
|
||||
"requires": {
|
||||
"ical.js": "^1.4.0",
|
||||
"uuid": "^8.3.2"
|
||||
|
|
|
@ -44,7 +44,7 @@
|
|||
"@fullcalendar/vue": "5.8.0",
|
||||
"@nextcloud/auth": "^1.3.0",
|
||||
"@nextcloud/axios": "^1.6.0",
|
||||
"@nextcloud/calendar-js": "^1.0.0",
|
||||
"@nextcloud/calendar-js": "^1.1.0",
|
||||
"@nextcloud/dialogs": "^3.1.2",
|
||||
"@nextcloud/event-bus": "^2.0.0",
|
||||
"@nextcloud/initial-state": "^1.2.0",
|
||||
|
@ -92,6 +92,7 @@
|
|||
"babel-core": "^7.0.0-bridge.0",
|
||||
"babel-jest": "^27.0.6",
|
||||
"babel-loader-exclude-node-modules-except": "^1.2.1",
|
||||
"ical.js": "^1.4.0",
|
||||
"iconfont-plugin-webpack": "^1.1.4",
|
||||
"jest": "^27.0.6",
|
||||
"jest-serializer-vue": "^2.0.2",
|
||||
|
@ -131,7 +132,7 @@
|
|||
"clover"
|
||||
],
|
||||
"transformIgnorePatterns": [
|
||||
"/node_modules/(?!(@nextcloud\/calendar-js)|(@fullcalendar)).+\\.js$"
|
||||
"/node_modules/(?!(@nextcloud/calendar-js)|(@fullcalendar)).+\\.js$"
|
||||
],
|
||||
"setupFilesAfterEnv": [
|
||||
"./tests/javascript/jest.setup.js",
|
||||
|
|
|
@ -14,11 +14,10 @@
|
|||
</template>
|
||||
|
||||
<script>
|
||||
import { getReadableTimezoneName, getSortedTimezoneList } from '@nextcloud/calendar-js/src/timezones/utils'
|
||||
import Multiselect from '@nextcloud/vue/dist/Components/Multiselect'
|
||||
import {
|
||||
getReadableTimezoneName,
|
||||
getSortedTimezoneList,
|
||||
} from '../../utils/timezone.js'
|
||||
import { translate as t } from '@nextcloud/l10n'
|
||||
|
||||
import getTimezoneManager from '../../services/timezoneDataProviderService.js'
|
||||
|
||||
export default {
|
||||
|
@ -56,7 +55,12 @@ export default {
|
|||
},
|
||||
options() {
|
||||
const timezoneManager = getTimezoneManager()
|
||||
return getSortedTimezoneList(timezoneManager.listAllTimezones(), this.additionalTimezones)
|
||||
return getSortedTimezoneList(
|
||||
timezoneManager.listAllTimezones(),
|
||||
this.additionalTimezones,
|
||||
// TRANSLATORS This refers to global timezones in the timezone picker
|
||||
t('calendar', 'Global')
|
||||
)
|
||||
},
|
||||
},
|
||||
methods: {
|
||||
|
|
|
@ -16,9 +16,7 @@
|
|||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
import tzData from '../../timezones/zones.json'
|
||||
import { getTimezoneManager } from '@nextcloud/calendar-js'
|
||||
import logger from '../utils/logger.js'
|
||||
|
||||
const timezoneManager = getTimezoneManager()
|
||||
let initialized = false
|
||||
|
@ -31,35 +29,10 @@ let initialized = false
|
|||
*/
|
||||
export default function() {
|
||||
if (!initialized) {
|
||||
initialize()
|
||||
timezoneManager.registerDefaultTimezones()
|
||||
|
||||
initialized = true
|
||||
}
|
||||
|
||||
return timezoneManager
|
||||
}
|
||||
|
||||
/**
|
||||
* Initializes the timezone-manager with all timezones shipped by the calendar app
|
||||
*/
|
||||
function initialize() {
|
||||
logger.debug(`The calendar app is using version ${tzData.version} of the timezone database`)
|
||||
|
||||
for (const tzid in tzData.zones) {
|
||||
if (Object.prototype.hasOwnProperty.call(tzData.zones, [tzid])) {
|
||||
const ics = [
|
||||
'BEGIN:VTIMEZONE',
|
||||
'TZID:' + tzid,
|
||||
...tzData.zones[tzid].ics,
|
||||
'END:VTIMEZONE',
|
||||
].join('\r\n')
|
||||
timezoneManager.registerTimezoneFromICS(tzid, ics)
|
||||
}
|
||||
}
|
||||
|
||||
for (const tzid in tzData.aliases) {
|
||||
if (Object.prototype.hasOwnProperty.call(tzData.aliases, [tzid])) {
|
||||
timezoneManager.registerAlias(tzid, tzData.aliases[tzid].aliasTo)
|
||||
}
|
||||
}
|
||||
|
||||
initialized = true
|
||||
}
|
||||
|
|
|
@ -1,107 +0,0 @@
|
|||
/**
|
||||
* @copyright Copyright (c) 2019 Georg Ehrke
|
||||
* @author Georg Ehrke <oc.list@georgehrke.com>
|
||||
* @license GNU AGPL version 3 or any later version
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as
|
||||
* published by the Free Software Foundation, either version 3 of the
|
||||
* License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
import { translate as t } from '@nextcloud/l10n'
|
||||
|
||||
/**
|
||||
*
|
||||
* @param {string[]} timezoneList List of Olsen timezones
|
||||
* @param {Array} additionalTimezones List of additional timezones
|
||||
* @return {[]}
|
||||
*/
|
||||
export function getSortedTimezoneList(timezoneList = [], additionalTimezones = []) {
|
||||
const sortedByContinent = {}
|
||||
const sortedList = []
|
||||
|
||||
for (const timezoneId of timezoneList) {
|
||||
const components = timezoneId.split('/')
|
||||
let [continent, name] = [components.shift(), components.join('/')]
|
||||
if (!name) {
|
||||
name = continent
|
||||
// TRANSLATORS This refers to global timezones in the timezone picker
|
||||
continent = t('calendar', 'Global')
|
||||
}
|
||||
|
||||
sortedByContinent[continent] = sortedByContinent[continent] || {
|
||||
continent,
|
||||
regions: [],
|
||||
}
|
||||
|
||||
sortedByContinent[continent].regions.push({
|
||||
label: getReadableTimezoneName(name),
|
||||
cities: [],
|
||||
timezoneId,
|
||||
})
|
||||
}
|
||||
|
||||
for (const additionalTimezone of additionalTimezones) {
|
||||
const { continent, label, timezoneId } = additionalTimezone
|
||||
|
||||
sortedByContinent[continent] = sortedByContinent[continent] || {
|
||||
continent,
|
||||
regions: [],
|
||||
}
|
||||
|
||||
sortedByContinent[continent].regions.push({
|
||||
label,
|
||||
cities: [],
|
||||
timezoneId,
|
||||
})
|
||||
}
|
||||
|
||||
for (const continent in sortedByContinent) {
|
||||
if (!Object.prototype.hasOwnProperty.call(sortedByContinent, continent)) {
|
||||
continue
|
||||
}
|
||||
|
||||
sortedByContinent[continent].regions.sort((a, b) => {
|
||||
if (a.label < b.label) {
|
||||
return -1
|
||||
}
|
||||
|
||||
return 1
|
||||
})
|
||||
sortedList.push(sortedByContinent[continent])
|
||||
}
|
||||
|
||||
// Sort continents by name
|
||||
sortedList.sort((a, b) => {
|
||||
if (a.continent < b.continent) {
|
||||
return -1
|
||||
}
|
||||
|
||||
return 1
|
||||
})
|
||||
|
||||
return sortedList
|
||||
}
|
||||
|
||||
/**
|
||||
* Get human-readable name for timezoneId
|
||||
*
|
||||
* @param {string} timezoneId TimezoneId to turn human-readable
|
||||
* @return {string}
|
||||
*/
|
||||
export function getReadableTimezoneName(timezoneId) {
|
||||
return timezoneId
|
||||
.split('_')
|
||||
.join(' ')
|
||||
.replace('St ', 'St. ')
|
||||
.split('/')
|
||||
.join(' - ')
|
||||
}
|
|
@ -323,7 +323,7 @@ export default {
|
|||
return moment(this.calendarObjectInstance.startDate).locale(this.locale).fromNow()
|
||||
},
|
||||
/**
|
||||
* @returns {boolean}
|
||||
* @return {boolean}
|
||||
*/
|
||||
canModifyCalendar() {
|
||||
const eventComponent = this.calendarObjectInstance.eventComponent
|
||||
|
|
|
@ -1,124 +0,0 @@
|
|||
/**
|
||||
* @copyright Copyright (c) 2019 Georg Ehrke
|
||||
*
|
||||
* @author Georg Ehrke <oc.list@georgehrke.com>
|
||||
*
|
||||
* @license GNU AGPL version 3 or any later version
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as
|
||||
* published by the Free Software Foundation, either version 3 of the
|
||||
* License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
import {
|
||||
getSortedTimezoneList,
|
||||
getReadableTimezoneName
|
||||
} from '../../../../src/utils/timezone.js'
|
||||
import { translate } from '@nextcloud/l10n'
|
||||
|
||||
jest.mock('@nextcloud/l10n')
|
||||
|
||||
describe('utils/timezone test suite', () => {
|
||||
|
||||
beforeEach(() => {
|
||||
translate.mockClear()
|
||||
})
|
||||
|
||||
it('should sort a timezone list', () => {
|
||||
translate
|
||||
.mockImplementation((app, str) => str)
|
||||
|
||||
const sorted = getSortedTimezoneList([
|
||||
'Europe/Berlin',
|
||||
'Europe/Amsterdam',
|
||||
'Europe/Paris',
|
||||
'America/New_York',
|
||||
'America/Los_Angeles',
|
||||
'UTC',
|
||||
'Z',
|
||||
'GMT'
|
||||
], [{
|
||||
continent: 'FOO',
|
||||
label: 'ABC',
|
||||
timezoneId: 'id123'
|
||||
}, {
|
||||
continent: 'Global',
|
||||
label: 'DEF',
|
||||
timezoneId: 'id456'
|
||||
}])
|
||||
|
||||
expect(sorted.length).toEqual(4)
|
||||
expect(sorted[0].continent).toEqual('America')
|
||||
expect(sorted[0].regions).toEqual([{
|
||||
cities: [],
|
||||
label: 'Los Angeles',
|
||||
timezoneId: 'America/Los_Angeles'
|
||||
}, {
|
||||
cities: [],
|
||||
label: 'New York',
|
||||
timezoneId: 'America/New_York'
|
||||
}])
|
||||
|
||||
expect(sorted[1].continent).toEqual('Europe')
|
||||
expect(sorted[1].regions).toEqual([{
|
||||
cities: [],
|
||||
label: 'Amsterdam',
|
||||
timezoneId: 'Europe/Amsterdam'
|
||||
}, {
|
||||
cities: [],
|
||||
label: 'Berlin',
|
||||
timezoneId: 'Europe/Berlin'
|
||||
}, {
|
||||
cities: [],
|
||||
label: 'Paris',
|
||||
timezoneId: 'Europe/Paris'
|
||||
}])
|
||||
|
||||
expect(sorted[2].continent).toEqual('FOO')
|
||||
expect(sorted[2].regions).toEqual([{
|
||||
cities: [],
|
||||
label: 'ABC',
|
||||
timezoneId: 'id123'
|
||||
}])
|
||||
|
||||
expect(sorted[3].continent).toEqual('Global')
|
||||
expect(sorted[3].regions).toEqual([{
|
||||
cities: [],
|
||||
label: 'DEF',
|
||||
timezoneId: 'id456'
|
||||
}, {
|
||||
cities: [],
|
||||
label: 'GMT',
|
||||
timezoneId: 'GMT'
|
||||
}, {
|
||||
cities: [],
|
||||
label: 'UTC',
|
||||
timezoneId: 'UTC'
|
||||
}, {
|
||||
cities: [],
|
||||
label: 'Z',
|
||||
timezoneId: 'Z'
|
||||
}])
|
||||
|
||||
expect(translate).toHaveBeenCalledTimes(3)
|
||||
expect(translate).toHaveBeenNthCalledWith(1, 'calendar', 'Global')
|
||||
expect(translate).toHaveBeenNthCalledWith(2, 'calendar', 'Global')
|
||||
expect(translate).toHaveBeenNthCalledWith(3, 'calendar', 'Global')
|
||||
})
|
||||
|
||||
it('should get a readable timezone name', () => {
|
||||
expect(getReadableTimezoneName('Europe/Berlin')).toEqual('Europe - Berlin')
|
||||
expect(getReadableTimezoneName('America/New_York')).toEqual('America - New York')
|
||||
expect(getReadableTimezoneName('America/St_Johns')).toEqual('America - St. Johns')
|
||||
expect(getReadableTimezoneName('America/Argentina/Buenos_Aires')).toEqual('America - Argentina - Buenos Aires')
|
||||
})
|
||||
})
|
|
@ -1,383 +0,0 @@
|
|||
### Timezones
|
||||
|
||||
`update-zones.py` is part of the [comm-central calendar project](https://hg.mozilla.org/comm-central/file/tip/calendar) by Mozilla and licensed under the MPL 2.0.
|
||||
|
||||
Copyright Geoff Lankow and Philipp Kewisch.
|
||||
|
||||
### Mozilla Public License Version 2.0
|
||||
|
||||
```
|
||||
Mozilla Public License Version 2.0
|
||||
==================================
|
||||
|
||||
1. Definitions
|
||||
--------------
|
||||
|
||||
1.1. "Contributor"
|
||||
means each individual or legal entity that creates, contributes to
|
||||
the creation of, or owns Covered Software.
|
||||
|
||||
1.2. "Contributor Version"
|
||||
means the combination of the Contributions of others (if any) used
|
||||
by a Contributor and that particular Contributor's Contribution.
|
||||
|
||||
1.3. "Contribution"
|
||||
means Covered Software of a particular Contributor.
|
||||
|
||||
1.4. "Covered Software"
|
||||
means Source Code Form to which the initial Contributor has attached
|
||||
the notice in Exhibit A, the Executable Form of such Source Code
|
||||
Form, and Modifications of such Source Code Form, in each case
|
||||
including portions thereof.
|
||||
|
||||
1.5. "Incompatible With Secondary Licenses"
|
||||
means
|
||||
|
||||
(a) that the initial Contributor has attached the notice described
|
||||
in Exhibit B to the Covered Software; or
|
||||
|
||||
(b) that the Covered Software was made available under the terms of
|
||||
version 1.1 or earlier of the License, but not also under the
|
||||
terms of a Secondary License.
|
||||
|
||||
1.6. "Executable Form"
|
||||
means any form of the work other than Source Code Form.
|
||||
|
||||
1.7. "Larger Work"
|
||||
means a work that combines Covered Software with other material, in
|
||||
a separate file or files, that is not Covered Software.
|
||||
|
||||
1.8. "License"
|
||||
means this document.
|
||||
|
||||
1.9. "Licensable"
|
||||
means having the right to grant, to the maximum extent possible,
|
||||
whether at the time of the initial grant or subsequently, any and
|
||||
all of the rights conveyed by this License.
|
||||
|
||||
1.10. "Modifications"
|
||||
means any of the following:
|
||||
|
||||
(a) any file in Source Code Form that results from an addition to,
|
||||
deletion from, or modification of the contents of Covered
|
||||
Software; or
|
||||
|
||||
(b) any new file in Source Code Form that contains any Covered
|
||||
Software.
|
||||
|
||||
1.11. "Patent Claims" of a Contributor
|
||||
means any patent claim(s), including without limitation, method,
|
||||
process, and apparatus claims, in any patent Licensable by such
|
||||
Contributor that would be infringed, but for the grant of the
|
||||
License, by the making, using, selling, offering for sale, having
|
||||
made, import, or transfer of either its Contributions or its
|
||||
Contributor Version.
|
||||
|
||||
1.12. "Secondary License"
|
||||
means either the GNU General Public License, Version 2.0, the GNU
|
||||
Lesser General Public License, Version 2.1, the GNU Affero General
|
||||
Public License, Version 3.0, or any later versions of those
|
||||
licenses.
|
||||
|
||||
1.13. "Source Code Form"
|
||||
means the form of the work preferred for making modifications.
|
||||
|
||||
1.14. "You" (or "Your")
|
||||
means an individual or a legal entity exercising rights under this
|
||||
License. For legal entities, "You" includes any entity that
|
||||
controls, is controlled by, or is under common control with You. For
|
||||
purposes of this definition, "control" means (a) the power, direct
|
||||
or indirect, to cause the direction or management of such entity,
|
||||
whether by contract or otherwise, or (b) ownership of more than
|
||||
fifty percent (50%) of the outstanding shares or beneficial
|
||||
ownership of such entity.
|
||||
|
||||
2. License Grants and Conditions
|
||||
--------------------------------
|
||||
|
||||
2.1. Grants
|
||||
|
||||
Each Contributor hereby grants You a world-wide, royalty-free,
|
||||
non-exclusive license:
|
||||
|
||||
(a) under intellectual property rights (other than patent or trademark)
|
||||
Licensable by such Contributor to use, reproduce, make available,
|
||||
modify, display, perform, distribute, and otherwise exploit its
|
||||
Contributions, either on an unmodified basis, with Modifications, or
|
||||
as part of a Larger Work; and
|
||||
|
||||
(b) under Patent Claims of such Contributor to make, use, sell, offer
|
||||
for sale, have made, import, and otherwise transfer either its
|
||||
Contributions or its Contributor Version.
|
||||
|
||||
2.2. Effective Date
|
||||
|
||||
The licenses granted in Section 2.1 with respect to any Contribution
|
||||
become effective for each Contribution on the date the Contributor first
|
||||
distributes such Contribution.
|
||||
|
||||
2.3. Limitations on Grant Scope
|
||||
|
||||
The licenses granted in this Section 2 are the only rights granted under
|
||||
this License. No additional rights or licenses will be implied from the
|
||||
distribution or licensing of Covered Software under this License.
|
||||
Notwithstanding Section 2.1(b) above, no patent license is granted by a
|
||||
Contributor:
|
||||
|
||||
(a) for any code that a Contributor has removed from Covered Software;
|
||||
or
|
||||
|
||||
(b) for infringements caused by: (i) Your and any other third party's
|
||||
modifications of Covered Software, or (ii) the combination of its
|
||||
Contributions with other software (except as part of its Contributor
|
||||
Version); or
|
||||
|
||||
(c) under Patent Claims infringed by Covered Software in the absence of
|
||||
its Contributions.
|
||||
|
||||
This License does not grant any rights in the trademarks, service marks,
|
||||
or logos of any Contributor (except as may be necessary to comply with
|
||||
the notice requirements in Section 3.4).
|
||||
|
||||
2.4. Subsequent Licenses
|
||||
|
||||
No Contributor makes additional grants as a result of Your choice to
|
||||
distribute the Covered Software under a subsequent version of this
|
||||
License (see Section 10.2) or under the terms of a Secondary License (if
|
||||
permitted under the terms of Section 3.3).
|
||||
|
||||
2.5. Representation
|
||||
|
||||
Each Contributor represents that the Contributor believes its
|
||||
Contributions are its original creation(s) or it has sufficient rights
|
||||
to grant the rights to its Contributions conveyed by this License.
|
||||
|
||||
2.6. Fair Use
|
||||
|
||||
This License is not intended to limit any rights You have under
|
||||
applicable copyright doctrines of fair use, fair dealing, or other
|
||||
equivalents.
|
||||
|
||||
2.7. Conditions
|
||||
|
||||
Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
|
||||
in Section 2.1.
|
||||
|
||||
3. Responsibilities
|
||||
-------------------
|
||||
|
||||
3.1. Distribution of Source Form
|
||||
|
||||
All distribution of Covered Software in Source Code Form, including any
|
||||
Modifications that You create or to which You contribute, must be under
|
||||
the terms of this License. You must inform recipients that the Source
|
||||
Code Form of the Covered Software is governed by the terms of this
|
||||
License, and how they can obtain a copy of this License. You may not
|
||||
attempt to alter or restrict the recipients' rights in the Source Code
|
||||
Form.
|
||||
|
||||
3.2. Distribution of Executable Form
|
||||
|
||||
If You distribute Covered Software in Executable Form then:
|
||||
|
||||
(a) such Covered Software must also be made available in Source Code
|
||||
Form, as described in Section 3.1, and You must inform recipients of
|
||||
the Executable Form how they can obtain a copy of such Source Code
|
||||
Form by reasonable means in a timely manner, at a charge no more
|
||||
than the cost of distribution to the recipient; and
|
||||
|
||||
(b) You may distribute such Executable Form under the terms of this
|
||||
License, or sublicense it under different terms, provided that the
|
||||
license for the Executable Form does not attempt to limit or alter
|
||||
the recipients' rights in the Source Code Form under this License.
|
||||
|
||||
3.3. Distribution of a Larger Work
|
||||
|
||||
You may create and distribute a Larger Work under terms of Your choice,
|
||||
provided that You also comply with the requirements of this License for
|
||||
the Covered Software. If the Larger Work is a combination of Covered
|
||||
Software with a work governed by one or more Secondary Licenses, and the
|
||||
Covered Software is not Incompatible With Secondary Licenses, this
|
||||
License permits You to additionally distribute such Covered Software
|
||||
under the terms of such Secondary License(s), so that the recipient of
|
||||
the Larger Work may, at their option, further distribute the Covered
|
||||
Software under the terms of either this License or such Secondary
|
||||
License(s).
|
||||
|
||||
3.4. Notices
|
||||
|
||||
You may not remove or alter the substance of any license notices
|
||||
(including copyright notices, patent notices, disclaimers of warranty,
|
||||
or limitations of liability) contained within the Source Code Form of
|
||||
the Covered Software, except that You may alter any license notices to
|
||||
the extent required to remedy known factual inaccuracies.
|
||||
|
||||
3.5. Application of Additional Terms
|
||||
|
||||
You may choose to offer, and to charge a fee for, warranty, support,
|
||||
indemnity or liability obligations to one or more recipients of Covered
|
||||
Software. However, You may do so only on Your own behalf, and not on
|
||||
behalf of any Contributor. You must make it absolutely clear that any
|
||||
such warranty, support, indemnity, or liability obligation is offered by
|
||||
You alone, and You hereby agree to indemnify every Contributor for any
|
||||
liability incurred by such Contributor as a result of warranty, support,
|
||||
indemnity or liability terms You offer. You may include additional
|
||||
disclaimers of warranty and limitations of liability specific to any
|
||||
jurisdiction.
|
||||
|
||||
4. Inability to Comply Due to Statute or Regulation
|
||||
---------------------------------------------------
|
||||
|
||||
If it is impossible for You to comply with any of the terms of this
|
||||
License with respect to some or all of the Covered Software due to
|
||||
statute, judicial order, or regulation then You must: (a) comply with
|
||||
the terms of this License to the maximum extent possible; and (b)
|
||||
describe the limitations and the code they affect. Such description must
|
||||
be placed in a text file included with all distributions of the Covered
|
||||
Software under this License. Except to the extent prohibited by statute
|
||||
or regulation, such description must be sufficiently detailed for a
|
||||
recipient of ordinary skill to be able to understand it.
|
||||
|
||||
5. Termination
|
||||
--------------
|
||||
|
||||
5.1. The rights granted under this License will terminate automatically
|
||||
if You fail to comply with any of its terms. However, if You become
|
||||
compliant, then the rights granted under this License from a particular
|
||||
Contributor are reinstated (a) provisionally, unless and until such
|
||||
Contributor explicitly and finally terminates Your grants, and (b) on an
|
||||
ongoing basis, if such Contributor fails to notify You of the
|
||||
non-compliance by some reasonable means prior to 60 days after You have
|
||||
come back into compliance. Moreover, Your grants from a particular
|
||||
Contributor are reinstated on an ongoing basis if such Contributor
|
||||
notifies You of the non-compliance by some reasonable means, this is the
|
||||
first time You have received notice of non-compliance with this License
|
||||
from such Contributor, and You become compliant prior to 30 days after
|
||||
Your receipt of the notice.
|
||||
|
||||
5.2. If You initiate litigation against any entity by asserting a patent
|
||||
infringement claim (excluding declaratory judgment actions,
|
||||
counter-claims, and cross-claims) alleging that a Contributor Version
|
||||
directly or indirectly infringes any patent, then the rights granted to
|
||||
You by any and all Contributors for the Covered Software under Section
|
||||
2.1 of this License shall terminate.
|
||||
|
||||
5.3. In the event of termination under Sections 5.1 or 5.2 above, all
|
||||
end user license agreements (excluding distributors and resellers) which
|
||||
have been validly granted by You or Your distributors under this License
|
||||
prior to termination shall survive termination.
|
||||
|
||||
************************************************************************
|
||||
* *
|
||||
* 6. Disclaimer of Warranty *
|
||||
* ------------------------- *
|
||||
* *
|
||||
* Covered Software is provided under this License on an "as is" *
|
||||
* basis, without warranty of any kind, either expressed, implied, or *
|
||||
* statutory, including, without limitation, warranties that the *
|
||||
* Covered Software is free of defects, merchantable, fit for a *
|
||||
* particular purpose or non-infringing. The entire risk as to the *
|
||||
* quality and performance of the Covered Software is with You. *
|
||||
* Should any Covered Software prove defective in any respect, You *
|
||||
* (not any Contributor) assume the cost of any necessary servicing, *
|
||||
* repair, or correction. This disclaimer of warranty constitutes an *
|
||||
* essential part of this License. No use of any Covered Software is *
|
||||
* authorized under this License except under this disclaimer. *
|
||||
* *
|
||||
************************************************************************
|
||||
|
||||
************************************************************************
|
||||
* *
|
||||
* 7. Limitation of Liability *
|
||||
* -------------------------- *
|
||||
* *
|
||||
* Under no circumstances and under no legal theory, whether tort *
|
||||
* (including negligence), contract, or otherwise, shall any *
|
||||
* Contributor, or anyone who distributes Covered Software as *
|
||||
* permitted above, be liable to You for any direct, indirect, *
|
||||
* special, incidental, or consequential damages of any character *
|
||||
* including, without limitation, damages for lost profits, loss of *
|
||||
* goodwill, work stoppage, computer failure or malfunction, or any *
|
||||
* and all other commercial damages or losses, even if such party *
|
||||
* shall have been informed of the possibility of such damages. This *
|
||||
* limitation of liability shall not apply to liability for death or *
|
||||
* personal injury resulting from such party's negligence to the *
|
||||
* extent applicable law prohibits such limitation. Some *
|
||||
* jurisdictions do not allow the exclusion or limitation of *
|
||||
* incidental or consequential damages, so this exclusion and *
|
||||
* limitation may not apply to You. *
|
||||
* *
|
||||
************************************************************************
|
||||
|
||||
8. Litigation
|
||||
-------------
|
||||
|
||||
Any litigation relating to this License may be brought only in the
|
||||
courts of a jurisdiction where the defendant maintains its principal
|
||||
place of business and such litigation shall be governed by laws of that
|
||||
jurisdiction, without reference to its conflict-of-law provisions.
|
||||
Nothing in this Section shall prevent a party's ability to bring
|
||||
cross-claims or counter-claims.
|
||||
|
||||
9. Miscellaneous
|
||||
----------------
|
||||
|
||||
This License represents the complete agreement concerning the subject
|
||||
matter hereof. If any provision of this License is held to be
|
||||
unenforceable, such provision shall be reformed only to the extent
|
||||
necessary to make it enforceable. Any law or regulation which provides
|
||||
that the language of a contract shall be construed against the drafter
|
||||
shall not be used to construe this License against a Contributor.
|
||||
|
||||
10. Versions of the License
|
||||
---------------------------
|
||||
|
||||
10.1. New Versions
|
||||
|
||||
Mozilla Foundation is the license steward. Except as provided in Section
|
||||
10.3, no one other than the license steward has the right to modify or
|
||||
publish new versions of this License. Each version will be given a
|
||||
distinguishing version number.
|
||||
|
||||
10.2. Effect of New Versions
|
||||
|
||||
You may distribute the Covered Software under the terms of the version
|
||||
of the License under which You originally received the Covered Software,
|
||||
or under the terms of any subsequent version published by the license
|
||||
steward.
|
||||
|
||||
10.3. Modified Versions
|
||||
|
||||
If you create software not governed by this License, and you want to
|
||||
create a new license for such software, you may create and use a
|
||||
modified version of this License if you rename the license and remove
|
||||
any references to the name of the license steward (except to note that
|
||||
such modified license differs from this License).
|
||||
|
||||
10.4. Distributing Source Code Form that is Incompatible With Secondary
|
||||
Licenses
|
||||
|
||||
If You choose to distribute Source Code Form that is Incompatible With
|
||||
Secondary Licenses under the terms of this version of the License, the
|
||||
notice described in Exhibit B of this License must be attached.
|
||||
|
||||
Exhibit A - Source Code Form License Notice
|
||||
-------------------------------------------
|
||||
|
||||
This Source Code Form is subject to the terms of the Mozilla Public
|
||||
License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
If it is not possible or desirable to put the notice in a particular
|
||||
file, then You may include the notice in a location (such as a LICENSE
|
||||
file in a relevant directory) where a recipient would be likely to look
|
||||
for such a notice.
|
||||
|
||||
You may add additional accurate notices of copyright ownership.
|
||||
|
||||
Exhibit B - "Incompatible With Secondary Licenses" Notice
|
||||
---------------------------------------------------------
|
||||
|
||||
This Source Code Form is "Incompatible With Secondary Licenses", as
|
||||
defined by the Mozilla Public License, v. 2.0.
|
||||
```
|
|
@ -1,418 +0,0 @@
|
|||
#!/usr/bin/python
|
||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
"""
|
||||
This script allows updating Lightning's zones.json.
|
||||
python update-zones.py --vzic /path/to/tzurl/vzic --tzdata /path/to/latest/tzdata
|
||||
|
||||
You can also have the latest tzdata downloaded automatically:
|
||||
python update-zones.py --vzic /path/to/tzurl/vzic
|
||||
|
||||
IMPORTANT: Make sure your local copy of zones.json is in sync with Hg before running this script.
|
||||
Otherwise manual corrections will get dropped when pushing the update.
|
||||
|
||||
"""
|
||||
|
||||
from __future__ import absolute_import
|
||||
|
||||
import argparse, ftplib, json, os, os.path, re, shutil, subprocess, sys, tarfile, tempfile
|
||||
from collections import OrderedDict
|
||||
from datetime import date, timedelta
|
||||
|
||||
# Keep timezone changes from this date onwards. If the zones.json file is becoming
|
||||
# too large, consider changing to a later date.
|
||||
HISTORY_CUTOFF = 20180101
|
||||
FUTURE_CUTOFF = 20221231
|
||||
|
||||
|
||||
class TimezoneUpdater(object):
|
||||
""" Timezone updater class, use the run method to do everything automatically"""
|
||||
def __init__(self, tzdata_path, zoneinfo_pure_path):
|
||||
self.tzdata_path = tzdata_path
|
||||
self.zoneinfo_pure_path = zoneinfo_pure_path
|
||||
|
||||
def download_tzdata(self):
|
||||
"""Download the latest tzdata from ftp.iana.org"""
|
||||
tzdata_download_path = tempfile.mktemp(".tar.gz", prefix="zones")
|
||||
sys.stderr.write("Downloading tzdata-latest.tar.gz from"
|
||||
" ftp.iana.org to %s\n" % tzdata_download_path)
|
||||
ftp = ftplib.FTP("ftp.iana.org")
|
||||
ftp.login()
|
||||
ftp.retrbinary("RETR /tz/tzdata-latest.tar.gz", open(tzdata_download_path, "wb").write)
|
||||
ftp.quit()
|
||||
|
||||
self.tzdata_path = tempfile.mkdtemp(prefix="zones")
|
||||
sys.stderr.write("Extracting %s to %s\n" % (tzdata_download_path, self.tzdata_path))
|
||||
tarfile.open(tzdata_download_path).extractall(path=self.tzdata_path)
|
||||
os.unlink(tzdata_download_path)
|
||||
|
||||
def get_tzdata_version(self):
|
||||
"""Extract version number of tzdata files."""
|
||||
version = None
|
||||
with open(os.path.join(self.tzdata_path, "version"), "r") as versionfile:
|
||||
for line in versionfile:
|
||||
match = re.match(r"\w+", line)
|
||||
if match is not None:
|
||||
version = "2." + match.group(0)
|
||||
break
|
||||
return version
|
||||
|
||||
def run_vzic(self, vzic_path):
|
||||
"""Use vzic to create ICS versions of the data."""
|
||||
|
||||
# Use `vzic` to create zone files.
|
||||
sys.stderr.write("Exporting pure zone info to %s\n" % self.zoneinfo_pure_path)
|
||||
subprocess.check_call([
|
||||
vzic_path,
|
||||
"--olson-dir", self.tzdata_path,
|
||||
"--output-dir", self.zoneinfo_pure_path,
|
||||
"--pure"
|
||||
], stdout=sys.stderr)
|
||||
|
||||
def read_backward(self):
|
||||
"""Read the 'backward' file, which contains timezone identifier links"""
|
||||
links = {}
|
||||
with open(os.path.join(self.tzdata_path, "backward"), "r") as backward:
|
||||
for line in backward:
|
||||
parts = line.strip().split()
|
||||
if len(parts) == 3 and parts[0] == "Link":
|
||||
_, tgt, src = parts
|
||||
links[src] = tgt
|
||||
return links
|
||||
|
||||
def read_zones_tab(self):
|
||||
"""Read zones.tab for latitude and longitude data."""
|
||||
lat_long_data = {}
|
||||
with open(os.path.join(self.zoneinfo_pure_path, "zones.tab"), "r") as tab:
|
||||
for line in tab:
|
||||
if len(line) < 19:
|
||||
sys.stderr.write("Line in zones.tab not long enough: %s\n" % line.strip())
|
||||
continue
|
||||
|
||||
[latitude, longitude, name] = line.rstrip().split(" ", 2)
|
||||
lat_long_data[name] = (latitude, longitude)
|
||||
|
||||
return lat_long_data
|
||||
|
||||
def read_ics(self, filename, lat_long_data):
|
||||
"""Read a single zone's ICS files."""
|
||||
with open(os.path.join(self.zoneinfo_pure_path, filename), "r") as zone:
|
||||
zoneinfo_pure = zone.readlines()
|
||||
|
||||
# Loop through the lines of the file, splitting it into components.
|
||||
components = []
|
||||
current_component = None
|
||||
for i in range(0, len(zoneinfo_pure)):
|
||||
line = zoneinfo_pure[i].rstrip()
|
||||
[key, value] = line.split(":", 1)
|
||||
|
||||
if line in ["BEGIN:STANDARD", "BEGIN:DAYLIGHT"]:
|
||||
current_component = {"line": i, "type": value}
|
||||
|
||||
elif line in ["END:STANDARD", "END:DAYLIGHT"]:
|
||||
components.append(current_component)
|
||||
current_component = None
|
||||
|
||||
elif current_component:
|
||||
if key == "RDATE":
|
||||
if "rdates" not in current_component:
|
||||
current_component["rdates"] = []
|
||||
current_component["rdates"].append(value)
|
||||
else:
|
||||
current_component[key] = value
|
||||
|
||||
# Create a copy of each component for every date that it started.
|
||||
# Later, we'll sort them into order of starting date.
|
||||
components_by_start_date = {}
|
||||
for component in components:
|
||||
max_rdate = int(component["DTSTART"][0:8])
|
||||
components_by_start_date[max_rdate] = component
|
||||
if "rdates" in component:
|
||||
for rdate in component["rdates"]:
|
||||
rdate = int(rdate[0:8])
|
||||
max_rdate = max(rdate, max_rdate)
|
||||
components_by_start_date[rdate] = component
|
||||
component["valid_rdates"] = filter(
|
||||
lambda rd: FUTURE_CUTOFF >= int(rd[0:8]) >= HISTORY_CUTOFF,
|
||||
component["rdates"]
|
||||
)
|
||||
component["max_date"] = max_rdate
|
||||
|
||||
# Sort, and keep only the components in use since the cutoff date.
|
||||
kept_components = []
|
||||
finished = False
|
||||
for key in sorted(components_by_start_date.keys(), reverse=True):
|
||||
if key > FUTURE_CUTOFF:
|
||||
continue
|
||||
component = components_by_start_date[key]
|
||||
if finished and "RRULE" not in component:
|
||||
continue
|
||||
if "used" in component:
|
||||
continue
|
||||
component["used"] = True
|
||||
kept_components.append(component)
|
||||
if key <= HISTORY_CUTOFF:
|
||||
finished = True
|
||||
|
||||
for i in range(len(kept_components)):
|
||||
component = kept_components[i]
|
||||
last = i == len(kept_components) - 1
|
||||
# In this block of code, we attempt to match what vzic does when
|
||||
# creating "Outlook-compatible" timezone files. This is to minimize
|
||||
# changes in our zones.json file. And to be more Outlook-compatible.
|
||||
if int(component["DTSTART"][0:8]) < HISTORY_CUTOFF:
|
||||
if not last and "valid_rdates" in component and len(component["valid_rdates"]) > 0:
|
||||
component["DTSTART"] = component["valid_rdates"][0]
|
||||
continue
|
||||
|
||||
# Change the start date to what it would've been in 1970.
|
||||
start_date = "19700101"
|
||||
start_time = "T000000"
|
||||
|
||||
if "RRULE" in component:
|
||||
rrule = dict(part.split("=") for part in component["RRULE"].split(";"))
|
||||
bymonth = int(rrule["BYMONTH"])
|
||||
weekday = rrule["BYDAY"].lstrip("-012345")
|
||||
weekday_index = ["MO", "TU", "WE", "TH", "FR", "SA", "SU"].index(weekday)
|
||||
|
||||
if "BYMONTHDAY" in rrule:
|
||||
bymonthday = list(int(d) for d in rrule["BYMONTHDAY"].split(","))
|
||||
for day in bymonthday:
|
||||
test_day = date(1970, bymonth, day)
|
||||
if test_day.weekday() == weekday_index:
|
||||
start_date = test_day.strftime("%Y%m%d")
|
||||
start_time = component["DTSTART"][8:]
|
||||
break
|
||||
elif "BYDAY" in rrule:
|
||||
which_weekday = int(rrule["BYDAY"].rstrip("AEFHMORSTUW"))
|
||||
days_matching = [0]
|
||||
test_day = date(1970, bymonth, 1)
|
||||
while test_day.month == bymonth:
|
||||
if test_day.weekday() == weekday_index:
|
||||
days_matching.append(test_day)
|
||||
test_day = test_day + timedelta(days=1)
|
||||
start_date = days_matching[which_weekday].strftime("%Y%m%d")
|
||||
start_time = component["DTSTART"][8:]
|
||||
|
||||
component["DTSTART"] = start_date + start_time
|
||||
|
||||
# Sort the components back into the order they appeared in the original file.
|
||||
# This is to minimize changes in our zones.json file.
|
||||
kept_components.sort(key=lambda b: b["line"])
|
||||
|
||||
zone_name = filename[:-4]
|
||||
ics = []
|
||||
for component in kept_components:
|
||||
ics_lines = []
|
||||
ics_lines.append("BEGIN:%s" % component["type"])
|
||||
if len(kept_components) == 1 or len(component["TZOFFSETFROM"]) != 5:
|
||||
ics_lines.append("TZOFFSETFROM:%s" % component["TZOFFSETTO"])
|
||||
else:
|
||||
ics_lines.append("TZOFFSETFROM:%s" % component["TZOFFSETFROM"])
|
||||
ics_lines.append("TZOFFSETTO:%s" % component["TZOFFSETTO"])
|
||||
|
||||
if "TZNAME" in component:
|
||||
ics_lines.append("TZNAME:%s" % component["TZNAME"])
|
||||
ics_lines.append("DTSTART:%s" % component["DTSTART"])
|
||||
if "RRULE" in component:
|
||||
ics_lines.append("RRULE:%s" % component["RRULE"])
|
||||
elif len(kept_components) > 1 and "valid_rdates" in component:
|
||||
for rdate in component["valid_rdates"]:
|
||||
ics_lines.append("RDATE:%s" % rdate)
|
||||
|
||||
ics_lines.append("END:%s" % component["type"])
|
||||
ics.append("\r\n".join(ics_lines))
|
||||
|
||||
zone_data = {
|
||||
"ics": ics,
|
||||
}
|
||||
if zone_name in lat_long_data:
|
||||
zone_data["latitude"] = lat_long_data[zone_name][0]
|
||||
zone_data["longitude"] = lat_long_data[zone_name][1]
|
||||
|
||||
return zone_data
|
||||
|
||||
def read_dir(self, path, process_zone, prefix=""):
|
||||
"""Recursively read a directory for ICS files.
|
||||
|
||||
Files could be two or three levels deep."""
|
||||
|
||||
zones = {}
|
||||
for entry in os.listdir(path):
|
||||
if entry == "Etc":
|
||||
continue
|
||||
fullpath = os.path.join(path, entry)
|
||||
if os.path.isdir(fullpath):
|
||||
zones.update(self.read_dir(fullpath, process_zone, os.path.join(prefix, entry)))
|
||||
elif prefix != "":
|
||||
filename = os.path.join(prefix, entry)
|
||||
zones[filename[:-4]] = process_zone(filename)
|
||||
return zones
|
||||
|
||||
@staticmethod
|
||||
def link_removed_zones(oldzones, newzones, links):
|
||||
"""Checks which zones have been removed and creates an alias entry if
|
||||
there is one"""
|
||||
aliases = {}
|
||||
for key in oldzones:
|
||||
if key not in newzones and key in links:
|
||||
sys.stderr.write("Linking %s to %s\n" % (key, links[key]))
|
||||
aliases[key] = {"aliasTo": links[key]}
|
||||
return aliases
|
||||
|
||||
@staticmethod
|
||||
def update_timezones_properties(tzprops_file, version, newzones, aliases):
|
||||
TZ_LINE = re.compile(r'^(?P<name>pref.timezone.[^=]+)=(?P<value>.*)$')
|
||||
outlines = []
|
||||
zoneprops = {}
|
||||
|
||||
with open(tzprops_file) as fp:
|
||||
for line in fp.readlines():
|
||||
match = TZ_LINE.match(line.rstrip("\n"))
|
||||
if match:
|
||||
zoneprops[match.group('name')] = match.group('value')
|
||||
|
||||
for zone in newzones:
|
||||
propname = 'pref.timezone.' + zone.replace('/', '.')
|
||||
if propname not in zoneprops:
|
||||
outlines.append(propname + "=" + zone.replace("_", " "))
|
||||
|
||||
if len(outlines):
|
||||
with open(tzprops_file, 'a') as fp:
|
||||
fp.write("\n#added with %s\n" % version)
|
||||
fp.write("\n".join(outlines) + "\n")
|
||||
|
||||
@staticmethod
|
||||
def write_output(version, aliases, zones, filename):
|
||||
"""Write the data to zones.json."""
|
||||
data = OrderedDict()
|
||||
data["version"] = version
|
||||
data["aliases"] = OrderedDict(sorted(aliases.items()))
|
||||
data["zones"] = OrderedDict(sorted(zones.items()))
|
||||
|
||||
with open(filename, "w") as jsonfile:
|
||||
json.dump(data, jsonfile, indent=2, separators=(",", ": "))
|
||||
jsonfile.write("\n")
|
||||
|
||||
def run(self, zones_json_file, tzprops_file, vzic_path):
|
||||
"""Run the timezone updater, with a zones.json file and the path to vzic"""
|
||||
|
||||
need_download_tzdata = self.tzdata_path is None
|
||||
if need_download_tzdata:
|
||||
self.download_tzdata()
|
||||
|
||||
with open(zones_json_file, "r") as jsonfile:
|
||||
zonesjson = json.load(jsonfile)
|
||||
|
||||
version = self.get_tzdata_version()
|
||||
if version == zonesjson["version"]:
|
||||
sys.stderr.write("zones.json is already up to date (%s)\n" % version)
|
||||
return
|
||||
else:
|
||||
sys.stderr.write("You are using tzdata %s\n" % version[2:])
|
||||
|
||||
links = self.read_backward()
|
||||
|
||||
self.run_vzic(vzic_path)
|
||||
lat_long_data = self.read_zones_tab()
|
||||
|
||||
newzones = self.read_dir(self.zoneinfo_pure_path,
|
||||
lambda fn: self.read_ics(fn, lat_long_data))
|
||||
|
||||
newaliases = self.link_removed_zones(zonesjson["zones"], newzones, links)
|
||||
zonesjson["aliases"].update(newaliases)
|
||||
|
||||
self.update_timezones_properties(tzprops_file, version, newzones, zonesjson["aliases"])
|
||||
|
||||
self.write_output(version, zonesjson["aliases"], newzones, zones_json_file)
|
||||
|
||||
if need_download_tzdata:
|
||||
shutil.rmtree(self.tzdata_path)
|
||||
|
||||
|
||||
def parse_args():
|
||||
"""Gather arguments from the command-line."""
|
||||
parser = argparse.ArgumentParser(
|
||||
description="Create timezone info JSON file from tzdata files"
|
||||
)
|
||||
parser.add_argument("-v", "--vzic", dest="vzic_path", required=True,
|
||||
help="""Path to the `vzic` executable. This must be
|
||||
downloaded from https://code.google.com/p/tzurl/ and
|
||||
compiled.""")
|
||||
parser.add_argument("-t", "--tzdata", dest="tzdata_path",
|
||||
help="""Path to a directory containing the IANA
|
||||
timezone data. If this argument is omitted, the data
|
||||
will be downloaded from ftp.iana.org.""")
|
||||
return parser.parse_args()
|
||||
|
||||
|
||||
def create_test_data(zones_file):
|
||||
"""Creating test data."""
|
||||
|
||||
previous_file = os.path.join(os.path.dirname(os.path.realpath(__file__)),
|
||||
"..", "test", "unit", "data", "previous.json")
|
||||
|
||||
previous_version = "no previous version"
|
||||
current_version = "no current version"
|
||||
if (os.path.isfile(zones_file) and os.access(zones_file, os.R_OK)):
|
||||
with open(zones_file, "r") as rzf:
|
||||
current_data = json.load(rzf)
|
||||
current_version = current_data["version"]
|
||||
current_zones = current_data["zones"]
|
||||
current_aliases = current_data["aliases"]
|
||||
if (os.path.isfile(previous_file) and os.access(previous_file, os.R_OK)):
|
||||
with open(previous_file, "r") as rpf:
|
||||
previous_data = json.load(rpf)
|
||||
previous_version = previous_data["version"]
|
||||
|
||||
if (current_version == "no current version"):
|
||||
"""Test data creation not possible - currently no zones.json file available."""
|
||||
|
||||
elif (current_version != previous_version):
|
||||
"""Extracting data from zones.json"""
|
||||
|
||||
test_aliases = current_aliases.keys()
|
||||
test_zones = current_zones.keys()
|
||||
|
||||
test_data = OrderedDict()
|
||||
test_data["version"] = current_version
|
||||
test_data["aliases"] = sorted(test_aliases)
|
||||
test_data["zones"] = sorted(test_zones)
|
||||
|
||||
"""Writing test data"""
|
||||
with open(previous_file, "w") as wpf:
|
||||
json.dump(test_data, wpf, indent=2, separators=(",", ": "))
|
||||
wpf.write("\n")
|
||||
|
||||
"""Please run calendar xpshell test 'test_timezone_definition.js' to check the updated
|
||||
timezone definition for any glitches."""
|
||||
|
||||
else:
|
||||
# This may happen if the script is executed multiple times without new tzdata available
|
||||
"""Skipping test data creation.
|
||||
Test data are already available for the current version of zones.json"""
|
||||
|
||||
|
||||
def main():
|
||||
"""Run the timezone updater from command-line args"""
|
||||
args = parse_args()
|
||||
json_file = os.path.join(os.path.dirname(os.path.realpath(__file__)), "zones.json")
|
||||
tzprops_file = os.path.join(os.path.dirname(os.path.realpath(__file__)),
|
||||
"..", "locales", "en-US", "chrome", "calendar",
|
||||
"timezones.properties")
|
||||
|
||||
# A test data update must occur before the zones.json file gets updated to have meaningful data
|
||||
create_test_data(json_file)
|
||||
|
||||
zoneinfo_pure_path = tempfile.mkdtemp(prefix="zones")
|
||||
|
||||
updater = TimezoneUpdater(args.tzdata_path, zoneinfo_pure_path)
|
||||
updater.run(json_file, tzprops_file, args.vzic_path)
|
||||
|
||||
# Clean up.
|
||||
shutil.rmtree(zoneinfo_pure_path)
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
3583
timezones/zones.json
3583
timezones/zones.json
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue