From 56f7175e7c27bb1731d4a7784838fb088b7c9d77 Mon Sep 17 00:00:00 2001 From: Will Budic Date: Fri, 17 Nov 2023 12:06:20 +1100 Subject: [PATCH] Transfer of Latest dev to new server. --- AAA_TEST.txt | 1 + Installation_PostgreSQL.txt | 12 +- TestMindMap.blinkmind | 111 +++++ htdocs/cgi-bin/CNFServices.cgi | 56 ++- htdocs/cgi-bin/config.cgi | 2 +- htdocs/cgi-bin/contact.cnf | 37 ++ htdocs/cgi-bin/docs/EContactHashSpecs.md | 22 + htdocs/cgi-bin/index.cnf | 12 +- htdocs/cgi-bin/login_ctr.cgi | 1 + htdocs/cgi-bin/main.cgi | 4 +- htdocs/cgi-bin/static | 1 + htdocs/cgi-bin/system/modules/CNFDateTime.pm | 1 + htdocs/cgi-bin/system/modules/CNFMeta.pm | 108 +++-- htdocs/cgi-bin/system/modules/CNFParser.pm | 390 +++++++++------- htdocs/cgi-bin/system/modules/CNFSQL.pm | 441 ++++++++++++++++++ .../cgi-bin/system/modules/ContactsPlugin.pm | 161 +++++++ .../cgi-bin/system/modules/MarkdownPlugin.pm | 6 +- .../cgi-bin/system/modules/RSSFeedsPlugin.pm | 2 +- htdocs/cgi-bin/wsrc/feeds.js | 31 +- htdocs/cgi-bin/wsrc/main.css | 51 +- htdocs/test.html | 79 ++++ install_lifelog_req_modules_2.4.sh | 35 ++ tash clear | 218 +++++++++ 23 files changed, 1548 insertions(+), 234 deletions(-) create mode 100644 AAA_TEST.txt create mode 100644 TestMindMap.blinkmind create mode 100644 htdocs/cgi-bin/contact.cnf create mode 100644 htdocs/cgi-bin/docs/EContactHashSpecs.md create mode 120000 htdocs/cgi-bin/static create mode 100644 htdocs/cgi-bin/system/modules/CNFSQL.pm create mode 100644 htdocs/cgi-bin/system/modules/ContactsPlugin.pm create mode 100755 install_lifelog_req_modules_2.4.sh create mode 100644 tash clear diff --git a/AAA_TEST.txt b/AAA_TEST.txt new file mode 100644 index 0000000..08d196d --- /dev/null +++ b/AAA_TEST.txt @@ -0,0 +1 @@ +added to test mods to lifelog.hopto.org diff --git a/Installation_PostgreSQL.txt b/Installation_PostgreSQL.txt index 108991e..040d2cf 100644 --- a/Installation_PostgreSQL.txt +++ b/Installation_PostgreSQL.txt @@ -49,7 +49,7 @@ host all all {client-server-access-ip}/24 scram- sudo service postgresql restart -## Install required libpq-dev to compile test perl driver, later. +## Install required libpq-dev to compile test perl driver, later. sudo apt install libpq-dev ## Install perl driver. @@ -96,12 +96,18 @@ pg_dump --file "~/dev/LifeLog/dbLifeLog/bck-pg-$DB_NAME.sql" $DB_NAME # Restore with: psql $DB_NAME < "~/dev/LifeLog/dbLifeLog/bck-pg-$DB_NAME.sql" +or +pg_restore -U lifelog -d lifelog < lifelog.sql +20231102 - Note bin/psql can have different default port number from the one in server config, + it is a separate client utility to postgres, bad thing refusing you connections. + So -h and -p options might be needed if using host settings which are for TCP sockets + The local setting is for linux sockets in the pg_hba.config file. ############################### Important pgAdmin4 Notes ############################### -What pgAdmin4 and their documentation and installation doesn't describe, +What pgAdmin4 and their documentation and installation doesn't describe, that the default web server is python based. The web based package will install the apache web server. You most likely don't want that. And the pgAdmin-desktop, you possibly don't need that. (Can use any browser instead) :) @@ -127,7 +133,7 @@ NOTE: Configuring authentication for SERVER mode. Enter the email address and password to use for the initial pgAdmin user account: Email address: user@domain.com -Password: +Password: Retype password: Starting pgAdmin 4. Please navigate to http://127.0.0.1:5050 in your browser. * Serving Flask app "pgadmin" (lazy loading) diff --git a/TestMindMap.blinkmind b/TestMindMap.blinkmind new file mode 100644 index 0000000..4845c1f --- /dev/null +++ b/TestMindMap.blinkmind @@ -0,0 +1,111 @@ +{ + "rootTopicKey": "c787a1ac-6cf8-4a19-8533-2011cfd25526", + "editorRootTopicKey": "c787a1ac-6cf8-4a19-8533-2011cfd25526", + "focusKey": "8a10c048-9a7a-49f6-b241-96c8f659882a", + "extData": {}, + "topics": [ + { + "key": "c787a1ac-6cf8-4a19-8533-2011cfd25526", + "parentKey": null, + "subKeys": [ + "8a10c048-9a7a-49f6-b241-96c8f659882a", + "b604e11b-8a64-4596-b7a1-6b964d96f9da" + ], + "collapse": false, + "style": null, + "blocks": [ + { + "type": "CONTENT", + "data": "Sample" + } + ] + }, + { + "key": "8a10c048-9a7a-49f6-b241-96c8f659882a", + "parentKey": "c787a1ac-6cf8-4a19-8533-2011cfd25526", + "subKeys": [], + "collapse": false, + "style": null, + "blocks": [ + { + "type": "CONTENT", + "data": "Test Code" + } + ] + }, + { + "key": "b604e11b-8a64-4596-b7a1-6b964d96f9da", + "parentKey": "c787a1ac-6cf8-4a19-8533-2011cfd25526", + "subKeys": [], + "collapse": false, + "style": null, + "blocks": [ + { + "type": "CONTENT", + "data": "" + } + ] + } + ], + "config": { + "readOnly": false, + "allowUndo": true, + "layoutDir": 0, + "theme": { + "name": "default", + "randomColor": true, + "background": "rgb(57,60,65)", + "highlightColor": "#50C9CE", + "marginH": 60, + "marginV": 20, + "contentStyle": { + "lineHeight": "1.5" + }, + "linkStyle": { + "lineRadius": 5, + "lineType": "curve", + "lineWidth": "3px" + }, + "rootTopic": { + "contentStyle": { + "fontSize": "34px", + "borderRadius": "35px", + "padding": "16px 18px 16px 18px" + }, + "subLinkStyle": { + "lineType": "curve", + "lineWidth": "3px", + "lineColor": "rgb(113, 203, 45)" + } + }, + "primaryTopic": { + "contentStyle": { + "borderWidth": "1px", + "borderStyle": "solid", + "borderRadius": "20px", + "fontSize": "17px", + "padding": "10px 15px 10px 15px" + }, + "subLinkStyle": { + "lineType": "curve", + "lineWidth": "3px", + "lineColor": "rgb(113, 203, 45)" + } + }, + "normalTopic": { + "contentStyle": { + "border": "1px solid #e8eaec", + "borderRadius": "20px", + "fontSize": "17px", + "padding": "4px 10px" + }, + "subLinkStyle": { + "lineType": "curve", + "lineWidth": "3px", + "lineColor": "white" + } + } + } + }, + "formatVersion": null +} \ No newline at end of file diff --git a/htdocs/cgi-bin/CNFServices.cgi b/htdocs/cgi-bin/CNFServices.cgi index 651e8aa..03388ad 100755 --- a/htdocs/cgi-bin/CNFServices.cgi +++ b/htdocs/cgi-bin/CNFServices.cgi @@ -18,24 +18,22 @@ use feature qw(signatures); ## use CGI::Carp qw(fatalsToBrowser set_message); -## -# This is a entry point script (main). -## -use lib::relative "system/modules"; +use lib "/home/will/dev/LifeLog/htdocs/cgi-bin/system/modules"; +#use lib::relative "system/modules"; require CNFParser; require CNFNode; our $GLOB_HTML_SERVE = "'{}/*.cgi' '{}/*.htm' '{}/*.html' '{}/*.md' '{}/*.txt'"; our $script_path = $0; $script_path =~ s/\w+.cgi$//; -use constant LOG_Settings =>q( +use constant LOG_Settings => q( <<@<%LOG> file = web_server.log # Should it mirror to console too? console = 0 # Disable/enable output to file at all? - enabled = 0 + enabled = 1 # Tail size cut, set to 0 if no tail cutting is desired. - tail = 1000 + tail = 60 >> ); @@ -47,21 +45,27 @@ cgi { chomp $error; $cgi->render(text=>qq(You have unfortunately hit an cgi-bin::CNFHTMLServiceError 
$error

