Merge lp:~seif/globaleaks/demo into lp:globaleaks/demo

[Seif Lotfy]

Clean up code
moved all globaleaks logic into modules

[Arturo (hellais)]

Good cleanup and proper reorganization of GlobaLeaks models and classes. Though still a lot of methods need to be properly implemented

[Arturo (hellais)]

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2011-09-01 15:27:04 +0000
+++ .bzrignore	2011-09-02 13:56:08 +0000
@@ -34,3 +34,4 @@
 material/*
 applications/globaleaks/cache/cache.lock
 applications/globaleaks/cache/cache.shelve
+applications/admin/cache/*
 
=== removed file 'applications/admin/cache/cache.lock'
=== removed file 'applications/admin/cache/cache.shelve'
 Binary files applications/admin/cache/cache.shelve	2011-08-28 08:06:54 +0000 and applications/admin/cache/cache.shelve	1970-01-01 00:00:00 +0000 differ
=== modified file 'applications/globaleaks/models/db.py'
--- applications/globaleaks/models/db.py	2011-09-01 15:27:04 +0000
+++ applications/globaleaks/models/db.py	2011-09-02 13:56:08 +0000
@@ -20,158 +20,8 @@
     db = DAL('sqlite://storage.sqlite')       # if not, use SQLite or other DB
 """
 randomizer = local_import('randomizer')
-
-class DB(DAL):
-    def __init__(self):
-        DAL.__init__(self, 'sqlite://storage.db')
-        self.create_db()
-    
-    def create_db(self):
-        self.define_table('target',
-            Field('name'),
-            Field('category'),
-            Field('desc'),
-            Field('url'),
-            Field('type'),
-            Field('info'),
-            Field('status'),
-            Field('last_sent_tulip'),
-            Field('last_access'),
-            Field('last_download'),
-            Field('tulip_counter'),
-            Field('dowload_counter'),
-            format='%(name)s'
-        )
-            
-        self.define_table('leak',
-            Field('title'),
-            Field('desc'),
-            Field('submission_timestamp'),
-            Field('leaker_id', self.target),
-            Field('spooled', 'boolean', False),
-            format='%(name)s'
-        )
-            
-        self.define_table('comment',
-            Field('leak_id', self.leak),
-            Field('commenter_id', self.target),
-            Field('comment'),
-            format='%(name)s'
-        )
-    
-        self.define_table('material',
-            Field('url', unique=True),
-            Field('leak_id', self.leak),
-            Field('type'),
-            format='%(name)s'
-        )
-            
-        self.define_table('tulip',
-            Field('url', unique=True),
-            Field('leak_id', self.leak),
-            Field('target_id'),
-            Field('allowed_accesses'),
-            Field('accesses_counter'),
-            Field('allowed_downloads'),
-            Field('downloads_counter'),
-            Field('expiry_time'),
-            format='%(name)s'
-            )
-            
-        self.define_table('mail',
-            Field('target'),
-            Field('address'),
-            Field('tulip', unique=True),
-            format='%(name)s'
-        )
-
-db = DB()
-
-
-#XXX remove for non demo functionality
-#
-
-
-####
-# The main GlobaLeaks Class
-###
-
-class Globaleaks(object):
-
-    def __init__(self):
-        pass
-        
-    def create_target(self, name, category, desc, url, type, info):
-        target_id = db.target.insert(name=name, 
-            category=category,
-            desc = desc, url=url, type=type, info=info,
-            status="subscribed" #, last_send_tulip=None,
-            #last_access=None, last_download=None,
-            #tulip_counter=None, download_counter=None
-           )
-        db.commit()
-        return target_id
-        
-    def delete_target (self, id):
-       db(db.target.id==id).delete()
-       pass
-
-    def get_targets(self, target_set):
-        if target_set == "ANY":
-            return db(db.target).select()
-        return db(db.target.category==target_set).select()
-        
-    def get_target(self, target_id):
-        return db(db.target.id==target_id).select().first()
-        
-    def create_leak(self, title, desc, leaker, material, target_set, tags="", number=None):
-        #FIXME insert new tags into DB first
-        
-        #Create leak and insert into DB
-        leak_id = db.leak.insert(title = title, desc = desc,
-            submission_timestamp = time.time(),
-            leaker_id = 0, spooled=False)
-        
-        targets = gl.get_targets(target_set)
-        
-        for t in targets:
-        #Create a tulip for each target and insert into DB
-        #for target_url, allowed_downloads in targets.iteritems():
-            db.tulip.insert(url = randomizer.generate_tulip_url(),
-                leak_id = leak_id,
-                target_id = t.id, #FIXME get target_id_properly
-                allowed_accesses = 0, # inf
-                accesses_counter = 0,
-                allowed_downloads = 5,
-                downloads_counter = 0,
-                expiry_time = 0)
-        
-        db.tulip.insert(url = number,
-                leak_id = leak_id,
-                target_id = 0, #FIXME get target_id_properly
-                allowed_accesses = 0, # inf
-                accesses_counter = 0,
-                allowed_downloads = 5,
-                downloads_counter = 0,
-                expiry_time = 0)
-        
-        db.commit()
-        return leak_id
-        
-    def get_leaks(self):
-        pass
-        
-    def get_leak(self, leak_id):
-        pass
-        
-    def get_tulips(self, leak_id):
-        pass
-        
-    def get_tulip(self, tulip_id):
-        pass
-
-
-
+db = local_import('logic.db').DB()
+gl = local_import('logic.globaleaks').Globaleaks(db)
 
 ####
 # For the time being just use sqlite
@@ -267,4 +117,3 @@
     def formatter(self, value):
         return format(value)
 
-gl = Globaleaks()
 
=== added directory 'applications/globaleaks/modules/logic'
=== added file 'applications/globaleaks/modules/logic/__init__.py'
=== added file 'applications/globaleaks/modules/logic/datamodel.py'
--- applications/globaleaks/modules/logic/datamodel.py	1970-01-01 00:00:00 +0000
+++ applications/globaleaks/modules/logic/datamodel.py	2011-09-02 13:56:08 +0000
@@ -0,0 +1,154 @@
+import time
+
+# web2py's funny way to import "local" modules
+#db = local_import('sql').db
+#randomizer = local_import('randomizer')
+
+randomizer = local_import('randomizer')
+
+class Leak(object):
+    def __init__(self, id):
+        self._id = id
+    
+    def get_id(self):
+        return self._id
+    def set_id(self):
+        print "Error: id is read only"
+        pass
+    id = property(get_id, set_id)
+    
+    def get_title(self):
+        return db.leak[self.id].title
+    def set_title(self, title):
+        db.leak[self.id] = dict(title = title)
+        db.commit()
+    title = property(get_title, set_title)
+    
+    #TODO:implement get/set tags
+    def set_tags(self):
+        pass
+    def get_tags(self):
+        pass
+    tags = property(get_tags, set_tags)
+
+    def get_desc(self):
+        return db.leak[self.id].desc
+    def set_desc(self, desc):
+        db.leak[self.id].desc = desc
+        db.commit()
+    desc = property(get_desc, set_desc)
+    
+    #TODO: implement get/set material
+    def get_material(self):
+        pass
+    def set_material(self, material):
+        pass
+    material = property(get_material, set_material)
+    
+    #TODO: implement get/set targets
+    def get_targets(self):
+        pass
+    def set_targets(self, targets):
+        pass
+    targets = property(get_targets, set_targets)
+    
+    def get_submission_timestamp(self):
+        return db.leak[self.id].submission_timestamp
+    def set_submission_timstamp(self, timestamp):
+        print "Error: submission_timestamp is read only"
+        pass
+    submission_timestamp = property(get_submission_timestamp, set_submission_timstamp)
+    
+    def get_leaker(self):
+        pass
+    def set_leaker(self, leaker):
+        print "Error: leaker is read only"
+        pass
+    leaker = property(get_leaker, set_leaker)
+    
+    def get_tulips(self):
+        for tulip_id in db(db.tulip.leak_id==self._id).select(db.tulip.id):
+            yield Tulip(tulip_id["id"])
+        
+    def set_tulips(self, tulips):
+        print "Error: tulip is read only"
+        pass
+    tulips = property(get_tulips, set_tulips)
+
+
+class Tulip(object):
+    def __init__(self, id=None, url=None):
+        if url:
+            self._id = db(db.tulip.url==url).select().first().id
+        else:
+            self._id = id
+        
+    def get_id(self):
+        return self._id
+    def set_id(self, id):
+        print "Error: id is read only"
+        pass
+    id = property(get_id, set_id)
+    
+    def get_url(self):
+        return db.tulip[self.id].url
+    def set_url(self, url):
+        print "Error: url is read only"
+        pass
+    url = property(get_url, set_url)
+    
+    def get_target(self):
+        return db.tulip[self.id].target_id
+    def set_target(self, target):
+        print "Error: target is read only"
+        pass
+    target = property(get_target, set_target)
+
+    def get_allowed_accesses(self):
+        return db.tulip[self.id].allowed_accesses
+    def set_allowed_accesses(self, allowed_accesses):
+        db.tulip[self.id].update_record(allowed_accessess=allowed_accesses)
+        db.commit()
+    allowed_accesses = property(get_allowed_accesses, set_allowed_accesses)
+
+    def get_accesses_counter(self):
+        return db.tulip[self.id].accesses_counter
+    def set_accesses_counter(self, accesses_counter):
+        db.tulip[self.id].update_record(accesses_counter=accesses_counter)
+        db.commit()
+    accesses_counter = property(get_accesses_counter, set_accesses_counter)
+   
+    def get_allowed_downloads(self):
+        return db.tulip[self.id].allowed_downloads
+    def set_allowed_downloads(self, allowed_downloads):
+        db.tulip[self.id].update_record(allowed_downloads=allowed_downloads)
+        db.commit()
+    allowed_downloads = property(get_allowed_downloads, set_allowed_downloads)
+    
+    def get_downloads_counter(self):
+        return db.tulip[self.id].downloads_counter
+    def set_downloads_counter(self, downloads_counter):
+        db.tulip[self.id].update_record(downloads_counter=downloads_counter)
+        db.commit()
+    downloads_counter = property(get_downloads_counter, set_downloads_counter)
+    
+    def get_leak(self):
+        return Leak(db.tulip[self.id].leak_id)
+    def set_leak(self):
+        print "Error: leak is read only"
+        pass
+    leak = property(get_leak, set_leak)
+    
+
+
+# FIXME move to better location
+class NOT_IMPLEMENTED(object):
+    def __init__(self, a, error_message='This function is not implemented: visit http://blueprints.launchpad.net/globaleaks/+spec/%s'):
+        self.e = error_message % a
+    def __call__(self, value):
+        if value == "off" or not value:
+            return (value, None)
+        return (value, self.e)
+    def formatter(self, value):
+        return format(value)
+
 
=== added file 'applications/globaleaks/modules/logic/db.py'
--- applications/globaleaks/modules/logic/db.py	1970-01-01 00:00:00 +0000
+++ applications/globaleaks/modules/logic/db.py	2011-09-02 13:56:08 +0000
@@ -0,0 +1,67 @@
+from gluon import DAL, Field
+
+class DB(DAL):
+    def __init__(self):
+        DAL.__init__(self, 'sqlite://storage.db')
+        self.create_db()
+    
+    def create_db(self):
+        self.define_table('target',
+            Field('name'),
+            Field('category'),
+            Field('desc'),
+            Field('url'),
+            Field('type'),
+            Field('info'),
+            Field('status'),
+            Field('last_sent_tulip'),
+            Field('last_access'),
+            Field('last_download'),
+            Field('tulip_counter'),
+            Field('dowload_counter'),
+            format='%(name)s'
+        )
+            
+        self.define_table('leak',
+            Field('title'),
+            Field('desc'),
+            Field('submission_timestamp'),
+            Field('leaker_id', self.target),
+            Field('spooled', 'boolean', False),
+            format='%(name)s'
+        )
+            
+        self.define_table('comment',
+            Field('leak_id', self.leak),
+            Field('commenter_id', self.target),
+            Field('comment'),
+            format='%(name)s'
+        )
+    
+        self.define_table('material',
+            Field('url', unique=True),
+            Field('leak_id', self.leak),
+            Field('type'),
+            format='%(name)s'
+        )
+            
+        self.define_table('tulip',
+            Field('url', unique=True),
+            Field('leak_id', self.leak),
+            Field('target_id'),
+            Field('allowed_accesses'),
+            Field('accesses_counter'),
+            Field('allowed_downloads'),
+            Field('downloads_counter'),
+            Field('expiry_time'),
+            format='%(name)s'
+            )
+            
+        self.define_table('mail',
+            Field('target'),
+            Field('address'),
+            Field('tulip', unique=True),
+            format='%(name)s'
+        )
+
+db = DB()
 
=== added file 'applications/globaleaks/modules/logic/globaleaks.py'
--- applications/globaleaks/modules/logic/globaleaks.py	1970-01-01 00:00:00 +0000
+++ applications/globaleaks/modules/logic/globaleaks.py	2011-09-02 13:56:08 +0000
@@ -0,0 +1,77 @@
+import randomizer
+import time
+
+class Globaleaks(object):
+
+    def __init__(self, db):
+        self._db = db
+        
+    def create_target(self, name, category, desc, url, type, info):
+        target_id = self._db.target.insert(name=name, 
+            category=category,
+            desc = desc, url=url, type=type, info=info,
+            status="subscribed" #, last_send_tulip=None,
+            #last_access=None, last_download=None,
+            #tulip_counter=None, download_counter=None
+           )
+        self._db.commit()
+        return target_id
+        
+    def delete_target (self, id):
+       self._db(self._db.target.id==id).delete()
+       pass
+
+    def get_targets(self, target_set):
+        if target_set == "ANY":
+            return self._db(self._db.target).select()
+        return self._db(self._db.target.category==target_set).select()
+        
+    def get_target(self, target_id):
+        return self._db(self._db.target.id==target_id).select().first()
+        
+    def create_leak(self, title, desc, leaker, material, target_set, tags="", number=None):
+        #FIXME insert new tags into DB first
+        
+        #Create leak and insert into DB
+        leak_id = self._db.leak.insert(title = title, desc = desc,
+            submission_timestamp = time.time(),
+            leaker_id = 0, spooled=False)
+        
+        targets = self.get_targets(target_set)
+        
+        for t in targets:
+        #Create a tulip for each target and insert into DB
+        #for target_url, allowed_downloads in targets.iteritems():
+            self._db.tulip.insert(url = randomizer.generate_tulip_url(),
+                leak_id = leak_id,
+                target_id = t.id, #FIXME get target_id_properly
+                allowed_accesses = 0, # inf
+                accesses_counter = 0,
+                allowed_downloads = 5,
+                downloads_counter = 0,
+                expiry_time = 0)
+        
+        self._db.tulip.insert(url = number,
+                leak_id = leak_id,
+                target_id = 0, #FIXME get target_id_properly
+                allowed_accesses = 0, # inf
+                accesses_counter = 0,
+                allowed_downloads = 5,
+                downloads_counter = 0,
+                expiry_time = 0)
+        
+        self._db.commit()
+        return leak_id
+        
+    def get_leaks(self):
+        pass
+        
+    def get_leak(self, leak_id):
+        pass
+        
+    def get_tulips(self, leak_id):
+        pass
+        
+    def get_tulip(self, tulip_id):
+        pass
+