Skip to content

Commit e6cb5f8

Browse files
authored
Merge pull request blind-oracle#12 from mavaddat/patch-1
Robust env recall w multiple failsafe
2 parents fca828a + cddfbd4 commit e6cb5f8

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

transmission-trackers.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,17 @@
4646
# Debug output
4747
'debug': False
4848
}
49-
49+
cache_file = None # Universal scope
5050
from os import getcwd
5151
if getcwd() != '/docker/transmission/transmission-trackers':
5252
from os import environ as env, path, mkdir
5353
try:
54+
cache_file = path.join(env.get('TEMP',env.get('TMP',None)) ,'.cache/trackers.txt')
55+
if not path.isdir(path.dirname(cache_file)):
56+
mkdir(path.dirname(cache_file))
5457
import toml
5558
configfile = path.join( \
56-
env.get('XDG_CONFIG_HOME', path.join(env['HOME'],'.config')),
59+
env.get('XDG_CONFIG_HOME', path.join(env.get('HOME',env.get('USERPROFILE',env.get('HOMEPATH',None))),'.config')),
5760
'transmission/trackers.toml'
5861
)
5962
if path.exists(configfile):
@@ -64,10 +67,9 @@
6467
mkdir(path.dirname(configfile))
6568
with open(configfile, 'w') as f:
6669
toml.dump( {'client': client, 'config': config }, f )
67-
except:
68-
pass
70+
except KeyError:
6971
# Where to cache downloaded lists
70-
cache_file = path.join(env['HOME'] ,'.cache/trackers.txt')
72+
cache_file = path.join(env['TEMP'] ,'.cache/trackers.txt')
7173
else:
7274
cache_file = '/tmp/trackers_cache.txt'
7375

0 commit comments

Comments
 (0)