Merge pull request #102 from tacheraSasi/main

time: add leo, baada_ya, tofauti, ongeza methods

Author: AvicennaJr

module/time.go

@@ -14,6 +14,10 @@ func init() {
 	TimeFunctions["hasahivi"] = now
 	TimeFunctions["lala"] = sleep
 	TimeFunctions["tangu"] = since
+	TimeFunctions["leo"] = today
+	TimeFunctions["baada_ya"] = after
+	TimeFunctions["tofauti"] = diff
+	TimeFunctions["ongeza"] = addTime
 }
 
 func now(args []object.Object, defs map[string]object.Object) object.Object {
@@ -80,3 +84,108 @@ func since(args []object.Object, defs map[string]object.Object) object.Object {
 
 	return &object.Integer{Value: int64(durationInSeconds)}
 }
+
+func today(args []object.Object, defs map[string]object.Object) object.Object {
+	if len(args) != 0 || len(defs) != 0 {
+		return &object.Error{Message: "hatuhitaji hoja kwenye leo"}
+	}
+
+	dateStr := time.Now().Format("02-01-2006")
+	return &object.String{Value: dateStr}
+}
+
+func after(args []object.Object, defs map[string]object.Object) object.Object {
+	if len(defs) != 0 || len(args) != 1 {
+		return &object.Error{Message: "tunahitaji hoja moja tu kwenye baada_ya"}
+	}
+
+	secondsStr := args[0].Inspect()
+	seconds, err := strconv.Atoi(secondsStr)
+	if err != nil {
+		return &object.Error{Message: "hoja lazima iwe namba"}
+	}
+
+	future := time.Now().Add(time.Duration(seconds) * time.Second)
+	return &object.Time{TimeValue: future.Format("15:04:05 02-01-2006")}
+}
+
+func diff(args []object.Object, defs map[string]object.Object) object.Object {
+	if len(defs) != 0 || len(args) != 2 {
+		return &object.Error{Message: "tunahitaji hoja mbili kwenye tofauti"}
+	}
+
+	parseTime := func(o object.Object) (time.Time, error) {
+		switch v := o.(type) {
+		case *object.Time:
+			return time.Parse("15:04:05 02-01-2006", v.TimeValue)
+		case *object.String:
+			return time.Parse("15:04:05 02-01-2006", v.Value)
+		default:
+			return time.Time{}, fmt.Errorf("aina batili")
+		}
+	}
+
+	t1, err1 := parseTime(args[0])
+	t2, err2 := parseTime(args[1])
+
+	if err1 != nil || err2 != nil {
+		return &object.Error{Message: "tofauti inahitaji nyakati halali mbili"}
+	}
+
+	diff := t1.Sub(t2).Seconds()
+	return &object.Integer{Value: int64(diff)}
+}
+
+
+func addTime(args []object.Object, defs map[string]object.Object) object.Object {
+	if len(args) != 1 {
+		return &object.Error{Message: "ongeza inahitaji wakati mmoja wa kuanzia"}
+	}
+
+	baseTimeObj := args[0]
+	baseTime, err := func() (time.Time, error) {
+		switch t := baseTimeObj.(type) {
+		case *object.Time:
+			return time.Parse("15:04:05 02-01-2006", t.TimeValue)
+		case *object.String:
+			return time.Parse("15:04:05 02-01-2006", t.Value)
+		default:
+			return time.Time{}, fmt.Errorf("aina ya wakati sio sahihi")
+		}
+	}()
+	if err != nil {
+		return &object.Error{Message: "wakati uliotolewa sio sahihi"}
+	}
+
+	secs := getInt(defs["sekunde"])
+	mins := getInt(defs["dakika"])
+	hours := getInt(defs["masaa"])
+	days := getInt(defs["siku"])
+	weeks := getInt(defs["wiki"])
+	months := getInt(defs["miezi"])
+	years := getInt(defs["miaka"])
+
+	result := baseTime.
+		Add(time.Second * time.Duration(secs)).
+		Add(time.Minute * time.Duration(mins)).
+		Add(time.Hour * time.Duration(hours)).
+		AddDate(years, months, days+(weeks*7))
+
+	return &object.Time{TimeValue: result.Format("15:04:05 02-01-2006")}
+}
+
+func getInt(obj object.Object) int {
+	if obj == nil {
+		return 0
+	}
+	switch o := obj.(type) {
+	case *object.Integer:
+		return int(o.Value)
+	case *object.String:
+		n, err := strconv.Atoi(o.Value)
+		if err == nil {
+			return n
+		}
+	}
+	return 0
+}

repl/docs/en/time.md

@@ -3,55 +3,100 @@
 ## Importing Time
 
 To use Time in Nuru, you first have to import the `muda` module as follows:
+
 ```so
 tumia muda
 ```
 
+---
+
 ## Time Methods
 
-### hasahivi()
-To get the current time use the the `muda.hasahivi()` method. This will return a `muda` object with the current time:
+### `hasahivi()`
+
+To get the current time, use `muda.hasahivi()`. It returns a `muda` object with the current time in the format `HH:mm:ss dd-MM-YYYY`.
+
 ```so
 tumia muda
 
 saivi = muda.hasahivi()
 ```
 
-### tangu()
-Use this method to get the total time elapsed in seconds. It accepts a time object or a string in the format `HH:mm:ss dd-MM-YYYY`:
+---
+
+### `leo()`
+
+To get today’s date in the format `dd-MM-YYYY`:
 
 ```so
 tumia muda
 
-sasa = muda.hasahivi()
+leo = muda.leo()
+```
 
-muda.tangu(s) // will return the elapsed time
+---
 
-// alternatively:
+### `tangu(time)`
 
-sasa.tangu("00:00:00 01-01-1900") // will return the elapsed time in seconds since that date
+Gets the total time elapsed **in seconds** from the given time to now. Accepts a `muda` object or string in `HH:mm:ss dd-MM-YYYY` format.
+
+```so
+tumia muda
+
+muda_ulioyopita = muda.tangu("15:00:00 01-01-2024")
 ```
 
-### lala()
+---
+
+### `lala(sekunde)`
+
+Pauses the program for the given number of seconds:
 
-Use lala if you want your program to sleep. It accepts one argument which is the total time to sleep in seconds:
 ```so
-muda.lala(10) // will sleep for ten seconds
+tumia muda
+
+muda.lala(5) // sleeps for 5 seconds
 ```
 
-### ongeza()
+---
+
+### `baada_ya(sekunde)`
+
+Returns a `muda` object representing the time after the given number of seconds from now.
 
-Use this method to add to time, better explained with an example:
 ```so
 tumia muda
 
-sasa = muda.hasahivi()
+baadaye = muda.baada_ya(60) // one minute from now
+```
+
+---
+
+### `tofauti(muda1, muda2)`
+
+Returns the difference between two time values in seconds.
+
+```so
+tumia muda
+
+saa1 = muda.hasahivi()
+saa2 = muda.baada_ya(30)
+
+tofauti = muda.tofauti(saa2, saa1) // 30
+```
+
+---
+
+### `ongeza(...)`
+
+To add time to a `muda` object. You must specify at least one of the following fields `sekunde`, `dakika`, `masaa`, `siku`, `wiki`, `miezi`, `miaka`.
+
+Example:
 
+```so
+tumia muda
+
+sasa = muda.hasahivi()
 kesho = sasa.ongeza(siku=1)
-kesho_pia = sasa.ongeza(saa=24)
 mwakani = sasa.ongeza(miaka=1)
-miezi_tatu_mbele = sasa.ongeza(miezi = 3)
-wiki_ijayo = sasa.ongeza(siku=7)
-idi = sasa.ongeza(siku=3, masaa=4, dakika=50, sekunde=3)
 ```
-It will return a muda object with the specified time.