Skip to content

Commit 3de983c

Browse files
machawk1machawk1
authored
Merge pull request #348 from machawk1/issue-308-refix
Issue 308 refix
2 parents 023d034 + 8169057 commit 3de983c

File tree

1 file changed

+34
-30
lines changed

1 file changed

+34
-30
lines changed

‎bundledApps/WAIL.py

+34-30
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ def setMementoCount(self, mCount, aCount=0):
280280
if mCount is None:
281281
memCountMsg = config.msg_fetchingMementos
282282
elif mCount > 0:
283-
locale.setlocale(locale.LC_ALL, '')
283+
locale.setlocale(locale.LC_ALL, 'en_US')
284284

285285
mPlurality = 's'
286286
aPlurality = 's'
@@ -546,7 +546,7 @@ def checkIfURLIsInArchive(self, button):
546546
else:
547547
mb = wx.MessageBox(config.msg_uriInArchives_body,
548548
config.msg_uriInArchives_title)
549-
#b = wx.Button(self, -1, config.buttonLabel_mementoCountInfo,
549+
# b = wx.Button(self, -1, config.buttonLabel_mementoCountInfo,
550550
# pos=(10, 85), size=(25, 15))
551551
# Disabled until we tie more functionality to the button
552552
# mb.AddButton(b) # Will not work in wxPython >4
@@ -574,7 +574,7 @@ def viewArchiveInBrowser(self, button):
574574
# img = wx.EmptyBitmap( 1, 1 )
575575
# img.LoadFile('/Users/machawk1/Downloads/Spinner.gif', wx.BITMAP_TYPE_ANY)
576576
# self.archiveNowButton.SetBitmap(img)
577-
577+
578578
# self.viewArchiveInBrowser(None)
579579

580580

@@ -583,7 +583,7 @@ class ServicesPanel(wx.Panel, threading.Thread):
583583
def __init__(self, parent):
584584
wx.Panel.__init__(self, parent)
585585
colWidth = 60
586-
rowHeight = 20#18
586+
rowHeight = 20 # 18
587587
cellSize = (150, rowHeight)
588588

589589
col0 = colWidth * 0 + 10
@@ -597,10 +597,10 @@ def __init__(self, parent):
597597

598598
col1 = 65 + colWidth * 1
599599

600-
thread.start_new_thread(self.updateServiceStatuses,())
600+
thread.start_new_thread(self.updateServiceStatuses, ())
601601

602602
col2 = col1 + colWidth
603-
cellSize_versionFix = (50,rowHeight)
603+
cellSize_versionFix = (50, rowHeight)
604604
wx.StaticText(self, 100, 'VERSION',
605605
(col2, rowHeight * 0), cellSize_versionFix)
606606
wx.StaticText(self, 100, self.getWaybackVersion(),
@@ -618,11 +618,11 @@ def __init__(self, parent):
618618

619619
self.fix_wayback = wx.Button(self, 1, config.buttonLabel_fix,
620620
(col3, rowHeight*1),
621-
buttonSize,wx.BU_EXACTFIT)
621+
buttonSize, wx.BU_EXACTFIT)
622622
self.fix_wayback.SetFont(wail_style_button_font_small)
623623
self.fix_heritrix = wx.Button(self, 1, config.buttonLabel_fix,
624624
(col3, rowHeight*2),
625-
buttonSize,wx.BU_EXACTFIT)
625+
buttonSize, wx.BU_EXACTFIT)
626626
self.fix_heritrix.SetFont(wail_style_button_font_small)
627627

628628
self.fix_wayback.Bind(wx.EVT_BUTTON, Wayback().fix)
@@ -642,37 +642,37 @@ def __init__(self, parent):
642642
self.kill_wayback.Bind(wx.EVT_BUTTON, Wayback().kill)
643643
self.kill_heritrix.Bind(wx.EVT_BUTTON, Heritrix().kill)
644644

645-
thread.start_new_thread(self.updateServiceStatuses,())
645+
thread.start_new_thread(self.updateServiceStatuses, ())
646646

647647
def setHeritrixStatus(self, status):
648648
colWidth = 60
649649
rowHeight = 20
650650
col1 = 65+colWidth*1
651651
cellSize = (40, rowHeight)
652-
653-
if hasattr(self,'status_heritrix'):
652+
653+
if hasattr(self, 'status_heritrix'):
654654
self.status_heritrix.Destroy()
655655
self.status_heritrix = wx.StaticText(self, 100, status,
656656
(col1, rowHeight*2), cellSize)
657-
657+
658658
def setWaybackStatus(self, status):
659659
colWidth = 60
660660
rowHeight = 20
661661
col1 = 65+colWidth*1
662662
cellSize = (40, rowHeight)
663663

664-
if hasattr(self,'status_wayback'):
664+
if hasattr(self, 'status_wayback'):
665665
self.status_wayback.Destroy()
666666
self.status_wayback = wx.StaticText(self, 100, status,
667667
(col1, rowHeight*1), cellSize)
668-
668+
669669
def getHeritrixVersion(self, abbr=True):
670670
htrixLibPath = config.heritrixPath + "lib/"
671671

