[pkg-fso-commits] [SCM] FSO frameworkd Debian packaging branch, debian, updated. upstream/0.9.5.5-717-g0f98819
Sebastian Krzyszkowiak
seba.dos1 at gmail.com
Sat Aug 6 08:17:58 UTC 2011
The following commit has been merged in the debian branch:
commit 77f434ea58ccd67ea863172426eec580119e7457
Author: Sebastian Krzyszkowiak <seba.dos1 at gmail.com>
Date: Fri Aug 21 00:00:28 2009 +0200
opimd: Todos: rename to Tasks
diff --git a/conf/example/frameworkd.conf b/conf/example/frameworkd.conf
index 85ffe9b..efd0bbe 100644
--- a/conf/example/frameworkd.conf
+++ b/conf/example/frameworkd.conf
@@ -136,7 +136,7 @@ messages_default_backend = SIM-Messages-FSO
calls_default_backend = SQLite-Calls
dates_default_backend = SQLite-Dates
notes_default_backend = SQLite-Notes
-todos_default_backend = SQLite-Todos
+tasks_default_backend = SQLite-Tasks
messages_default_folder = Unfiled
messages_trash_folder = Trash
sim_messages_default_folder = SMS
diff --git a/framework/subsystems/opimd/opimd.py b/framework/subsystems/opimd/opimd.py
index abd2ea0..8c0a66e 100644
--- a/framework/subsystems/opimd/opimd.py
+++ b/framework/subsystems/opimd/opimd.py
@@ -47,7 +47,7 @@ import pimd_messages
import pimd_calls
import pimd_dates
import pimd_notes
-import pimd_todos
+import pimd_tasks
# Same thing for the backend modules
import pimb_sim_contacts_fso
import pimb_sim_messages_fso
@@ -57,7 +57,7 @@ import pimb_sqlite_messages
import pimb_sqlite_calls
import pimb_sqlite_dates
import pimb_sqlite_notes
-import pimb_sqlite_todos
+import pimb_sqlite_tasks
import pimb_ogsmd_calls
from backend_manager import BackendManager
diff --git a/framework/subsystems/opimd/pimb_sqlite_todos.py b/framework/subsystems/opimd/pimb_sqlite_tasks.py
similarity index 74%
rename from framework/subsystems/opimd/pimb_sqlite_todos.py
rename to framework/subsystems/opimd/pimb_sqlite_tasks.py
index 3589633..1709f46 100644
--- a/framework/subsystems/opimd/pimb_sqlite_todos.py
+++ b/framework/subsystems/opimd/pimb_sqlite_tasks.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
#
# Openmoko PIM Daemon
-# SQLite-Todos Backend Plugin
+# SQLite-Tasks Backend Plugin
#
# http://openmoko.org/
#
@@ -23,7 +23,7 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
-"""opimd SQLite-Todos Backend Plugin"""
+"""opimd SQLite-Tasks Backend Plugin"""
import os
import sqlite3
@@ -40,15 +40,15 @@ import framework.patterns.tasklet as tasklet
from framework.config import config, rootdir
rootdir = os.path.join( rootdir, 'opim' )
-_DOMAINS = ('Todos', )
-_SQLITE_FILE_NAME = os.path.join(rootdir,'sqlite-todos.db')
+_DOMAINS = ('Tasks', )
+_SQLITE_FILE_NAME = os.path.join(rootdir,'sqlite-tasks.db')
#----------------------------------------------------------------------------#
-class SQLiteTodosBackend(Backend):
+class SQLiteTasksBackend(Backend):
#----------------------------------------------------------------------------#
- name = 'SQLite-Todos'
+ name = 'SQLite-Tasks'
properties = [PIMB_CAN_ADD_ENTRY, PIMB_CAN_DEL_ENTRY, PIMB_CAN_UPD_ENTRY, PIMB_CAN_UPD_ENTRY_WITH_NEW_FIELD]
_domain_handlers = None # Map of the domain handler objects we support
@@ -56,13 +56,13 @@ class SQLiteTodosBackend(Backend):
#----------------------------------------------------------------------------#
def __init__(self):
- super(SQLiteTodosBackend, self).__init__()
+ super(SQLiteTasksBackend, self).__init__()
self._domain_handlers = {}
self._entry_ids = []
try:
self.con = sqlite3.connect(_SQLITE_FILE_NAME)
cur = self.con.cursor()
- cur.execute("""CREATE TABLE IF NOT EXISTS todos (
+ cur.execute("""CREATE TABLE IF NOT EXISTS tasks (
id INTEGER PRIMARY KEY,
Timestamp TEXT,
Timezone TEXT,
@@ -71,13 +71,13 @@ class SQLiteTodosBackend(Backend):
Started INTEGER,
Finished INTEGER);""")
- cur.execute("CREATE TABLE IF NOT EXISTS todo_values (id INTEGER PRIMARY KEY, todoId INTEGER, Field TEXT, Value TEXT)")
+ cur.execute("CREATE TABLE IF NOT EXISTS task_values (id INTEGER PRIMARY KEY, taskId INTEGER, Field TEXT, Value TEXT)")
- cur.execute("CREATE INDEX IF NOT EXISTS todos_id_idx ON todos (id)")
- cur.execute("CREATE INDEX IF NOT EXISTS todos_Title_idx ON todos (Title)")
- cur.execute("CREATE INDEX IF NOT EXISTS todos_Content_idx ON todos (Content)")
+ cur.execute("CREATE INDEX IF NOT EXISTS tasks_id_idx ON tasks (id)")
+ cur.execute("CREATE INDEX IF NOT EXISTS tasks_Title_idx ON tasks (Title)")
+ cur.execute("CREATE INDEX IF NOT EXISTS tasks_Content_idx ON tasks (Content)")
- cur.execute("CREATE INDEX IF NOT EXISTS todo_values_todosId_idx ON todo_values (todoId)")
+ cur.execute("CREATE INDEX IF NOT EXISTS task_values_tasksId_idx ON task_values (taskId)")
self.con.text_factory = sqlite3.OptimizedUnicode
self.con.commit()
@@ -113,10 +113,10 @@ class SQLiteTodosBackend(Backend):
keys = {0:'_backend_entry_id', 1:'Timestamp', 2:'Timezone', 3:'Title', 4:'Content', 5:'Started', 6:'Finished'}
cur = self.con.cursor()
try:
- cur.execute('SELECT * FROM todos')
+ cur.execute('SELECT * FROM tasks')
lines = cur.fetchall()
except:
- logger.error("%s: Could not read from database (table todos)! Possible reason is old, uncompatible table structure. If you don't have important data, please remove %s file.", self.name, _SQLITE_FILE_NAME)
+ logger.error("%s: Could not read from database (table tasks)! Possible reason is old, uncompatible table structure. If you don't have important data, please remove %s file.", self.name, _SQLITE_FILE_NAME)
raise OperationalError
for line in lines:
@@ -124,7 +124,7 @@ class SQLiteTodosBackend(Backend):
for key in keys:
entry[keys[key]] = line[key]
try:
- cur.execute('SELECT Field, Value FROM todo_values WHERE todoId=?',(line[0],))
+ cur.execute('SELECT Field, Value FROM task_values WHERE taskId=?',(line[0],))
for pair in cur:
if entry.has_key(pair[0]):
if type(entry[pair[0]]) == list:
@@ -134,10 +134,10 @@ class SQLiteTodosBackend(Backend):
else:
entry[pair[0]]=pair[1]
except:
- logger.error("%s: Could not read from database (table todo_values)! Possible reason is old, uncompatible table structure. If you don't have important data, please remove %s file.", self.name, _SQLITE_FILE_NAME)
+ logger.error("%s: Could not read from database (table task_values)! Possible reason is old, uncompatible table structure. If you don't have important data, please remove %s file.", self.name, _SQLITE_FILE_NAME)
raise OperationalError
- entry_id = self._domain_handlers['Todos'].register_entry(self, entry)
+ entry_id = self._domain_handlers['Tasks'].register_entry(self, entry)
self._entry_ids.append(entry_id)
cur.close()
@@ -147,9 +147,9 @@ class SQLiteTodosBackend(Backend):
for (field_name, field_value) in entry_data:
if field_name=='_backend_entry_id':
entryId=field_value
- # cur.execute('UPDATE todos SET deleted=1 WHERE id=?',(entryId,))
- cur.execute('DELETE FROM todos WHERE id=?',(entryId,))
- cur.execute('DELETE FROM todo_values WHERE todoId=?',(entryId,))
+ # cur.execute('UPDATE tasks SET deleted=1 WHERE id=?',(entryId,))
+ cur.execute('DELETE FROM tasks WHERE id=?',(entryId,))
+ cur.execute('DELETE FROM task_values WHERE taskId=?',(entryId,))
self.con.commit()
cur.close()
@@ -161,22 +161,22 @@ class SQLiteTodosBackend(Backend):
entryId=value
for (field, value) in entry_data:
if field in reqfields:
- cur.execute('UPDATE todos SET '+field+'=? WHERE id=?',(value,entryId))
+ cur.execute('UPDATE tasks SET '+field+'=? WHERE id=?',(value,entryId))
elif not field.startswith('_'):
- cur.execute('SELECT id FROM todo_values WHERE todoId=? AND field=?',(entryId,field))
+ cur.execute('SELECT id FROM task_values WHERE taskId=? AND field=?',(entryId,field))
if cur.fetchone() == None:
- cur.execute('INSERT INTO todo_values (field,value,todoId) VALUES (?,?,?)',(field,value,entryId))
+ cur.execute('INSERT INTO task_values (field,value,taskId) VALUES (?,?,?)',(field,value,entryId))
else:
- cur.execute('UPDATE todo_values SET value=? WHERE field=? AND todoId=?',(value,field,entryId))
- # cur.execute('UPDATE todos SET updated=1 WHERE id=?',(entryId,))
+ cur.execute('UPDATE task_values SET value=? WHERE field=? AND taskId=?',(value,field,entryId))
+ # cur.execute('UPDATE tasks SET updated=1 WHERE id=?',(entryId,))
self.con.commit()
cur.close()
def add_entry(self, entry_data):
- todo_id = self.add_todo_to_db(entry_data)
- return todo_id
+ task_id = self.add_task_to_db(entry_data)
+ return task_id
- def add_todo_to_db(self, entry_data):
+ def add_task_to_db(self, entry_data):
reqfields = ['Timestamp', 'Timezone', 'Title', 'Content', 'Started', 'Finished']
reqIntFields = ['Started', 'Finished']
@@ -188,20 +188,20 @@ class SQLiteTodosBackend(Backend):
entry_data[field]=0
cur = self.con.cursor()
- cur.execute('INSERT INTO todos (Timestamp, Timezone, Title, Content, Started, Finished) VALUES (?,?,?,?,?,?)',(entry_data['Timestamp'], entry_data['Timezone'], entry_data['Title'], entry_data['Content'], entry_data['Started'], entry_data['Finished']))
+ cur.execute('INSERT INTO tasks (Timestamp, Timezone, Title, Content, Started, Finished) VALUES (?,?,?,?,?,?)',(entry_data['Timestamp'], entry_data['Timezone'], entry_data['Title'], entry_data['Content'], entry_data['Started'], entry_data['Finished']))
cid = cur.lastrowid
for field in entry_data:
if not field in reqfields and not field in reqIntFields:
if type(entry_data[field]) == Array or type(entry_data[field]) == list:
for value in entry_data[field]:
- cur.execute('INSERT INTO todo_values (todoId, Field, Value) VALUES (?,?,?)',(cid, field, value))
+ cur.execute('INSERT INTO task_values (taskId, Field, Value) VALUES (?,?,?)',(cid, field, value))
else:
- cur.execute('INSERT INTO todo_values (todoId, Field, Value) VALUES (?,?,?)',(cid, field, entry_data[field]))
+ cur.execute('INSERT INTO task_values (taskId, Field, Value) VALUES (?,?,?)',(cid, field, entry_data[field]))
self.con.commit()
cur.close()
entry_data['_backend_entry_id']=cid
- todo_id = self._domain_handlers['Todos'].register_entry(self, entry_data)
- return todo_id
+ task_id = self._domain_handlers['Tasks'].register_entry(self, entry_data)
+ return task_id
diff --git a/framework/subsystems/opimd/pimd_todos.py b/framework/subsystems/opimd/pimd_tasks.py
similarity index 90%
rename from framework/subsystems/opimd/pimd_todos.py
rename to framework/subsystems/opimd/pimd_tasks.py
index 53fba09..467fe61 100644
--- a/framework/subsystems/opimd/pimd_todos.py
+++ b/framework/subsystems/opimd/pimd_tasks.py
@@ -9,9 +9,9 @@ Open PIM Daemon
(C) 2009 Sebastian Krzyszkowiak <seba.dos1 at gmail.com>
GPLv2 or later
-Todos Domain Plugin
+Tasks Domain Plugin
-Establishes the 'Todos' PIM domain and handles all related requests
+Establishes the 'Tasks' PIM domain and handles all related requests
"""
from dbus.service import FallbackObject as DBusFBObject
@@ -38,22 +38,22 @@ from pimd_generic import GenericEntry, GenericDomain
#----------------------------------------------------------------------------#
-_DOMAIN_NAME = "Todos"
+_DOMAIN_NAME = "Tasks"
_DBUS_PATH_NOTES = DBUS_PATH_BASE_FSO + '/' + _DOMAIN_NAME
_DIN_NOTES_BASE = DIN_BASE_FSO
_DBUS_PATH_QUERIES = _DBUS_PATH_NOTES + '/Queries'
-_DIN_NOTES = _DIN_NOTES_BASE + '.' + 'Todos'
-_DIN_ENTRY = _DIN_NOTES_BASE + '.' + 'Todo'
-_DIN_QUERY = _DIN_NOTES_BASE + '.' + 'TodoQuery'
+_DIN_NOTES = _DIN_NOTES_BASE + '.' + 'Tasks'
+_DIN_ENTRY = _DIN_NOTES_BASE + '.' + 'Task'
+_DIN_QUERY = _DIN_NOTES_BASE + '.' + 'TaskQuery'
#----------------------------------------------------------------------------#
-class Todo(GenericEntry):
+class Task(GenericEntry):
#----------------------------------------------------------------------------#
- """Represents one single todo with all the data fields it consists of.
+ """Represents one single task with all the data fields it consists of.
_fields[n] = [field_name, field_value, value_used_for_comparison, source]
@@ -76,7 +76,7 @@ class QueryManager(DBusFBObject):
_entries = None
_next_query_id = None
- # Todo: _queries must be a dict so we can remove queries without messing up query IDs
+ # Note: _queries must be a dict so we can remove queries without messing up query IDs
def __init__(self, entries):
"""Creates a new QueryManager instance
@@ -115,7 +115,7 @@ class QueryManager(DBusFBObject):
def check_new_entry(self, entry_id):
"""Checks whether a newly added entry matches one or more queries so they can signal clients
- @param entry_id Todo ID of the todo that was added"""
+ @param entry_id Task ID of the task that was added"""
for (query_id, query_handler) in self._queries.items():
if query_handler.check_new_entry(entry_id):
@@ -131,10 +131,10 @@ class QueryManager(DBusFBObject):
raise InvalidQueryID( "Existing query IDs: %s" % self._queries.keys() )
def EntryAdded(self, path, rel_path=None):
- self.TodoAdded(path, rel_path=rel_path)
+ self.TaskAdded(path, rel_path=rel_path)
@dbus_signal(_DIN_QUERY, "s", rel_path_keyword="rel_path")
- def TodoAdded(self, path, rel_path=None):
+ def TaskAdded(self, path, rel_path=None):
pass
@dbus_method(_DIN_QUERY, "", "i", rel_path_keyword="rel_path")
@@ -162,7 +162,7 @@ class QueryManager(DBusFBObject):
@dbus_method(_DIN_QUERY, "", "s", rel_path_keyword="rel_path", sender_keyword="sender")
- def GetTodoPath(self, rel_path, sender):
+ def GetTaskPath(self, rel_path, sender):
num_id = int(rel_path[1:])
self.check_query_id_ok( num_id )
@@ -196,7 +196,7 @@ class QueryManager(DBusFBObject):
self._queries.__delitem__(num_id)
#----------------------------------------------------------------------------#
-class TodoDomain(Domain, GenericDomain):
+class TaskDomain(Domain, GenericDomain):
#----------------------------------------------------------------------------#
name = _DOMAIN_NAME
@@ -207,9 +207,9 @@ class TodoDomain(Domain, GenericDomain):
Entry = None
def __init__(self):
- """Creates a new TodoDomain instance"""
+ """Creates a new TaskDomain instance"""
- self.Entry = Todo
+ self.Entry = Task
self._backends = {}
self._entries = []
@@ -229,10 +229,10 @@ class TodoDomain(Domain, GenericDomain):
#---------------------------------------------------------------------#
def NewEntry(self, path):
- self.NewTodo(path)
+ self.NewTask(path)
@dbus_signal(_DIN_NOTES, "s")
- def NewTodo(self, path):
+ def NewTask(self, path):
pass
@dbus_method(_DIN_NOTES, "a{sv}", "s")
@@ -290,11 +290,11 @@ class TodoDomain(Domain, GenericDomain):
return self.get_multiple_fields(num_id, field_list)
@dbus_signal(_DIN_ENTRY, "", rel_path_keyword="rel_path")
- def TodoDeleted(self, rel_path=None):
+ def TaskDeleted(self, rel_path=None):
pass
def EntryDeleted(self, rel_path=None):
- self.TodoDeleted(rel_path=rel_path)
+ self.TaskDeleted(rel_path=rel_path)
@dbus_method(_DIN_ENTRY, "", "", rel_path_keyword="rel_path")
def Delete(self, rel_path):
@@ -303,10 +303,10 @@ class TodoDomain(Domain, GenericDomain):
self.delete(num_id)
def EntryUpdated(self, data, rel_path=None):
- self.TodoUpdated(data, rel_path=rel_path)
+ self.TaskUpdated(data, rel_path=rel_path)
@dbus_signal(_DIN_ENTRY, "a{sv}", rel_path_keyword="rel_path")
- def TodoUpdated(self, data, rel_path=None):
+ def TaskUpdated(self, data, rel_path=None):
pass
@dbus_method(_DIN_ENTRY, "a{sv}", "", rel_path_keyword="rel_path")
--
FSO frameworkd Debian packaging
More information about the pkg-fso-commits
mailing list