Commit graph

535 commits

Author SHA1 Message Date
Jack
b727bd20c8 version bump 2016-07-06 22:48:38 -04:00
Jack
5a703c116f linux lbrycrdd path 2016-07-06 22:46:59 -04:00
Alex Liebowitz
c58fc0781c Call xdg-open properly in jsonrpc_reveal() 2016-07-06 15:57:00 -04:00
Jack
03c02ff74f lbrycrdd path wierdness 2016-07-06 03:37:31 -04:00
Jack
9277c3c674 add help for when things go wrong 2016-07-06 03:02:55 -04:00
Jack
34b1259dc6 move check for if daemon is running to inside of function 2016-07-06 02:20:18 -04:00
Jack
257e38de12 add command line wrapper for lbrynet-daemon calls 2016-07-06 02:17:38 -04:00
Jack
1984132eae add update_available keys to version()
as to not require making the version string comparison in whatever is
making the daemon call
2016-07-06 01:46:49 -04:00
Jack
8b1d75ea98 check every 30 minutes for a new ui version
-previously the check for a new ui version was only at startup, which
resulted in bugs persisting after they’d been fixed

-add option to skip requirements check

-try to load an existing ui if it can’t be obtained from github
2016-07-06 01:27:25 -04:00
Alex Grintsvayg
8336930091 Bump version: 0.3.2 → 0.3.3 2016-07-05 15:20:35 -04:00
Alex Grintsvayg
d875325cee better non-root fix, restore version var 2016-07-05 15:20:30 -04:00
Alex Grintsvayg
f1c5d1cb23 Bump version: 0.3.1 → 0.3.2 2016-07-05 14:30:35 -04:00
Alex Grintsvayg
b55752e715 add bumpversion script 2016-07-05 14:29:24 -04:00
Jack
4c2ab23c1f write to the file that's supposed to be written to 2016-07-04 20:19:04 -04:00
Jack
0a3f81e364 fix download directory not existing problem 2016-07-04 20:02:38 -04:00
Jack
cca4331ac4 create lbrycrddpath.conf if it doesnt exist 2016-07-04 19:34:51 -04:00
Job Evers-Meltzer
794f2d8576 version bump: 0.3.0.2 2016-07-04 16:51:29 -05:00
Alex Liebowitz
e35dce530a Set default download dir to ~/Downloads on Linux 2016-07-04 17:49:48 -04:00
Job Evers-Meltzer
6034bd3cb2 version bump: 0.3.0.1 2016-07-04 15:47:12 -05:00
Job Evers‐Meltzer
42c77bbb67 Merge pull request #51 from lbryio/restart-lbrycrd
add a more useful exception if auth fails on lbrycrd
2016-07-04 15:45:44 -05:00
Job Evers‐Meltzer
d504c8f4a3 Merge pull request #50 from lbryio/lbrycrd-in-bundle
Add lbrycrd to app bundle on macos
2016-07-04 15:42:24 -05:00
Job Evers-Meltzer
976c8b3ce0 add a more useful exception if auth fails on lbrycrd 2016-07-04 15:40:52 -05:00
Job Evers-Meltzer
16f48d0400 Add lbrycrd to app bundle on macos 2016-07-04 15:18:08 -05:00
Alex Liebowitz
6d7608d851 Create lbrycrd.conf if needed 2016-07-04 16:16:34 -04:00
Jack
7b9e3aace9 use lbrycrd 2016-07-04 05:43:26 -04:00
Jack
568737e123 change lbryum version constant name 2016-07-04 05:15:53 -04:00
Jack
808e3ea6e3 rename LBRYcrdWallet.py to LBRYWallet.py and change default wallet to lbrycrd 2016-07-04 04:57:30 -04:00
Jack
1cedd8ee5b update name 2016-07-01 03:16:08 -04:00
Jack
b80fe24179 tanstaafl 2016-07-01 02:55:20 -04:00
Jack
3cea41a854 remove lbrynet_gui 2016-07-01 02:42:34 -04:00
Jack
62b80c13cc version bump 2016-06-30 01:26:33 -04:00
Jack
08b612575c update_claim fix and clean up publish keys
-replace ‘value’ key with ‘metadata’

