Skip to content

Commit 2c467ac

Browse files
authored
Merge pull request #324 from davidhozic/develop
Release 2.8 Prep
2 parents 65c971e + c081c69 commit 2c467ac

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+2137
-1824
lines changed

.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@ docs/common/reference
1818
daf_web_data
1919
test.py
2020

21-
venv/*
22-
.venv/*
21+
venv*
22+
.venv*

README.rst

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,22 @@
11
=========================================================
2-
Discord Advertisement Framework (Shiller)
2+
Discord Advertisement Framework
33
=========================================================
4-
The Discord advertisement framework is a Python based **shilling application** that allows automatic advertising (and much more) on Discord.
4+
The Discord advertisement framework is a Python based automatic application that allows **easy automatic advertisement** (and much more) on Discord.
55

66

77
.. image:: ./docs/images/daf-gui-front.png
88

99
.. image:: ./docs/images/daf-gui-front-edit-msg.png
1010

11-
---------------
12-
Help
13-
---------------
14-
Need help? Contact me in my `Discord server <https://discord.gg/DEnvahb2Sw>`_.
15-
16-
1711
----------------
1812
Guide / Usage
1913
----------------
2014
Instructions can be found `here <https://daf.davidhozic.com/en/stable/guide/GUI/quickstart.html>`_.
2115

16+
---------------
17+
Help
18+
---------------
19+
Need help? Contact me in my `Discord server <https://discord.gg/DEnvahb2Sw>`_.
2220

2321
----------------------
2422
Key features

docs/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,11 @@ SOURCEDIR ?= source
99
BUILDDIR ?= build
1010
USE_LANGUAGE ?= en
1111

12+
export LANGUAGE=$(USE_LANGUAGE)
1213

1314
_BUILD_DIR = $(BUILDDIR)/$(SOURCEDIR)
1415

16+
1517
# Put it first so that "make" without argument is like "make help".
1618
help:
1719
@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
@@ -31,8 +33,6 @@ pdf: latex
3133
cp $(CURDIR)/$(_BUILD_DIR)/latex/*.pdf $(CURDIR)/$(_BUILD_DIR)/pdf/
3234

3335

34-
export LANGUAGE=$(USE_LANGUAGE)
35-
3636
%: Makefile
3737
python3 ./setup.py
3838
@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(_BUILD_DIR)" $(SPHINXOPTS) $(O)
-5.64 KB
Loading

docs/images/daf-gui-front.png

-13.3 KB
Loading

docs/setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
cp_to = dest["to"]
4343
if re.search(r"\.[A-z]+$", cp_to) is None: # The path does not have extension -> assume a dir
4444
_src = [x for x in glob.glob(cp_from, recursive=True) if os.path.isfile(x)]
45-
_dest = [os.path.join(cp_to, m.lstrip("./").lstrip("../")) for m in _src]
45+
_dest = [os.path.join(cp_to, os.path.basename(m)) for m in _src]
4646
else:
4747
_src = [cp_from]
4848
_dest = [cp_to]
@@ -59,6 +59,7 @@
5959

6060
# Run scripts
6161
if CLEAN:
62+
os.chdir(cwd)
6263
continue
6364

6465
scripts = setup_file_data["scripts"]
@@ -68,4 +69,3 @@
6869

6970
# Change cwd back to original
7071
os.chdir(cwd)
71-

docs/source/changelog.rst

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,34 @@ Glossary
3232
Releases
3333
----------------------
3434

35+
v2.8
36+
=================
37+
38+
- Remote control though HTTP access:
39+
40+
- The core can be started on a remote server and then connected to and controlled by the graphical interface.
41+
- The GUI now has a dropdown menu where users can select between a local connection client and a remote connection client.
42+
Local connection client won't use the HTTP API, but will start DAF locally and interact with it directly.
43+
44+
- GUI:
45+
46+
- Method execution
47+
- Executing method status window.
48+
- When editing objects, the Y size will now be set to default size every time the frame changes.
49+
- When executing async blocking functions, a progress bar window will be shown to indicate something is happening.
50+
51+
- Logging:
52+
53+
- :class:`daf.logging.LoggerJSON` will create a new file once the current one reaches 100 kilobytes.
54+
- Improved performance of :class:`daf.logging.LoggerJSON`.
55+
- Loggers will now trace their output path, so users can find the output logs more easily.
56+
57+
- State preservation
58+
59+
- When using the state preservation (introduced in :ref:`v2.7`), accounts that fail to login will, from now on,
60+
not be removed from list to prevent data loss.
61+
62+
3563

3664
v2.7
3765
================
@@ -102,7 +130,7 @@ v2.6.0
102130
- Graphical User Interface - **GUI** for controlling the framework,
103131
defining the schema (with backup and restore) and script generation!
104132

105-
.. image:: ./DEP/images/daf-gui-front.png
133+
.. image:: ./DEP/daf-gui-front.png
106134
:align: center
107135
:scale: 40%
108136

docs/source/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484

8585
# ----------- HTML ----------- #
8686
html_title = project
87-
html_logo = "./DEP/images/logo.png"
87+
html_logo = "./DEP/logo.png"
8888
html_favicon = html_logo
8989
html_theme = 'furo'
9090
html_static_path = ['_static']

docs/source/guide/GUI/filegen.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Schema backup
2121
.. seealso::
2222
:download:`Download example schema backup (schema.json) <./images/schema.json>`
2323

24-
To save a schema after it has been defined, we can click on the *Load/Save/Generate* button, located in the top left
24+
To save a schema after it has been defined, we can click on the *Schema* button, located in the top left
2525
corner of the *Schema definition* tab and then click the **Save schema** option.
2626

2727
We will be asked for a file location of the schema backup, where the GUI will save backup our schema.
@@ -37,7 +37,7 @@ We will be asked for a file location of the schema backup, where the GUI will sa
3737

3838
Schema restore
3939
---------------
40-
In case we want to restore a backed-up schema, we can click on the *Load/Save/Generate* button, located in the top left
40+
In case we want to restore a backed-up schema, we can click on the *Schema* button, located in the top left
4141
corner of the *Schema definition* tab and then click the **Load schema** option.
4242

4343
We will be asked for a file location of the schema backup, from which the GUI will load our schema.
@@ -56,7 +56,7 @@ a computer capable of displaying image.
5656

5757
Luckily DAF-GUI allows use to create a (Python) shilling script in the event that we want to run DAF on a server 24/7.
5858

59-
To generate a shilling script , we can click on the *Load/Save/Generate* button, located in the top left
59+
To generate a shilling script , we can click on the *Schema* button, located in the top left
6060
corner of the *Schema definition* tab and then click the **Generate script** option.
6161
This will open up a file dialog asking us where to save the shilling script.
6262
After we save the location our shilling script will be generated and we
10.8 KB
Loading

0 commit comments

Comments
 (0)