Removed MSPA & Pesterchum update checking
This commit is contained in:
BuildTools
parent
f19c3af61f
commit
e069f2b31e
3 changed files with 35 additions and 170 deletions
30
menus.py
30
menus.py
|
|
@ -1133,21 +1133,21 @@ class PesterOptions(QtWidgets.QDialog):
|
|||
layout_5.addWidget(QtWidgets.QLabel("Minutes before Idle:"))
|
||||
layout_5.addWidget(self.idleBox)
|
||||
|
||||
self.updateBox = QtWidgets.QComboBox(self)
|
||||
self.updateBox.addItem("Once a Day")
|
||||
self.updateBox.addItem("Once a Week")
|
||||
self.updateBox.addItem("Only on Start")
|
||||
self.updateBox.addItem("Never")
|
||||
check = self.config.checkForUpdates()
|
||||
if check >= 0 and check < self.updateBox.count():
|
||||
self.updateBox.setCurrentIndex(check)
|
||||
#self.updateBox = QtWidgets.QComboBox(self)
|
||||
#self.updateBox.addItem("Once a Day")
|
||||
#self.updateBox.addItem("Once a Week")
|
||||
#self.updateBox.addItem("Only on Start")
|
||||
#self.updateBox.addItem("Never")
|
||||
#check = self.config.checkForUpdates()
|
||||
#if check >= 0 and check < self.updateBox.count():
|
||||
# self.updateBox.setCurrentIndex(check)
|
||||
layout_6 = QtWidgets.QHBoxLayout()
|
||||
layout_6.addWidget(QtWidgets.QLabel("Check for\nPesterchum Updates:"))
|
||||
layout_6.addWidget(self.updateBox)
|
||||
#layout_6.addWidget(QtWidgets.QLabel("Check for\nPesterchum Updates:"))
|
||||
#layout_6.addWidget(self.updateBox)
|
||||
|
||||
if not ostools.isOSXLeopard():
|
||||
self.mspaCheck = QtWidgets.QCheckBox("Check for MSPA Updates", self)
|
||||
self.mspaCheck.setChecked(self.config.checkMSPA())
|
||||
#if not ostools.isOSXLeopard():
|
||||
# self.mspaCheck = QtWidgets.QCheckBox("Check for MSPA Updates", self)
|
||||
# self.mspaCheck.setChecked(self.config.checkMSPA())
|
||||
|
||||
self.randomscheck = QtWidgets.QCheckBox("Receive Random Encounters")
|
||||
self.randomscheck.setChecked(parent.userprofile.randoms)
|
||||
|
|
@ -1342,8 +1342,8 @@ class PesterOptions(QtWidgets.QDialog):
|
|||
layout_idle.setAlignment(QtCore.Qt.AlignTop)
|
||||
layout_idle.addLayout(layout_5)
|
||||
layout_idle.addLayout(layout_6)
|
||||
if not ostools.isOSXLeopard():
|
||||
layout_idle.addWidget(self.mspaCheck)
|
||||
#if not ostools.isOSXLeopard():
|
||||
# layout_idle.addWidget(self.mspaCheck)
|
||||
self.pages.addWidget(widget)
|
||||
|
||||
# Theme
|
||||
|
|
|
|||
|
|
@ -123,8 +123,8 @@ from randomer import RandomHandler, RANDNICK
|
|||
import nickservmsgs
|
||||
|
||||
# Rawr, fuck you OSX leopard
|
||||
if not ostools.isOSXLeopard():
|
||||
from updatecheck import MSPAChecker
|
||||
#if not ostools.isOSXLeopard():
|
||||
# from updatecheck import MSPAChecker
|
||||
|
||||
from toast import PesterToastMachine, PesterToast
|
||||
from libs import pytwmn
|
||||
|
|
@ -1286,8 +1286,8 @@ class PesterWindow(MovingWindow):
|
|||
self.changeProfile()
|
||||
|
||||
# Fuck you some more OSX leopard! >:(
|
||||
if not ostools.isOSXLeopard():
|
||||
QtCore.QTimer.singleShot(1000, self.mspacheck)
|
||||
#if not ostools.isOSXLeopard():
|
||||
# QtCore.QTimer.singleShot(1000, self.mspacheck)
|
||||
|
||||
self.pcUpdate['QString', 'QString'].connect(self.updateMsg)
|
||||
|
||||
|
|
@ -1296,11 +1296,11 @@ class PesterWindow(MovingWindow):
|
|||
self.lastping = int(time())
|
||||
self.pingtimer.start(1000*90)
|
||||
|
||||
@QtCore.pyqtSlot()
|
||||
def mspacheck(self):
|
||||
# Fuck you EVEN more OSX leopard! >:((((
|
||||
if not ostools.isOSXLeopard():
|
||||
checker = MSPAChecker(self)
|
||||
#@QtCore.pyqtSlot()
|
||||
#def mspacheck(self):
|
||||
# # Fuck you EVEN more OSX leopard! >:((((
|
||||
# if not ostools.isOSXLeopard():
|
||||
# checker = MSPAChecker(self)
|
||||
|
||||
@QtCore.pyqtSlot(QString, QString)
|
||||
def updateMsg(self, ver, url):
|
||||
|
|
@ -2652,18 +2652,18 @@ class PesterWindow(MovingWindow):
|
|||
self.config.set('animations', animatesetting)
|
||||
self.animationSetting.emit(animatesetting)
|
||||
# update checked
|
||||
updatechecksetting = self.optionmenu.updateBox.currentIndex()
|
||||
curupdatecheck = self.config.checkForUpdates()
|
||||
if updatechecksetting != curupdatecheck:
|
||||
self.config.set('checkUpdates', updatechecksetting)
|
||||
#updatechecksetting = self.optionmenu.updateBox.currentIndex()
|
||||
#curupdatecheck = self.config.checkForUpdates()
|
||||
#if updatechecksetting != curupdatecheck:
|
||||
# self.config.set('checkUpdates', updatechecksetting)
|
||||
# mspa update check
|
||||
if ostools.isOSXLeopard():
|
||||
mspachecksetting = false
|
||||
else:
|
||||
mspachecksetting = self.optionmenu.mspaCheck.isChecked()
|
||||
curmspacheck = self.config.checkMSPA()
|
||||
if mspachecksetting != curmspacheck:
|
||||
self.config.set('mspa', mspachecksetting)
|
||||
#if ostools.isOSXLeopard():
|
||||
# mspachecksetting = false
|
||||
#else:
|
||||
# mspachecksetting = self.optionmenu.mspaCheck.isChecked()
|
||||
#curmspacheck = self.config.checkMSPA()
|
||||
#if mspachecksetting != curmspacheck:
|
||||
# self.config.set('mspa', mspachecksetting)
|
||||
# Taskbar blink
|
||||
blinksetting = 0
|
||||
if self.optionmenu.pesterBlink.isChecked():
|
||||
|
|
|
|||
135
updatecheck.py
135
updatecheck.py
|
|
@ -1,135 +0,0 @@
|
|||
# Adapted from Eco-Mono's F5Stuck RSS Client
|
||||
|
||||
# karxi: Now that Homestuck is over, this might be removed.
|
||||
# Even if it isn't, it needs cleanup; the code is unpleasant.
|
||||
|
||||
import feedparser
|
||||
import pickle
|
||||
import os
|
||||
import sys
|
||||
import threading
|
||||
from time import mktime
|
||||
from PyQt5 import QtCore, QtGui, QtWidgets
|
||||
|
||||
import logging
|
||||
logging.basicConfig(level=logging.WARNING)
|
||||
|
||||
class MSPAChecker(QtWidgets.QWidget):
|
||||
def __init__(self, parent=None):
|
||||
#~QtCore.QObject.__init__(self, parent)
|
||||
# karxi: Why would you do that?
|
||||
super(MSPAChecker, self).__init__(parent)
|
||||
self.mainwindow = parent
|
||||
self.refreshRate = 30 # seconds
|
||||
self.status = None
|
||||
self.lock = False
|
||||
self.timer = QtCore.QTimer(self)
|
||||
self.timer.timeout.connect(self.check_site_wrapper)
|
||||
self.timer.start(1000*self.refreshRate)
|
||||
|
||||
def save_state(self):
|
||||
try:
|
||||
with open("status_new.pkl", "w") as current_status:
|
||||
pickle.dump(self.status, current_status)
|
||||
try:
|
||||
os.rename("status.pkl","status_old.pkl")
|
||||
except:
|
||||
pass
|
||||
try:
|
||||
os.rename("status_new.pkl","status.pkl")
|
||||
except:
|
||||
if os.path.exists("status_old.pkl"):
|
||||
os.rename("status_old.pkl","status.pkl")
|
||||
raise
|
||||
if os.path.exists("status_old.pkl"):
|
||||
os.remove("status_old.pkl")
|
||||
except Exception as e:
|
||||
logging.error("Error: %s", e, exc_info=sys.exc_info())
|
||||
msg = QtWidgets.QMessageBox(self)
|
||||
msg.setText("Problems writing save file.")
|
||||
msg.show()
|
||||
|
||||
@QtCore.pyqtSlot()
|
||||
def check_site_wrapper(self):
|
||||
if not self.mainwindow.config.checkMSPA():
|
||||
return
|
||||
if self.lock:
|
||||
return
|
||||
logging.debug("Checking MSPA updates...")
|
||||
s = threading.Thread(target=self.check_site)
|
||||
s.start()
|
||||
|
||||
def check_site(self):
|
||||
rss = None
|
||||
must_save = False
|
||||
try:
|
||||
self.lock = True
|
||||
rss = feedparser.parse("http://www.mspaintadventures.com/rss/rss.xml")
|
||||
except:
|
||||
return
|
||||
finally:
|
||||
self.lock = False
|
||||
if len(rss.entries) == 0:
|
||||
return
|
||||
entries = sorted(rss.entries,key=(lambda x: mktime(x.updated_parsed)))
|
||||
if self.status == None:
|
||||
self.status = {}
|
||||
self.status['last_visited'] = {'pubdate':mktime(entries[-1].updated_parsed),'link':entries[-1].link}
|
||||
self.status['last_seen'] = {'pubdate':mktime(entries[-1].updated_parsed),'link':entries[-1].link}
|
||||
must_save = True
|
||||
elif mktime(entries[-1].updated_parsed) > self.status['last_seen']['pubdate']:
|
||||
#This is the first time the app itself has noticed this update.
|
||||
self.status['last_seen'] = {'pubdate':mktime(entries[-1].updated_parsed),'link':entries[-1].link}
|
||||
must_save = True
|
||||
if self.status['last_seen']['pubdate'] > self.status['last_visited']['pubdate']:
|
||||
if not hasattr(self, "mspa"):
|
||||
self.mspa = None
|
||||
if not self.mspa:
|
||||
self.mspa = MSPAUpdateWindow(self.parent())
|
||||
self.mspa.accepted.connect(self.visit_site)
|
||||
self.mspa.rejected.connect(self.nothing)
|
||||
self.mspa.show()
|
||||
else:
|
||||
#logging.info("No new updates :(")
|
||||
pass
|
||||
if must_save:
|
||||
self.save_state()
|
||||
|
||||
@QtCore.pyqtSlot()
|
||||
def visit_site(self):
|
||||
logging.debug(self.status['last_visited']['link'])
|
||||
QtGui.QDesktopServices.openUrl(QtCore.QUrl(self.status['last_visited']['link'], QtCore.QUrl.TolerantMode))
|
||||
if self.status['last_seen']['pubdate'] > self.status['last_visited']['pubdate']:
|
||||
#Visited for the first time. Untrip the icon and remember that we saw it.
|
||||
self.status['last_visited'] = self.status['last_seen']
|
||||
self.save_state()
|
||||
self.mspa = None
|
||||
@QtCore.pyqtSlot()
|
||||
def nothing(self):
|
||||
self.mspa = None
|
||||
|
||||
class MSPAUpdateWindow(QtWidgets.QDialog):
|
||||
def __init__(self, parent=None):
|
||||
super(MSPAUpdateWindow, self).__init__(parent)
|
||||
self.mainwindow = parent
|
||||
self.setStyleSheet(self.mainwindow.theme["main/defaultwindow/style"])
|
||||
self.setWindowTitle("MSPA Update!")
|
||||
self.setModal(False)
|
||||
|
||||
self.title = QtWidgets.QLabel("You have an unread MSPA update! :o)")
|
||||
|
||||
layout_0 = QtWidgets.QVBoxLayout()
|
||||
layout_0.addWidget(self.title)
|
||||
|
||||
self.ok = QtWidgets.QPushButton("GO READ NOW!", self)
|
||||
self.ok.setDefault(True)
|
||||
self.ok.clicked.connect(self.accept)
|
||||
self.cancel = QtWidgets.QPushButton("LATER", self)
|
||||
self.cancel.clicked.connect(self.reject)
|
||||
layout_2 = QtWidgets.QHBoxLayout()
|
||||
layout_2.addWidget(self.cancel)
|
||||
layout_2.addWidget(self.ok)
|
||||
|
||||
layout_0.addLayout(layout_2)
|
||||
|
||||
self.setLayout(layout_0)
|
||||
Loading…
Reference in a new issue