yogsototh/ytodo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Légères améliorations, restes beaucoups de bug

Browse source 
Problème de parsing de la description (n'exclue pas les created:)
    peut-être à cause d'une légère modif des regexp des contextes.
This commit is contained in:
Yann Esposito 2009-06-05 16:36:55 +02:00
parent 98b593dcdf
commit 0664f70f64
3 changed files with 20 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
task.rb
View file

@ -16,38 +16,38 @@ class Task
end
def to_s
res=@description
if (@contexts.length>0): res+=' ' + @contexts.map { |x| x.to_s }.join(" ") end
if (@projects.length>0): res+=' ' + @projects.map { |x| '['+x.to_s+']' }.join(" ") end
if (@priority != 0): res+=' /'+ @priority.to_s + '\\' end
if (@notes.length>0): res+=' ' + @notes.map { |x| '('+x.to_s+')' }.join(" ") end
if (@contacts.length>0): res+=' ' + @contacts.map { |x| x.to_s }.join(" ") end
if (@dates): res+=' ' + @dates.to_s end
if (@tags.length>0): res+=' ' + '{' + @tags.map{ |x| x.to_s }.join(", ") + '}' end
if (@contexts.length>0): res<<=' ' + @contexts.map { |x| '@'+x.to_s }.join(" ") end
if (@projects.length>0): res<<=' ' + @projects.map { |x| '['+x.to_s+']' }.join(" ") end
if (@priority != 0): res<<=' /'+ @priority.to_s + '\\' end
if (@notes.length>0): res<<=' ' + @notes.map { |x| '('+x.to_s+')' }.join(" ") end
if (@contacts.length>0): res<<=' ' + @contacts.map { |x| x.to_s }.join(" ") end
if (@dates): res<<=' ' + @dates.to_s end
if (@tags.length>0): res<<=' ' + '{' + @tags.map{ |x| x.to_s }.join(", ") + '}' end
return res
end
def to_detailled_s
res='desc: '+@description
if (@contexts.length>0):
res+="\n contexts:" + @contexts.map { |x| x.to_s }.join(" ")
res<<="\n contexts:" + @contexts.map { |x| x.to_s }.join(" ")
end
if (@projects.length>0):
res+="\n projects:" + @projects.map { |x| '['+x.to_s+']' }.join(" ")
res<<="\n projects:" + @projects.map { |x| '['+x.to_s+']' }.join(" ")
end
if (@priority != 0):
res+="\n priority: " + @priority.to_s
res<<="\n priority: " + @priority.to_s
end
if (@notes.length>0):
res+="\n notes : " + @notes.map { |x| '('+x.to_s+')' }.join(" ")
res<<="\n notes : " + @notes.map { |x| '('+x.to_s+')' }.join(" ")
end
if (@contacts.length>0):
res+="\n contacts:" + @contacts.map { |x| x.to_s }.join(" ")
res<<="\n contacts:" + @contacts.map { |x| x.to_s }.join(" ")
end
if (@dates):
res+="\n dates :\n" + @dates.to_detailled_s
res<<="\n dates :\n" + @dates.to_detailled_s
end
if (@tags.length>0):
res+="\n tags :" + '{' + @tags.map{ |x| x.to_s }.join(", ") + '}'
res<<="\n tags :" + '{' + @tags.map{ |x| x.to_s }.join(", ") + '}'
end
return res
end
@ -58,7 +58,7 @@ class Task
# Regular Expressions for that class
@@StdTokenRegExp=Regexp.new(%{(\\w+|"[^"]*")})
# Context
@@ContextsRegExp=Regexp.new(%{ @#{@@StdTokenRegExp.inspect[1..-2]}})
@@ContextsRegExp=Regexp.new(%{(^| )@#{@@StdTokenRegExp.inspect[1..-2]}})
# Project
@@ProjectsRegExp=Regexp.new(%{\\[#{@@StdTokenRegExp.inspect[1..-2]}\\]})
# Contact
@ -70,7 +70,7 @@ class Task
def from_s( raw_input )
@contexts=raw_input.scan(@@ContextsRegExp).map{ |x| x[0] }
@contexts=raw_input.scan(@@ContextsRegExp).map{ |x| x[1] }
@projects=raw_input.scan(@@ProjectsRegExp).map{ |x| x[0] }
@contacts=raw_input.scan(@@ContactsRegExp).map{ |x| x[1] }
@notes =raw_input.scan( @@NotesRegExp).map{ |x| x[0] }

7
taskTime.rb
View file

@ -53,11 +53,10 @@ class TaskTime
str_of_due_date = scanned_input.map{ |x| x[1] }
@start_date = Chronic.parse(str_of_due_date)
raw_input.scan( @@TimeVerbose ).each do |x|
timeValue=Time.parse(x[1])
if ! timeValue:
timeValue=Chronic.parse(x[1])
timeValue=Chronic.parse(x[1])
if timeValue=nil:
timeValue=Time.parse(x[1])
end
puts %{@#{x[0]}=timeValue}
eval %{@#{x[0]}=timeValue}
end

2
todolist.rb
View file

@ -41,7 +41,7 @@ end
if __FILE__ == $0:
todoList=TodoList.new
defaultTaskFile=$0+".tasks"
defaultTaskFile="tasks.ytd"
print defaultTaskFile+"\n"
todoList.load defaultTaskFile
while true: