Skip to content

Commit

Permalink
commit
Browse files Browse the repository at this point in the history
  • Loading branch information
@filecxx
filecxx committed Mar 24, 2022
1 parent 96cb153 commit e9298b8
Show file tree
Hide file tree
Showing 78 changed files with 815 additions and 143 deletions.
3 changes: 3 additions & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ If you like this software, please give a help translate to other languages, tran
#### ${torrent\_confirm}

![${torrent_confirm}](images/screenshot_torrent_confirm.png)
![${torrent_confirm}](images/screenshot_http_confirm.png)
![${torrent_confirm}](images/screenshot_links_confirm.png)

#### ${add\_catalog}

Expand Down Expand Up @@ -125,6 +127,7 @@ ${browser\_extension} ${screenshot}
* Magnet to torrent tool 1.0
* File merge tool 1.0
* Statistics 1.0
* Download all links from webpage 1.6

## languages
* Website: "lang/*.lang"
Expand Down
12 changes: 8 additions & 4 deletions en_US/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ <h2>Download</h2>
<div class="detail_">
<div class="version_">
Latest version:
<b>1.5 </b>
<span style="color: green">(2022.03.22)</span>
<b>1.6 </b>
<span style="color: green">(2022.03.25)</span>
<span> - </span>
<a href="update_log.html">Update log</a>
</div>
Expand All @@ -80,12 +80,12 @@ <h4>MacOS x64</h4>
<a class="button disabled" href="#">Lack build environment</a>
</div>
<div class="platform_">
<h4>Chrome extension 1.2</h4>
<h4>Chrome extension 1.3</h4>
<a class="button" href="https://github.com/filecxx/FileCentipede/raw/main/release/chrome.crx">Download link1</a>
<a class="button" href="../release/chrome.crx">Download link2</a>
</div>
<div class="platform_">
<h4>Firefox extension 1.2</h4>
<h4>Firefox extension 1.3</h4>
<a class="button" href="https://github.com/filecxx/FileCentipede/raw/main/release/firefox.xpi">Download link1</a>
<a class="button" href="../release/firefox.xpi">Download link2</a>
</div>
Expand Down Expand Up @@ -146,6 +146,7 @@ <h2>Features</h2>
<tr><td>Magnet to torrent tool</td><td>1.0</td></tr>
<tr><td>File merge tool</td><td>1.0</td></tr>
<tr><td>Statistics</td><td>1.0</td></tr>
<tr><td>Download all links from webpage</td><td>1.6</td></tr>
</tbody>
</table>
</div>
Expand All @@ -172,6 +173,9 @@ <h4>Torrent confirm</h4>
<div>
<img loading="lazy" src="../images/screenshot_http_confirm.png" alt="http_confirm">
</div>
<div>
<img loading="lazy" src="../images/screenshot_links_confirm.png" alt="Download all links from webpage">
</div>
<div>
<h4>Add catalog</h4>
<img loading="lazy" src="../images/screenshot_add_catalog.png" alt="Add catalog">
Expand Down
10 changes: 10 additions & 0 deletions en_US/update_log.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,16 @@ <h1><a href="http://filecxx.com">File Centipede</a></h1>
<div class="section">
<h1>Update log</h1>
</div>
<div class="section">
<h3>1.6 (uptime: 2022.03.25)</h3>
<h4>New:</h4>
<p>Sound effects when task download completed or error. (optional)</p>
<p>Browser extensions up to 1.3</p>
<p>Download all links from the web page</p>
<h4>Fixed:</h4>
<p>UI configs are lost when upgrading to a new version.</p>
<p>On windows7, fileu std::filesystem::path error (caused by MinGW).</p>
</div>
<div class="section">
<h3>1.5 (uptime: 2022.03.22)</h3>
<h4>New:</h4>
Expand Down
Binary file added images/screenshot_links_confirm.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/screenshot_software.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions lang/en_US.lang
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,3 +125,4 @@ feature_29=Create torrent
number=Number
one_click_download_file_=One click download file
update_log=Update log
feature_34=Download all links from webpage
3 changes: 2 additions & 1 deletion lang/ru_RU.lang
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,4 +124,5 @@ seeding_limit_size_enable=Seeding limit, size enable
feature_20=Экспортировать торрент из задачи
feature_6=Адрес в формате JSON
one_click_download_file_=One click download file
update_log=Update log
update_log=Update log
feature_34=Download all links from webpage
1 change: 1 addition & 0 deletions lang/zh_CN.lang
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,3 +125,4 @@ usage=用法
feature_3=Magnet, HASH 地址
refresh_address=刷新地址
update_log=更新日志
feature_34=从网页下载所有链接
11 changes: 6 additions & 5 deletions release/FileCentipede_pad.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,9 @@
<Program_Info>
<AppID>app-0100aa3d7a5e</AppID>
<Program_Name>FileCentipede</Program_Name>
<Program_Version>1.5</Program_Version>
<Program_Version>1.6</Program_Version>
<Program_Release_Month>03</Program_Release_Month>
<Program_Release_Day>22</Program_Release_Day>
<Program_Release_Day>25</Program_Release_Day>
<Program_Release_Year>2022</Program_Release_Year>
<Program_Cost_Dollars>0</Program_Cost_Dollars>
<Program_Type>Freeware</Program_Type>
Expand All @@ -78,9 +78,9 @@
<Limitations></Limitations>
<Awards></Awards>
<File_Info>
<File_Size_Bytes>25164504</File_Size_Bytes>
<File_Size_K>25164</File_Size_K>
<File_Size_MB>24.0</File_Size_MB>
<File_Size_Bytes>25568569</File_Size_Bytes>
<File_Size_K>25685</File_Size_K>
<File_Size_MB>24.4</File_Size_MB>
</File_Info>
<Expire_Info>
<Has_Expire_Info>N</Has_Expire_Info>
Expand Down Expand Up @@ -148,6 +148,7 @@ Chrome Browser integration
Firefox Browser integration
Capture videos, audios from web page
Find all magnets from web page
Download all links from web page
Translate tool
HTTP tool
URI encode/decode tool
Expand Down
Binary file modified release/chrome.crx
View file
Binary file not shown.
Binary file added release/chrome.zip
View file
Binary file not shown.
Binary file modified release/filecxx_latest_linux_x64.zip
View file
Binary file not shown.
Binary file modified release/filecxx_latest_win_x64.zip
View file
Binary file not shown.
Binary file modified release/firefox.xpi
View file
Binary file not shown.
12 changes: 8 additions & 4 deletions ru_RU/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ <h2>Скачать</h2>
<div class="detail_">
<div class="version_">
Последняя версия:
<b>1.5 </b>
<span style="color: green">(2022.03.22)</span>
<b>1.6 </b>
<span style="color: green">(2022.03.25)</span>
<span> - </span>
<a href="update_log.html">Update log</a>
</div>
Expand All @@ -80,12 +80,12 @@ <h4>MacOS x64</h4>
<a class="button disabled" href="#">Отсутствие среды сборки</a>
</div>
<div class="platform_">
<h4>Chrome extension 1.2</h4>
<h4>Chrome extension 1.3</h4>
<a class="button" href="https://github.com/filecxx/FileCentipede/raw/main/release/chrome.crx">Ссылка на скачивание1</a>
<a class="button" href="../release/chrome.crx">Ссылка на скачивание2</a>
</div>
<div class="platform_">
<h4>Firefox extension 1.2</h4>
<h4>Firefox extension 1.3</h4>
<a class="button" href="https://github.com/filecxx/FileCentipede/raw/main/release/firefox.xpi">Ссылка на скачивание1</a>
<a class="button" href="../release/firefox.xpi">Ссылка на скачивание2</a>
</div>
Expand Down Expand Up @@ -146,6 +146,7 @@ <h2>Возможности</h2>
<tr><td>Инструмент Magnet в торрент</td><td>1.0</td></tr>
<tr><td>Инструмент слияния файлов</td><td>1.0</td></tr>
<tr><td>Статистика</td><td>1.0</td></tr>
<tr><td>Download all links from webpage</td><td>1.6</td></tr>
</tbody>
</table>
</div>
Expand All @@ -172,6 +173,9 @@ <h4>Подтвердить торрент</h4>
<div>
<img loading="lazy" src="../images/screenshot_http_confirm.png" alt="http_confirm">
</div>
<div>
<img loading="lazy" src="../images/screenshot_links_confirm.png" alt="Download all links from webpage">
</div>
<div>
<h4>Добавить каталог</h4>
<img loading="lazy" src="../images/screenshot_add_catalog.png" alt="Добавить каталог">
Expand Down
10 changes: 10 additions & 0 deletions ru_RU/update_log.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,16 @@ <h1><a href="http://filecxx.com">File Centipede</a></h1>
<div class="section">
<h1>Update log</h1>
</div>
<div class="section">
<h3>1.6 (uptime: 2022.03.25)</h3>
<h4>New:</h4>
<p>Sound effects when task download completed or error. (optional)</p>
<p>Browser extensions up to 1.3</p>
<p>Download all links from the web page</p>
<h4>Fixed:</h4>
<p>UI configs are lost when upgrading to a new version.</p>
<p>On windows7, fileu std::filesystem::path error (caused by MinGW).</p>
</div>
<div class="section">
<h3>1.5 (uptime: 2022.03.22)</h3>
<h4>New:</h4>
Expand Down
2 changes: 1 addition & 1 deletion source_code/fileu/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/../bin/lib)
add_executable(${PROJECT_NAME} ${no_console} ${QRC_FILES} ${project_files})