-update claim metadata in db when an update is published
2016-06-28 23:20:28 -04:00
Jack
b3b804bf2d add update_name 2016-06-28 14:28:59 -04:00
Jack
09d8a86e30 rename variable 2016-06-28 02:06:04 -04:00
Jack
cc5d917c72 download fix 2016-06-28 01:51:05 -04:00
Jack
7cc3e9d5ef publish updates
-adds a base set of metadata fields required for results to be rendered
in conf.py, including language and content-type

-dont support old style claims on the new blockchain
2016-06-27 17:07:59 -04:00
Jack
f89486f5fe port and import name 2016-06-24 13:12:27 -04:00
Jack
761e4f2718 change variable name to lbrynet_log 2016-06-07 04:30:22 -04:00
Jack
3441dd4d2d don't mess with logging 2016-06-07 04:19:51 -04:00
Jack
a0f823910c delete accidentally committed file 2016-06-07 03:16:22 -04:00
Jack
755338ded0 import logging.handlers 2016-06-07 03:08:32 -04:00
Jack
ecd85a53a1 ui dir for linux 2016-06-07 01:20:44 -04:00
Jack
8faa0d9e01 update lbryum log path 2016-06-06 15:24:29 -04:00
Jack
20ca2eac37 lbryum logging in lbryum.log, add to upload_log() 2016-06-04 17:05:14 -04:00
Jack
85b56247a3 merge add-tests-to-travis updates 2016-06-04 15:11:51 -04:00
Jack
febc66fb02 missing keyword args for travis 2016-06-04 15:03:16 -04:00
Jack
3f929aee3c merge travis fixes 2016-06-04 14:28:32 -04:00
Jack
8c46dd194d save command line wallet choice to config 2016-06-04 14:18:58 -04:00
Jack
a9f99d05b9 add more known dht nodes
also fix migrator bug
2016-06-03 20:20:16 -04:00
Jack
e224c33817 add mime_type to get_lbry_file 2016-06-03 03:45:46 -04:00
Jack
36787eeeeb default value 2016-06-01 21:05:38 -04:00
Jack
104cafedb0 --wallet fix 2016-06-01 20:52:15 -04:00
Jack
f50c98e10d revert import
see if this helps travis
2016-05-31 17:45:04 -04:00
Jack
a4a5d63da7 fix update settings problem
also move log upload url constant to conf.py
2016-05-31 17:38:00 -04:00
Jack
9f0f9e0928 Merge remote-tracking branch 'origin/better_log_names' into add-tests-to-travis 2016-05-30 17:09:39 -04:00
Jack
2026024c8a updates from development 2016-05-30 15:49:25 -04:00
Jack
3d56baddd7 fix import error 2016-05-30 15:44:31 -04:00
Jack
c10e7b2b41 fix import 2016-05-30 15:39:27 -04:00
Jack
ba605e985a no shell=True 2016-05-30 04:40:58 -04:00
Jack
4cd1cdf495 escape spaces in paths given to reveal() 2016-05-30 04:37:34 -04:00
Jack
f9c644b964 fix switching between --branch and --ui 2016-05-30 04:00:47 -04:00
Jack
da68bcf952 third time's the charm 2016-05-30 03:14:59 -04:00
Jack
2c3b625b6b change full_path to path 2016-05-30 02:56:08 -04:00
Jack
16ef259ae1 add full_path to lbry_file 2016-05-30 02:53:36 -04:00
Jack
c56b3e75ea add download_directory to lbry_file 2016-05-30 02:42:33 -04:00
Jack
772866389f ui manager fixes
load a ui when it’s supposed to be loaded
2016-05-30 02:36:13 -04:00
Jack
41f8b5aee2 add reveal() function and delete_target_file param for delete_lbry_file 2016-05-30 02:05:16 -04:00
Jack
75052fc773 remove check_for_new_version vestige 2016-05-30 00:10:43 -04:00
Jack
e7a580fd3a add lbry_ui_manager 2016-05-29 23:18:30 -04:00
Jack
8922fd6dde add startup scripts
-populate blockchainname.db on first run from older version
2016-05-25 22:28:45 -04:00
Jack
eb0dd827b1 delete old unused app and move uri handler to lbry-osx-app 2016-05-24 17:54:44 -04:00
Jack
7fca1f865d update from master 2016-05-24 17:50:01 -04:00
Alex Grintsvayg
7a97a28e00 fix lbry icon 2016-05-22 23:48:51 -04:00
Alex Grintsvayg
f48c1562f3 better log names 2016-05-20 19:59:49 -04:00
Jack
be96c77467 add set_miner and get_miner_status
set_miner takes parameter key ‘run’, which is True or False
2016-05-14 17:57:34 -04:00
Jack
b5e8aec548 fix --wallet=lbrycrd 2016-05-14 17:36:30 -04:00
Jack
278c7dc836 have get() wait for file to have written data before returning by default
controlled by wait_for_write parameter
2016-05-13 19:35:38 -04:00
Jack
1425ad87ab fix get_lbry_file problem 2016-05-11 04:44:23 -04:00
Jack
f985a2a8ad add waiting_for_credits startup code 2016-05-11 02:47:33 -04:00
Jack
20f423a2fc bump version 2016-05-11 02:08:13 -04:00
Jack
210c1215d6 add metadata to lbry_file 2016-05-11 01:48:23 -04:00
Jack
1c507393a9 fix problem with getting a stream where the file has been deleted 2016-05-10 21:01:53 -04:00
Jack
b04cfdc091 load uri and txid when stream is started 2016-05-10 20:47:35 -04:00
Jack
42a3006f6e add claim txid and uri to lbry_file 2016-05-10 19:03:18 -04:00
Jack
8bd6fb5b4e clean up uri handler
clean up work arounds from when ui didn’t do loading nicely
2016-05-06 17:20:03 -04:00
Jack
bb2fb92b0e have uri handler fail silently to prevent misleading error
otherwise first run produced an error while it was downloading the
headers if the app was started by going to lbry://lbry
2016-05-06 16:59:23 -04:00
Jack
10b016312d get rid of Xcode tools and git requirement 2016-05-06 16:16:09 -04:00
Jack
b4500a2914 get rid of git HEAD stuff 2016-05-06 15:51:59 -04:00
Jack
da9b1b3f58 merge conflicts 2016-05-06 15:42:21 -04:00
Alex Grintsvayg
da31520465 use github api instead of git 2016-05-06 15:34:41 -04:00
Jack
f3d3a0e57f Don't show 0 while downloading headers from amazon, fix uri handler 2016-05-06 14:31:44 -04:00
Jack
e32853744a better loading message 2016-05-05 22:26:25 -04:00
Jack
b017b63745 status code for previously downloaded file
also fix return for files downloaded manually with stream_info
2016-05-05 21:45:25 -04:00
Jack
29d6d824fc write cryptsd files to data dir instead of cwd 2016-05-05 19:16:36 -04:00
Jack
d6983a25b0 fix metadata problem in downloader and publisher 2016-05-04 23:40:05 -04:00
Jack
4cab6726b0 log to file from publisher
also fix sd_hash exception that could happen
2016-05-04 23:27:40 -04:00
Jack
509b8f3a29 add file_name and stream_info fields to get()
-file_name is the name of the file in the downloads folder

