Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Send2Ebook (receiver) plugin #3681

Merged
merged 27 commits into from Feb 22, 2018
Merged
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
0bea043
Sent-to-kindle init version
Feb 4, 2018
d7cd972
Merge remote-tracking branch 'upstream/master' into send-to-koreader-…
Feb 4, 2018
f8207fd
changes, fixes
Feb 5, 2018
e6e53f7
Merge remote-tracking branch 'upstream/master' into send-to-koreader-…
Feb 5, 2018
4da445b
externalized ftp config file
Feb 15, 2018
603246b
fix crash when wifi was off before download & auto turn on wifi is en…
Feb 15, 2018
e943548
lua check fix
Feb 15, 2018
6ecd191
"Remove read articles" instead "remove all"
Feb 16, 2018
562cb6c
code review fixes
Feb 16, 2018
2bd0c3c
fixes
Feb 16, 2018
2431835
fix removing read files sdr dir
Feb 16, 2018
33baf46
fix name, code review change
Feb 17, 2018
7a71f52
UI for ftp connection
Feb 17, 2018
5462200
fix crash
Feb 17, 2018
a39e123
help text update
Feb 17, 2018
c5fd4e7
Clarification, better label
mwoz123 Feb 17, 2018
74439c9
minor fixes (fixed names etc)
Feb 18, 2018
5a53c99
Merge branch 'send-to-koreader-receiver' of https://github.com/mwoz12…
Feb 18, 2018
67c21b3
remove anonim functions
Feb 18, 2018
905de0a
Lower case folder name
mwoz123 Feb 18, 2018
f45a46a
workaround no init ftp settings error.
Feb 22, 2018
17a9ff1
Merge branch 'send-to-koreader-receiver' of https://github.com/mwoz12…
Feb 22, 2018
caadd1c
Merge remote-tracking branch 'upstream/master' into send-to-koreader-…
Feb 22, 2018
ab7ee80
ftp.lua include order
Frenzie Feb 22, 2018
a778d9a
stray newline
Frenzie Feb 22, 2018
d47ae54
code review fixes + other minors
Feb 22, 2018
12f6cff
Merge branch 'send-to-koreader-receiver' of https://github.com/mwoz12…
Feb 22, 2018
File filter...
Filter file types
Jump to…
Jump to file or symbol
Failed to load files and symbols.
+3 −7
Diff settings

Always

Just for now

lua check fix

  • Loading branch information...
mwoz123
mwoz123 committed Feb 15, 2018
commit e943548255ba8929bc9140e8752bd07c5e7ed304
@@ -16,8 +16,8 @@ function FtpApi:generateUrl(address, user, pass)
colon_sign = ":"
end
local replace = "://" .. user .. colon_sign .. pass .. at_sign
local url = string.gsub(address, "://", replace)
return url
local generated_url = string.gsub(address, "://", replace)
return generated_url
end

function FtpApi:nlst(u)
@@ -1,7 +1,6 @@
local DataStorage = require("datastorage")
local ReadHistory = require("readhistory")
local FFIUtil = require("ffi/util")
local Ftp = require("apps/cloudstorage/ftp")
local FtpApi = require("apps/cloudstorage/ftpapi")
local FtpConnectionConfig = require("ftpconnectionconfigfile")
local InfoMessage = require("ui/widget/infomessage")
@@ -23,7 +22,7 @@ local ftp_connection_config_file = "ftpconnectionconfig.lua"
local send_to_koreader_config_file = "send_to_koreader_settings.lua"
local config_key_custom_dl_dir = "custom_dl_dir";
local default_download_dir_name = "Send2Ebook"
local download_dir_path, feed_config_path
local download_dir_path

local function stringEnds(String,End)

This comment has been minimized.

Copy link
@Frenzie

Frenzie Feb 15, 2018

Member

variables should be lowercase

return End=='' or string.sub(String,-string.len(End))==End

This comment has been minimized.

Copy link
@Frenzie

Frenzie Feb 15, 2018

Member

Please use ""

@@ -192,9 +191,6 @@ function Send2Ebook:setCustomDownloadDirectory()
send_to_koreader_settings:saveSetting(config_key_custom_dl_dir, ("%s/"):format(path))
send_to_koreader_settings:flush()

logger.dbg("Send2Ebook: Coping to new download folder previous ftp_connection_config_file from: ", feed_config_path)
FFIUtil.copyFile(feed_config_path, ("%s/%s"):format(path, ftp_connection_config_file))

initialized = false
self:lazyInitialization()
end,
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.