if(WIN32)
set(require_libs ${require_libs} Iphlpapi)
set(require_libs ${require_libs} winmm wtsapi32 userenv iphlpapi)
endif()

target_precompile_headers(${PROJECT_NAME} PUBLIC pro_headers.h)
Expand Down
45 changes: 34 additions & 11 deletions source_code/fileu/help/help_install.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
namespace pro::help
{

install::install(pro::global& global) : pro::dialog_sample(global,"ui/help/install.sml")
install::install(pro::global& global) : pro::dialog_sample<>(global,"ui/help/install.sml")
{
ui.cast(licence_,"#licence");
ui.cast(path_,"#path");
Expand All @@ -24,6 +24,32 @@ install::~install()
}


///--------------------------
ext::value install::load_settings(const ext::fs::path& path,ext::text_view lang)
{
std::error_code error;
ext::value setting({
{"installed",1},
{"watch_clipboard",true},
{"lang",lang},
{"sound_effects",true}
});
if(ext::fs::exists(path,error))
{
ext::text conf;
ext::value json;

if(ext::cfile::read(path,conf).value() == 0 && (json = ext::json::parse(conf)).is_map()){
setting.merge(std::move(json));
}
}
setting["tray_icon"] = values_["tray_icon"];
setting["autostart"] = values_["autostart"];

return setting;
}


///--------------------------
void install::init_languages()
{
Expand Down Expand Up @@ -120,7 +146,7 @@ void install::start_install()
ext::ui::post([this,ret,elevatable]() mutable
{
if(WEXITSTATUS(ret) != 200){
install_failed(ret,elevatable);
install_failed(WEXITSTATUS(ret),elevatable);
}else{
install_success();
}
Expand All @@ -147,20 +173,17 @@ void install::install_write_conf_failed()

void install::install_success()
{
auto lang = language_->value();
auto setting = ext::value{
{"installed",1},
{"watch_clipboard",true},
{"lang",lang},
{"tray_icon",values_["tray_icon"]},
{"autostart",values_["autostart"]}
};
auto lang = language_->value();

if(!lang.is_string()){
lang = ext::ui::language::locale_name();
}
ext::ui::language language;
ext::text software_name = ext::ui::lang("software_name_");
ext::fs::path lang_path = install_path_ / "lang" / (lang.text() + ".lang");
ext::fs::path config_path = install_path_ / "lib" / FileU_Config_File_Name;

auto setting = load_settings(config_path,lang.text_view());

if(language.load_file(lang_path))
{
Expand All @@ -176,7 +199,7 @@ void install::install_success()
if(values_["desktop_shortcuts"] == true){
create_desktop_shortcuts(software_name);
}
if(ext::cfile::write((install_path_ / "lib" / FileU_Config_File_Name).u8string().c_str(),"wb",setting.stringify()).value() != 0){
if(ext::cfile::write(config_path,"wb",setting.stringify()).value() != 0){
install_write_conf_failed();
}else{
ext::ui::alert("info","success",ext::ui::lang("install_success")).exec();
Expand Down
9 changes: 8 additions & 1 deletion source_code/fileu/help/help_install.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
namespace pro::help
{

class install : public pro::dialog_sample
class install : public pro::dialog_sample<>
{
public:
install(pro::global& global);
Expand Down Expand Up @@ -50,6 +50,13 @@ class install : public pro::dialog_sample
ext::fs::path install_path_;


protected:
/*
* load settings
*/
ext::value load_settings(const ext::fs::path& path,ext::text_view lang);


protected:
/*
* init languages
Expand Down
2 changes: 1 addition & 1 deletion source_code/fileu/help/help_translate_files.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
namespace pro::help
{

translate_files::translate_files(pro::global& global) : pro::dialog_sample(global,"ui/help/translate_files.sml")
translate_files::translate_files(pro::global& global) : pro::dialog_sample<>(global,"ui/help/translate_files.sml")
{
dialog_->on_close([this](auto){
delete this;
Expand Down
2 changes: 1 addition & 1 deletion source_code/fileu/help/help_translate_files.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
namespace pro::help
{

class translate_files : public pro::dialog_sample
class translate_files : public pro::dialog_sample<>
{
public:
translate_files(pro::global& global);
Expand Down
5 changes: 2 additions & 3 deletions source_code/fileu/help/help_translator.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
namespace pro::help
{

translator::translator(pro::global& global) : pro::dialog_sample(global,"ui/help/translator.sml")
translator::translator(pro::global& global) : pro::dialog_sample<>(global,"ui/help/translator.sml")
{
ui.cast(dialog_languages_,"#dialog_languages");
ui.cast(languages_list_,"#languages_list");
Expand Down Expand Up @@ -111,8 +111,7 @@ void translator::init_data_list()
}
return false;
});
data_list_->on_context_menu([this](auto)
{
data_list_->on_context_menu([this](auto){
Ext_Return_If(!data_list_->has_selection());
data_list_->show_context_menu();
});
Expand Down
2 changes: 1 addition & 1 deletion source_code/fileu/help/help_translator.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
namespace pro::help
{

class translator : public pro::dialog_sample
class translator : public pro::dialog_sample<>
{
constexpr static auto Auto_Grow_Row = 2;

Expand Down
2 changes: 1 addition & 1 deletion source_code/fileu/help/help_uninstall.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
namespace pro::help
{

uninstall::uninstall(pro::global& global) : pro::dialog_sample(global,"ui/help/uninstall.sml")
uninstall::uninstall(pro::global& global) : pro::dialog_sample<>(global,"ui/help/uninstall.sml")
{
ui.cast(path_,"#path");
path_->text(ext::text(zzz.workspace.u8string()));
Expand Down
2 changes: 1 addition & 1 deletion source_code/fileu/help/help_uninstall.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
namespace pro::help
{

class uninstall : public pro::dialog_sample
class uninstall : public pro::dialog_sample<>
{
public:
uninstall(pro::global& global);
Expand Down
2 changes: 1 addition & 1 deletion source_code/fileu/help/help_update.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
namespace pro::help
{

update::update(pro::global& global) : pro::dialog_sample(global,"ui/help/update.sml")
update::update(pro::global& global) : pro::dialog_sample<>(global,"ui/help/update.sml")
{
dialog_->on_close([this](auto){
ext::ui::clear_timeout(timer_);
Expand Down
2 changes: 1 addition & 1 deletion source_code/fileu/help/help_update.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
namespace pro::help
{

class update : public pro::dialog_sample
class update : public pro::dialog_sample<>
{
public:
update(pro::global& global);
Expand Down
Loading

0 comments on commit e9298b8

Please sign in to comment.