-stream_info is a dict of the metadata in a name claim, it can be used
to download streams where the claim hasn’t yet been added to the
nametrie
2016-05-04 21:25:46 -04:00
Jack
461c2f9055 add file download statuses for get_lbry_file
also clean up remaining fetcher stuff
2016-05-04 05:20:38 -04:00
Jack
c1d0f9cf1b get rid of autofetcher in daemon
the purpose of the autofetcher was to automatically back up and host
published content, it is simpler to do this in a separate script that
uses existing daemon functions than to have it be built in
2016-05-04 04:12:11 -04:00
Jack
019de08c64 add more transaction functions to daemon
also fix —wallet command line option
2016-05-03 23:13:31 -04:00
Jack
30f88f99b7 use static.File 2016-05-02 15:58:40 -04:00
Jack
04ee9894c9 speed up streaming, off by one errors 2016-05-02 04:10:50 -04:00
Jack
46368f52f5 streaming files
still needs work, still has problems in safari and is otherwise slow
2016-05-01 05:17:59 -04:00
Jack
226e9084c9 return false from get_lbry_file if the file doesnt exist 2016-04-30 23:43:02 -04:00
Jack
caf5d2f788 update uri handler to use /watch 2016-04-26 19:48:43 -04:00
Jack
591634f175 cache name claim info
-cache name claim info for an hour rather than looking it up each time
it’s required

