Refactor start and year end and show daily NS dates

README.md

@@ -1,9 +1,14 @@
 # nanakshahi-ical
 [![Nanakshahi iCal CI](https://github.com/janpreet/nanakshahi-ical/actions/workflows/main.yml/badge.svg)](https://github.com/janpreet/nanakshahi-ical/actions/workflows/main.yml)
 
-This is a script that generates an ICS file for Nanakshahi dates and Sikh religious holidays.
+This script generates an ICS file that includes both Nanakshahi calendar dates and Sikh religious holidays. Itdisplays:
+- Daily Nanakshahi dates in both English and Punjabi.
+- Day of the week in both languages.
+- All Gurpurabs and historical events.
+- Nanakshahi year (NS - Nanakshahi Samvat).
 
 ## Usage
+### Apple Calendar
 You can subscribe to this calendar from your Apple calendar by following these steps:
 
 1. Open the Calendar app on your Mac.
@@ -13,5 +18,14 @@ You can subscribe to this calendar from your Apple calendar by following these s
 5. Customize the settings for the calendar subscription, such as the name and color.
 6. Click OK.
 
+### Google Calendar
+To add this calendar to Google Calendar:
+
+1. Open Google Calendar
+2. Click the "+" next to "Other calendars"
+3. Select "From URL"
+4. Enter [this URL](https://raw.githubusercontent.com/janpreet/nanakshahi-ical/main/nanakshahi.ics)
+5. Click "Add calendar"
+
 ## Acknowledgments
-This script is built on top of the [nanakshahi-js](https://github.com/Sarabveer/nanakshahi-js) library, which provides the necessary functions to calculate the Gurpurab dates.
+This script is built on top of the [nanakshahi-js](https://github.com/Sarabveer/nanakshahi-js) library, which provides the necessary functions to calculate the Gurpurab dates and Nanakshahi calendar conversions.

main.js

@@ -1,49 +1,65 @@
 const n = require('nanakshahi')
-const ics = require('ics', './dist')
-const {
-  writeFileSync
-} = require('fs')
+const ics = require('ics')
+const { writeFileSync } = require('fs')
 const path = require('path')
 
 const newDateFormat = (a) => {
   return a.toISOString().split('T')[0].split('-').map(Number)
 }
 
-const getGurpurab = (a) => {
-  return n.getGurpurabsForDay(a)
+const formatNanakshahiDate = (gregorianDate) => {
+  const nDate = n.getNanakshahiDate(gregorianDate)
+  if (!nDate || !nDate.englishDate || !nDate.punjabiDate) return null
+
+  return {
+    en: `${nDate.englishDate.date} ${nDate.englishDate.monthName}`,
+    pa: `${nDate.punjabiDate.date} ${nDate.punjabiDate.monthName}`,
+    year: nDate.englishDate.year,
+    day: {
+      en: nDate.englishDate.day,
+      pa: nDate.punjabiDate.day
+    }
+  }
 }
 
 const calEvents = []
-let gurpurab = {}
-const yearStart = new Date(new Date().getFullYear(), 0, 1)
-const yearEnd = new Date(new Date().getFullYear(), 12, 0)
-const day = yearStart
-while (day.setDate(day.getDate() + 1) <= yearEnd) {
-  gurpurab = getGurpurab(day)
+
+const currentYear = new Date().getFullYear()
+const yearStart = new Date(currentYear, 0, 1)
+const yearEnd = new Date(currentYear + 1, 11, 31)
+const day = new Date(yearStart)
+
+while (day <= yearEnd) {
+  const currentDay = new Date(day)
+  const gurpurab = n.getGurpurabsForDay(currentDay)
+  const nDate = formatNanakshahiDate(currentDay)
+
   for (const g in gurpurab) {
     calEvents.push({
-      start: newDateFormat(day),
+      start: newDateFormat(currentDay),
       title: gurpurab[g].en,
-      description: gurpurab[g].pa,
+      description: gurpurab[g].pa + (nDate ? `\n\nNanakshahi Date:\n${nDate.pa} ${nDate.year} NS` : ''),
       categories: [gurpurab[g].type]
     })
   }
+
+  if (nDate) {
+    calEvents.push({
+      start: newDateFormat(currentDay),
+      duration: { days: 1 },
+      title: `${nDate.en} ${nDate.year} NS (${nDate.day.en})`,
+      description: `Nanakshahi Date:\n${nDate.en} ${nDate.year} NS (${nDate.day.en})\n${nDate.pa} ${nDate.year} NS (${nDate.day.pa})`,
+      categories: ['daily']
+    })
+  }
+
+  day.setDate(day.getDate() + 1)
 }
 
-const {
-  error,
-  value
-} = ics.createEvents(calEvents)
-
-if (error) {
-  console.log(error)
-}
-console.log(value)
+const { error, value } = ics.createEvents(calEvents)
+if (error) throw error
 
 const filePath = path.join(__dirname, '/nanakshahi.ics')
 writeFileSync(filePath, value)
 
-module.exports = {
-  newDateFormat,
-  getGurpurab
-}
+module.exports = { newDateFormat, formatNanakshahiDate }