Mercurial Repositories > eric / file comparison
comparison: src/eric7/Graphics/PackageDiagramBuilder.py
src/eric7/Graphics/PackageDiagramBuilder.py
- branch
- server
- changeset 10585
- 83e5a9a64543
- parent 10583
- 2114cc7275e8
- child 10596
- ea35c92a3c7c
equal
deleted
inserted
replaced
| 10584:a596cf392291 | 10585:83e5a9a64543 |
|---|---|
| 108 if FileSystemUtilities.isRemoteFileName(self.package): | 108 if FileSystemUtilities.isRemoteFileName(self.package): |
| 109 modules.extend( | 109 modules.extend( |
| 110 [ | 110 [ |
| 111 FileSystemUtilities.remoteFileName(f) | 111 FileSystemUtilities.remoteFileName(f) |
| 112 for f in self.__remotefsInterface.glob( | 112 for f in self.__remotefsInterface.glob( |
| 113 os.path.join(self.package, ext) | 113 self.__remotefsInterface.join(self.package, ext) |
| 114 ) | 114 ) |
| 115 ] | 115 ] |
| 116 ) | 116 ) |
| 117 else: | 117 else: |
| 118 modules.extend( | 118 modules.extend( |
| 177 if ( | 177 if ( |
| 178 subpackage["is_dir"] | 178 subpackage["is_dir"] |
| 179 and subpackage["name"] != "__pycache__" | 179 and subpackage["name"] != "__pycache__" |
| 180 and len( | 180 and len( |
| 181 self.__remotefsInterface.glob( | 181 self.__remotefsInterface.glob( |
| 182 os.path.join(subpackage["path"], "__init__.*") | 182 self.__remotefsInterface.join( |
| 183 subpackage["path"], "__init__.*" | |
| 184 ) | |
| 183 ) | 185 ) |
| 184 ) != 0 | 186 ) != 0 |
| 185 ): | 187 ): |
| 186 subpackagesList.append( | 188 subpackagesList.append( |
| 187 FileSystemUtilities.remoteFileName(subpackage["path"]) | 189 FileSystemUtilities.remoteFileName(subpackage["path"]) |
| 197 subpackagesList.append(subpackage.path) | 199 subpackagesList.append(subpackage.path) |
| 198 | 200 |
| 199 tot = 0 | 201 tot = 0 |
| 200 for ext in supportedExt: | 202 for ext in supportedExt: |
| 201 for subpackage in subpackagesList: | 203 for subpackage in subpackagesList: |
| 202 tot += len(glob.glob(FileSystemUtilities.normjoinpath(subpackage, ext))) | 204 if FileSystemUtilities.isRemoteFileName(subpackage): |
| 205 tot += len( | |
| 206 self.__remotefsInterface.glob( | |
| 207 self.__remotefsInterface.join(subpackage, ext) | |
| 208 ) | |
| 209 ) | |
| 210 else: | |
| 211 tot += len( | |
| 212 glob.glob(FileSystemUtilities.normjoinpath(subpackage, ext)) | |
| 213 ) | |
| 203 progress = EricProgressDialog( | 214 progress = EricProgressDialog( |
| 204 self.tr("Parsing modules..."), | 215 self.tr("Parsing modules..."), |
| 205 None, | 216 None, |
| 206 0, | 217 0, |
| 207 tot, | 218 tot, |
| 223 if FileSystemUtilities.isRemoteFileName(subpackage): | 234 if FileSystemUtilities.isRemoteFileName(subpackage): |
| 224 modules.extend( | 235 modules.extend( |
| 225 [ | 236 [ |
| 226 FileSystemUtilities.remoteFileName(f) | 237 FileSystemUtilities.remoteFileName(f) |
| 227 for f in self.__remotefsInterface.glob( | 238 for f in self.__remotefsInterface.glob( |
| 228 os.path.join(subpackage, ext) | 239 self.__remotefsInterface.join(subpackage, ext) |
| 229 ) | 240 ) |
| 230 ] | 241 ] |
| 231 ) | 242 ) |
| 232 else: | 243 else: |
| 233 modules.extend( | 244 modules.extend( |