-add default thumbnail to search results
2016-04-25 22:35:21 -04:00
Jack
dfaf51a432 lbry file improvements
-fix daemon functions to start/stop lbry files

-remove unused stuff in LBRYFileManager

-improve and use new get_lbry_file function instead of _check_history,
which didn’t use the lbry file manager

-use said function to let delete_lbry_file use the same search keys
(sd_hash, name, and file_name)

-logging in LBRYDownloader
2016-04-24 17:51:24 -04:00
Jack
c2ec066c85 add LBRYFileProducer
-Add LBRYFileProducer, to host the contents of a download without
having to keep re-opening it as it is added to

-included sd hash in ManagedLBRYFileDownloader, to make comparing the
contents of the file manager against name claims easier

-add get_lbry_file function, which returns information about a LBRY
file found by sd_hash, file name, or lbry uri
2016-04-24 04:42:42 -04:00
Jack
3e7c09bb44 fix duplicate/buffering problem
fix problem where get request takes time to respond, in this time it
can receive more get requests that each manage to start downloading
2016-04-22 18:48:44 -04:00
Jack
28f66e30dd improve timeouts 2016-04-22 18:18:17 -04:00
Jack
bac7f097a9 add -x to filename before extension for duplicate downloads 2016-04-22 02:45:41 -04:00
Jack
fecd29a967 only load /view page when file isn't empty 2016-04-22 02:45:05 -04:00
Jack
2c1ba623a4 add message key to upload_log
log the message which is then uploaded with a special file prefix, and
also send the message to slack
2016-04-20 23:50:13 -04:00
Jack
561cdba7c9 fix jsonrpc import 2016-04-20 22:59:46 -04:00
Jack
e5e25012ff move daemon server stuff into its own class 2016-04-20 22:02:52 -04:00
Jack
c5d653a51a add bug report page
adds a page to submit a message and upload log at /report
2016-04-20 14:44:26 -04:00
Jack
c4620a0b0c add problem_code to daemon_status 2016-04-20 04:24:32 -04:00
Jack
a82f85f058 bump version, increase log size, fix shutdown problem 2016-04-20 02:56:29 -04:00
Jack
29f7307f9d periodically check internet connection and for new versions 2016-04-18 13:21:53 -04:00
Jack
24eed71959 upload log function doc string 2016-04-18 03:41:16 -04:00
Jack
9341ccb643 Merge branch 'master' into transaction-explorer
fix conflicts in LBRYDaemonControl.py
2016-04-17 23:28:00 -04:00
Jack
4385b90cca add get transaction and history functions to daemon 2016-04-17 23:23:20 -04:00
Jack
99b3cdd45d default on launching ui if daemon already running when command is called
-also update deb version
2016-04-17 20:16:35 -04:00
Jack
5f49827bd2 fix lagging indicator and improve diagnostic
-make is_lagging more meaningful - it is set to true after 90 seconds
with no progress, this is to stop slow but steady catchups from
triggering it

