Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ The installer has a global variable called DEVELOPER_MODE, which controls how it
In developer mode, the installer will prefer local files (on disk) if they are present, instead of remote files (from github). This mode will Specifically:

- `installData.json`
- all .md files in the `news` folder
- `cachedDownloadSizes.json`

## Cached Download Sizes
Expand Down
17 changes: 0 additions & 17 deletions common.py
Original file line number Diff line number Diff line change
Expand Up @@ -591,23 +591,6 @@ def sevenZipTest(archive_path):
]
return runProcessOutputToTempFile(arguments, sevenZipMode=True)

def tryGetRemoteNews(newsName):
"""
:param changelogName: the name of the changelog to retrieve, without file extension
There should be one for each mod, and one called 'news' for the index.html page
:return:
"""
localPath = 'news/' + newsName + '.md'
url = Globals.GITHUB_MASTER_BASE_URL + 'news/' + quote(newsName) + '.md'
try:
if Globals.DEVELOPER_MODE and os.path.exists(localPath):
with io.open(localPath, 'r', encoding='utf-8') as file:
return file.read()
else:
return downloadFile(url, is_text=True)
except HTTPError as error:
return """The news [{}] couldn't be retrieved from [{}] the server.""".format(newsName, url)

def getDonationStatus():
# type: () -> (Optional[str], Optional[str])
"""
Expand Down
5 changes: 0 additions & 5 deletions httpGUI.py
Original file line number Diff line number Diff line change
Expand Up @@ -720,7 +720,6 @@ def __init__(self):
self.threadException = None # type: Optional[Exception]
self.selectedModName = None # type: Optional[str] # user sets this while navigating the website

self.remoteNews = ""
self.donationMonthsRemaining = ""
self.donationProgressPercent = ""

Expand All @@ -736,9 +735,6 @@ def __init__(self):
def shutdown(self):
self.installRunningLock.release()

def loadNews(self):
self.remoteNews = common.tryGetRemoteNews('news')

def loadDonationStatus(self):
self.donationMonthsRemaining, self.donationProgressPercent = common.getDonationStatus()

Expand Down Expand Up @@ -897,7 +893,6 @@ def getSubModHandlesRequestHandler(requestData):
'installAlreadyInProgress': self.installAlreadyInProgress(), # This is true if the install is currently running. Use to resume displaying an ongoing installation if the user accidentally closed the browser tab.
'lastInstallPath': self.lastInstallPath, # The last path installed to - only valid if an install is currently running.
'lastSubModID': self.lastSubModID, # The ID of the last submod installed to - only valid if an install is currently running.
'news': self.remoteNews, # News across all mods, fetched from github
'donationMonthsRemaining': self.donationMonthsRemaining, # How many months the server can be paid for with current funding
'donationProgressPercent': self.donationProgressPercent, # How close funding is to the 12 month donation goal, in percent
},
Expand Down
7 changes: 0 additions & 7 deletions httpGUI/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -67,13 +67,6 @@ <h2 class="uppercase mb8">Higurashi Rei</h2>
<p class="lead mb0">New chapter: Higurashi Rei<br></p>
<a class="btn btn-lg" onclick="setModNameAndNavigate('Rei')">INSTALL</a>
</div>
<div class="col-md-6 text-center">
<div class="feature bordered hidden-xs hidden-sm boxed">
<div class="rendered-markdown">
<span v-html="globalNews"></span>
</div>
</div>
</div>
</div>

</div>
Expand Down
4 changes: 0 additions & 4 deletions httpGUI/python-patcher-index.js
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,6 @@ window.onload = function onWindowLoaded() {
dataFilters: ['Question Arcs', 'Answer Arcs', 'Console Arcs', 'Bonus Content'],
currentDataFilter: null,
masonryInitialized: false,
globalNews: 'News not loaded',
donationProgress: 'N months',
donationMonthsRemaining: 'XXX%',
metaInfo: {
Expand All @@ -99,7 +98,6 @@ window.onload = function onWindowLoaded() {
lockFileExists: false, // This indicates if a install is already running in a different instance, or a previous install was killed while running
operatingSystem: '', // The operating system - either 'windows', 'linux', or 'mac'
installAlreadyInProgress: false, // This is true if the install is currently running. Use to resume displaying an ongoing installation if the user accidentally closed the browser tab.
news: '', // News across all mods, fetched from github
donationMonthsRemaining: '', // How many months the server can be paid for with current funding
donationProgressPercent: '', // How close funding is to the 12 month donation goal, in percent
},
Expand Down Expand Up @@ -152,8 +150,6 @@ window.onload = function onWindowLoaded() {
app.modalVisible = true;
}

app.globalNews = DOMPurify.sanitize(marked(app.metaInfo.news));

app.uniqueSubMods = Object.values(modNameToSubModHandleMap);
app.uniqueSubMods.sort((a, b) => a.id - b.id);
console.log(app.uniqueSubMods);
Expand Down
1 change: 0 additions & 1 deletion httpGUI/python-patcher-lib.js
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,6 @@ window.onload = function onWindowLoaded() {
lockFileExists: false, // This indicates if a install is already running in a different instance, or a previous install was killed while running
operatingSystem: '', // The operating system - either 'windows', 'linux', or 'mac'
installAlreadyInProgress: false, // This is true if the install is currently running. Use to resume displaying an ongoing installation if the user accidentally closed the browser tab.
news: '', // News across all mods, fetched from github
donationMonthsRemaining: '', // How many months the server can be paid for with current funding
donationProgressPercent: '', // How close funding is to the 12 month donation goal, in percent
},
Expand Down
5 changes: 0 additions & 5 deletions httpGUI/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -154,11 +154,6 @@ h1, h2, h3, h4, h5, h6 {
color: black;
}

#globalNews {
overflow-y: auto;
height: 280px;
}

.background-image-holder.fadeIn {
-webkit-filter: brightness(50%); filter: brightness(50%)
}
Expand Down
7 changes: 0 additions & 7 deletions main.py
Original file line number Diff line number Diff line change
Expand Up @@ -232,18 +232,11 @@ def thread_getSubModConfigList():
return getSubModConfigList(modList)

def thread_unimportantTasks():
t_loadNews = common.makeThread(installerGUI.loadNews)
t_loadDonations = common.makeThread(installerGUI.loadDonationStatus)
t_loadLatestInstallerStatus = common.makeThread(common.Globals.loadInstallerLatestStatus)
t_loadNews.start()
t_loadDonations.start()
t_loadLatestInstallerStatus.start()

try:
t_loadNews.join(timeout=6)
except Exception as e:
print(e)

try:
t_loadDonations.join(timeout=6)
except Exception as e:
Expand Down
3 changes: 0 additions & 3 deletions news/Console Arcs.md

This file was deleted.

3 changes: 0 additions & 3 deletions news/Himatsubushi Ch.4.md

This file was deleted.

3 changes: 0 additions & 3 deletions news/Meakashi Ch.5.md

This file was deleted.

5 changes: 0 additions & 5 deletions news/Minagoroshi Ch.7.md

This file was deleted.

3 changes: 0 additions & 3 deletions news/Onikakushi Ch.1.md

This file was deleted.

3 changes: 0 additions & 3 deletions news/Tatarigoroshi Ch.3.md

This file was deleted.

3 changes: 0 additions & 3 deletions news/Tsumihoroboshi Ch.6.md

This file was deleted.

97 changes: 0 additions & 97 deletions news/Umineko Answer (Ch. 5-8).md

This file was deleted.

5 changes: 0 additions & 5 deletions news/Umineko Hane.md

This file was deleted.

Loading