Mercurial Repositories > eric / file comparison
comparison: src/eric7/UI/BrowserModel.py
src/eric7/UI/BrowserModel.py
- branch
- server
- changeset 10596
- ea35c92a3c7c
- parent 10594
- 6156d9675f62
- child 10598
- 79c6ea2cb2e7
equal
deleted
inserted
replaced
| 10594:6156d9675f62 | 10596:ea35c92a3c7c |
|---|---|
| 616 @param repopulate flag indicating a repopulation | 616 @param repopulate flag indicating a repopulation |
| 617 @type bool | 617 @type bool |
| 618 """ | 618 """ |
| 619 self._addWatchedItem(parentItem) | 619 self._addWatchedItem(parentItem) |
| 620 | 620 |
| 621 # TODO: add support for 'remote:' directories | |
| 622 dirName = parentItem.dirName() | 621 dirName = parentItem.dirName() |
| 623 if FileSystemUtilities.isPlainFileName(dirName): | 622 if FileSystemUtilities.isPlainFileName(dirName): |
| 624 qdir = QDir(dirName) | 623 qdir = QDir(dirName) |
| 625 | 624 |
| 626 dirFilter = ( | 625 dirFilter = ( |
| 636 ) | 635 ) |
| 637 for f in entryInfoList: | 636 for f in entryInfoList: |
| 638 if f.isDir(): | 637 if f.isDir(): |
| 639 node = BrowserDirectoryItem( | 638 node = BrowserDirectoryItem( |
| 640 parentItem, | 639 parentItem, |
| 641 FileSystemUtilities.toNativeSeparators(f.absoluteFilePath()), | 640 FileSystemUtilities.toNativeSeparators( |
| 641 f.absoluteFilePath() | |
| 642 ), | |
| 642 False, | 643 False, |
| 643 ) | 644 ) |
| 644 else: | 645 else: |
| 645 fileFilters = Preferences.getUI("BrowsersFileFilters").split(";") | 646 fileFilters = Preferences.getUI("BrowsersFileFilters").split( |
| 647 ";" | |
| 648 ) | |
| 646 if fileFilters: | 649 if fileFilters: |
| 647 fn = f.fileName() | 650 fn = f.fileName() |
| 648 if any(fnmatch.fnmatch(fn, ff.strip()) for ff in fileFilters): | 651 if any( |
| 652 fnmatch.fnmatch(fn, ff.strip()) for ff in fileFilters | |
| 653 ): | |
| 649 continue | 654 continue |
| 650 node = BrowserFileItem( | 655 node = BrowserFileItem( |
| 651 parentItem, | 656 parentItem, |
| 652 FileSystemUtilities.toNativeSeparators(f.absoluteFilePath()), | 657 FileSystemUtilities.toNativeSeparators( |
| 658 f.absoluteFilePath() | |
| 659 ), | |
| 653 ) | 660 ) |
| 654 self._addItem(node, parentItem) | 661 self._addItem(node, parentItem) |
| 655 if repopulate: | 662 if repopulate: |
| 656 self.endInsertRows() | 663 self.endInsertRows() |
| 657 | 664 |
| 671 FileSystemUtilities.remoteFileName(entry["path"]), | 678 FileSystemUtilities.remoteFileName(entry["path"]), |
| 672 False, | 679 False, |
| 673 fsInterface=self.__remotefsInterface, | 680 fsInterface=self.__remotefsInterface, |
| 674 ) | 681 ) |
| 675 else: | 682 else: |
| 676 fileFilters = Preferences.getUI("BrowsersFileFilters").split(";") | 683 fileFilters = Preferences.getUI("BrowsersFileFilters").split( |
| 684 ";" | |
| 685 ) | |
| 677 if fileFilters: | 686 if fileFilters: |
| 678 fn = entry["name"] | 687 fn = entry["name"] |
| 679 if any(fnmatch.fnmatch(fn, ff.strip()) for ff in fileFilters): | 688 if any( |
| 689 fnmatch.fnmatch(fn, ff.strip()) for ff in fileFilters | |
| 690 ): | |
| 680 continue | 691 continue |
| 681 node = BrowserFileItem( | 692 node = BrowserFileItem( |
| 682 parentItem, | 693 parentItem, |
| 683 FileSystemUtilities.remoteFileName(entry["path"]), | 694 FileSystemUtilities.remoteFileName(entry["path"]), |
| 684 fsInterface=self.__remotefsInterface, | 695 fsInterface=self.__remotefsInterface, |
| 1298 """ | 1309 """ |
| 1299 self.__fsInterface = fsInterface | 1310 self.__fsInterface = fsInterface |
| 1300 | 1311 |
| 1301 if FileSystemUtilities.isRemoteFileName(dinfo): | 1312 if FileSystemUtilities.isRemoteFileName(dinfo): |
| 1302 self._dirName = dinfo | 1313 self._dirName = dinfo |
| 1303 dn = ( | 1314 dn = self._dirName if full else self.__fsInterface.basename(self._dirName) |
| 1304 self._dirName | |
| 1305 if full | |
| 1306 else self.__fsInterface.basename(self._dirName) | |
| 1307 ) | |
| 1308 else: | 1315 else: |
| 1309 self._dirName = os.path.abspath(dinfo) | 1316 self._dirName = os.path.abspath(dinfo) |
| 1310 dn = self._dirName if full else os.path.basename(self._dirName) | 1317 dn = self._dirName if full else os.path.basename(self._dirName) |
| 1311 BrowserItem.__init__(self, parent, dn) | 1318 BrowserItem.__init__(self, parent, dn) |
| 1312 | 1319 |
| 1335 @param full flag indicating full pathname should be displayed | 1342 @param full flag indicating full pathname should be displayed |
| 1336 @type bool | 1343 @type bool |
| 1337 """ | 1344 """ |
| 1338 if FileSystemUtilities.isRemoteFileName(dinfo): | 1345 if FileSystemUtilities.isRemoteFileName(dinfo): |
| 1339 self._dirName = dinfo | 1346 self._dirName = dinfo |
| 1340 dn = ( | 1347 dn = self._dirName if full else self.__fsInterface.basename(self._dirName) |
| 1341 self._dirName | |
| 1342 if full | |
| 1343 else self.__fsInterface.basename(self._dirName) | |
| 1344 ) | |
| 1345 else: | 1348 else: |
| 1346 self._dirName = os.path.abspath(dinfo) | 1349 self._dirName = os.path.abspath(dinfo) |
| 1347 dn = self._dirName if full else os.path.basename(self._dirName) | 1350 dn = self._dirName if full else os.path.basename(self._dirName) |
| 1348 self.itemData[0] = dn | 1351 self.itemData[0] = dn |
| 1349 | 1352 |
