pictuga/morss
1
1
Fork 0
Code Issues Pull Requests Actions Packages Releases Activity

Use "options" in Gather instead of "progress"

Browse Source 
Also made it possible to toggle Fill's toggle through parameters
This commit is contained in:
pictuga
2013-09-29 15:32:58 +02:00
parent a5a327388a
commit 1b7fe8fbee
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
morss.py
View File

@@ -365,7 +365,7 @@ def Fill(item, cache, feedurl='/', fast=False, clip=False):
return True return True
def Gather(url, cachePath, progress=False): def Gather(url, cachePath, options):
log(url) log(url)
url = url.replace(' ', '%20') url = url.replace(' ', '%20')
@@ -413,7 +413,7 @@ def Gather(url, cachePath, progress=False):
match = lxml.html.fromstring(xml).xpath("//link[@rel='alternate'][@type='application/rss+xml' or @type='application/atom+xml']/@href") match = lxml.html.fromstring(xml).xpath("//link[@rel='alternate'][@type='application/rss+xml' or @type='application/atom+xml']/@href")
if len(match): if len(match):
link = urlparse.urljoin(url, match[0]) link = urlparse.urljoin(url, match[0])
return Gather(link, cachePath, progress) return Gather(link, cachePath, options)
else: else:
log('no-link html') log('no-link html')
return False return False
@@ -426,7 +426,7 @@ def Gather(url, cachePath, progress=False):
# set # set
startTime = time.time() startTime = time.time()
for i, item in enumerate(rss.items): for i, item in enumerate(rss.items):
if progress: if 'progress' in options:
if MAX_ITEM == 0: if MAX_ITEM == 0:
print '%s/%s' % (i+1, size) print '%s/%s' % (i+1, size)
else: else:
@@ -439,7 +439,7 @@ def Gather(url, cachePath, progress=False):
if Fill(item, cache, url, True) is False: if Fill(item, cache, url, True) is False:
item.remove() item.remove()
else: else:
Fill(item, cache, url) Fill(item, cache, url, clip='clip' in options)
log(len(rss.items)) log(len(rss.items))
log(time.time() - startTime) log(time.time() - startTime)
@@ -485,7 +485,7 @@ if __name__ == '__main__':
if 'cache' in options: if 'cache' in options:
MAX_TIME = 0 MAX_TIME = 0
RSS = Gather(url, cache, 'progress' in options) RSS = Gather(url, cache, options)
if RSS is not False and 'progress' not in options and not DEBUG: if RSS is not False and 'progress' not in options and not DEBUG:
print RSS print RSS