Changeset 2516

Timestamp:

07/23/07 14:29:41 (1 year ago)

Author:

ant_39

Message:

CalendarPlugin:

• A bit of a cleanup, moved a lot of generic stuff into caltools.
  

Files:

• calendarplugin/0.10/azcalendar/azcalendar.py (modified) (5 diffs)
• calendarplugin/0.10/azcalendar/caltools.py (modified) (2 diffs)

calendarplugin/0.10/azcalendar/azcalendar.py

@@ -67 +67 @@
-        req.perm.assert_permission('CAL_VIEW')
-
-        def get_week(date):
-            # If there is a simpler way to do this, let me know.  For now...
-            d_year, d_doy, d_dow = date[0], date[-2], date[-3]
-
-            doy_start = d_doy - d_dow
-            y_start = d_year
-            if doy_start < 1:
-                y_start -= 1
-                doy_start += 365 + int (calendar.isleap (y_start))
-
-            doy_end = d_doy - d_dow + 7
-            y_end = d_year
-            if doy_end > 365 + int (calendar.isleap (y_end)):
-                doy_end -= 365 + int (calendar.isleap (y_end))
-                y_end += 1
-
-            week_start = time.strptime (str(y_start) + str(doy_start), "%Y%j")
-            week_end = time.strptime (str(y_end) + str(doy_end), "%Y%j")
-            return week_start, week_end
-
-        def get_month_range(date):
-            d_year, d_month = date[0], date[1]
-            month_start = tuple([d_year, d_month, 1] + [0 for _ in date[3:]])
-            d_month = d_month + 1
-            if d_month > 12:
-                d_year += 1
-                d_month = 1
-            month_end = tuple([d_year, d_month, 1] + [0 for _ in date[3:]])
-            return month_start, month_end
-
-        def relative_day(week_start, which_day):
-            d_year, d_doy = week_start[0], week_start[-2]
-            doy = d_doy + which_day
-            if doy < 1:
-                d_year -= 1
-                doy += 365 + int (calendar.isleap (d_year))
-            elif doy > 365 + int (calendar.isleap (d_year)):
-                doy -= 365 + int (calendar.isleap (d_year))
-                d_year += 1
-            day = time.strptime (str(d_year) + str(doy), "%Y%j")
-            return day
-
-        def stamp_dow (stamp):
-            return time.localtime(stamp)[6]
@@ -132 +90 @@
-
-        cweek = [[] for _ in xrange(7)]
-get_week
+caltools.get_week_range
-        bg, en = time.mktime(week_range[0]), time.mktime(week_range[1])
-        for ev in Event.events_between (self.env, bg, en,req.authname):
@@ -146 +104 @@
-
-        for d in xrange (len (day_layouts)):
-
+caltools.
-            today_stamp = time.mktime (today)
-            tomorrow_stamp = today_stamp + 24 * 60 * 60
@@ -183 +141 @@
-
-        display_months = []
-
+caltools.
-
-        prev_year, prev_month, prev_day = date[:3]
@@ -200 +158 @@
-
-        for i in range(3):
-
+caltools.
-            interesting_days = {}
-

calendarplugin/0.10/azcalendar/caltools.py

@@ -20 +20 @@
-    return (tm_year, tm_mon, tm_day) + struct_time[3:]
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-def strptimeopt (string, *formats):
+    """
+    Each format may be either a string, or a tuple (string, callback).
+    strptime result of the first matching format is returned.  If the
+    format has assigned a callback, it is first called with the result
+    of strptime, and result of the callback is then returned.
+    """
+
-    import types
-    assert formats, "Non-empty list of formats required."
@@ -59 +75 @@
-
-    return begin_time, end_time, begin_stamp, end_stamp
+
+def get_week_range(date):
+    """
+    Answer the tuple (start, end) with timestamps of start and end of
+    the week that contains given date.
+    """
+
+    # If there is a simpler way to do this, let me know.  For now...
+    d_year, d_doy, d_dow = date[0], date[-2], date[-3]
+
+    doy_start = d_doy - d_dow
+    y_start = d_year
+    if doy_start < 1:
+        y_start -= 1
+        doy_start += 365 + int (calendar.isleap (y_start))
+
+    doy_end = d_doy - d_dow + 7
+    y_end = d_year
+    if doy_end > 365 + int (calendar.isleap (y_end)):
+        doy_end -= 365 + int (calendar.isleap (y_end))
+        y_end += 1
+
+    week_start = time.strptime (str(y_start) + str(doy_start), "%Y%j")
+    week_end = time.strptime (str(y_end) + str(doy_end), "%Y%j")
+    return week_start, week_end
+
+def get_month_range(date):
+    """
+    Answer the tuple (start, end) with timestamps of start and end of
+    the month that contains given date.
+    """
+
+    d_year, d_month = date[0], date[1]
+    month_start = tuple([d_year, d_month, 1] + [0 for _ in date[3:]])
+    d_month = d_month + 1
+    if d_month > 12:
+        d_year += 1
+        d_month = 1
+    month_end = tuple([d_year, d_month, 1] + [0 for _ in date[3:]])
+    return month_start, month_end