diff options
| author | jvoisin | 2011-12-24 00:43:20 +0100 |
|---|---|---|
| committer | jvoisin | 2011-12-24 00:43:20 +0100 |
| commit | 72980c74513f20b7b5f3e42a5bf1c8c50dda17d9 (patch) | |
| tree | 1e195a21700bc8dfdc77a0189b6f88c891a907f8 | |
| parent | 82776ce3beb8a3a7a4465832980e846498d1e542 (diff) | |
Revert a stupid idea
| -rwxr-xr-x | mat-cli | 2 | ||||
| -rwxr-xr-x | mat-gui | 11 | ||||
| -rw-r--r-- | mat/mat.py | 10 |
3 files changed, 12 insertions, 11 deletions
| @@ -149,7 +149,7 @@ def main(): | |||
| 149 | for filename in filenames: | 149 | for filename in filenames: |
| 150 | class_file = mat.create_class_file(filename, args.backup, | 150 | class_file = mat.create_class_file(filename, args.backup, |
| 151 | args.add2archive) | 151 | args.add2archive) |
| 152 | if class_file is not False: | 152 | if class_file is not None: |
| 153 | func(class_file, filename, args.force) | 153 | func(class_file, filename, args.force) |
| 154 | else: | 154 | else: |
| 155 | print('Unable to process %s' % filename) | 155 | print('Unable to process %s' % filename) |
| @@ -34,7 +34,7 @@ class CFile(object): | |||
| 34 | try: | 34 | try: |
| 35 | self.file = mat.create_class_file(filename, backup, add2archive) | 35 | self.file = mat.create_class_file(filename, backup, add2archive) |
| 36 | except: | 36 | except: |
| 37 | self.file = False | 37 | self.file = None |
| 38 | 38 | ||
| 39 | 39 | ||
| 40 | class GUI: | 40 | class GUI: |
| @@ -73,7 +73,8 @@ class GUI: | |||
| 73 | self.treeview.set_search_column(1) # filename column is searchable | 73 | self.treeview.set_search_column(1) # filename column is searchable |
| 74 | self.treeview.set_rules_hint(True) # alternate colors for rows | 74 | self.treeview.set_rules_hint(True) # alternate colors for rows |
| 75 | self.treeview.set_rubber_banding(True) # mouse selection | 75 | self.treeview.set_rubber_banding(True) # mouse selection |
| 76 | self.treeview.connect('drag_data_received', self.__on_drag_data_received) | 76 | self.treeview.connect('drag_data_received', |
| 77 | self.__on_drag_data_received) | ||
| 77 | self.treeview.drag_dest_set(gtk.DEST_DEFAULT_MOTION | | 78 | self.treeview.drag_dest_set(gtk.DEST_DEFAULT_MOTION | |
| 78 | gtk.DEST_DEFAULT_HIGHLIGHT | gtk.DEST_DEFAULT_DROP, | 79 | gtk.DEST_DEFAULT_HIGHLIGHT | gtk.DEST_DEFAULT_DROP, |
| 79 | [('text/uri-list', 0, 80)], gtk.gdk.ACTION_COPY) | 80 | [('text/uri-list', 0, 80)], gtk.gdk.ACTION_COPY) |
| @@ -191,8 +192,8 @@ data loss, but clean more efficiently')) | |||
| 191 | self.__create_menu_item(_('Clear the filelist'), | 192 | self.__create_menu_item(_('Clear the filelist'), |
| 192 | lambda x: self.liststore.clear(), edit_menu, gtk.STOCK_REMOVE, | 193 | lambda x: self.liststore.clear(), edit_menu, gtk.STOCK_REMOVE, |
| 193 | '<Control>L') | 194 | '<Control>L') |
| 194 | self.__create_menu_item(_('Preferences'), self.__preferences, edit_menu, | 195 | self.__create_menu_item(_('Preferences'), self.__preferences, |
| 195 | gtk.STOCK_PREFERENCES, '<Control>P') | 196 | edit_menu, gtk.STOCK_PREFERENCES, '<Control>P') |
| 196 | 197 | ||
| 197 | process_menu = self.__create_sub_menu(_('Process'), menubar) | 198 | process_menu = self.__create_sub_menu(_('Process'), menubar) |
| 198 | item = gtk.ImageMenuItem() | 199 | item = gtk.ImageMenuItem() |
| @@ -295,7 +296,7 @@ data loss, but clean more efficiently')) | |||
| 295 | return False | 296 | return False |
| 296 | 297 | ||
| 297 | cf = CFile(filename, self.backup, self.add2archive) | 298 | cf = CFile(filename, self.backup, self.add2archive) |
| 298 | if cf.file is not False: # if the file is supported by the mat | 299 | if cf.file is not None: # if the file is supported by the mat |
| 299 | self.liststore.append([cf, cf.file.basename, | 300 | self.liststore.append([cf, cf.file.basename, |
| 300 | cf.file.mime, _('unknow'), 'None']) | 301 | cf.file.mime, _('unknow'), 'None']) |
| 301 | return False | 302 | return False |
| @@ -108,17 +108,17 @@ def create_class_file(name, backup, add2archive): | |||
| 108 | if not os.path.isfile(name): | 108 | if not os.path.isfile(name): |
| 109 | # check if the file exists | 109 | # check if the file exists |
| 110 | logging.error('%s is not a valid file' % name) | 110 | logging.error('%s is not a valid file' % name) |
| 111 | return False | 111 | return None |
| 112 | 112 | ||
| 113 | if not os.access(name, os.R_OK): | 113 | if not os.access(name, os.R_OK): |
| 114 | #check read permissions | 114 | #check read permissions |
| 115 | logging.error('%s is is not readable' % name) | 115 | logging.error('%s is is not readable' % name) |
| 116 | return False | 116 | return None |
| 117 | 117 | ||
| 118 | if not os.access(name, os.W_OK): | 118 | if not os.access(name, os.W_OK): |
| 119 | #check write permission | 119 | #check write permission |
| 120 | logging.error('%s is not writtable' % name) | 120 | logging.error('%s is not writtable' % name) |
| 121 | return False | 121 | return None |
| 122 | 122 | ||
| 123 | filename = '' | 123 | filename = '' |
| 124 | try: | 124 | try: |
| @@ -129,7 +129,7 @@ def create_class_file(name, backup, add2archive): | |||
| 129 | parser = hachoir_parser.createParser(filename) | 129 | parser = hachoir_parser.createParser(filename) |
| 130 | if not parser: | 130 | if not parser: |
| 131 | logging.info('Unable to parse %s' % filename) | 131 | logging.info('Unable to parse %s' % filename) |
| 132 | return False | 132 | return None |
| 133 | 133 | ||
| 134 | mime = parser.mime_type | 134 | mime = parser.mime_type |
| 135 | 135 | ||
| @@ -145,6 +145,6 @@ def create_class_file(name, backup, add2archive): | |||
| 145 | stripper_class = strippers.STRIPPERS[mime] | 145 | stripper_class = strippers.STRIPPERS[mime] |
| 146 | except KeyError: | 146 | except KeyError: |
| 147 | logging.info('Don\'t have stripper for %s format' % mime) | 147 | logging.info('Don\'t have stripper for %s format' % mime) |
| 148 | return False | 148 | return None |
| 149 | 149 | ||
| 150 | return stripper_class(filename, parser, mime, backup, add2archive) | 150 | return stripper_class(filename, parser, mime, backup, add2archive) |