672672
for file in os.listdir(htrixLibPath):
673-
if file.startswith("heritrix-commons"):
674-
regex = re.compile("commons-(.*)\.")
675-
return regex.findall(file)[0]
673+
if file.startswith("heritrix-commons"):
674+
regex = re.compile("commons-(.*)\.")
675+
return regex.findall(file)[0]
676676

677677
def getWaybackVersion(self):
678678
tomcatLibPath = config.tomcatPath + "/webapps/lib/"
@@ -683,10 +683,11 @@ def getWaybackVersion(self):
683683
return regex.findall(file)[0]
684684

685685
def getTomcatVersion(self):
686-
#Apache Tomcat Version 7.0.30
686+
# Apache Tomcat Version 7.0.30
687687
releaseNotesPath = config.tomcatPath + '/RELEASE-NOTES'
688688

689-
if not os.path.exists(releaseNotesPath): return "?"
689+
if not os.path.exists(releaseNotesPath):
690+
return "?"
690691
f = open(releaseNotesPath, 'r')
691692
version = ""
692693
for line in f.readlines():
@@ -737,13 +738,13 @@ def updateServiceStatuses(self, serviceId=None, transitionalStatus=None):
737738
self.setHeritrixStatus(heritrixAccessible)
738739
self.setWaybackStatus(tomcatAccessible)
739740

740-
if not hasattr(self,'fix_heritrix'):
741+
if not hasattr(self, 'fix_heritrix'):
741742
print('First call, UI has not been setup')
742743
# Initial setup call will return here, ui elements
743744
# ...have not been created
744745
return
745746

746-
#enable/disable FIX buttons based on service status
747+
# Enable/disable FIX buttons based on service status
747748
if heritrixAccessible is config.serviceEnabledLabel_YES:
748749
self.fix_heritrix.Disable()
749750
self.kill_heritrix.Enable()
@@ -791,20 +792,21 @@ def openWaybackInBrowser(self, button):
791792
config.wail_style_yesNo)
792793
result = d.ShowModal()
793794
d.Destroy()
794-
if result == wx.ID_YES: # Launch Wayback
795+
if result == wx.ID_YES: # Launch Wayback
795796
Wayback().fix(None, lambda: self.openWaybackInBrowser(None))
796797
self.viewWaybackInBrowserButton.SetLabel(
797798
config.buttonLabel_wayback_launching)
798799
self.viewWaybackInBrowserButton.Disable()
799800

800-
def openWaybackConfiguration(self,button):
801+
def openWaybackConfiguration(self, button):
801802
filepath = config.tomcatPath + "/webapps/ROOT/WEB-INF/wayback.xml"
802803
if sys.platform.startswith('darwin'):
803-
subprocess.call(('open', filepath))
804+
subprocess.call(('open', filepath))
804805
elif os.name == 'nt':
805-
os.startfile(filepath)
806+
os.startfile(filepath)
806807
elif os.name == 'posix':
807-
subprocess.call(('xdg-open', filepath))
808+
subprocess.call(('xdg-open', filepath))
809+
808810
class HeritrixPanel(wx.Panel):
809811
def __init__(self, parent):
810812
wx.Panel.__init__(self, parent)
@@ -829,7 +831,8 @@ def __init__(self, parent):
829831
self.setupNewCrawlButton.Bind(wx.EVT_BUTTON, self.setupNewCrawl)
830832
self.launchWebUIButton.Bind(wx.EVT_BUTTON, self.launchWebUI)
831833

832-
self.panelUpdater = None # For updating stats UI
834+
self.panelUpdater = None # For updating stats UI
835+
833836
def populateListboxWithJobs(self):
834837
list = Heritrix().getListOfJobs()
835838

@@ -844,17 +847,18 @@ def clickedListboxItem(self, event):
844847
active = self.listbox.GetString(self.listbox.GetSelection())
845848
print(util.tail(config.heritrixJobPath + active + '/job.log'))
846849
jobLaunches = Heritrix().getJobLaunches(active)
847-
if self.panelUpdater: # Kill any currently running timer
850+
if self.panelUpdater: # Kill any currently running timer
848851
self.panelUpdater.cancel()
849852
self.panelUpdater = None
850853
self.updateInfoPanel(active)
854+
851855
def updateInfoPanel(self, active):
852856
self.statusMsg.SetLabel(Heritrix().getCurrentStats(active))
853857
self.panelUpdater = threading.Timer(
854858
1.0, self.updateInfoPanel, [active])
855859
self.panelUpdater.daemon = True
856860
self.panelUpdater.start()
857-
861+
858862
def launchWebUI(self, button):
859863
self.launchWebUIButton.SetLabel(
860864
config.buttonLabel_heritrix_launchWebUI_launching)
@@ -997,7 +1001,7 @@ def handleCrawlDepthKeypress(self, event):
9971001

9981002
def validateCrawlDepth(self, event):
9991003
if len(self.newCrawlDepthTextCtrl.GetValue()) == 0:
1000-
self.newCrawlDepthTextCtrl.SetValue('1')
1004+
self.newCrawlDepthTextCtrl.SetValue('1')
10011005
event.Skip()
10021006

10031007
def hideNewCrawlUIElements(self):

0 commit comments

Comments
 (0)