-prevent situation where repeated shutdowns before wallet catchup
results in never receiving first run credits

-fix settings to write new defaults that aren’t already in the
configuration file

-report log of startup sequence if upload_log set to true

-redirect /view?name=lbry to the main UI page. This is to make the ui
accessible from a lbry:// link on linux
2016-04-17 19:54:04 -04:00
Jack
cdab127b98 have separate handlers for uris on linux and os x 2016-04-15 23:57:52 -04:00
Jack
bac7ea5dc0 include platform information in version() 2016-04-15 22:31:06 -04:00
Jack
b3b5581f2d don't log to console, add --no-launch flag, fix help()
by default, the ui opens in the lbrynet-daemon startup sequence, the
—no-launch flag stops the ui from launching
2016-04-15 19:37:27 -04:00
Jack
9a26d869fe better first run message 2016-04-14 17:01:05 -04:00
Jack
57138d9629 is_lagging message 2016-04-14 16:50:11 -04:00
Jack
47d897b48d is_lagging indicator and internet connection check
-adds is_lagging indicator as a key from daemon_status, which is set to
True during a phase of the startup sequence, presently only during
loading_wallet if catching up with the blockchain takes longer than a
minute.

-checks if connected to internet before trying to start
2016-04-14 00:29:40 -04:00
Jack
6b9f1d519e remove null handling used to fix a now resolved bug, update daemon_status outputs per alex's suggestions 2016-04-13 23:10:17 -04:00
Jack
8b966c61d8 check version during startup 2016-04-13 22:07:27 -04:00
Jack
65a0583c85 add help function and documentation for functions
-calling help() will return the list of functions

-setting the ‘function’ param in the help function will return the doc
string for that function

-setting the ‘callable_on_startup’ in the help function will return the
list of functions callable during the startup sequence
2016-04-13 14:47:34 -04:00
Jack
2000a1b334 replace rawgit with raw.githubusercontent 2016-04-13 02:52:41 -04:00
Jack
cdd44af043 fix links in LBRYDaemonControl
https was failing
2016-04-13 02:39:50 -04:00
Jack
df99d06d11 fix links in check_for_new_version and log version info
-also handle situation where function is given a null argument
2016-04-13 02:35:31 -04:00
Alex Grintsvayg
b9d5d1041c bump version, better icon 2016-04-12 19:27:26 -04:00
Jack
59002413f8 organize daemon init, move more into daemon_settings.json
-also add wallet.catchup_progress to get a rough percentage of how
caught up the daemon is, this is accessed through daemon_status()
2016-04-12 02:03:57 -04:00
Jack
e04f35af4f fix check_for_new_version
returns true if new version is available, otherwise false

check_for_new_version is callable during startup
2016-04-11 23:13:26 -04:00
Jack
c50f83400a make version callable during startup 2016-04-11 22:37:42 -04:00
Jack
31fa974379 version function, ui version tracking, blocks behind blockchain during startup, cleaner set_vars
-adds version() function, which can be called after the daemon is
running and returns lbrynet, lbryum, and lbry ui version information.

-daemon_status now returns how far behind its behind the blockchain
when in the loading_wallet phase of startup

-cleans up set_vars by moving to init
2016-04-11 22:28:46 -04:00
Jack
aa8c362cb8 add --branch arg to lbrynet-daemon to specify ui branch 2016-04-11 16:15:12 -04:00
Jack
e48cc40610 fix incorrect variable 2016-04-09 16:18:06 -04:00
Jack
a931f59dda only return first run message until credits arrive 2016-04-09 16:14:28 -04:00
Jack
f0d39e6081 log LBRYDaemonControl and return None from get_start_notice if there is no notice to give 2016-04-09 15:43:10 -04:00
Jack
c11872a229 default on no startup message 2016-04-09 04:35:34 -04:00
Jack
f4fe730dc9 add get_start_notice to return startup messages 2016-04-09 04:15:58 -04:00
Jack
a4c83a08c7 change name of check_first_run to is_first_run 2016-04-09 04:00:31 -04:00
Jack
c3277d24c3 use status_message and status_code return fields for daemon_status() 2016-04-09 02:09:30 -04:00
Jack
28a23590ef add message for startup status
-added daemon_status function that returns {'status': startup status
message, 'is_running': true/false}
2016-04-09 01:33:27 -04:00
Jack
162275992b return fail from check_first_run when is_first_run isn't callable 2016-04-08 23:52:43 -04:00
Jack
08e25f4622 convert ints to floats if given as settings params 2016-04-08 23:38:57 -04:00
Jack
9a300d773f optional download_directory parameter for get function
-optional download_directory parameter to choose the directory a file
is saved to, if not given or not a valid directory it uses the default
2016-04-08 22:23:37 -04:00
Jack
a5362f3170 daemon settings
-set_settings accepts a dict of settings
    -adds upload_log field, defaulting on true, this uploads the lbry
log file to lbry.io to help figure out if and where things aren’t
working
    -default_download_directory is the key of the path where files are
saved

-gets publish working with sources

-adds check_first_run function, returns True/False

-previously only is_running would work during startup, check_first_run,
 get_time_behind_blockchain, and stop have been added

-requires six 1.9, 1.10.0 produced errors
2016-04-07 03:12:09 -04:00
Jimmy Kiselak
f464b3ae7c when decoding lbryum transactions, return values as Decimal 2016-04-04 22:20:15 -04:00
Jack
d4b7064d2f fix sources problems 2016-04-01 22:11:11 -04:00
Jack
2540b9969f check UI version from command line
-check UI version, if out of date get a fresh copy. overridden by —ui
flag, which is used to specify a ui directory
2016-04-01 22:06:06 -04:00
Jack
4355b799cb before is_running is true all other methods return a failure 2016-03-29 22:02:36 -04:00
Jack
a7fb434f9f update uri handler for change in daemon output 2016-03-29 17:04:01 -04:00
Jack
b3465f3bbf fix /view, improve is_running, clean function outputs
-Use localhost:5279/view?name=wonderfullife to download and render a
file

-is_running is now the only function that will work during startup

-functions output json, rather than json in your json
2016-03-29 16:42:47 -04:00
Jack
2670279b0d change access control allow origin to * 2016-03-28 16:49:51 -04:00
Jack
200d239e0b log ui directory 2016-03-28 14:54:01 -04:00
Jack
41a0590182 fix daemon directories for linux 2016-03-28 14:53:32 -04:00
Jack
63b2c49354 don't start lbry app if daemon is running in console 2016-03-28 14:21:41 -04:00
Jack
fa1d4dae0f add --ui parameter to lbrynet-daemon to set ui path
defaults on temp, which will download a .zip of the current ui to a
temp directory, which will be deleted when lbrynet-daemon closes
2016-03-25 21:03:58 -04:00
Jack
a882bdb08c fix output of get_time_behind_blockchain function 2016-03-25 09:32:24 -04:00
Jack
cfd6ea5a34 Merge branch 'development' 2016-03-24 21:15:54 -04:00
Jack
b3cf5e8698 add bundle identifier to uri handler 2016-03-24 20:46:44 -04:00
Jack
71c4dba34d Merge branch 'development' into jsonrpc
# Conflicts:
#	setup.py
2016-03-23 22:34:27 -04:00
Jack
9a3187e36c merge updates 2016-03-23 22:29:48 -04:00
Jack
c714a3f91c merge updates 2016-03-23 22:27:48 -04:00
Jimmy Kiselak
1ccd2a3cc9 do version better 2016-03-23 22:02:02 -04:00
Jack
94398071eb have uri handler check if app is running
-checks if LBRY.app is running, starts it if it isn’t

-delete unused function in LBRYDaemon
2016-03-23 19:49:14 -04:00
Jimmy Kiselak
e85683e40f show more informative messages when blockchain is catching up 2016-03-22 22:42:45 -04:00
Jack
13acbfb64f update uri handler
-use new jsonrpc daemon, start app if it isn’t running on first lbry://
request
2016-03-22 11:51:27 -04:00
Jack
a55e3d8578 use UI downloaded to temp folder at startup 2016-03-22 10:37:13 -04:00
Jack
2486ae6d3f get rid of unused updater function
updater function was hacky and not the most reliable, to be replaced by
app version checking
2016-03-22 09:40:18 -04:00
Jack
ba991b47ea add /view to dynamically generate a video containing page
-uses UI stored in Resources folder of app

-going to /view?name=  will download the corresponding stream and
display the file in the browser

-adds default daemon settings, currently they don’t do anything, to be
added to

-adds missing packages to setup.py
2016-03-22 00:03:17 -04:00
Jimmy Kiselak
e4a30c052e put the actual version in __init__.py 2016-03-21 21:37:15 -04:00
Jimmy Kiselak
df5b889f7d add a version to lbrynet 2016-03-21 21:33:55 -04:00
Jack
55f25c2613 consolidate search output
consolidate search output into a list of dicts
2016-03-21 12:06:19 -04:00
Jack
34eaa822a0 handle null parameter 2016-03-21 10:12:01 -04:00
Jack
5072f503c4 fix cross scripting problem
add access-control-allow-origin: http://localhost:5279
2016-03-20 22:53:01 -04:00
Jimmy Kiselak
246647641a remove some log statements that are useless, instead log whenever balance changes 2016-03-19 22:39:47 -04:00
Jimmy Kiselak
a0b75d7ada Tell user to be patient if it's the first run and user has no funds, in two more places 2016-03-19 22:30:55 -04:00
Jimmy Kiselak
d36036a9fe Tell user to be patient if it's the first run and user has no funds 2016-03-19 21:50:38 -04:00
Jimmy Kiselak
a68d891770 enable checking first run status multiple times 2016-03-19 21:24:44 -04:00
Jimmy Kiselak
f272a9ead2 Merge branch 'badunicode' into development 2016-03-19 18:56:21 -04:00
Jimmy Kiselak
8db2e10696 Merge branch 'master' of github.com:lbryio/lbry 2016-03-19 18:55:50 -04:00
Jimmy Kiselak
3cd74c06d6 convert description in ControlHandlers to str so that the prompt does not get converted to unicode 2016-03-19 18:55:17 -04:00
Jack
e3225f7123 add missing commits 2016-03-17 22:50:15 -04:00
Jack
ef62b0e746 fix conflicts 2016-03-17 22:38:48 -04:00
Jack
7756d12993 check if daemon is running before starting console 2016-03-17 22:03:56 -04:00
Jimmy Kiselak
4449bf3c75 change manage timer back to 60 seconds 2016-03-17 21:55:06 -04:00
Jimmy Kiselak
0200ed1341 refresh wallet balance every 3 seconds instead of 60 2016-03-17 20:19:13 -04:00
Jack
02bde900d6 update daemon and console
-don’t start console if daemon is running, display a message alerting
user

-move os x data directory to match app

-add timeout parameter to get function
2016-03-17 10:19:36 -04:00
Jack
36e299b4cf fix files
-don’t automatically remove files that can’t be found from
LBRYFileManager

-add timeout to GetStream
2016-03-17 00:44:04 -04:00
Jack
4e34f861c9 Merge branch 'development' into jsonrpc 2016-03-15 23:02:06 -04:00
Jack
42df2fe242 update daemon
convert to jsonrpc, fix a few issues, remove hacky functions
2016-03-14 12:30:22 -04:00
Jimmy Kiselak
dff0fcb1fd ensure the lbryum wallet is caught up before giving the prompt 2016-03-12 14:58:58 -05:00