Skip to content

Commit 5d92cd7

Browse files
masonasonsmasonasons
committed
Adds threading. In addition, sets some default values for the contents of edit boxes.
1 parent 737c4ed commit 5d92cd7

File tree

5 files changed

+216
-208
lines changed

5 files changed

+216
-208
lines changed

‎.gitignore

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
*.pyc
2-
*~
3-
build/
4-
dist/
5-
run.bat
6-
compile.bat
7-
commit.txt
1+
*.pyc
2+
*~
3+
build/
4+
dist/
5+
run.bat
6+
compile.bat
7+
commit.txt
88
uploader.cfg

‎documentation/changes.txt

+7-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
New in 1.1
2-
* Adds tweet feature.
3-
* Adds Twup support as well as Sndup.
4-
* Adds an Attach Another File button after upload finishes.
5-
* Now hides controls instead of disabling them.
1+
New in 1.2
2+
*Adds threading (The program no longer freezes during upload)
3+
New in 1.1
4+
* Adds tweet feature.
5+
* Adds Twup support as well as Sndup.
6+
* Adds an Attach Another File button after upload finishes.
7+
* Now hides controls instead of disabling them.

‎requirements.txt

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
http://hg.q-continuum.net/sound_lib/archive/tip.tar.gz
2-
requests
3-
configobj
4-
validate
5-
tweepy
1+
http://hg.q-continuum.net/sound_lib/archive/tip.tar.gz
2+
requests
3+
configobj
4+
validate
5+
tweepy

‎uploader.py

