mirror of
https://github.com/evilhero/mylar
synced 2024-12-22 15:52:47 +00:00
21eee17344
torrents will now properly hide torrent information, IMP: Specified daemon port for deluge as an on-screen tip for more detail, IMP: Added 100,200,ALL as viewable watchlist views, FIX: When viewing pullist and annual integration enabled, if annual was present would incorrectly link to invalid annual series instead of the actual series itself, IMP: Added more detail error messages to metatagging errors and better handling of stranded files during cleanup, IMP: Improved some handling for weekly pull-list one-off's and refactored the nzb/oneoff post-processing into a seperate function for future callables, Moved all the main url locations for public torrent sites to the init module so that it can be cascaded down for use in other modules instead as a global, IMP: Added a 'deep_search_32p' variable in the config.ini for specific usage with 32p, where if there is more than one result will dig deeper into each result to try and figure out if there are series matches, as opposed to the default where it will only use ref32p table if available or just the first hit in a multiple series search results and ignore the remainder, FIX:Fixed some unknown characters appearing in the pullist due to unicode-related conversion problems, FIX: fixed some special cases of file parsing errors due to Volume label being named different than expected, FIX: Added a 3s pause between experimental searches to try and not hit their frequency limitation, IMP: Weekly Pullist One-off's will now show status of Snatched/Downloaded as required, FIX: Fixed some deluge parameter problems when using auto-snatch torrent script/option, IMP: Changed the downlocation in the auto-snatch option to an env variable instead of being passed to avoid unicode-related problems, FIX: Fixed some magnet-related issues for torrents when using a watchdir + TPSE, FIX: Added more verbose error message for rtorrent connection issues, FIX: Could not connect to rtorrent client if no username/password were provided, IMP: Set the db updater to run every 5 minutes on the watchlist, automatically refreshing the oldest updated series each time that is more than 5 hours old (force db update from the activity/job schedulers page will run the db updater against the entire watchlist in sequence), IMP: Attempt to handle long paths in windows (ie. > 256c) by prepending the unicode windows api character to the import a directory path (windows only), IMP: When manual metatagging a series, will update the series after all the metatagging has been completed as opposed to after each issue, IMP: Will now display available inkdrops on Config/Search Providers tab when using 32P (future will utilize/indicate inkdrop threshold when downloading)
115 lines
3.9 KiB
Python
115 lines
3.9 KiB
Python
from __future__ import with_statement
|
|
import os
|
|
import re
|
|
import pytz
|
|
|
|
_cache_tz = None
|
|
|
|
def _tz_from_env(tzenv):
|
|
if tzenv[0] == ':':
|
|
tzenv = tzenv[1:]
|
|
|
|
# TZ specifies a file
|
|
if os.path.exists(tzenv):
|
|
with open(tzenv, 'rb') as tzfile:
|
|
return pytz.tzfile.build_tzinfo('local', tzfile)
|
|
|
|
# TZ specifies a zoneinfo zone.
|
|
try:
|
|
tz = pytz.timezone(tzenv)
|
|
# That worked, so we return this:
|
|
return tz
|
|
except pytz.UnknownTimeZoneError:
|
|
raise pytz.UnknownTimeZoneError(
|
|
"tzlocal() does not support non-zoneinfo timezones like %s. \n"
|
|
"Please use a timezone in the form of Continent/City")
|
|
|
|
def _get_localzone(_root='/'):
|
|
"""Tries to find the local timezone configuration.
|
|
|
|
This method prefers finding the timezone name and passing that to pytz,
|
|
over passing in the localtime file, as in the later case the zoneinfo
|
|
name is unknown.
|
|
|
|
The parameter _root makes the function look for files like /etc/localtime
|
|
beneath the _root directory. This is primarily used by the tests.
|
|
In normal usage you call the function without parameters."""
|
|
|
|
tzenv = os.environ.get('TZ')
|
|
if tzenv:
|
|
try:
|
|
return _tz_from_env(tzenv)
|
|
except pytz.UnknownTimeZoneError:
|
|
pass
|
|
|
|
# Now look for distribution specific configuration files
|
|
# that contain the timezone name.
|
|
tzpath = os.path.join(_root, 'etc/timezone')
|
|
if os.path.exists(tzpath):
|
|
with open(tzpath, 'rb') as tzfile:
|
|
data = tzfile.read()
|
|
|
|
# Issue #3 was that /etc/timezone was a zoneinfo file.
|
|
# That's a misconfiguration, but we need to handle it gracefully:
|
|
if data[:5] != 'TZif2':
|
|
etctz = data.strip().decode()
|
|
# Get rid of host definitions and comments:
|
|
if ' ' in etctz:
|
|
etctz, dummy = etctz.split(' ', 1)
|
|
if '#' in etctz:
|
|
etctz, dummy = etctz.split('#', 1)
|
|
return pytz.timezone(etctz.replace(' ', '_'))
|
|
|
|
# CentOS has a ZONE setting in /etc/sysconfig/clock,
|
|
# OpenSUSE has a TIMEZONE setting in /etc/sysconfig/clock and
|
|
# Gentoo has a TIMEZONE setting in /etc/conf.d/clock
|
|
# We look through these files for a timezone:
|
|
|
|
zone_re = re.compile('\s*ZONE\s*=\s*\"')
|
|
timezone_re = re.compile('\s*TIMEZONE\s*=\s*\"')
|
|
end_re = re.compile('\"')
|
|
|
|
for filename in ('etc/sysconfig/clock', 'etc/conf.d/clock'):
|
|
tzpath = os.path.join(_root, filename)
|
|
if not os.path.exists(tzpath):
|
|
continue
|
|
with open(tzpath, 'rt') as tzfile:
|
|
data = tzfile.readlines()
|
|
|
|
for line in data:
|
|
# Look for the ZONE= setting.
|
|
match = zone_re.match(line)
|
|
if match is None:
|
|
# No ZONE= setting. Look for the TIMEZONE= setting.
|
|
match = timezone_re.match(line)
|
|
if match is not None:
|
|
# Some setting existed
|
|
line = line[match.end():]
|
|
etctz = line[:end_re.search(line).start()]
|
|
|
|
# We found a timezone
|
|
return pytz.timezone(etctz.replace(' ', '_'))
|
|
|
|
# No explicit setting existed. Use localtime
|
|
for filename in ('etc/localtime', 'usr/local/etc/localtime'):
|
|
tzpath = os.path.join(_root, filename)
|
|
|
|
if not os.path.exists(tzpath):
|
|
continue
|
|
with open(tzpath, 'rb') as tzfile:
|
|
return pytz.tzfile.build_tzinfo('local', tzfile)
|
|
|
|
raise pytz.UnknownTimeZoneError('Can not find any timezone configuration')
|
|
|
|
def get_localzone():
|
|
"""Get the computers configured local timezone, if any."""
|
|
global _cache_tz
|
|
if _cache_tz is None:
|
|
_cache_tz = _get_localzone()
|
|
return _cache_tz
|
|
|
|
def reload_localzone():
|
|
"""Reload the cached localzone. You need to call this if the timezone has changed."""
|
|
global _cache_tz
|
|
_cache_tz = _get_localzone()
|
|
return _cache_tz
|