Skip to content

Commit 26e704c

Browse files
drojfdrojf
committed
Remove references to donations as we don't take donations anymore
1 parent 58f8dd1 commit 26e704c

9 files changed

+0
-71
lines changed

‎common.py

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -718,35 +718,6 @@ def sevenZipTest(archive_path):
718718
]
719719
return runProcessOutputToTempFile(arguments, sevenZipMode=True)
720720

721-
def getDonationStatus():
722-
# type: () -> (Optional[str], Optional[str])
723-
"""
724-
:return: (months_remaining, funding_goal_percentage) as a tuple (can both be None if download or parsing failed)
725-
"""
726-
try:
727-
entirePage = downloadFile(r"https://07th-mod.com/wiki/", is_text=True)
728-
except HTTPError as error:
729-
return None, None
730-
731-
class DonationHTMLParser(HTMLParser, object):
732-
def __init__(self):
733-
super(DonationHTMLParser, self).__init__()
734-
self.funding_goal_percentage = None
735-
self.months_remaining = None
736-
737-
def handle_starttag(self, tag, attrs):
738-
if tag == "progress":
739-
for k, v in attrs:
740-
if k == 'value':
741-
self.funding_goal_percentage = v
742-
elif k == 'data-months-remaining':
743-
self.months_remaining = v
744-
745-
parser = DonationHTMLParser()
746-
parser.feed(entirePage)
747-
748-
return parser.months_remaining, parser.funding_goal_percentage
749-
750721
def preloadModUpdatesHTML():
751722
html, errorInfo = getJSON("https://github.com/07th-mod/python-patcher-updates/releases/latest/download/updates.json", isURL=True)
752723

‎httpGUI.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -722,9 +722,6 @@ def __init__(self):
722722
self.threadException = None # type: Optional[Exception]
723723
self.selectedModName = None # type: Optional[str] # user sets this while navigating the website
724724

725-
self.donationMonthsRemaining = ""
726-
self.donationProgressPercent = ""
727-
728725
self.lastInstallPath = "" #type: str
729726
self.lastSubModID = 0 #type: int
730727

@@ -738,9 +735,6 @@ def __init__(self):
738735
def shutdown(self):
739736
self.installRunningLock.release()
740737

741-
def loadDonationStatus(self):
742-
self.donationMonthsRemaining, self.donationProgressPercent = common.getDonationStatus()
743-
744738
def preloadModUpdatesHTML(self):
745739
self.updates = common.preloadModUpdatesHTML()
746740

@@ -918,8 +912,6 @@ def getSubModHandlesRequestHandler(requestData):
918912
'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.
919913
'lastInstallPath': self.lastInstallPath, # The last path installed to - only valid if an install is currently running.
920914
'lastSubModID': self.lastSubModID, # The ID of the last submod installed to - only valid if an install is currently running.
921-
'donationMonthsRemaining': self.donationMonthsRemaining, # How many months the server can be paid for with current funding
922-
'donationProgressPercent': self.donationProgressPercent, # How close funding is to the 12 month donation goal, in percent
923915
'landingBannerHTML': self.getUpdate('Landing Banner'), # HTML for the index page landing banner
924916
},
925917
}

‎httpGUI/index.html

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -173,14 +173,6 @@ <h5 class="uppercase mb0">Shutdown the installer</h5>
173173

174174
</section>
175175
<section class="section-small-padding bg-secondary">
176-
<div class="container">
177-
<h4>Donation Status</h4>
178-
<p>
179-
Server time remaining: <b>{{ metaInfo.donationMonthsRemaining }}</b><b> months</b><br>
180-
This year's funding goal is <b>{{ metaInfo.donationProgressPercent }}</b>% complete.<br>
181-
<a href="https://07th-mod.com/wiki/Donations/" target="_blank">Click Here</a> to Donate!<br>
182-
</p>
183-
</div>
184176
<div class="container">{{ metaInfo.buildInfo }}</div>
185177
</section>
186178
</div>

