mirror of
https://github.com/gryf/pygtktalog.git
synced 2025-12-17 11:30:19 +01:00
* Added column with parent id to TreeStore. Now it can be possible to
activate items in context menu for specified files.
This commit is contained in:
@@ -8,7 +8,7 @@ try:
|
|||||||
import threading as _threading
|
import threading as _threading
|
||||||
except ImportError:
|
except ImportError:
|
||||||
if __debug__:
|
if __debug__:
|
||||||
print "import exception: _threading"
|
print "m_main.py: import exception: _threading"
|
||||||
import dummy_threading as _threading
|
import dummy_threading as _threading
|
||||||
|
|
||||||
from pysqlite2 import dbapi2 as sqlite
|
from pysqlite2 import dbapi2 as sqlite
|
||||||
@@ -37,7 +37,7 @@ class MainModel(ModelMT):
|
|||||||
db_cursor = None
|
db_cursor = None
|
||||||
abort = False
|
abort = False
|
||||||
# Drzewo katalogów: id, nazwa
|
# Drzewo katalogów: id, nazwa
|
||||||
discsTree = gtk.TreeStore(gobject.TYPE_INT, gobject.TYPE_STRING,str)
|
discsTree = gtk.TreeStore(gobject.TYPE_INT, gobject.TYPE_STRING, str, gobject.TYPE_INT)
|
||||||
# Lista plików wskazanego katalogu: child_id (?), filename, size, date, typ, ikonka
|
# Lista plików wskazanego katalogu: child_id (?), filename, size, date, typ, ikonka
|
||||||
filesList = gtk.ListStore(gobject.TYPE_INT, gobject.TYPE_STRING, gobject.TYPE_UINT64, gobject.TYPE_STRING, gobject.TYPE_INT, gobject.TYPE_STRING, str)
|
filesList = gtk.ListStore(gobject.TYPE_INT, gobject.TYPE_STRING, gobject.TYPE_UINT64, gobject.TYPE_STRING, gobject.TYPE_INT, gobject.TYPE_STRING, str)
|
||||||
|
|
||||||
@@ -57,13 +57,13 @@ class MainModel(ModelMT):
|
|||||||
os.unlink(self.internal_filename)
|
os.unlink(self.internal_filename)
|
||||||
except:
|
except:
|
||||||
if __debug__:
|
if __debug__:
|
||||||
print "cleanup()", self.internal_filename
|
print "m_main.py: cleanup()", self.internal_filename
|
||||||
pass
|
pass
|
||||||
try:
|
try:
|
||||||
os.unlink(self.internal_filename + '-journal')
|
os.unlink(self.internal_filename + '-journal')
|
||||||
except:
|
except:
|
||||||
if __debug__:
|
if __debug__:
|
||||||
print "cleanup()", self.internal_filename+'-journal'
|
print "m_main.py: cleanup()", self.internal_filename+'-journal'
|
||||||
pass
|
pass
|
||||||
return
|
return
|
||||||
|
|
||||||
@@ -100,15 +100,23 @@ class MainModel(ModelMT):
|
|||||||
self.__create_internal_filename()
|
self.__create_internal_filename()
|
||||||
self.filename = filename
|
self.filename = filename
|
||||||
|
|
||||||
|
try:
|
||||||
source = bz2.BZ2File(filename, 'rb')
|
source = bz2.BZ2File(filename, 'rb')
|
||||||
|
except:
|
||||||
|
print "%s: file cannot be read!" % self.filename
|
||||||
|
self.filename = None
|
||||||
|
self.internal_filename = None
|
||||||
|
return
|
||||||
|
|
||||||
destination = open(self.internal_filename, 'wb')
|
destination = open(self.internal_filename, 'wb')
|
||||||
while True:
|
while True:
|
||||||
try:
|
try:
|
||||||
data = source.read(1024000)
|
data = source.read(1024000)
|
||||||
except:
|
except:
|
||||||
# smth went wrong
|
# smth went wrong
|
||||||
|
print "%s: Wrong database format!" % self.filename
|
||||||
if __debug__:
|
if __debug__:
|
||||||
print "something goes bad"
|
print "m_main.py: open() something goes bad"
|
||||||
self.filename = None
|
self.filename = None
|
||||||
self.internal_filename = None
|
self.internal_filename = None
|
||||||
try:
|
try:
|
||||||
@@ -128,6 +136,7 @@ class MainModel(ModelMT):
|
|||||||
|
|
||||||
self.__connect_to_db()
|
self.__connect_to_db()
|
||||||
self.__fetch_db_into_treestore()
|
self.__fetch_db_into_treestore()
|
||||||
|
self.config.add_recent(filename)
|
||||||
|
|
||||||
return True
|
return True
|
||||||
|
|
||||||
@@ -355,19 +364,19 @@ class MainModel(ModelMT):
|
|||||||
|
|
||||||
if __recurse(1, self.label, self.path, 0, 0, self.DIR) == -1:
|
if __recurse(1, self.label, self.path, 0, 0, self.DIR) == -1:
|
||||||
if __debug__:
|
if __debug__:
|
||||||
print "__scan: __recurse returns -1"
|
print "m_main.py: __scan() __recurse() returns -1"
|
||||||
db_cursor.close()
|
db_cursor.close()
|
||||||
db_connection.rollback()
|
db_connection.rollback()
|
||||||
else:
|
else:
|
||||||
if __debug__:
|
if __debug__:
|
||||||
print "__scan: __recurse returns something else"
|
print "m_main.py: __scan() __recurse() returns something else"
|
||||||
db_cursor.close()
|
db_cursor.close()
|
||||||
db_connection.commit()
|
db_connection.commit()
|
||||||
self.__fetch_db_into_treestore()
|
self.__fetch_db_into_treestore()
|
||||||
db_connection.close()
|
db_connection.close()
|
||||||
|
|
||||||
if __debug__:
|
if __debug__:
|
||||||
print "scan time: ", (datetime.datetime.now() - timestamp)
|
print "m_main.py: __scan() time: ", (datetime.datetime.now() - timestamp)
|
||||||
|
|
||||||
self.unsaved_project = True
|
self.unsaved_project = True
|
||||||
self.busy = False
|
self.busy = False
|
||||||
@@ -387,9 +396,16 @@ class MainModel(ModelMT):
|
|||||||
db_cursor = db_connection.cursor()
|
db_cursor = db_connection.cursor()
|
||||||
|
|
||||||
# fetch all the directories
|
# fetch all the directories
|
||||||
|
try:
|
||||||
db_cursor.execute("SELECT id, parent_id, filename FROM files WHERE type=1 ORDER BY parent_id, filename")
|
db_cursor.execute("SELECT id, parent_id, filename FROM files WHERE type=1 ORDER BY parent_id, filename")
|
||||||
data = db_cursor.fetchall()
|
data = db_cursor.fetchall()
|
||||||
print data
|
except:
|
||||||
|
# cleanup
|
||||||
|
self.cleanup()
|
||||||
|
self.filename = None
|
||||||
|
self.internal_filename = None
|
||||||
|
print "%s: Wrong database format!" % self.filename
|
||||||
|
return
|
||||||
|
|
||||||
def get_children(parent_id = 1, iterator = None):
|
def get_children(parent_id = 1, iterator = None):
|
||||||
"""fetch all children and place them in model"""
|
"""fetch all children and place them in model"""
|
||||||
@@ -398,6 +414,7 @@ class MainModel(ModelMT):
|
|||||||
myiter = self.discsTree.insert_before(iterator,None)
|
myiter = self.discsTree.insert_before(iterator,None)
|
||||||
self.discsTree.set_value(myiter,0,row[0])
|
self.discsTree.set_value(myiter,0,row[0])
|
||||||
self.discsTree.set_value(myiter,1,row[2])
|
self.discsTree.set_value(myiter,1,row[2])
|
||||||
|
self.discsTree.set_value(myiter,3,row[1])
|
||||||
get_children(row[0], myiter)
|
get_children(row[0], myiter)
|
||||||
|
|
||||||
# isroot?
|
# isroot?
|
||||||
@@ -412,7 +429,7 @@ class MainModel(ModelMT):
|
|||||||
# launch scanning.
|
# launch scanning.
|
||||||
get_children()
|
get_children()
|
||||||
if __debug__:
|
if __debug__:
|
||||||
print "tree generation time: ", (datetime.datetime.now() - start_date)
|
print "m_main.py: __fetch_db_into_treestore() tree generation time: ", (datetime.datetime.now() - start_date)
|
||||||
db_connection.close()
|
db_connection.close()
|
||||||
return
|
return
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user