Skip to content

Look for a caches.json file in system locations (in addition to script dir) #86

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
djw8605 merged 1 commit into from
Oct 25, 2018
Merged

Look for a caches.json file in system locations (in addition to script dir) #86

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions bin/stashcp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,19 +374,19 @@ def get_ips(name):
return ipv4s + ipv6s

def get_best_stashcache():

# First, check for caches.json file in this file's directory:
dir_path = os.path.dirname(os.path.realpath(__file__))
cache_file = os.path.join(dir_path, 'caches.json')
if not os.path.isfile(cache_file):
logging.error("Unable to find caches.json in %s", dir_path)
cache_files = [os.path.join(os.path.dirname(os.path.realpath(__file__)), "caches.json"),
"/etc/stashcache/caches.json",
"/usr/share/stashcache/caches.json"]
for cache_file in cache_files:
if os.path.isfile(cache_file):
with open(cache_file, 'r') as f:
caches_list = json.loads(f.read())
logging.debug("Loaded caches list from %s", cache_file)
break
else:
logging.error("Unable to find caches.json in %r", cache_files)
return None

# Get all the caches from the json file
f = open(cache_file, 'r')
caches_list = json.loads(f.read())
f.close()


# Format the caches for the GeoIP query
caches_string = ""
usable_caches = []
Expand Down