‎httpGUI/python-patcher-index.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,16 +94,12 @@ window.onload = function onWindowLoaded() {
9494
dataFilters: ['Question Arcs', 'Answer Arcs', 'Console Arcs', 'Bonus Content'],
9595
currentDataFilter: null,
9696
masonryInitialized: false,
97-
donationProgress: 'N months',
98-
donationMonthsRemaining: 'XXX%',
9997
metaInfo: {
10098
buildInfo: '', // Installer Build Version and Date
10199
installerIsLatest: [null, ''], // 2- Tuple of whether installer is latest, and description of version information
102100
lockFileExists: false, // This indicates if a install is already running in a different instance, or a previous install was killed while running
103101
operatingSystem: '', // The operating system - either 'windows', 'linux', or 'mac'
104102
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.
105-
donationMonthsRemaining: '', // How many months the server can be paid for with current funding
106-
donationProgressPercent: '', // How close funding is to the 12 month donation goal, in percent
107103
},
108104
modalVisible: false,
109105
},

‎httpGUI/python-patcher-lib.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,8 +164,6 @@ window.onload = function onWindowLoaded() {
164164
lockFileExists: false, // This indicates if a install is already running in a different instance, or a previous install was killed while running
165165
operatingSystem: '', // The operating system - either 'windows', 'linux', or 'mac'
166166
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.
167-
donationMonthsRemaining: '', // How many months the server can be paid for with current funding
168-
donationProgressPercent: '', // How close funding is to the 12 month donation goal, in percent
169167
},
170168
// freeSpaceAdvisoryString: a message to the user indicating whether there is enough space on the selected install path
171169
freeSpaceAdvisoryString: null,

‎httpGUI/python-patcher-rest-lib.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,6 @@ function setModNameAndNavigate(modName) {
117117
}
118118

119119
function getInitStatus(onStatusReceived) {
120-
// Retrieve the donation status
121120
doPost('getInitStatus', [], (response) => {
122121
onStatusReceived(response);
123122
});

‎httpGUI/python-patcher-umineko-warning.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,12 @@ window.onload = function onWindowLoaded() {
2424
data: {
2525
subModList: [],
2626
masonryInitialized: false,
27-
donationProgress: 'N months',
28-
donationMonthsRemaining: 'XXX%',
2927
metaInfo: {
3028
buildInfo: '', // Installer Build Version and Date
3129
installerIsLatest: [null, ''], // 2- Tuple of whether installer is latest, and description of version information
3230
lockFileExists: false, // This indicates if a install is already running in a different instance, or a previous install was killed while running
3331
operatingSystem: '', // The operating system - either 'windows', 'linux', or 'mac'
3432
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.
35-
donationMonthsRemaining: '', // How many months the server can be paid for with current funding
36-
donationProgressPercent: '', // How close funding is to the 12 month donation goal, in percent
3733
},
3834
modalVisible: false,
3935
},

‎httpGUI/umineko-warning.html

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -132,14 +132,6 @@ <h3>Please read the information below!</h3>
132132
</section>
133133

134134
<section class="section-small-padding bg-secondary">
135-
<div class="container">
136-
<h4>Donation Status</h4>
137-
<p>
138-
Server time remaining: <b>{{ metaInfo.donationMonthsRemaining }}</b><b> months</b><br>
139-
This year's funding goal is <b>{{ metaInfo.donationProgressPercent }}</b>% complete.<br>
140-
<a href="https://07th-mod.com/wiki/Donations/" target="_blank">Click Here</a> to Donate!<br>
141-
</p>
142-
</div>
143135
<div class="container">{{ metaInfo.buildInfo }}</div>
144136
</section>
145137
</div>

‎main.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -212,18 +212,11 @@ def thread_getSubModConfigList():
212212
return getSubModConfigList(modList)
213213

214214
def thread_unimportantTasks():
215-
t_loadDonations = common.makeThread(installerGUI.loadDonationStatus)
216215
t_loadLatestInstallerStatus = common.makeThread(common.Globals.loadInstallerLatestStatus)
217216
t_preloadModUpdatesHTML = common.makeThread(installerGUI.preloadModUpdatesHTML)
218-
t_loadDonations.start()
219217
t_loadLatestInstallerStatus.start()
220218
t_preloadModUpdatesHTML.start()
221219

222-
try:
223-
t_loadDonations.join(timeout=6)
224-
except Exception as e:
225-
print(e)
226-
227220
try:
228221
t_loadLatestInstallerStatus.join(timeout=6)
229222
except Exception as e:

0 commit comments

Comments
 (0)