|
|
@@ -618,7 +618,23 @@ def namumark(title, data):
|
|
|
else:
|
|
|
break
|
|
|
|
|
|
- data = re.sub('\[date\]', get_time(), data)
|
|
|
+ now_time = get_time()
|
|
|
+ data = re.sub('\[date\]', now_time, data)
|
|
|
+
|
|
|
+ time_data = re.search('^([0-9]{4})-([0-9]{2})-([0-9]{2})', now_time)
|
|
|
+ time = time_data.groups()
|
|
|
+
|
|
|
+ age_data = re.findall('\[age\(([0-9]{4})-([0-9]{2})-([0-9]{2})\)\]', data)
|
|
|
+ for age in age_data:
|
|
|
+ year = int(time[0]) - int(age[0])
|
|
|
+ if(age[1] > time[1]):
|
|
|
+ year -= 1
|
|
|
+ elif(age[1] == time[1]):
|
|
|
+ if(age[2] > time[2]):
|
|
|
+ year -= 1
|
|
|
+
|
|
|
+ data = re.sub('\[age\(([0-9]{4})-([0-9]{2})-([0-9]{2})\)\]', str(year), data, 1)
|
|
|
+
|
|
|
data = re.sub("#(?P<in>[Jj][Pp][Gg]|[Pp][Nn][Gg]|[Gg][Ii][Ff]|[Jj][Pp][Ee][Gg])#", ".\g<in>", data)
|
|
|
data = re.sub("-{4,11}", "<hr>", data)
|
|
|
|
2DU