Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-01-03 19:51:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

removed helpers.get_tmp_dir() in favor of tempdir module

Browse Source
This commit is contained in:
Micah Lee 2014-12-10 00:50:19 +00:00
parent d0bdb9143f
commit ee98e1b024
2 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
onionshare/helpers.py
View File

@ -17,7 +17,7 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
""" """
import os, inspect, hashlib, base64, hmac, platform, zipfile import os, inspect, hashlib, base64, hmac, platform, zipfile, tempfile
from itertools import izip from itertools import izip
# hack to make unicode filenames work (#141) # hack to make unicode filenames work (#141)
@ -94,23 +94,12 @@ def dir_size(start_path):
return total_size return total_size
def get_tmp_dir():
if get_platform() == "Windows":
if 'Temp' in os.environ:
temp = os.environ['Temp'].replace('\\', '/')
else:
temp = 'C:/tmp'
else:
temp = '/tmp'
return temp
class ZipWriter(object): class ZipWriter(object):
def __init__(self, zip_filename=None): def __init__(self, zip_filename=None):
if zip_filename: if zip_filename:
self.zip_filename = zip_filename self.zip_filename = zip_filename
else: else:
self.zip_filename = '{0}/onionshare_{1}.zip'.format(get_tmp_dir(), random_string(4, 6)) self.zip_filename = '{0}/onionshare_{1}.zip'.format(tempfile.mkdtemp(), random_string(4, 6))
self.z = zipfile.ZipFile(self.zip_filename, 'w') self.z = zipfile.ZipFile(self.zip_filename, 'w')

4
onionshare/onionshare.py
View File

@ -17,7 +17,7 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
""" """
import os, sys, subprocess, time, argparse, inspect, shutil, socket, threading, urllib2 import os, sys, subprocess, time, argparse, inspect, shutil, socket, threading, urllib2, tempfile
import socks import socks
from stem.control import Controller from stem.control import Controller
@ -118,7 +118,7 @@ class OnionShare(object):
else: else:
# come up with a hidden service directory name # come up with a hidden service directory name
self.hidserv_dir = '{0}/onionshare_{1}'.format(helpers.get_tmp_dir(), helpers.random_string(8)) self.hidserv_dir = tempfile.mkdtemp()
self.cleanup_filenames.append(self.hidserv_dir) self.cleanup_filenames.append(self.hidserv_dir)
# connect to the tor controlport # connect to the tor controlport