From d76153aa0a96f6b692a8d2ce1aa6e906fd8b416e Mon Sep 17 00:00:00 2001 From: persianpros Date: Wed, 14 Apr 2021 15:29:09 +0430 Subject: [PATCH 1/7] PEP8 double aggressive E401 --- plugin/__init__.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/plugin/__init__.py b/plugin/__init__.py index 5892a40..8f4debc 100644 --- a/plugin/__init__.py +++ b/plugin/__init__.py @@ -2,7 +2,8 @@ from Components.Language import language from Tools.Directories import resolveFilename, SCOPE_PLUGINS -import os, gettext +import os +import gettext PluginLanguageDomain = "ShootYourScreen" PluginLanguagePath = "Extensions/ShootYourScreen/locale" @@ -21,4 +22,4 @@ def _(txt): return t localeInit() -language.addCallback(localeInit) \ No newline at end of file +language.addCallback(localeInit) From 9acec554fe139e3bee24472f5c164f02a5ae6621 Mon Sep 17 00:00:00 2001 From: persianpros Date: Wed, 14 Apr 2021 15:29:10 +0430 Subject: [PATCH 2/7] PEP8 double aggressive E251 and E252 --- plugin/plugin.py | 30 +++++++++++++++--------------- setup.py | 14 +++++++------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/plugin/plugin.py b/plugin/plugin.py index 83bd57f..49a5fad 100644 --- a/plugin/plugin.py +++ b/plugin/plugin.py @@ -34,12 +34,12 @@ config.plugins.shootyourscreen = ConfigSubsection() config.plugins.shootyourscreen.enable = ConfigEnableDisable(default=True) config.plugins.shootyourscreen.switchhelp = ConfigYesNo(default=True) -config.plugins.shootyourscreen.path = ConfigSelection(default = "/media/hdd", choices = [("/media/hdd"), ("/media/usb"), ("/media/hdd1"), ("/media/usb1"), ("/tmp", "/tmp")]) -config.plugins.shootyourscreen.pictureformat = ConfigSelection(default = "jpg", choices = [("", "bmp"), ("-j", "jpg"), ("-p", "png")]) -config.plugins.shootyourscreen.jpegquality = ConfigSelection(default = "100", choices = [("10"), ("20"), ("40"), ("60"), ("80"), ("100")]) -config.plugins.shootyourscreen.picturetype = ConfigSelection(default = "all", choices = [("all", "OSD + Video"), ("-v", "Video"), ("-o", "OSD")]) -config.plugins.shootyourscreen.picturesize = ConfigSelection(default = "default", choices = [("default", _("Skin resolution")), ("-r 480", "480"), ("-r 576", "576"), ("-r 720", "720"), ("-r 1280", "1280"), ("-r 1920", "1920")]) -config.plugins.shootyourscreen.timeout = ConfigSelection(default = "3", choices = [("1", "1 sec"), ("3", "3 sec"), ("5", "5 sec"), ("10", "10 sec"), ("off", _("no message")), ("0", _("no timeout"))]) +config.plugins.shootyourscreen.path = ConfigSelection(default="/media/hdd", choices=[("/media/hdd"), ("/media/usb"), ("/media/hdd1"), ("/media/usb1"), ("/tmp", "/tmp")]) +config.plugins.shootyourscreen.pictureformat = ConfigSelection(default="jpg", choices=[("", "bmp"), ("-j", "jpg"), ("-p", "png")]) +config.plugins.shootyourscreen.jpegquality = ConfigSelection(default="100", choices=[("10"), ("20"), ("40"), ("60"), ("80"), ("100")]) +config.plugins.shootyourscreen.picturetype = ConfigSelection(default="all", choices=[("all", "OSD + Video"), ("-v", "Video"), ("-o", "OSD")]) +config.plugins.shootyourscreen.picturesize = ConfigSelection(default="default", choices=[("default", _("Skin resolution")), ("-r 480", "480"), ("-r 576", "576"), ("-r 720", "720"), ("-r 1280", "1280"), ("-r 1920", "1920")]) +config.plugins.shootyourscreen.timeout = ConfigSelection(default="3", choices=[("1", "1 sec"), ("3", "3 sec"), ("5", "5 sec"), ("10", "10 sec"), ("off", _("no message")), ("0", _("no timeout"))]) def getPicturePath(): picturepath = config.plugins.shootyourscreen.path.value @@ -52,7 +52,7 @@ def getPicturePath(): if (path.exists(picturepath) == False): makedirs(picturepath) except OSError: - self.session.open(MessageBox, _("Sorry, your device for screenshots is not writeable.\n\nPlease choose another one."), MessageBox.TYPE_INFO, timeout = 10) + self.session.open(MessageBox, _("Sorry, your device for screenshots is not writeable.\n\nPlease choose another one."), MessageBox.TYPE_INFO, timeout=10) return picturepath class getScreenshot: @@ -86,7 +86,7 @@ def screenshotKey(self, key, flag): return 0 return 0 - def grabScreenshot(self, ret = None): + def grabScreenshot(self, ret=None): filename = self.getFilename() print "[ShootYourScreen] grab screenshot to %s" % filename cmd = "grab" @@ -105,7 +105,7 @@ def grabScreenshot(self, ret = None): extra_args = (filename) self.ScreenshotConsole.ePopen(cmd, self.gotScreenshot, extra_args) - def gotScreenshot(self, data, retval, extra_args = None): + def gotScreenshot(self, data, retval, extra_args=None): if extra_args is not None: filename = extra_args else: @@ -128,7 +128,7 @@ def gotScreenshot(self, data, retval, extra_args = None): if error: msg_text = _("Grabbing Screenshot failed !!!") msg_type = MessageBox.TYPE_ERROR - AddNotification(MessageBox, msg_text, MessageBox.TYPE_INFO, timeout = messagetimeout) + AddNotification(MessageBox, msg_text, MessageBox.TYPE_INFO, timeout=messagetimeout) else: pass @@ -171,7 +171,7 @@ def __init__(self,session): self.createConfigList() - ConfigListScreen.__init__(self, self.list, session = self.session, on_change = self.changedEntry) + ConfigListScreen.__init__(self, self.list, session=self.session, on_change=self.changedEntry) self["key_red"] = Label(_("Exit")) self["key_green"] = Label(_("Save")) @@ -218,7 +218,7 @@ def keyGreen(self): def cancel(self): if self["config"].isChanged(): - self.session.openWithCallback(self.cancelConfirm, MessageBox, _("Really close without saving settings?"), MessageBox.TYPE_YESNO, default = True) + self.session.openWithCallback(self.cancelConfirm, MessageBox, _("Really close without saving settings?"), MessageBox.TYPE_YESNO, default=True) else: for x in self["config"].list: x[1].cancel() @@ -234,7 +234,7 @@ def cancelConfirm(self, result): self.close(False,self.session) def revert(self): - self.session.openWithCallback(self.keyYellowConfirm, MessageBox, _("Reset ShootYourScreen settings to defaults?"), MessageBox.TYPE_YESNO, timeout = 20, default = True) + self.session.openWithCallback(self.keyYellowConfirm, MessageBox, _("Reset ShootYourScreen settings to defaults?"), MessageBox.TYPE_YESNO, timeout=20, default=True) def keyYellowConfirm(self, confirmed): if not confirmed: @@ -261,5 +261,5 @@ def startSetup(session, **kwargs): session.open(ShootYourScreenConfig) def Plugins(**kwargs): - return [PluginDescriptor(where = PluginDescriptor.WHERE_SESSIONSTART, fnc = autostart), - PluginDescriptor(name = "ShootYourScreen Setup", description = _("make Screenshots with your VU+"), where = [PluginDescriptor.WHERE_PLUGINMENU, PluginDescriptor.WHERE_EXTENSIONSMENU], icon="shootyourscreen.png", fnc=startSetup)] + return [PluginDescriptor(where=PluginDescriptor.WHERE_SESSIONSTART, fnc=autostart), + PluginDescriptor(name="ShootYourScreen Setup", description=_("make Screenshots with your VU+"), where=[PluginDescriptor.WHERE_PLUGINMENU, PluginDescriptor.WHERE_EXTENSIONSMENU], icon="shootyourscreen.png", fnc=startSetup)] diff --git a/setup.py b/setup.py index 07e408e..b34b98e 100644 --- a/setup.py +++ b/setup.py @@ -2,11 +2,11 @@ import setup_translate pkg = 'Extensions.ShootYourScreen' -setup (name = 'enigma2-plugin-extensions-shootyourscreen', - version = '0.2', - description = 'make Screenshots with your VU+', - packages = [pkg], - package_dir = {pkg: 'plugin'}, - package_data = {pkg: ['locale/*/LC_MESSAGES/*.mo', 'shootyourscreen.png', 'pic/*.png']}, - cmdclass = setup_translate.cmdclass, # for translation +setup (name='enigma2-plugin-extensions-shootyourscreen', + version='0.2', + description='make Screenshots with your VU+', + packages=[pkg], + package_dir={pkg: 'plugin'}, + package_data={pkg: ['locale/*/LC_MESSAGES/*.mo', 'shootyourscreen.png', 'pic/*.png']}, + cmdclass=setup_translate.cmdclass, # for translation ) From f7c0e4c7fe2ad5de50653a42cebe9d7236de797f Mon Sep 17 00:00:00 2001 From: persianpros Date: Wed, 14 Apr 2021 15:29:11 +0430 Subject: [PATCH 3/7] PEP8 double aggressive E20 and E211 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index b34b98e..f29b48e 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ import setup_translate pkg = 'Extensions.ShootYourScreen' -setup (name='enigma2-plugin-extensions-shootyourscreen', +setup(name='enigma2-plugin-extensions-shootyourscreen', version='0.2', description='make Screenshots with your VU+', packages=[pkg], From e7883f8f0455f42ecd172ce3e3aaf3273d2b94d1 Mon Sep 17 00:00:00 2001 From: persianpros Date: Wed, 14 Apr 2021 15:29:11 +0430 Subject: [PATCH 4/7] PEP8 double aggressive E22, E224, E241, E242 and E27 --- plugin/plugin.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugin/plugin.py b/plugin/plugin.py index 49a5fad..3c802d9 100644 --- a/plugin/plugin.py +++ b/plugin/plugin.py @@ -69,7 +69,7 @@ def screenshotKey(self, key, flag): self.previousflag = flag self.grabScreenshot() return 1 - if self.previousflag == 3 and flag ==1: + if self.previousflag == 3 and flag == 1: self.previousflag = 0 return 1 else: @@ -81,7 +81,7 @@ def screenshotKey(self, key, flag): if flag == 1 and self.previousflag == 0: self.grabScreenshot() return 1 - if self.previousflag == 3 and flag ==1: + if self.previousflag == 3 and flag == 1: self.previousflag = 0 return 0 return 0 From 5dc89a0d8774bdf6219781c66eba512ec26c75c9 Mon Sep 17 00:00:00 2001 From: persianpros Date: Wed, 14 Apr 2021 15:29:12 +0430 Subject: [PATCH 5/7] PEP8 double aggressive E225 ~ E228 and E231 --- plugin/plugin.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/plugin/plugin.py b/plugin/plugin.py index 3c802d9..f929a43 100644 --- a/plugin/plugin.py +++ b/plugin/plugin.py @@ -165,9 +165,9 @@ class ShootYourScreenConfig(Screen, ConfigListScreen): """ - def __init__(self,session): + def __init__(self, session): self.session = session - Screen.__init__(self,session) + Screen.__init__(self, session) self.createConfigList() @@ -214,7 +214,7 @@ def save(self): def keyGreen(self): self.save() - self.close(False,self.session) + self.close(False, self.session) def cancel(self): if self["config"].isChanged(): @@ -222,7 +222,7 @@ def cancel(self): else: for x in self["config"].list: x[1].cancel() - self.close(False,self.session) + self.close(False, self.session) def cancelConfirm(self, result): if result is None or result is False: @@ -231,7 +231,7 @@ def cancelConfirm(self, result): print "[ShootYourScreen] Cancel confirmed. Configchanges will be lost." for x in self["config"].list: x[1].cancel() - self.close(False,self.session) + self.close(False, self.session) def revert(self): self.session.openWithCallback(self.keyYellowConfirm, MessageBox, _("Reset ShootYourScreen settings to defaults?"), MessageBox.TYPE_YESNO, timeout=20, default=True) From a6194911f9bdc8b73ff21677a2c9b755e8cc6918 Mon Sep 17 00:00:00 2001 From: persianpros Date: Wed, 14 Apr 2021 15:29:12 +0430 Subject: [PATCH 6/7] PEP8 double aggressive E301 ~ E306 --- plugin/__init__.py | 3 +++ plugin/plugin.py | 6 ++++++ setup_translate.py | 5 +++++ 3 files changed, 14 insertions(+) diff --git a/plugin/__init__.py b/plugin/__init__.py index 8f4debc..aecee5b 100644 --- a/plugin/__init__.py +++ b/plugin/__init__.py @@ -8,12 +8,14 @@ PluginLanguageDomain = "ShootYourScreen" PluginLanguagePath = "Extensions/ShootYourScreen/locale" + def localeInit(): lang = language.getLanguage()[:2] os.environ["LANGUAGE"] = lang print "[ShootYourScreen] set language to ", lang gettext.bindtextdomain(PluginLanguageDomain, resolveFilename(SCOPE_PLUGINS, PluginLanguagePath)) + def _(txt): t = gettext.dgettext(PluginLanguageDomain, txt) if t == txt: @@ -21,5 +23,6 @@ def _(txt): t = gettext.gettext(txt) return t + localeInit() language.addCallback(localeInit) diff --git a/plugin/plugin.py b/plugin/plugin.py index f929a43..242df5a 100644 --- a/plugin/plugin.py +++ b/plugin/plugin.py @@ -41,6 +41,7 @@ config.plugins.shootyourscreen.picturesize = ConfigSelection(default="default", choices=[("default", _("Skin resolution")), ("-r 480", "480"), ("-r 576", "576"), ("-r 720", "720"), ("-r 1280", "1280"), ("-r 1920", "1920")]) config.plugins.shootyourscreen.timeout = ConfigSelection(default="3", choices=[("1", "1 sec"), ("3", "3 sec"), ("5", "5 sec"), ("10", "10 sec"), ("off", _("no message")), ("0", _("no timeout"))]) + def getPicturePath(): picturepath = config.plugins.shootyourscreen.path.value if picturepath.endswith('/'): @@ -55,6 +56,7 @@ def getPicturePath(): self.session.open(MessageBox, _("Sorry, your device for screenshots is not writeable.\n\nPlease choose another one."), MessageBox.TYPE_INFO, timeout=10) return picturepath + class getScreenshot: def __init__(self): self.ScreenshotConsole = Console() @@ -153,6 +155,7 @@ def getFilename(self): screenshotfile = picturepath + '/' + screenshottime + fileextension return screenshotfile + class ShootYourScreenConfig(Screen, ConfigListScreen): skin = """ @@ -251,15 +254,18 @@ def keyYellowConfirm(self, confirmed): config.plugins.shootyourscreen.timeout.setValue("3") self.save() + def autostart(reason, **kwargs): if kwargs.has_key("session") and reason == 0: print "[ShootYourScreen] start...." getScreenshot() + def startSetup(session, **kwargs): print "[ShootYourScreen] start configuration" session.open(ShootYourScreenConfig) + def Plugins(**kwargs): return [PluginDescriptor(where=PluginDescriptor.WHERE_SESSIONSTART, fnc=autostart), PluginDescriptor(name="ShootYourScreen Setup", description=_("make Screenshots with your VU+"), where=[PluginDescriptor.WHERE_PLUGINMENU, PluginDescriptor.WHERE_EXTENSIONSMENU], icon="shootyourscreen.png", fnc=startSetup)] diff --git a/setup_translate.py b/setup_translate.py index 692f001..a6a36d2 100644 --- a/setup_translate.py +++ b/setup_translate.py @@ -5,8 +5,10 @@ import glob import os + class build_trans(cmd.Command): description = 'Compile .po files into .mo files' + def initialize_options(self): pass @@ -33,11 +35,14 @@ def run(self): else: print "we got no domain -> no translation was compiled" + class build(_build): sub_commands = _build.sub_commands + [('build_trans', None)] + def run(self): _build.run(self) + cmdclass = { 'build': build, 'build_trans': build_trans, From 14e6641314ce9c230a068c0feb4330cb42c4dc09 Mon Sep 17 00:00:00 2001 From: persianpros Date: Wed, 14 Apr 2021 15:29:13 +0430 Subject: [PATCH 7/7] PEP8 double aggressive W291 ~ W293 and W391 --- plugin/plugin.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/plugin/plugin.py b/plugin/plugin.py index 242df5a..029bfe7 100644 --- a/plugin/plugin.py +++ b/plugin/plugin.py @@ -112,7 +112,7 @@ def gotScreenshot(self, data, retval, extra_args=None): filename = extra_args else: filename = "" - + if not config.plugins.shootyourscreen.timeout.value == "off": messagetimeout = int(config.plugins.shootyourscreen.timeout.value) error = False @@ -140,7 +140,7 @@ def getFilename(self): now = now.strftime("%Y-%m-%d_%H-%M-%S") screenshottime = "screenshot_" + now - + if config.plugins.shootyourscreen.pictureformat.getText() == "bmp": fileextension = ".bmp" elif config.plugins.shootyourscreen.pictureformat.getText() == "jpg": @@ -171,7 +171,7 @@ class ShootYourScreenConfig(Screen, ConfigListScreen): def __init__(self, session): self.session = session Screen.__init__(self, session) - + self.createConfigList() ConfigListScreen.__init__(self, self.list, session=self.session, on_change=self.changedEntry) @@ -187,7 +187,7 @@ def __init__(self, session): "cancel": self.cancel, "ok": self.keyGreen, }, -2) - + self.onShown.append(self.setWindowTitle) def setWindowTitle(self):