1 |
eva 09/03/22 14:27:46 |
2 |
|
3 |
Added: gnomecatalog-0.3.4.2-dbus.patch |
4 |
Log: |
5 |
Bump to 0.3.4.2. Fix bug #263001. |
6 |
(Portage version: 2.2_rc25/cvs/Linux x86_64) |
7 |
|
8 |
Revision Changes Path |
9 |
1.1 app-misc/gnomecatalog/files/gnomecatalog-0.3.4.2-dbus.patch |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/gnomecatalog/files/gnomecatalog-0.3.4.2-dbus.patch?rev=1.1&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/gnomecatalog/files/gnomecatalog-0.3.4.2-dbus.patch?rev=1.1&content-type=text/plain |
13 |
|
14 |
Index: gnomecatalog-0.3.4.2-dbus.patch |
15 |
=================================================================== |
16 |
# https://sourceforge.net/tracker2/?func=detail&aid=2622610&group_id=118573&atid=681722 |
17 |
--- a/gnomecatalog/data.py (revision 1) |
18 |
+++ b/gnomecatalog/data.py (working copy) |
19 |
@@ -33,32 +33,34 @@ |
20 |
|
21 |
""" Leemos el disco y lo insertamos en la base de datos """ |
22 |
def import_disk(self): |
23 |
- path = self.config.get("source") |
24 |
+ |
25 |
+ for path in utils.get_path(): |
26 |
+ #~ path = self.config.get("source") |
27 |
|
28 |
- database = storage.Sqlite(self.opened_database, self.app, True) |
29 |
+ database = storage.Sqlite(self.opened_database, self.app, True) |
30 |
|
31 |
- if self.config.get("thumbnails") == "True": |
32 |
- if not os.path.exists(database.database + "_thumbs"): |
33 |
- os.mkdir(database.database + "_thumbs") |
34 |
+ if self.config.get("thumbnails") == "True": |
35 |
+ if not os.path.exists(database.database + "_thumbs"): |
36 |
+ os.mkdir(database.database + "_thumbs") |
37 |
|
38 |
- """Importamos un nuevo disco""" |
39 |
- if not utils.is_mounted(path): |
40 |
- self.__path = path |
41 |
- self.__progress = self.app.progress_bar |
42 |
- utils.mount(path, self._mount_callback) |
43 |
+ """Importamos un nuevo disco""" |
44 |
+ if not utils.is_mounted(path): |
45 |
+ self.__path = path |
46 |
+ self.__progress = self.app.progress_bar |
47 |
+ utils.mount(path, self._mount_callback) |
48 |
|
49 |
- disk = self.reader.read(path, self.app.progress_bar) |
50 |
+ disk = self.reader.read(path, self.app.progress_bar) |
51 |
|
52 |
- if disk: |
53 |
- """ ahora insertamos los datos en la base de datos. """ |
54 |
- disk = database.insert_disk(disk) |
55 |
- if self.config.get("eject") == "True": utils.eject(path) |
56 |
- self.app.set_guardar_state(True) |
57 |
-# self.load_data() |
58 |
-# self.treeDisk.select(disk) |
59 |
- # self.show_files_from_selected() |
60 |
- database.close() |
61 |
- return disk |
62 |
+ if disk: |
63 |
+ """ ahora insertamos los datos en la base de datos. """ |
64 |
+ disk = database.insert_disk(disk) |
65 |
+ if self.config.get("eject") == "True": utils.eject(path) |
66 |
+ self.app.set_guardar_state(True) |
67 |
+ # self.load_data() |
68 |
+ # self.treeDisk.select(disk) |
69 |
+ # self.show_files_from_selected() |
70 |
+ database.close() |
71 |
+ return disk |
72 |
|
73 |
|
74 |
""" Carga los discos de a base de datos en el treeview tree """ |
75 |
--- a/gnomecatalog/utils.py (revision 1) |
76 |
+++ b/gnomecatalog/utils.py (working copy) |
77 |
@@ -1,6 +1,28 @@ |
78 |
import os, commands, time |
79 |
import gnomevfs, gtk |
80 |
+import dbus, dbus.glib, sys, urllib |
81 |
|
82 |
+ |
83 |
+def get_path(): |
84 |
+ path = [] |
85 |
+ bus = dbus.SystemBus() |
86 |
+ hal_obj = bus.get_object ('org.freedesktop.Hal', '/org/freedesktop/Hal/Manager') |
87 |
+ hal = dbus.Interface (hal_obj, 'org.freedesktop.Hal.Manager') |
88 |
+ udis = hal.FindDeviceByCapability ('storage') |
89 |
+ for udi in udis: |
90 |
+ dev_obj = bus.get_object ('org.freedesktop.Hal', udi) |
91 |
+ dev = dbus.Interface (dev_obj, 'org.freedesktop.Hal.Device') |
92 |
+ if (dev.GetProperty ('storage.removable')): |
93 |
+ block = dev.GetProperty ('block.device') |
94 |
+ f = open ('/etc/mtab') |
95 |
+ for line in f.readlines(): |
96 |
+ if (line.find (block) == 0): |
97 |
+ mount = line.split() |
98 |
+ path.append(mount[1].replace('\\040',' ')) |
99 |
+ f.close() |
100 |
+ return path |
101 |
+ |
102 |
+ |
103 |
def locate_file(path, type = "icons"): |
104 |
prefixes = ['', 'usr/', 'usr/local/'] |
105 |
if type == "glade": |
106 |
--- a/gnomecatalog/ui/app.py (revision 1) |
107 |
+++ b/gnomecatalog/ui/app.py (working copy) |
108 |
@@ -162,14 +162,6 @@ |
109 |
self.import_thread.start() |
110 |
gobject.timeout_add(1000, self.wait_import_cb) |
111 |
|
112 |
-# t2 = threading.Thread(target=self.wait_import_cb) |
113 |
-# t2.setDaemon(True) |
114 |
-# t2.start() |
115 |
- |
116 |
-# gobject.idle_add(self.wait_import_cb, t) |
117 |
- |
118 |
- #dialogs.addDisk(self.data).loadDisk() |
119 |
- |
120 |
def wait_import_cb(self): |
121 |
if not self.import_thread.isAlive(): |
122 |
self.hbox_import.hide() |