Changeset a62ba31e7ba19f2b44a02567e60284c920e30af2
- Timestamp:
- 04/05/08 23:43:10
(9 months ago)
- Author:
- Jason Michalski <armooo@armooo.net>
- git-committer:
- Jason Michalski <armooo@armooo.net> 1207456990 -0500
- git-parent:
[dd5494d3ace902c8d3e93ec5fc9015bdfcae7c4d]
- git-author:
- Jason Michalski <armooo@armooo.net> 1207456990 -0500
- Message:
Renamed metadata methods to then can be used by other plugins
-
Files:
-
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
| r2578ef5 |
ra62ba31 |
|
| 289 | 289 | return metadata |
|---|
| 290 | 290 | |
|---|
| 291 | | def __metadata_basic(self, full_path): |
|---|
| | 291 | def metadata_basic(self, full_path): |
|---|
| 292 | 292 | metadata = {} |
|---|
| 293 | 293 | |
|---|
| … | … | |
| 303 | 303 | return metadata |
|---|
| 304 | 304 | |
|---|
| 305 | | def __metadata_full(self, full_path, tsn=''): |
|---|
| | 305 | def metadata_full(self, full_path, tsn=''): |
|---|
| 306 | 306 | metadata = {} |
|---|
| 307 | | metadata.update(self.__metadata_basic(full_path)) |
|---|
| | 307 | metadata.update(self.metadata_basic(full_path)) |
|---|
| 308 | 308 | |
|---|
| 309 | 309 | now = datetime.utcnow() |
|---|
| … | … | |
| 386 | 386 | video['valid'] = transcode.supported_format(file) |
|---|
| 387 | 387 | if video['valid']: |
|---|
| 388 | | video.update(self.__metadata_full(file, tsn)) |
|---|
| | 388 | video.update(self.metadata_full(file, tsn)) |
|---|
| 389 | 389 | else: |
|---|
| 390 | 390 | video['valid'] = True |
|---|
| 391 | | video.update(self.__metadata_basic(file)) |
|---|
| | 391 | video.update(self.metadata_basic(file)) |
|---|
| 392 | 392 | |
|---|
| 393 | 393 | videos.append(video) |
|---|
| … | … | |
| 417 | 417 | file_info['valid'] = transcode.supported_format(file_path) |
|---|
| 418 | 418 | if file_info['valid']: |
|---|
| 419 | | file_info.update(self.__metadata_full(file_path, tsn)) |
|---|
| | 419 | file_info.update(self.metadata_full(file_path, tsn)) |
|---|
| 420 | 420 | |
|---|
| 421 | 421 | handler.send_response(200) |
|---|
| … | … | |
| 442 | 442 | file_info['valid'] = transcode.supported_format(file_path) |
|---|
| 443 | 443 | if file_info['valid']: |
|---|
| 444 | | file_info.update(self.__metadata_full(file_path, tsn)) |
|---|
| | 444 | file_info.update(self.metadata_full(file_path, tsn)) |
|---|
| 445 | 445 | |
|---|
| 446 | 446 | import socket |
|---|
