diff --git a/mylar/auth32p.py b/mylar/auth32p.py index f8426113..93a889c9 100644 --- a/mylar/auth32p.py +++ b/mylar/auth32p.py @@ -352,7 +352,7 @@ class info32p(object): 'leechers': a['leechers'], 'scanner': a['scanner'], 'chkit': {'id': x['id'], 'series': x['series']}, - 'pubdate': datetime.datetime.fromtimestamp(float(a['upload_time'])).strftime('%c')}) + 'pubdate': datetime.datetime.fromtimestamp(float(a['upload_time'])).strftime('%a, %d %b %Y %H:%M:%S')}) if len(results32p) > 0: diff --git a/mylar/rsscheck.py b/mylar/rsscheck.py index 91fea76e..eec3a647 100755 --- a/mylar/rsscheck.py +++ b/mylar/rsscheck.py @@ -248,24 +248,29 @@ def torrents(pickfeed=None, seriesname=None, issue=None, feedinfo=None): tmpsz_st = tmpsz.find('Size') if tmpsz_st != -1: tmpsize = tmpsz[tmpsz_st:tmpsz_st+14] - if any(['GB' in tmpsize, 'MB' in tmpsize]): + if any(['GB' in tmpsize, 'MB' in tmpsize, 'KB' in tmpsize, 'TB' in tmpsize]): tmp1 = tmpsz.find('MB', tmpsz_st) if tmp1 == -1: tmp1 = tmpsz.find('GB', tmpsz_st) if tmp1 == -1: tmp1 = tmpsz.find('TB', tmpsz_st) + if tmp1 == -1: + tmp1 = tmpsz.find('KB', tmpsz_st) tmpsz_end = tmp1 + 2 tmpsz_st += 7 else: tmpsz_st = tmpsz.rfind('|') if tmpsz_st != -1: tmpsize = tmpsz[tmpsz_st:tmpsz_st+14] - if any(['GB' in tmpsize, 'MB' in tmpsize]): + if any(['GB' in tmpsize, 'MB' in tmpsize, 'KB' in tmpsize, 'TB' in tmpsize]): tmp1 = tmpsz.find('MB', tmpsz_st) if tmp1 == -1: tmp1 = tmpsz.find('GB', tmpsz_st) if tmp1 == -1: tmp1 = tmpsz.find('TB', tmpsz_st) + if tmp1 == -1: + tmp1 = tmpsz.find('KB', tmpsz_st) + tmpsz_end = tmp1 + 2 tmpsz_st += 2 @@ -275,6 +280,12 @@ def torrents(pickfeed=None, seriesname=None, issue=None, feedinfo=None): elif 'MB' in tmpsz[tmpsz_st:tmpsz_end]: szform = 'MB' sz = 'M' + elif 'KB' in tmpsz[tmpsz_st:tmpsz_end]: + szform = 'KB' + sz = 'K' + elif 'TB' in tmpsz[tmpsz_st:tmpsz_end]: + szform = 'TB' + sz = 'T' tsize = helpers.human2bytes(str(tmpsz[tmpsz_st:tmpsz.find(szform, tmpsz_st) -1]) + str(sz))