Changeset 862

Show
Ignore:
Timestamp:
10/23/09 22:11:19 (11 months ago)
Author:
paranoidi
Message:

Renamed input directories to listdir since it can be used for files as well as directories.

Location:
trunk/flexget/plugins
Files:
1 modified
1 moved

Legend:

Unmodified
Added
Removed
  • trunk/flexget/plugins/filter_imdb_rated.py

    r798 r862  
    33from BeautifulSoup import BeautifulSoup 
    44from flexget.manager import Base 
    5 from sqlalchemy import Table, Column, Integer, Float, String, DateTime 
     5from sqlalchemy import Column, Integer, Float, String, DateTime 
    66import urllib2 
    77import re 
  • trunk/flexget/plugins/input_listdir.py

    • Property svn:mergeinfo set to (toggle deleted branches)
      /branches/0.9/flexget/plugins/input_directories.py335-481,​619
      /branches/paver_setup/flexget/plugins/input_directories.py653-658
      /branches/plugin_manager/flexget/plugins/input_directories.py702-703
    r845 r862  
    11import logging 
    2 from flexget.feed import Entry 
    32from flexget.plugin import * 
    43 
    5 log = logging.getLogger('input_mock') 
     4log = logging.getLogger('listdir') 
    65 
    7 class InputDirectories: 
     6class InputListdir: 
    87    """ 
    9         Uses local path as input 
     8        Uses local path content as an input. 
    109         
    1110        Example: 
    1211         
    13         directories: /storage/movies/ 
     12        listdir: /storage/movies/ 
    1413    """ 
    1514    def validator(self): 
     
    1817 
    1918    def on_feed_input(self, feed): 
     19        from flexget.feed import Entry 
    2020        import os 
    21          
    22         for name in os.listdir(feed.config['directories']): 
     21        for name in os.listdir(feed.config['listdir']): 
    2322            e = Entry() 
    2423            e['title'] = name 
    25             e['url'] = 'file://%s/%s' % (feed.config['directories'], dir) 
     24            e['url'] = 'file://%s/%s' % (feed.config['listdir'], dir) 
    2625             
    2726            feed.entries.append(e) 
    2827 
    29 register_plugin(InputDirectories, 'directories') 
     28register_plugin(InputListdir, 'listdir')