Bitmessage/PyBitmessage-2024-11-30
Archived
2
0
Fork 0
Code Issues 168 Pull Requests 53 Actions Packages Projects Releases 5 Wiki Activity

Merge remote-tracking branch 'upstream/master' into sql_refactor

Browse Source
This commit is contained in:
Grant T. Olson 2013-08-30 17:59:35 -04:00
commit b83781cefb
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/proofofwork.py
View File

@ -4,7 +4,7 @@
import hashlib import hashlib
from struct import unpack, pack from struct import unpack, pack
import sys import sys
from shared import config from shared import config, frozen
#import os #import os
def _set_idle(): def _set_idle():
@ -71,7 +71,7 @@ def _doFastPoW(target, initialHash):
time.sleep(0.2) time.sleep(0.2)
def run(target, initialHash): def run(target, initialHash):
if 'linux' in sys.platform: if frozen == "macosx_app" or not frozen:
return _doFastPoW(target, initialHash) return _doFastPoW(target, initialHash)
else: else:
return _doSafePoW(target, initialHash) return _doSafePoW(target, initialHash)

12
src/shared.py
View File

@ -76,6 +76,11 @@ networkDefaultPayloadLengthExtraBytes = 14000 #To make sending short messages a
# namecoin integration to "namecoind". # namecoin integration to "namecoind".
namecoinDefaultRpcPort = "8336" namecoinDefaultRpcPort = "8336"
# When using py2exe or py2app, the variable frozen is added to the sys
# namespace. This can be used to setup a different code path for
# binary distributions vs source distributions.
frozen = getattr(sys,'frozen', None)
def isInSqlInventory(hash): def isInSqlInventory(hash):
queryreturn = sqlQuery('''select hash from inventory where hash=?''', hash) queryreturn = sqlQuery('''select hash from inventory where hash=?''', hash)
if queryreturn == []: if queryreturn == []:
@ -118,7 +123,12 @@ def assembleVersionMessage(remoteHost, remotePort, myStreamNumber):
def lookupAppdataFolder(): def lookupAppdataFolder():
APPNAME = "PyBitmessage" APPNAME = "PyBitmessage"
if sys.platform == 'darwin': from os import path, environ
if "BITMESSAGE_HOME" in environ:
dataFolder = environ["BITMESSAGE_HOME"]
if dataFolder[-1] not in [os.path.sep, os.path.altsep]:
dataFolder += os.path.sep
elif sys.platform == 'darwin':
if "HOME" in environ: if "HOME" in environ:
dataFolder = path.join(os.environ["HOME"], "Library/Application Support/", APPNAME) + '/' dataFolder = path.join(os.environ["HOME"], "Library/Application Support/", APPNAME) + '/'
else: else: