harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some minor tweaks to zotsh.py, document that it needs the twitter_api plugin on the first hop since we no longer provide the twitter api by default

Browse Source
This commit is contained in:
zotlabs 2016-11-10 15:59:49 -08:00
parent 74947d1c1c
commit 20497f1be3
6 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/channel.php
View File

@ -1543,7 +1543,7 @@ function identity_selector() {
$r = q("select channel.*, xchan.* from channel left join xchan on channel.channel_hash = xchan.xchan_hash where channel.channel_account_id = %d and channel_removed = 0 order by channel_name ", $r = q("select channel.*, xchan.* from channel left join xchan on channel.channel_hash = xchan.xchan_hash where channel.channel_account_id = %d and channel_removed = 0 order by channel_name ",
intval(get_account_id()) intval(get_account_id())
); );
if (count($r) > 1) { if($r && count($r) > 1) {
//$account = App::get_account(); //$account = App::get_account();
$o = replace_macros(get_markup_template('channel_id_select.tpl'), array( $o = replace_macros(get_markup_template('channel_id_select.tpl'), array(
'$channels' => $r, '$channels' => $r,

2
util/zotsh/README.txt
View File

@ -8,6 +8,8 @@ Install
ZotSH requires 'requests'(1). ZotSH requires 'requests'(1).
Please refer to requests docs on how to install it (2) Please refer to requests docs on how to install it (2)
The initially connected server must have the twitter_api plugin installed
Extract somewere and launch zotsh.py Extract somewere and launch zotsh.py

BIN
util/zotsh/easywebdav/__init__.pyc
View File

Binary file not shown.

BIN
util/zotsh/easywebdav/__version__.pyc
View File

Binary file not shown.

BIN
util/zotsh/easywebdav/client.pyc
View File

Binary file not shown.

4
util/zotsh/zotsh.py
View File

@ -55,7 +55,7 @@ class ZotSH(object):
@session.setter @session.setter
def session(self, session): def session(self, session):
self._session = session self._session = session
self.davclient = easywebdav.connect( self.hostname, protocol='https', session=session, path="dav", verify_ssl=VERIFY_SSL) self.davclient = easywebdav.connect( self.hostname, protocol='https', session=session, path="cloud", verify_ssl=VERIFY_SSL)
@property @property
def PS1(self): def PS1(self):
@ -205,7 +205,7 @@ class ZotSH(object):
print _fmt('d', 0, "../") print _fmt('d', 0, "../")
for f in r: for f in r:
name = f.name.replace("/dav"+self.davclient.cwd,"") name = f.name.replace("/cloud"+self.davclient.cwd,"")
type = "-" type = "-"
if name.endswith("/"): if name.endswith("/"):
type = "d" type = "d"