+164-158
Original file line numberDiff line numberDiff line change
@@ -1,159 +1,165 @@
1-
import tweepy
2-
import webbrowser
3-
import config_utils
4-
import os.path as path
5-
import sys
6-
import urllib
7-
8-
import requests
9-
import wx
10-
11-
# Globals
12-
13-
tw1="MneWylqkykEp95neIxCvN1i2J" # twitter app key
14-
tw2="jPdug6Dl9IWxJvtsaQRqT120jYKf8bXl3drKFshw8JzGQCm6XX" # twitter app secret
15-
services = ['SNDUp', 'SoundCache'] # supported audio upload services
16-
17-
18-
class AudioUploader(wx.Frame):
19-
"""Application to allow uploading of audio files to SndUp and other similar services"""
20-
def __init__(self, title):
21-
wx.Frame.__init__(self, None, title=title, size=(350,200)) # initialize the wx frame
22-
# load config and validate a specification file
23-
self.MAINFILE = "uploader.cfg"
24-
self.MAINSPEC = "app.defaults"
25-
self.appconfig = config_utils.load_config(self.MAINFILE, self.MAINSPEC)
26-
# window events and controls
27-
self.Bind(wx.EVT_CLOSE, self.OnClose)
28-
self.panel = wx.Panel(self)
29-
self.main_box = wx.BoxSizer(wx.VERTICAL)
30-
self.select_file = wx.Button(self.panel, -1, "&Select File")
31-
self.select_file.Bind(wx.EVT_BUTTON, self.SelectFile)
32-
self.main_box.Add(self.select_file, 0, wx.ALL, 10)
33-
self.link_label = wx.StaticText(self.panel, -1, "Audio UR&L")
34-
self.link = wx.TextCtrl(self.panel, -1, "",style=wx.TE_READONLY)
35-
self.main_box.Add(self.link, 0, wx.ALL, 10)
36-
self.key_label = wx.StaticText(self.panel, -1,"SNDUp API &Key")
37-
self.key = wx.TextCtrl(self.panel, -1, "")
38-
self.main_box.Add(self.key, 0, wx.ALL, 10)
39-
self.key.SetValue(self.appconfig["general"]["APIKey"])
40-
self.services_label=wx.StaticText(self.panel, -1, "Upload to")
41-
self.services = wx.ComboBox(self.panel, -1, choices=services, value=services[0], style=wx.CB_READONLY)
42-
self.services.Bind(wx.EVT_COMBOBOX, self.on_service_change)
43-
self.main_box.Add(self.services, 0, wx.ALL, 10)
44-
self.upload = wx.Button(self.panel, -1, "&Upload")
45-
self.upload.Bind(wx.EVT_BUTTON, self.StartUpload)
46-
self.main_box.Add(self.upload, 0, wx.ALL, 10)
47-
self.upload.Hide()
48-
self.twitter_label = wx.StaticText(self.panel, -1,"Tweet Te&xt")
49-
self.twitter_text = wx.TextCtrl(self.panel, -1, "")
50-
self.main_box.Add(self.twitter_text, 0, wx.ALL, 10)
51-
self.twitter_text.Hide()
52-
self.tweet = wx.Button(self.panel, -1, "&Tweet")
53-
self.tweet.Bind(wx.EVT_BUTTON, self.Tweet)
54-
self.tweet.Hide()
55-
self.main_box.Add(self.tweet, 0, wx.ALL, 10)
56-
self.new = wx.Button(self.panel, -1, "&Attach another file")
57-
self.new.Bind(wx.EVT_BUTTON, self.Reset)
58-
self.main_box.Add(self.new, 0, wx.ALL, 10)
59-
self.new.Hide()
60-
self.close = wx.Button(self.panel, wx.ID_CLOSE, "&Close")
61-
self.close.Bind(wx.EVT_BUTTON, self.OnClose)
62-
self.main_box.Add(self.close, 0, wx.ALL, 10)
63-
self.panel.Layout()
64-
65-
def StartUpload(self,event):
66-
"""Starts an upload; only runs after a standard operating system find file dialog has been shown and a file selected"""
67-
self.services.Hide()
68-
self.select_file.Hide()
69-
self.upload.Hide()
70-
self.key.Hide()
71-
self.twitter_text.Show()
72-
self.tweet.Show()
73-
74-
if self.services.GetValue()=="SNDUp":
75-
if self.key.GetValue() != "":
76-
r=requests.post("http://www.sndup.net/post.php", files={"file":open(self.filename,'rb')}, data={'api_key':self.key.GetValue()})
77-
else:
78-
r=requests.post("http://www.sndup.net/post.php", files={"file":open(self.filename,'rb')})
79-
elif self.services.GetValue() == "SoundCache":
80-
r = requests.post("http://soundcache.tk/upload.php", files={"file":open(self.filename,'rb')})
81-
self.link.ChangeValue(handle_URL(r.json()))
82-
self.link.SetFocus()
83-
self.new.Show()
84-
85-
def SelectFile(self,event):
86-
"""Opens a standard OS find file dialog to find an audio file to upload"""
87-
openFileDialog = wx.FileDialog(self, "Select the audio file to be uploaded", "", "", "Audio Files (*.mp3, *.ogg, *.wav)|*.mp3; *.ogg; *.wav", wx.FD_OPEN | wx.FD_FILE_MUST_EXIST)
88-
if openFileDialog.ShowModal() == wx.ID_CANCEL:
89-
return False
90-
self.filename= openFileDialog.GetPath()
91-
self.name=path.basename(self.filename)
92-
self.upload.Show()
93-
94-
def Tweet(self, event):
95-
auth = tweepy.OAuthHandler(tw1, tw2)
96-
if self.appconfig["general"]["TWKey"]=="" or self.appconfig["general"]["TWSecret"]=="":
97-
webbrowser.open(auth.get_authorization_url())
98-
verifier = ask(parent=self, message='Enter pin:')
99-
auth.get_access_token(verifier)
100-
self.appconfig["general"]["TWKey"]=auth.access_token
101-
self.appconfig["general"]["TWSecret"]=auth.access_token_secret
102-
self.appconfig.write()
103-
else:
104-
auth.set_access_token(self.appconfig["general"]["TWKey"], self.appconfig["general"]["TWSecret"])
105-
api = tweepy.API(auth)
106-
api.update_status(self.twitter_text.GetValue()+" "+self.link.GetValue()+" #audio")
107-
108-
def Reset(self, event):
109-
self.twitter_text.SetValue("")
110-
self.twitter_text.Hide()
111-
self.tweet.Hide()
112-
self.services.Show()
113-
self.upload.Hide()
114-
self.new.Hide()
115-
self.select_file.Show()
116-
self.key.Show()
117-
self.select_file.SetFocus()
118-
self.link.ChangeValue("")
119-
120-
def on_service_change(self, event):
121-
"""Event handler for when the service combo box changes.
122-
Currently it just hides unnecessary fields for different services. For example, TWUp doesn't have an API key system, so we shouldn't keep the text field that SNDUp needs when it isn't selected.
123-
"""
124-
dir(event)
125-
if event.GetString() == 'SNDUp':
126-
self.key.Show()
127-
else:
128-
self.key.Hide()
129-
130-
def OnClose(self, event):
131-
"""App close event handler"""
132-
self.appconfig["general"]["APIKey"]=self.key.GetValue()
133-
self.appconfig.write()
134-
self.Destroy()
135-
136-
def handle_URL(url):
137-
"""Properly converts an escaped URL to a proper one, taking into account the difference in python 2 and python 3"""
138-
# We are passed a python dict by default, as SndUp's response is json and we convert that to a dict with .json()
139-
# So extract the URL from the dict:
140-
url = url['url']
141-
if sys.version_info[0]==2: # running python 2
142-
final_url = urllib.unquote(url)
143-
elif sys.version_info[1]==3:
144-
final_url = urllib.parse.unquote(url)
145-
return final_url
146-
147-
def ask(parent=None, message='', default_value=''):
148-
"""Simple dialog to get a response from the user"""
149-
dlg = wx.TextEntryDialog(parent, message)
150-
dlg.ShowModal()
151-
result = dlg.GetValue()
152-
dlg.Destroy()
153-
return result
154-
155-
156-
app = wx.App(redirect=False)
157-
window=AudioUploader("Audio uploader")
158-
window.Show()
1+
from threading import Thread
2+
import tweepy
3+
import webbrowser
4+
import config_utils
5+
import os.path as path
6+
import sys
7+
import urllib
8+
9+
import requests
10+
import wx
11+
12+
# Globals
13+
14+
tw1="MneWylqkykEp95neIxCvN1i2J" # twitter app key
15+
tw2="jPdug6Dl9IWxJvtsaQRqT120jYKf8bXl3drKFshw8JzGQCm6XX" # twitter app secret
16+
services = ['SNDUp', 'SoundCache'] # supported audio upload services
17+
18+
19+
class AudioUploader(wx.Frame):
20+
"""Application to allow uploading of audio files to SndUp and other similar services"""
21+
def __init__(self, title):
22+
wx.Frame.__init__(self, None, title=title, size=(350,200)) # initialize the wx frame
23+
# load config and validate a specification file
24+
self.MAINFILE = "uploader.cfg"
25+
self.MAINSPEC = "app.defaults"
26+
self.appconfig = config_utils.load_config(self.MAINFILE, self.MAINSPEC)
27+
# window events and controls
28+
self.Bind(wx.EVT_CLOSE, self.OnClose)
29+
self.panel = wx.Panel(self)
30+
self.main_box = wx.BoxSizer(wx.VERTICAL)
31+
self.select_file = wx.Button(self.panel, -1, "&Select File")
32+
self.select_file.Bind(wx.EVT_BUTTON, self.SelectFile)
33+
self.main_box.Add(self.select_file, 0, wx.ALL, 10)
34+
self.link_label = wx.StaticText(self.panel, -1, "Audio U&RL")
35+
self.link = wx.TextCtrl(self.panel, -1, "",style=wx.TE_READONLY)
36+
self.link.SetValue("Waiting for audio...")
37+
self.main_box.Add(self.link, 0, wx.ALL, 10)
38+
self.key_label = wx.StaticText(self.panel, -1,"SNDUp API &Key")
39+
self.key = wx.TextCtrl(self.panel, -1, "")
40+
self.main_box.Add(self.key, 0, wx.ALL, 10)
41+
self.key.SetValue(self.appconfig["general"]["APIKey"])
42+
self.services_label=wx.StaticText(self.panel, -1, "Upload to")
43+
self.services = wx.ComboBox(self.panel, -1, choices=services, value=services[0], style=wx.CB_READONLY)
44+
self.services.Bind(wx.EVT_COMBOBOX, self.on_service_change)
45+
self.main_box.Add(self.services, 0, wx.ALL, 10)
46+
self.upload = wx.Button(self.panel, -1, "&Upload")
47+
self.upload.Bind(wx.EVT_BUTTON, self.OnUpload)
48+
self.main_box.Add(self.upload, 0, wx.ALL, 10)
49+
self.upload.Hide()
50+
self.twitter_label = wx.StaticText(self.panel, -1,"Tweet Te&xt")
51+
self.twitter_text = wx.TextCtrl(self.panel, -1, "")
52+
self.main_box.Add(self.twitter_text, 0, wx.ALL, 10)
53+
self.twitter_text.Hide()
54+
self.tweet = wx.Button(self.panel, -1, "&Tweet")
55+
self.tweet.Bind(wx.EVT_BUTTON, self.Tweet)
56+
self.tweet.Hide()
57+
self.main_box.Add(self.tweet, 0, wx.ALL, 10)
58+
self.new = wx.Button(self.panel, -1, "&Attach another file")
59+
self.new.Bind(wx.EVT_BUTTON, self.Reset)
60+
self.main_box.Add(self.new, 0, wx.ALL, 10)
61+
self.new.Hide()
62+
self.close = wx.Button(self.panel, wx.ID_CLOSE, "&Close")
63+
self.close.Bind(wx.EVT_BUTTON, self.OnClose)
64+
self.main_box.Add(self.close, 0, wx.ALL, 10)
65+
self.panel.Layout()
66+
67+
def OnUpload(self,event):
68+
self.UploadThread = Thread(target=self.StartUpload)
69+
self.UploadThread.start()
70+
71+
def StartUpload(self):
72+
"""Starts an upload; only runs after a standard operating system find file dialog has been shown and a file selected"""
73+
self.services.Hide()
74+
self.select_file.Hide()
75+
self.upload.Hide()
76+
self.key.Hide()
77+
self.link.SetFocus()
78+
79+
if self.services.GetValue()=="SNDUp":
80+
if self.key.GetValue() != "":
81+
r=requests.post("http://www.sndup.net/post.php", files={"file":open(self.filename,'rb')}, data={'api_key':self.key.GetValue()})
82+
else:
83+
r=requests.post("http://www.sndup.net/post.php", files={"file":open(self.filename,'rb')})
84+
elif self.services.GetValue() == "SoundCache":
85+
r = requests.post("http://soundcache.tk/upload.php", files={"file":open(self.filename,'rb')})
86+
self.link.ChangeValue(handle_URL(r.json()))
87+
self.new.Show()
88+
self.twitter_text.Show()
89+
self.tweet.Show()
90+
91+
def SelectFile(self,event):
92+
"""Opens a standard OS find file dialog to find an audio file to upload"""
93+
openFileDialog = wx.FileDialog(self, "Select the audio file to be uploaded", "", "", "Audio Files (*.mp3, *.ogg, *.wav)|*.mp3; *.ogg; *.wav", wx.FD_OPEN | wx.FD_FILE_MUST_EXIST)
94+
if openFileDialog.ShowModal() == wx.ID_CANCEL:
95+
return False
96+
self.filename= openFileDialog.GetPath()
97+
self.name=path.basename(self.filename)
98+
self.upload.Show()
99+
100+
def Tweet(self, event):
101+
auth = tweepy.OAuthHandler(tw1, tw2)
102+
if self.appconfig["general"]["TWKey"]=="" or self.appconfig["general"]["TWSecret"]=="":
103+
webbrowser.open(auth.get_authorization_url())
104+
verifier = ask(parent=self, message='Enter pin:')
105+
auth.get_access_token(verifier)
106+
self.appconfig["general"]["TWKey"]=auth.access_token
107+
self.appconfig["general"]["TWSecret"]=auth.access_token_secret
108+
self.appconfig.write()
109+
else:
110+
auth.set_access_token(self.appconfig["general"]["TWKey"], self.appconfig["general"]["TWSecret"])
111+
api = tweepy.API(auth)
112+
api.update_status(self.twitter_text.GetValue()+" "+self.link.GetValue()+" #audio")
113+
114+
def Reset(self, event):
115+
self.twitter_text.SetValue("")
116+
self.twitter_text.Hide()
117+
self.tweet.Hide()
118+
self.services.Show()
119+
self.upload.Hide()
120+
self.new.Hide()
121+
self.select_file.Show()
122+
self.key.Show()
123+
self.select_file.SetFocus()
124+
self.link.ChangeValue("")
125+
126+
def on_service_change(self, event):
127+
"""Event handler for when the service combo box changes.
128+
Currently it just hides unnecessary fields for different services. For example, TWUp doesn't have an API key system, so we shouldn't keep the text field that SNDUp needs when it isn't selected.
129+
"""
130+
dir(event)
131+
if event.GetString() == 'SNDUp':
132+
self.key.Show()
133+
else:
134+
self.key.Hide()
135+
136+
def OnClose(self, event):
137+
"""App close event handler"""
138+
self.appconfig["general"]["APIKey"]=self.key.GetValue()
139+
self.appconfig.write()
140+
self.Destroy()
141+
142+
def handle_URL(url):
143+
"""Properly converts an escaped URL to a proper one, taking into account the difference in python 2 and python 3"""
144+
# We are passed a python dict by default, as SndUp's response is json and we convert that to a dict with .json()
145+
# So extract the URL from the dict:
146+
url = url['url']
147+
if sys.version_info[0]==2: # running python 2
148+
final_url = urllib.unquote(url)
149+
elif sys.version_info[1]==3:
150+
final_url = urllib.parse.unquote(url)
151+
return final_url
152+
153+
def ask(parent=None, message='', default_value=''):
154+
"""Simple dialog to get a response from the user"""
155+
dlg = wx.TextEntryDialog(parent, message)
156+
dlg.ShowModal()
157+
result = dlg.GetValue()
158+
dlg.Destroy()
159+
return result
160+
161+
162+
app = wx.App(redirect=False)
163+
window=AudioUploader("Audio uploader")
164+
window.Show()
159165
app.MainLoop()

0 commit comments

Comments
 (0)