Skip to content

Commit

Permalink
Extractions of optional packages happen like others
Browse files Browse the repository at this point in the history
  • Loading branch information
@TellowKrinkle
TellowKrinkle committed Apr 21, 2019
1 parent 4c45c67 commit 3370fbd
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion higurashiInstaller.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ def __init__(self, fullInstallConfiguration):
for opt in sorted(downloadAndExtractOptions, key=lambda opt: opt.data['priority']):
self.downloaderAndExtractor.addItemManually(
url=opt.data['url'],
extractionDir=os.path.join(self.dataDirectory, opt.data['relativeExtractionPath']),
extractionDir=os.path.join(self.extractDir, opt.data['relativeExtractionPath']),
)

self.downloaderAndExtractor.printPreview()
Expand Down
32 changes: 16 additions & 16 deletions installData.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
{"name": "Default BGM", "description": "Use the default Background Music"},
{
"name": "Old BGM", "description": "Restores the music tracks from the original release (pre-2019)",
"data": {"url": "http://07th-mod.com/rikachama/audio/Higurashi-OldBGM.7z", "relativeExtractionPath": "StreamingAssets", "priority": 10}
"data": {"url": "http://07th-mod.com/rikachama/audio/Higurashi-OldBGM.7z", "relativeExtractionPath": "HigurashiEp01_Data/StreamingAssets", "priority": 10}
}
]
},
Expand All @@ -42,7 +42,7 @@
{"name": "Default SE", "description": "Use the default Sound Effects", "data":null},
{
"name": "Old OST", "description": "Restores the SE from the original release (pre-2019)",
"data": {"url": "http://07th-mod.com/rikachama/audio/Higurashi-OldSE.7z", "relativeExtractionPath": "StreamingAssets", "priority": 10}
"data": {"url": "http://07th-mod.com/rikachama/audio/Higurashi-OldSE.7z", "relativeExtractionPath": "HigurashiEp01_Data/StreamingAssets", "priority": 10}
}
]
},
Expand All @@ -51,7 +51,7 @@
"checkBox": [
{
"name": "OST Remake", "description": "Handmade remakes of several music tracks from the original release (pre-2019)",
"data": {"url": "http://07th-mod.com/misc/Higurashi.OST.Remake.zip", "relativeExtractionPath": "StreamingAssets", "priority": 20}
"data": {"url": "http://07th-mod.com/misc/Higurashi.OST.Remake.zip", "relativeExtractionPath": "HigurashiEp01_Data/StreamingAssets", "priority": 20}
}
]
}
Expand Down Expand Up @@ -88,7 +88,7 @@
{"name": "Default BGM", "description": "Use the default Background Music"},
{
"name": "Old BGM", "description": "Restores the music tracks from the original release (pre-2019)",
"data": {"url": "http://07th-mod.com/rikachama/audio/Higurashi-OldBGM.7z", "relativeExtractionPath": "StreamingAssets", "priority": 10}
"data": {"url": "http://07th-mod.com/rikachama/audio/Higurashi-OldBGM.7z", "relativeExtractionPath": "HigurashiEp02_Data/StreamingAssets", "priority": 10}
}
]
},
Expand All @@ -98,7 +98,7 @@
{"name": "Default SE", "description": "Use the default Sound Effects", "data":null},
{
"name": "Old OST", "description": "Restores the SE from the original release (pre-2019)",
"data": {"url": "http://07th-mod.com/rikachama/audio/Higurashi-OldSE.7z", "relativeExtractionPath": "StreamingAssets", "priority": 10}
"data": {"url": "http://07th-mod.com/rikachama/audio/Higurashi-OldSE.7z", "relativeExtractionPath": "HigurashiEp02_Data/StreamingAssets", "priority": 10}
}
]
},
Expand All @@ -107,7 +107,7 @@
"checkBox": [
{
"name": "OST Remake", "description": "Handmade remakes of several music tracks from the original release (pre-2019)",
"data": {"url": "http://07th-mod.com/misc/Higurashi.OST.Remake.zip", "relativeExtractionPath": "StreamingAssets", "priority": 20}
"data": {"url": "http://07th-mod.com/misc/Higurashi.OST.Remake.zip", "relativeExtractionPath": "HigurashiEp02_Data/StreamingAssets", "priority": 20}
}
]
}
Expand Down Expand Up @@ -147,7 +147,7 @@
{"name": "Default BGM", "description": "Use the default Background Music"},
{
"name": "Old BGM", "description": "Restores the music tracks from the original release (pre-2019)",
"data": {"url": "http://07th-mod.com/rikachama/audio/Higurashi-OldBGM.7z", "relativeExtractionPath": "StreamingAssets", "priority": 10}
"data": {"url": "http://07th-mod.com/rikachama/audio/Higurashi-OldBGM.7z", "relativeExtractionPath": "HigurashiEp03_Data/StreamingAssets", "priority": 10}
}
]
},
Expand All @@ -157,7 +157,7 @@
{"name": "Default SE", "description": "Use the default Sound Effects", "data":null},
{
"name": "Old OST", "description": "Restores the SE from the original release (pre-2019)",
"data": {"url": "http://07th-mod.com/rikachama/audio/Higurashi-OldSE.7z", "relativeExtractionPath": "StreamingAssets", "priority": 10}
"data": {"url": "http://07th-mod.com/rikachama/audio/Higurashi-OldSE.7z", "relativeExtractionPath": "HigurashiEp03_Data/StreamingAssets", "priority": 10}
}
]
},
Expand All @@ -166,7 +166,7 @@
"checkBox": [
{
"name": "OST Remake", "description": "Handmade remakes of several music tracks from the original release (pre-2019)",
"data": {"url": "http://07th-mod.com/misc/Higurashi.OST.Remake.zip", "relativeExtractionPath": "StreamingAssets", "priority": 20}
"data": {"url": "http://07th-mod.com/misc/Higurashi.OST.Remake.zip", "relativeExtractionPath": "HigurashiEp03_Data/StreamingAssets", "priority": 20}
}
]
}
Expand Down Expand Up @@ -204,7 +204,7 @@
{"name": "Default BGM", "description": "Use the default Background Music"},
{
"name": "Old BGM", "description": "Restores the music tracks from the original release (pre-2019)",
"data": {"url": "http://07th-mod.com/rikachama/audio/Higurashi-OldBGM.7z", "relativeExtractionPath": "StreamingAssets", "priority": 10}
"data": {"url": "http://07th-mod.com/rikachama/audio/Higurashi-OldBGM.7z", "relativeExtractionPath": "HigurashiEp04_Data/StreamingAssets", "priority": 10}
}
]
},
Expand All @@ -214,7 +214,7 @@
{"name": "Default SE", "description": "Use the default Sound Effects", "data":null},
{
"name": "Old OST", "description": "Restores the SE from the original release (pre-2019)",
"data": {"url": "http://07th-mod.com/rikachama/audio/Higurashi-OldSE.7z", "relativeExtractionPath": "StreamingAssets", "priority": 10}
"data": {"url": "http://07th-mod.com/rikachama/audio/Higurashi-OldSE.7z", "relativeExtractionPath": "HigurashiEp04_Data/StreamingAssets", "priority": 10}
}
]
},
Expand All @@ -223,7 +223,7 @@
"checkBox": [
{
"name": "OST Remake", "description": "Handmade remakes of several music tracks from the original release (pre-2019)",
"data": {"url": "http://07th-mod.com/misc/Higurashi.OST.Remake.zip", "relativeExtractionPath": "StreamingAssets", "priority": 20}
"data": {"url": "http://07th-mod.com/misc/Higurashi.OST.Remake.zip", "relativeExtractionPath": "HigurashiEp04_Data/StreamingAssets", "priority": 20}
}
]
}
Expand Down Expand Up @@ -260,7 +260,7 @@
{"name": "Default BGM", "description": "Use the default Background Music"},
{
"name": "Old BGM", "description": "Restores the music tracks from the original release (pre-2019)",
"data": {"url": "http://07th-mod.com/rikachama/audio/HigurashiKai-OldBGM.7z", "relativeExtractionPath": "StreamingAssets", "priority": 10}
"data": {"url": "http://07th-mod.com/rikachama/audio/HigurashiKai-OldBGM.7z", "relativeExtractionPath": "HigurashiEp05_Data/StreamingAssets", "priority": 10}
}
]
},
Expand All @@ -270,7 +270,7 @@
{"name": "Default SE", "description": "Use the default Sound Effects", "data":null},
{
"name": "Old OST", "description": "Restores the SE from the original release (pre-2019)",
"data": { "url": "http://07th-mod.com/rikachama/audio/HigurashiKai-OldSE.7z", "relativeExtractionPath": "StreamingAssets", "priority": 10}
"data": { "url": "http://07th-mod.com/rikachama/audio/HigurashiKai-OldSE.7z", "relativeExtractionPath": "HigurashiEp05_Data/StreamingAssets", "priority": 10}
}
]
}
Expand Down Expand Up @@ -307,7 +307,7 @@
{"name": "Default BGM", "description": "Use the default Background Music"},
{
"name": "Old BGM", "description": "Restores the music tracks from the original release (pre-2019)",
"data": {"url": "http://07th-mod.com/rikachama/audio/HigurashiKai-OldBGM.7z", "relativeExtractionPath": "StreamingAssets", "priority": 10}
"data": {"url": "http://07th-mod.com/rikachama/audio/HigurashiKai-OldBGM.7z", "relativeExtractionPath": "HigurashiEp06_Data/StreamingAssets", "priority": 10}
}
]
},
Expand All @@ -317,7 +317,7 @@
{"name": "Default SE", "description": "Use the default Sound Effects", "data":null},
{
"name": "Old OST", "description": "Restores the SE from the original release (pre-2019)",
"data": { "url": "http://07th-mod.com/rikachama/audio/HigurashiKai-OldSE.7z", "relativeExtractionPath": "StreamingAssets", "priority": 10}
"data": { "url": "http://07th-mod.com/rikachama/audio/HigurashiKai-OldSE.7z", "relativeExtractionPath": "HigurashiEp06_Data/StreamingAssets", "priority": 10}
}
]
}
Expand Down

0 comments on commit 3370fbd

Please sign in to comment.