Post-scylla update to catch up with reverence changes

Author: DarkFenX

README.md

@@ -1,29 +1,31 @@
-#Phobos
+# Phobos
 Phobos is script for dumping EVE client data into JSON format.
 
-###How to use
+### How to use
 
-    python run.py --eve=<path to EVE client> --cache=<path to EVE client cache>  [--translate=<language>] --json=<output folder> [--list=<comma-separated list of containers to dump>]
+    python run.py --eve=<path to EVE client> --res=<path to shared resource cache> --cache=<path to EVE client cache>  [--translate=<language>] --json=<output folder> [--list=<comma-separated list of containers to dump>]
 
-###Example
- (or, how I usually launch it on Linux)
+### Example
+(or, how I usually launch it on Linux)
 
-    $ python run.py --eve="~/.wine_eve/drive_c/Program Files/CCP/EVE/" --cache="~/.wine_eve/drive_c/users/"$USER"/Local Settings/Application Data/CCP/EVE/c_program_files_ccp_eve_tranquility/" --translate=en-us --json=~/Desktop/phobos_dump_tq --list="invtypes, marketProxy()_GetMarketGroups(), phbmetadata"
+    $ python run.py --eve="~/.wine_eve/drive_c/Program Files/CCP/EVE/" --res="~/.wine_eve/drive_c/users/Public/Application Data/CCP/EVE/SharedCache" --cache="~/.wine_eve/drive_c/users/"$USER"/Local Settings/Application Data/CCP/EVE/c_program_files_ccp_eve_tranquility/" --translate=en-us --json=~/Desktop/phobos_dump_tq --list="invtypes, marketProxy()_GetMarketGroups(), phbmetadata"
 
-###Arguments:
+### Arguments:
 
-* --eve and --cache: just paths to eve client and to folder which contains client cache and settings.
+* --eve: path to EVE client, on Windows usually C:\Program Files (x86)\CCP\EVE\;
+* --res: path to shared cache with resources, on Windows usually C:\ProgramData\CCP\EVE\SharedCache\;
+* --cache: path to client-server specific data (which contains client cache and settings), on Windows usually C:\Users\<user_name>\AppData\Local\CCP\EVE\c_program_files_ccp_eve_tranquility
 * --translate: specify language to which strings will be translated. You can choose either individual languages (for a list - invoke script with --help argument) or 'multi' option. For individual language, translation will be done in-place (replaces original text with localized text), for multi-language translation - original text is not modified, but new text fields are added, named using <field name>_<language code> convention. Multi-language translation mode is default.
 * --json: output folder for JSON files.
 * --list: you can provide list of comma-separated 'containers' to dump, it uses names script prints to stdout. For list of all available names you can launch script without specifying this option (by default it dumps everything it can find).
 
-###Phobos-specific data
+### Phobos-specific data
 Besides raw data Phobos pulls from client, it provides two custom containers.
 
-####phbmetadata
+#### phbmetadata
 Contains just two parameters: client version and UNIX timestamp of the time script was invoked.
 
-####phbtraits
+#### phbtraits
 Traits for various ships. Data has following format:
 
     Returned value:

miner/cached_calls.py

@@ -35,9 +35,7 @@ class CachedCallsMiner(AbstractMiner):
     """
 
     def __init__(self, rvr, translator):
-        # Get path to folder with cached method calls
-        cache = rvr.getcachemgr()
-        self._path_cachedcalls = os.path.join(cache.machocachepath, 'CachedMethodCalls')
+        self._path_cachedcalls = os.path.join(rvr.paths.machocache, 'CachedMethodCalls')
         self._translator = translator
 
     def contname_iter(self):

miner/rescache/resbrowser.py

@@ -18,9 +18,6 @@
 #===============================================================================
 
 
-from itertools import chain
-
-
 class ResourceBrowser(object):
     """
     Class, responsible for browsing/retrieval of resources.
@@ -34,11 +31,7 @@ def get_filelist(self):
         Aggregate filepaths from all resource files and return
         them in the form of single list.
         """
-        resfilepaths = chain(
-            self._rvr.rot.res._nameMap.keys(),
-            *(stuff.files for stuff in self._rvr.rot.efs.stuff)
-        )
-        return sorted(resfilepaths)
+        return sorted(self._rvr.rescache._nameMap.keys())
 
     def get_file(self, resfilepath):
         """

run.py

@@ -64,7 +64,7 @@
     path_json = os.path.expanduser(args.json)
 
     rvr_language = args.translate if args.translate != 'multi' else 'en-us'
-    rvr = reverence.blue.EVE(path_eve, respath=path_res, cachepath=path_cache, server=args.server, languageID=rvr_language)
+    rvr = reverence.blue.EVE(path_eve, cachepath=path_cache, sharedcachepath=path_res, server=args.server, languageID=rvr_language)
 
     pickle_miner = ResourcePickleMiner(rvr)
     trans = Translator(pickle_miner)