Merge pull request #86 from yasserbdj96/hiphp-0.2.27

0.2.27
yasserbdj96 · Sep 13, 2022 · f29b6b3 · f29b6b3
2 parents 73c8146 + a8fb3b7
commit f29b6b3
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 39 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,9 +1,11 @@
-## 0.2.27-beta [xx-09-2022][In Progress]
+## 0.2.27 [13-09-2022][Last Version]
  - Updated some CLI Errors messages.
  - Updated CLI logo.
+ - Delete unused codes.
+ - Upgrading php-desktop in order to avoid errors that occur with various systems.
  - Bug fixes & performance improvements.
 
-## 0.2.26 [07-09-2022][Last Version]
+## 0.2.26 [07-09-2022]
  - Upgraded Docker files in order to be able to work from outside the container.
  - Add download option in hiphp_desktop.
  - Bug fixes & performance improvements.

diff --git a/Dockerfile b/Dockerfile
@@ -34,46 +34,18 @@
 
 #START{
 FROM python:3.10
-#FROM ubuntu
-#FROM debian:jessie
 
 # start install google-chrome:
-# Adding trusting keys to apt for repositories
+# Download the Chrome Driver
 RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add -
-
-# Adding Google Chrome to the repositories
 RUN sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google-chrome.list'
-
-# Updating apt to see
 RUN apt-get update -y
-
-# install Google Chrome
 RUN apt-get install -y google-chrome-stable
 
-# Installing Unzip
-#RUN apt-get install -yqq unzip
-
-# Download the Chrome Driver
-#RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add -
-#RUN sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google-chrome.list'
-#RUN apt-get update -y
-#RUN apt-get install -y google-chrome-stable
-
 # install chromedriver
 RUN apt-get install -yqq unzip
 RUN wget -O /tmp/chromedriver.zip http://chromedriver.storage.googleapis.com/`curl -sS chromedriver.storage.googleapis.com/LATEST_RELEASE`/chromedriver_linux64.zip
 RUN unzip /tmp/chromedriver.zip chromedriver -d /usr/local/bin/
-
-
-#ENV CHROME_VERSION "google-chrome-stable"
-#RUN sed -i -- 's&deb http://deb.debian.org/debian jessie-updates main&#deb http://deb.debian.org/debian jessie-updates main&g' /etc/apt/sources.list \
-#  && apt-get update && apt-get install wget -y
-#ENV CHROME_VERSION "google-chrome-stable"
-#RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - \
-#  && echo "deb http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list \
-#  && apt-get update && apt-get -qqy install ${CHROME_VERSION:-google-chrome-stable}
-
-
 # end install google-chrome.
 
 WORKDIR /wrdir

diff --git a/README.md b/README.md
@@ -370,12 +370,14 @@ hiphp Commands :
 <h2>Changelog History:</h2>
 
 ```
-## 0.2.27-beta [xx-09-2022][In Progress]
+## 0.2.27 [13-09-2022][Last Version]
  - Updated some CLI Errors messages.
  - Updated CLI logo.
+ - Delete unused codes.
+ - Upgrading php-desktop in order to avoid errors that occur with various systems.
  - Bug fixes & performance improvements.
 
-## 0.2.26 [07-09-2022][Last Version]
+## 0.2.26 [07-09-2022]
  - Upgraded Docker files in order to be able to work from outside the container.
  - Add download option in hiphp_desktop.
  - Bug fixes & performance improvements.

diff --git a/hiphp-desktop/main.py b/hiphp-desktop/main.py
@@ -102,10 +102,15 @@ def download_file(key,url,path):
     p1=hiphp(key,url,retu=True)
     return p1.run(down_from_path(path))
 
-host_ip="0.0.0.0"
-host_port=8080
+try:
+    if sys.argv[1]:
+        host_ip="0.0.0.0"
+        host_port=8080
+except:
+    host_ip="127.0.0.1"
+    host_port=8080
 
-print(f"local link: {host_ip}:{host_port}")
+print(f"hiphp run on local link: {host_ip}:{host_port}")
 
-eel.start("index.html",host=host_ip,port=host_port,size=(850,400))
+eel.start("index.html",host=host_ip,port=host_port,mode='default',size=(850,400))
 #}END.
diff --git a/hiphp-desktop/src/index.html b/hiphp-desktop/src/index.html
@@ -11,7 +11,7 @@
     </head>
     <body>
         <div id="connected">
-            <spam id="return" class="return pointer padding_9" onclick="back()">⬅️</spam>
+            <spam id="return" class="return pointer padding_9" onclick="back()">back</spam>
             <spam id="save" class="save pointer padding_9" onclick="save()">💾</spam>
             <spam id="temp" style="display:none;"></spam>
             <spam id="add" class="add_new pointer" onclick="add()"><h1 style="margin-top:-11px;margin-left:-4px;">+</h1></spam>

diff --git a/run.py b/run.py
@@ -22,7 +22,7 @@
         DST=os.environ['DST'] if "DST" in os.environ else False
         if DST!=False:
             os.chdir("hiphp-desktop")
-            os.system("python main.py")
+            os.system("python main.py docker")
             docker_check=True
     except:
         pass