- + ) ); } ); - exit CNFHTMLService($cgi); -}; + # my $p = $cgi->_body_params->{keyed}; + # $p->{'service'} = ['contacts']; + # $p->{'action'} = ['form']; + + ## + # This is a entry point script (main). + ## + exit CNFHTMLService($cgi); +}; -sub CNFHTMLService { - my ($cgi,$ptr) = (shift, undef); - my $cnf = CNFParser -> new (undef,{ DO_ENABLED => 1, HAS_EXTENSIONS=>1, ANONS_ARE_PUBLIC => 1, CGI=>$cgi }); - $cnf->parse(undef,_getServiceScript($cgi)); - $ptr = $cnf->data(); +sub CNFHTMLService($cgi) { + my $cnf = CNFParser -> new (undef,{ DO_ENABLED => 1, HAS_EXTENSIONS=>1, ANONS_ARE_PUBLIC => 1, CGI=>$cgi }); + $cnf -> parse(undef,_getServiceScript($cgi)); + my $ptr = $cnf->data(); $ptr = $ptr->{'PAGE'}; #say $$ptr if $ptr; $cgi -> render(text=>$$ptr); @@ -77,8 +81,30 @@ sub _getServiceScript($cgi) { if($service eq 'feeds'){ return _CNF_Script_For_Feeds(); } + elsif($service eq 'contacts'){ + return _CNF_Script_For_Contacts(); + } } +sub _CNF_Script_For_Contacts { +LOG_Settings . <<__CNF_IS_COOL__; +<<>> +< + + package : ContactsPlugin + subroutine : process + // The property holding the responce for the service. + property : ECHASH_CONTACT_RESPONSE + // The following maps in the CNF script the table and data properties for transfer/synch to the store. + // This shows how CNF can get complicated but also convenient to bind things in its scripts. + table : ECHASH_HOLDERS + data : CONTACTS_FORM_DATA + +>> +__CNF_IS_COOL__ +} + + sub _CNF_Script_For_Feeds { LOG_Settings . <<__CNF_IS_COOL__; < diff --git a/htdocs/cgi-bin/config.cgi b/htdocs/cgi-bin/config.cgi index 207f220..0564efd 100755 --- a/htdocs/cgi-bin/config.cgi +++ b/htdocs/cgi-bin/config.cgi @@ -75,7 +75,7 @@ if ($ERROR) { &error; } else { print qq(
-
+
Config diff --git a/htdocs/cgi-bin/contact.cnf b/htdocs/cgi-bin/contact.cnf new file mode 100644 index 0000000..facd110 --- /dev/null +++ b/htdocs/cgi-bin/contact.cnf @@ -0,0 +1,37 @@ +!CNF3.0 + +<<@<%WEB_SERVICE_SETTINGS> + $LOG_PATH = ../../dbLifeLog/ + user =admin + pass = admin + dbi_source = DBI:SQLite: + dbi_store= contacts.db +>> + +<< CONTACTS + ID INTEGER NOT NULL UNIQUE, + ID_FOR INTEGER NOT NULL UNIQUE, + Date TEXT NOT NULL, + FullName TEXT NOT NULL, + Message TEXT NOT NULL, + Status INTEGER, + PRIMARY KEY("ID" AUTOINCREMENT) +>> +<< ECHASH_HOLDERS
+ ID INTEGER NOT NULL UNIQUE, + Alias INTEGER NOT NULL UNIQUE, + ECHSH CHARACTER(16) NOT NULL, + Name varchar(64), + Email TEXT NOT NULL, + Details TEXT, PRIMARY KEY("ID" AUTOINCREMENT) +>> + +< +ID`Alias`ECHSH`Name`Image`Email`Details~ +#`webadmin`990MWWLWM8C2MI8K`Will Budic`images/webadmin.png`webadmin@fake.demo-email.com`Administrive Technical Contact.`~ +#`admin`990MWWLWM8C2MI8K`Will Budic`images/webadmin.png`webadmin@fake.demo-email.com`Engeenering site Owner Contact`~ +#`secretary`2435GG2G87HJLKLA`Rachel Zegler`images/zagler.png`zaglerr@fake.demo-email.com`Marketing Officer`~ +>> + +<<1>> + diff --git a/htdocs/cgi-bin/docs/EContactHashSpecs.md b/htdocs/cgi-bin/docs/EContactHashSpecs.md new file mode 100644 index 0000000..9408020 --- /dev/null +++ b/htdocs/cgi-bin/docs/EContactHashSpecs.md @@ -0,0 +1,22 @@ +# Electronic Contact Hash Message Specifications + + ECMessage is an alternative to E-Mail postboxes, utilizing a webservice to provide + fast and secure one way contact messages for a website. To the website owner ore admin. + + With this system in place, website scanners or email ants have no way of accessing email. + And do not feed them these, leaving email's in webpages. As will eventually SPAM you, + and possibly sell your details on the dark web. + +## ECHMessage Provides + + * No Email server/client requirements. + * Secure service to service channel, if required. + * Spam prevention mechanism and message size limitation. + * ECHMessage to real email proxy, if setup. + * One Message store for multiple aliases, for easier management. + * Cross internetwork messaging closed away from the cloud. + * Strict private and public info store and presentation. + * private is email, real, name and address. + * public is alias and the hash. + * Hash is not global or domain centralized at all. + diff --git a/htdocs/cgi-bin/index.cnf b/htdocs/cgi-bin/index.cnf index 5abe045..8d0d9af 100644 --- a/htdocs/cgi-bin/index.cnf +++ b/htdocs/cgi-bin/index.cnf @@ -2,7 +2,7 @@ <<@<%WEBAPP_SETTINGS> $LOG_PATH = ../../dbLifeLog/ - //We are reading only the css property, old way is the following hash, preserved as reminder. + //TODO We are reading only the css property, old way is the following hash, preserved as reminder. $THEME = css => wsrc/main.css, colBG => #c8fff8, colSHDW => #9baec8 >> @@ -50,7 +50,14 @@ margin:5px; background: rgba(0, 223, 246, 0.13); } - + .textual { + width: 40%; + } + .textual p::first-letter { + color: blueviolet; + initial-letter: 3 2; + padding-right: 5pt; + } #content ul { padding-left: 20px; } @@ -310,7 +317,6 @@ function loadDocResult(content){ Index
Life Log
RSS Feeds - >#> >div> Index
Demo
Feeds
+ Contact
+ + + + + + + ); + while (my @row = $st->fetchrow_array()){ + my $details = $row[$hdr{Details}]; $details = "" if not $details;#driver returns empty string as undef from table. + $buffer .= qq( + + + + + + + ) + } + $buffer .= "\n
IDContactECHASH
$row[$hdr{ID}]$row[$hdr{Alias}]$row[$hdr{ECHSH}]
$details
"; + $buffer .= qq( + ); + } + $parser->data()->{PAGE} = \$buffer; + + #$parser->data()->{$property} = \@data +} +sub js{ +< + + + +JS +} +sub css{ +< + .styled-table { + display: block; + border-collapse: collapse; + margin: 25px 0; + font-size: 0.9em; + font-family: sans-serif; + box-shadow: 8px 10px 20px rgba(0, 0, 0, 0.572); +} +.styled-table thead tr { + background-color: #00fbff; + color: #121111; + text-align: left; + font-weight: bold; +} + +.styled-table td{ + border:1px solid black;padding: 5px;margin: 0; + padding: 12px 15px; +} +.styled-table a{ + cursor:pointer; +} +.styled-table tbody tr { + border-bottom: 1px solid #eff190; +} +.styled-table tbody tr:nth-of-type(even) { + background-color: #f9b5b5; +} +.styled-table tbody tr:last-of-type { + border-bottom: 1px solid #000000; + border-right: 1px solid #000000; +} +.styled-table tbody tr:hover { + font-weight: bold; + background-color: #98fce8; +} +.styled-table textarea{ + overflow-y: scroll; + overflow: scroll; + width:98%; +} +.styled-message{ + margin-left: 0; + font-weight: bold; + text-shadow: 8px 10px 20px rgba(0, 0, 0, 0.572)} + +CSS +} + +1; + + +=begin copyright +Programed by : Will Budic +EContactHash : 990MWWLWM8C2MI8K (https://github.com/wbudic/EContactHash.md) +Source : https://github.com/wbudic/PerlCNF.git +Documentation : Specifications_For_CNF_ReadMe.md + This source file is copied and usually placed in a local directory, outside of its repository project. + So it could not be the actual or current version, can vary or has been modiefied for what ever purpose in another project. + Please leave source of origin in this file for future references. +Open Source Code License -> https://github.com/wbudic/PerlCNF/blob/master/ISC_License.md +=cut copyright \ No newline at end of file diff --git a/htdocs/cgi-bin/system/modules/MarkdownPlugin.pm b/htdocs/cgi-bin/system/modules/MarkdownPlugin.pm index 67da6fe..1636665 100644 --- a/htdocs/cgi-bin/system/modules/MarkdownPlugin.pm +++ b/htdocs/cgi-bin/system/modules/MarkdownPlugin.pm @@ -261,11 +261,11 @@ try{ $ln =~ s/^\s*\>+//; ($ln =~ /^(\s+) (\d+) \.\s (.*)/x || $ln =~ /^(\s*) ([-+*]) \s(.*)/x); if($2 && $2 =~ /[-+*]/){ - $bqte_tag = "ul"; + $bqte_tag = "ul" }elsif($2){ - $bqte_tag = "ol"; + $bqte_tag = "ol" }else{ - $bqte_tag = "p"; + $bqte_tag = "p" } if(!$bqte_nested){ $bqte_nested = $nested; diff --git a/htdocs/cgi-bin/system/modules/RSSFeedsPlugin.pm b/htdocs/cgi-bin/system/modules/RSSFeedsPlugin.pm index 920d275..d0fc97a 100644 --- a/htdocs/cgi-bin/system/modules/RSSFeedsPlugin.pm +++ b/htdocs/cgi-bin/system/modules/RSSFeedsPlugin.pm @@ -73,7 +73,7 @@ sub collectFeeds($self, $parser) { my $feed = $cgi->param('feed') if $cgi; $parser->log("Feed request:$feed"); for my $idx (0 .. $#data){ - my @col = @{$data[$idx]}; + my @col = @{$data[$idx]}; if($idx==0){ for my $i(0..$#col){ # Get the matching table column index names as scripted. $hdr{$col[$i]} = $i diff --git a/htdocs/cgi-bin/wsrc/feeds.js b/htdocs/cgi-bin/wsrc/feeds.js index adc795a..51e3249 100644 --- a/htdocs/cgi-bin/wsrc/feeds.js +++ b/htdocs/cgi-bin/wsrc/feeds.js @@ -7,7 +7,9 @@ function fetchFeeds(id){ ); pnl.show(); pnl.css('visibility','visible'); + if(ID === "#feeds"){ $(document).scrollTop( $("#rss_anchor").offset().top ); + } $.post('CNFServices.cgi', {service:'feeds',action:'list'}, displayFeeds).fail( function(response) { pnl.html(response.responseText); @@ -26,7 +28,7 @@ function fetchFeed(feed) { $.post('CNFServices.cgi', {service:'feeds', action:'read', feed:feed}, displayFeeds).fail( function(response) { pnl.html(response.responseText); - pnl.fadeOut(20000); + pnl.fadeOut(30000); } ); } @@ -35,7 +37,9 @@ function displayFeeds(content){ pnl.html(content); $("#index-content").css("height",'100%'); pnl.show(); - $(document).scrollTop( $("#rss_anchor").offset().top ); + if(ID === "#feeds"){ + $(document).scrollTop( $("#rss_anchor").offset().top ); + } } function demoLogin() { @@ -44,3 +48,26 @@ function demoLogin() { $('#frm_login input[name=passw]').val("admin"); form.submit(); } + +function contactForm(){ + var pnl = $(ID); + $.post('CNFServices.cgi', {service:'contacts', action:'form'}, + function(content){ + pnl.html(content); + pnl.css('visibility','visible'); + pnl.show(); + }).fail( + function(response) { + pnl.html(response.responseText); + pnl.fadeOut(30000); + } + ); +} +function contact(contact,echsh){ + $("#frm_contact input[name=poster_contacts]").val(contact); + $("#frm_contact input[name=echsh]").val(echsh); + var pnl = $('#div_contact'); + pnl.show(); + pnl.css('visibility','visible'); + return false; +} \ No newline at end of file diff --git a/htdocs/cgi-bin/wsrc/main.css b/htdocs/cgi-bin/wsrc/main.css index d87efa8..c371ba1 100644 --- a/htdocs/cgi-bin/wsrc/main.css +++ b/htdocs/cgi-bin/wsrc/main.css @@ -13,9 +13,8 @@ body{ padding:0; } p { - font-family: Bookman; - margin-left: 70px; - font-weight: normal; + margin-left: 70px; + font-weight: bold; } pre{ color: #070707; @@ -79,7 +78,7 @@ th, background: #ccffff; margin-top: 15px; margin-left: 200px; - width: 400px; + width: 280px; text-decoration-style: wavy; } @@ -168,6 +167,8 @@ div#rz { border: 1px solid black; border-right: 1px solid black; text-align: center; + margin:0; + padding: 3px; } .edit { @@ -235,18 +236,52 @@ img { margin-left: 91%; } +#menu_page { + border: 2px solid #10c69b72; +} +.marg-top-2{ + margin-top: 5px; +} + #frm_login { vertical-align: middle; margin: 0; } +.ui-icon,.menu_title { + background-color: transparent; + font-weight: bolder; +} +.ui-button { + font-size: 12px !important; + outline-color: transparent; +} +.ui-button:hover { + background: #00ddfa79; + background-image: none; + color: #000000 !important; +} +.ui-selectmenu-button:{ + background-image: none; +} +.ui-selectmenu-button:hover{ + background-image: none; + background: #00ddfa; +} + -.ui-button, -.ui-button-text .ui-button { - font-size: 12px !important; -} + +.ui-widget.ui-widget-content { + border: 1px solid #131311; + color: #362b36; + font-weight: bold; +} +.ui-widget-content { + background: #183c76; + color: #362b36; +} .ui-menu { list-style: none; padding: 10px; diff --git a/htdocs/test.html b/htdocs/test.html index 3911662..4abc361 100644 --- a/htdocs/test.html +++ b/htdocs/test.html @@ -1,5 +1,84 @@ + + + +

Hello From THTTPD

+ + + + + + + + + + + + + + +
IDContactECHASH
1webadmin990MWWLWM8C2MI8K
A 
+ + + + +
To run the Web Application please click on CGI-BIN. +
+

MaryLou wore the tiara with real pride. +There was something that made doing anything she didn't really want to do a bit easier when she wore it. + She really didn't care what those staring through the window were thinking as she vacuumed her apartment. +

+
+

+ The water rush down the wash and into the slot canyon below. Two hikers had started the day to sunny weather without a cloud in the sky, but they hadn't thought to check the weather north of the canyon. Huge thunderstorms had brought a deluge o rain and produced flash floods heading their way. The two hikers had no idea what was coming. +

+ There are different types of secrets. She had held onto plenty of them during her life, but this one was different. She found herself holding onto the worst type. It was the type of secret that could gnaw away at your insides if you didn't tell someone about it, but it could end up getting you killed if you did. +

+ +

diff --git a/install_lifelog_req_modules_2.4.sh b/install_lifelog_req_modules_2.4.sh new file mode 100755 index 0000000..1af9048 --- /dev/null +++ b/install_lifelog_req_modules_2.4.sh @@ -0,0 +1,35 @@ +sudo apt install cpanminus -y +sudo apt install perlbrew -y +sudo apt install libperl-critic-perl -y +sudo apt install libperl-dev -y +Avoid: sudo apt install openssl -y +sudo cpan DBD::SQLite; +sudo cpan Perl::LanguageServer +# before was -> sudo cpanm Try::Tiny; +sudo cpan Exception::Class +sudo cpan Log::Log4per +sudo cpan Syntax::Keyword::Try +sudo cpan DateTime; +sudo cpan DateTime::Format::Human::Duration +sudo cpan DateTime::Format::SQLite; +sudo cpan Text::CSV; +sudo cpan Number::Bytes::Human; +sudo cpan Gzip::Faster; +sudo cpan Number/Bytes/Human.pm; +sudo cpan Regexp::Common; +sudo cpan JSON; +sudo cpan Switch; +sudo cpan IPC::Run; +sudo cpan Syntax::Keyword::Try; +sudo cpan Text::Markdown +sudo cpan Crypt::Blowfish; +sudo cpan Compress::Zlib; +sudo cpan IO::Compress::Gzip; +sudo cpan IO::Prompter; +sudo cpan IO::Interactive; +sudo cpan -T DBD::Pg; +sudo cpan CGI CGI::Session; +sudo cpan Crypt::CBC; +sudo cpan DBI; +sudo cpan DBD::SQLite; + *$ sudo cpan -r Perl::LanguageServer diff --git a/tash clear b/tash clear new file mode 100644 index 0000000..2f70006 --- /dev/null +++ b/tash clear @@ -0,0 +1,218 @@ +GIT-STASH(1) Git Manual GIT-STASH(1) + +NNAAMMEE + git-stash - Stash the changes in a dirty working directory away + +SSYYNNOOPPSSIISS + _g_i_t _s_t_a_s_h list [] + _g_i_t _s_t_a_s_h show [-u|--include-untracked|--only-untracked] [] [] + _g_i_t _s_t_a_s_h drop [-q|--quiet] [] + _g_i_t _s_t_a_s_h ( pop | apply ) [--index] [-q|--quiet] [] + _g_i_t _s_t_a_s_h branch [] + _g_i_t _s_t_a_s_h [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet] + [-u|--include-untracked] [-a|--all] [-m|--message ] + [--pathspec-from-file= [--pathspec-file-nul]] + [--] [...]] + _g_i_t _s_t_a_s_h clear + _g_i_t _s_t_a_s_h create [] + _g_i_t _s_t_a_s_h store [-m|--message ] [-q|--quiet] + +DDEESSCCRRIIPPTTIIOONN + Use ggiitt ssttaasshh when you want to record the current state of the working directory and the index, but want to go back to a clean working directory. The command saves your local modifications away and reverts the working directory to match the HHEEAADD commit. + + The modifications stashed away by this command can be listed with ggiitt ssttaasshh lliisstt, inspected with ggiitt ssttaasshh sshhooww, and restored (potentially on top of a different commit) with ggiitt ssttaasshh aappppllyy. Calling ggiitt ssttaasshh without any arguments is equivalent to ggiitt ssttaasshh ppuusshh. A stash is by + default listed as "WIP on _b_r_a_n_c_h_n_a_m_e ...", but you can give a more descriptive message on the command line when you create one. + + The latest stash you created is stored in rreeffss//ssttaasshh; older stashes are found in the reflog of this reference and can be named using the usual reflog syntax (e.g. ssttaasshh@@{{00}} is the most recently created stash, ssttaasshh@@{{11}} is the one before it, ssttaasshh@@{{22..hhoouurrss..aaggoo}} is also + possible). Stashes may also be referenced by specifying just the stash index (e.g. the integer nn is equivalent to ssttaasshh@@{{nn}}). + +CCOOMMMMAANNDDSS + push [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [-m|--message ] [--pathspec-from-file= [--pathspec-file-nul]] [--] [...] + Save your local modifications to a new _s_t_a_s_h _e_n_t_r_y and roll them back to HEAD (in the working tree and in the index). The part is optional and gives the description along with the stashed state. + + For quickly making a snapshot, you can omit "push". In this mode, non-option arguments are not allowed to prevent a misspelled subcommand from making an unwanted stash entry. The two exceptions to this are ssttaasshh --pp which acts as alias for ssttaasshh ppuusshh --pp and pathspec + elements, which are allowed after a double hyphen ---- for disambiguation. + + save [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [] + This option is deprecated in favour of _g_i_t _s_t_a_s_h _p_u_s_h. It differs from "stash push" in that it cannot take pathspec. Instead, all non-option arguments are concatenated to form the stash message. + + list [] + List the stash entries that you currently have. Each _s_t_a_s_h _e_n_t_r_y is listed with its name (e.g. ssttaasshh@@{{00}} is the latest entry, ssttaasshh@@{{11}} is the one before, etc.), the name of the branch that was current when the entry was made, and a short description of the commit the + entry was based on. + + stash@{0}: WIP on submit: 6ebd0e2... Update git-stash documentation + stash@{1}: On master: 9cc0589... Add git-stash + + The command takes options applicable to the _g_i_t _l_o_g command to control what is shown and how. See ggiitt--lloogg(1). + + show [-u|--include-untracked|--only-untracked] [] [] + Show the changes recorded in the stash entry as a diff between the stashed contents and the commit back when the stash entry was first created. By default, the command shows the diffstat, but it will accept any format known to _g_i_t _d_i_f_f (e.g., ggiitt ssttaasshh sshhooww --pp ssttaasshh@@{{11}} to + view the second most recent entry in patch form). If no <> is provided, the default behavior will be given by the ssttaasshh..sshhoowwSSttaatt, and ssttaasshh..sshhoowwPPaattcchh config variables. You can also use ssttaasshh..sshhoowwIInncclluuddeeUUnnttrraacckkeedd to set whether ----iinncclluuddee--uunnttrraacckkeedd is enabled by + default. + + pop [--index] [-q|--quiet] [] + Remove a single stashed state from the stash list and apply it on top of the current working tree state, i.e., do the inverse operation of ggiitt ssttaasshh ppuusshh. The working directory must match the index. + + Applying the state can fail with conflicts; in this case, it is not removed from the stash list. You need to resolve the conflicts by hand and call ggiitt ssttaasshh ddrroopp manually afterwards. + + apply [--index] [-q|--quiet] [] + Like ppoopp, but do not remove the state from the stash list. Unlike ppoopp, <> may be any commit that looks like a commit created by ssttaasshh ppuusshh or ssttaasshh ccrreeaattee. + + branch [] + Creates and checks out a new branch named <> starting from the commit at which the <> was originally created, applies the changes recorded in <> to the new working tree and index. If that succeeds, and <> is a reference of the form + ssttaasshh@@{{<>}}, it then drops the <>. + + This is useful if the branch on which you ran ggiitt ssttaasshh ppuusshh has changed enough that ggiitt ssttaasshh aappppllyy fails due to conflicts. Since the stash entry is applied on top of the commit that was HEAD at the time ggiitt ssttaasshh was run, it restores the originally stashed state with no + conflicts. + + clear + Remove all the stash entries. Note that those entries will then be subject to pruning, and may be impossible to recover (see _E_x_a_m_p_l_e_s below for a possible strategy). + + drop [-q|--quiet] [] + Remove a single stash entry from the list of stash entries. + + create + Create a stash entry (which is a regular commit object) and return its object name, without storing it anywhere in the ref namespace. This is intended to be useful for scripts. It is probably not the command you want to use; see "push" above. + + store + Store a given stash created via _g_i_t _s_t_a_s_h _c_r_e_a_t_e (which is a dangling merge commit) in the stash ref, updating the stash reflog. This is intended to be useful for scripts. It is probably not the command you want to use; see "push" above. + +OOPPTTIIOONNSS + -a, --all + This option is only valid for ppuusshh and ssaavvee commands. + + All ignored and untracked files are also stashed and then cleaned up with ggiitt cclleeaann. + + -u, --include-untracked, --no-include-untracked + When used with the ppuusshh and ssaavvee commands, all untracked files are also stashed and then cleaned up with ggiitt cclleeaann. + + When used with the sshhooww command, show the untracked files in the stash entry as part of the diff. + + --only-untracked + This option is only valid for the sshhooww command. + + Show only the untracked files in the stash entry as part of the diff. + + --index + This option is only valid for ppoopp and aappppllyy commands. + + Tries to reinstate not only the working tree’s changes, but also the index’s ones. However, this can fail, when you have conflicts (which are stored in the index, where you therefore can no longer apply the changes as they were originally). + + -k, --keep-index, --no-keep-index + This option is only valid for ppuusshh and ssaavvee commands. + + All changes already added to the index are left intact. + + -p, --patch + This option is only valid for ppuusshh and ssaavvee commands. + + Interactively select hunks from the diff between HEAD and the working tree to be stashed. The stash entry is constructed such that its index state is the same as the index state of your repository, and its worktree contains only the changes you selected interactively. The + selected changes are then rolled back from your worktree. See the “Interactive Mode” section of ggiitt--aadddd(1) to learn how to operate the ----ppaattcchh mode. + + The ----ppaattcchh option implies ----kkeeeepp--iinnddeexx. You can use ----nnoo--kkeeeepp--iinnddeexx to override this. + + --pathspec-from-file= + This option is only valid for ppuusshh command. + + Pathspec is passed in <> instead of commandline args. If <> is exactly -- then standard input is used. Pathspec elements are separated by LF or CR/LF. Pathspec elements can be quoted as explained for the configuration variable ccoorree..qquuootteePPaatthh (see ggiitt--ccoonnffiigg(1)). See + also ----ppaatthhssppeecc--ffiillee--nnuull and global ----lliitteerraall--ppaatthhssppeeccss. + + --pathspec-file-nul + This option is only valid for ppuusshh command. + + Only meaningful with ----ppaatthhssppeecc--ffrroomm--ffiillee. Pathspec elements are separated with NUL character and all other characters are taken literally (including newlines and quotes). + + -q, --quiet + This option is only valid for aappppllyy, ddrroopp, ppoopp, ppuusshh, ssaavvee, ssttoorree commands. + + Quiet, suppress feedback messages. + + -- + This option is only valid for ppuusshh command. + + Separates pathspec from options for disambiguation purposes. + + ... + This option is only valid for ppuusshh command. + + The new stash entry records the modified states only for the files that match the pathspec. The index entries and working tree files are then rolled back to the state in HEAD only for these files, too, leaving files that do not match the pathspec intact. + + For more details, see the _p_a_t_h_s_p_e_c entry in ggiittgglloossssaarryy(7). + + + This option is only valid for aappppllyy, bbrraanncchh, ddrroopp, ppoopp, sshhooww commands. + + A reference of the form ssttaasshh@@{{<>}}. When no <> is given, the latest stash is assumed (that is, ssttaasshh@@{{00}}). + +DDIISSCCUUSSSSIIOONN + A stash entry is represented as a commit whose tree records the state of the working directory, and its first parent is the commit at HHEEAADD when the entry was created. The tree of the second parent records the state of the index when the entry is made, and it is made a child of + the HHEEAADD commit. The ancestry graph looks like this: + + .----W + / / + -----H----I + + where HH is the HHEEAADD commit, II is a commit that records the state of the index, and WW is a commit that records the state of the working tree. + +EEXXAAMMPPLLEESS + Pulling into a dirty tree + When you are in the middle of something, you learn that there are upstream changes that are possibly relevant to what you are doing. When your local changes do not conflict with the changes in the upstream, a simple ggiitt ppuullll will let you move forward. + + However, there are cases in which your local changes do conflict with the upstream changes, and ggiitt ppuullll refuses to overwrite your changes. In such a case, you can stash your changes away, perform a pull, and then unstash, like this: + + $ git pull + ... + file foobar not up to date, cannot merge. + $ git stash + $ git pull + $ git stash pop + + Interrupted workflow + When you are in the middle of something, your boss comes in and demands that you fix something immediately. Traditionally, you would make a commit to a temporary branch to store your changes away, and return to your original branch to make the emergency fix, like this: + + # ... hack hack hack ... + $ git switch -c my_wip + $ git commit -a -m "WIP" + $ git switch master + $ edit emergency fix + $ git commit -a -m "Fix in a hurry" + $ git switch my_wip + $ git reset --soft HEAD^ + # ... continue hacking ... + + You can use _g_i_t _s_t_a_s_h to simplify the above, like this: + + # ... hack hack hack ... + $ git stash + $ edit emergency fix + $ git commit -a -m "Fix in a hurry" + $ git stash pop + # ... continue hacking ... + + Testing partial commits + You can use ggiitt ssttaasshh ppuusshh ----kkeeeepp--iinnddeexx when you want to make two or more commits out of the changes in the work tree, and you want to test each change before committing: + + # ... hack hack hack ... + $ git add --patch foo # add just first part to the index + $ git stash push --keep-index # save all other changes to the stash + $ edit/build/test first part + $ git commit -m 'First part' # commit fully tested change + $ git stash pop # prepare to work on all other changes + # ... repeat above five steps until one commit remains ... + $ edit/build/test remaining parts + $ git commit foo -m 'Remaining parts' + + Recovering stash entries that were cleared/dropped erroneously + If you mistakenly drop or clear stash entries, they cannot be recovered through the normal safety mechanisms. However, you can try the following incantation to get a list of stash entries that are still in your repository, but not reachable any more: + + git fsck --unreachable | + grep commit | cut -d\ -f3 | + xargs git log --merges --no-walk --grep=WIP + +SSEEEE AALLSSOO + ggiitt--cchheecckkoouutt(1), ggiitt--ccoommmmiitt(1), ggiitt--rreefflloogg(1), ggiitt--rreesseett(1), ggiitt--sswwiittcchh(1) + +GGIITT + Part of the ggiitt(1) suite + +Git 2.34.1 02/08/2023 GIT-STASH(1) -- 2.34.1