Skip to content
This repository has been archived by the owner on Apr 29, 2023. It is now read-only.

Commit

Permalink
Optimized path for linux
Browse files Browse the repository at this point in the history
  • Loading branch information
@lonadels
lonadels committed Jul 29, 2018
1 parent 95a335a commit b5bcc81
Show file tree
Hide file tree
Showing 14 changed files with 86 additions and 86 deletions.
4 changes: 2 additions & 2 deletions .dn/backup.conf
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#Sat Jul 28 17:39:04 MSK 2018
#Sun Jul 29 14:06:53 MSK 2018
autoOpenTrigger=
autoCloseTrigger=1
autoIntervalTriggerTime=240000
masterDefault=dev
autoAmountMaxInSession=8
autoIntervalTrigger=1
autoAmountMax=12
autoIntervalTrigger=1
2 changes: 1 addition & 1 deletion .dn/bundles/develnext.bundle.httpclient.HttpClientBundle.conf
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#Sat Jul 28 17:39:04 MSK 2018
#Sun Jul 29 14:06:53 MSK 2018
version=1.0
name=HTTP Client
env=all
2 changes: 1 addition & 1 deletion .dn/bundles/develnext.bundle.jurl.jURLBundle.conf
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#Sat Jul 28 17:39:04 MSK 2018
#Sun Jul 29 14:06:53 MSK 2018
version=2.0.0.13-dev
name=jURL
env=all
2 changes: 1 addition & 1 deletion .dn/bundles/develnext.bundle.sql.SqliteBundle.conf
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#Sat Jul 28 17:39:04 MSK 2018
#Sun Jul 29 14:06:53 MSK 2018
version=1.0
name=SQLite
env=all
2 changes: 1 addition & 1 deletion .dn/bundles/develnext.bundle.zip.ZipBundle.conf
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#Sat Jul 28 17:39:04 MSK 2018
#Sun Jul 29 14:06:53 MSK 2018
version=1.0
name=ZIP
env=all
2 changes: 1 addition & 1 deletion .dn/bundles/ide.bundle.std.JPHPDesktopDebugBundle.conf
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#Sat Jul 28 17:39:04 MSK 2018
#Sun Jul 29 14:06:53 MSK 2018
env=dev
2 changes: 1 addition & 1 deletion .dn/bundles/ide.bundle.std.UIDesktopBundle.conf
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#Sat Jul 28 17:39:04 MSK 2018
#Sun Jul 29 14:06:53 MSK 2018
env=all
2 changes: 1 addition & 1 deletion .dn/ide/editors/ScriptModuleEditor/src/app/modules/MainModule.php.conf
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#Sat Jul 28 17:39:04 MSK 2018
#Sun Jul 29 14:06:53 MSK 2018
blockedNodes=
2 changes: 1 addition & 1 deletion .dn/ide/project/behaviours/BundleProjectBehaviour.conf
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#Sat Jul 28 17:39:04 MSK 2018
#Sun Jul 29 14:06:53 MSK 2018
useImports=
2 changes: 1 addition & 1 deletion .dn/ide/project/behaviours/PhpProjectBehaviour.conf
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#Sat Jul 28 17:39:04 MSK 2018
#Sun Jul 29 14:06:53 MSK 2018
compileByteCode=1
importType=package
2 changes: 1 addition & 1 deletion .dn/library.conf
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
#Sat Jul 28 17:39:04 MSK 2018
#Sun Jul 29 14:06:53 MSK 2018
110 changes: 55 additions & 55 deletions FlowerVK.dnproject
View file
Original file line number Diff line number Diff line change
@@ -1,55 +1,55 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<project author="TheLonadels" authorOS="Windows 10" createdAt="1523034279978" ideName="DevelNext" ideVersion="16.7.0" ideVersionHash="2017103112" name="FlowerVK" packageName="app" template="ide\project\templates\DefaultGuiProjectTemplate" updatedAt="1532788744454">
<tree>
<expanded>
<path src=""/>
<path src="/src"/>
<path src="/src/.data"/>
<path src="/src/.theme"/>
<path src="/src/app"/>
<path src="/src/app/forms"/>
<path src="/src/app/modules"/>
</expanded>
</tree>
<openedFiles>
<file selected="1" src="FlowerVK.dnproject"/>
<file src="src/app/modules/MainFunctions.php"/>
<file src="src/app/forms/history.php"/>
<file src="src/app/modules/MainModule.php"/>
<file src="src/app/modules/AdditionFunctions.php"/>
<file src="src/app/modules/StringUtils.php"/>
<file src="src/app/modules/AppModule.php"/>
<file src="src/app/forms/loader.php"/>
<file src="src/.theme/style_dark.fx.css"/>
<file src="src/.theme/style.fx.css"/>
<file src="src/app/forms/update.php"/>
<file src="src/app/forms/settings.php"/>
<file src="src/app/modules/Forms.php"/>
<file src="src/app/modules/vkuser.php"/>
<file src="src/app/forms/MainForm.php"/>
<file src="src/app/modules/Updater.php"/>
<file src="src/app/forms/auth.php"/>
<file src="src/app/forms/mainMenu.php"/>
<file src="src/app/forms/autoAuth.php"/>
<file src="src/app/forms/validate.php"/>
<file src="src/app/modules/config.php"/>
<file src="src/.theme/style_light.fx.css"/>
<file src="src/app/forms/splashscreen.php"/>
<file src="src/app/modules/Params.php"/>
<file src="src/app/forms/userStats.php"/>
<file src="src/app/modules/Localization.php"/>
<file src="src/app/forms/statsProgressDialog.php"/>
<file src="src/.theme/font.fx.css"/>
</openedFiles>
<files/>
<behaviours>
<behaviour class="ide\project\behaviours\BundleProjectBehaviour"/>
<behaviour class="ide\project\behaviours\PhpProjectBehaviour"/>
<behaviour class="ide\project\behaviours\JavaPlatformBehaviour"/>
<behaviour class="ide\project\behaviours\GuiFrameworkProjectBehaviour"/>
<behaviour class="ide\project\behaviours\RunBuildProjectBehaviour"/>
<behaviour class="ide\project\behaviours\ShareProjectBehaviour"/>
<behaviour class="ide\project\behaviours\BackupProjectBehaviour"/>
<behaviour class="ide\project\behaviours\GradleProjectBehaviour"/>
</behaviours>
</project>
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<project author="TheLonadels" authorOS="Windows 10" createdAt="1523034279978" ideName="DevelNext" ideVersion="16.7.0" ideVersionHash="2017103112" name="FlowerVK" packageName="app" template="ide\project\templates\DefaultGuiProjectTemplate" updatedAt="1532862413091">
<tree>
<expanded>
<path src=""/>
<path src="/src"/>
<path src="/src/.theme"/>
<path src="/src/app"/>
<path src="/src/app/forms"/>
<path src="/src/app/modules"/>
<path src="/src/.data"/>
</expanded>
</tree>
<openedFiles>
<file src="FlowerVK.dnproject"/>
<file src="src/app/modules/MainFunctions.php"/>
<file src="src/app/forms/history.php"/>
<file selected="1" src="src/app/modules/MainModule.php"/>
<file src="src/app/modules/AdditionFunctions.php"/>
<file src="src/app/modules/StringUtils.php"/>
<file src="src/app/modules/AppModule.php"/>
<file src="src/app/forms/loader.php"/>
<file src="src/.theme/style_dark.fx.css"/>
<file src="src/.theme/style.fx.css"/>
<file src="src/app/forms/update.php"/>
<file src="src/app/forms/settings.php"/>
<file src="src/app/modules/Forms.php"/>
<file src="src/app/modules/vkuser.php"/>
<file src="src/app/forms/MainForm.php"/>
<file src="src/app/modules/Updater.php"/>
<file src="src/app/forms/auth.php"/>
<file src="src/app/forms/mainMenu.php"/>
<file src="src/app/forms/autoAuth.php"/>
<file src="src/app/forms/validate.php"/>
<file src="src/app/modules/config.php"/>
<file src="src/.theme/style_light.fx.css"/>
<file src="src/app/forms/splashscreen.php"/>
<file src="src/app/modules/Params.php"/>
<file src="src/app/forms/userStats.php"/>
<file src="src/app/modules/Localization.php"/>
<file src="src/app/forms/statsProgressDialog.php"/>
<file src="src/.theme/font.fx.css"/>
</openedFiles>
<files/>
<behaviours>
<behaviour class="ide\project\behaviours\BundleProjectBehaviour"/>
<behaviour class="ide\project\behaviours\PhpProjectBehaviour"/>
<behaviour class="ide\project\behaviours\JavaPlatformBehaviour"/>
<behaviour class="ide\project\behaviours\GuiFrameworkProjectBehaviour"/>
<behaviour class="ide\project\behaviours\RunBuildProjectBehaviour"/>
<behaviour class="ide\project\behaviours\ShareProjectBehaviour"/>
<behaviour class="ide\project\behaviours\BackupProjectBehaviour"/>
<behaviour class="ide\project\behaviours\GradleProjectBehaviour"/>
</behaviours>
</project>
22 changes: 11 additions & 11 deletions src/.system/application.conf
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# MAIN CONFIGURATION

app.name = FlowerVK
app.uuid = 29091323-5f07-47a0-a627-30fafd67cd63
app.version = 1

# APP
app.namespace = app
app.mainForm =
app.showMainForm = 1

# MAIN CONFIGURATION
app.name = FlowerVK
app.uuid = 29091323-5f07-47a0-a627-30fafd67cd63
app.version = 1
# APP
app.namespace = app
app.mainForm =
app.showMainForm = 1
app.fx.splash.autoHide = 0
16 changes: 8 additions & 8 deletions src/app/modules/MainModule.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ function __construct(){
$this->checkDirs();

try {
$dbfile = $this->dataDir . "\\data.db";
$dbfile = $this->dataDir . "/data.db";

$this->database = new SqliteClient;
$this->database->file = $dbfile;
Expand Down Expand Up @@ -1340,12 +1340,12 @@ public function autoAuth(){

public function cachePhoto($url, $name=null, $folder='photos'){

$this->checkDir($this->dataDir . "\\cache\\{$folder}\\");
$this->checkDir($this->dataDir . "/cache/{$folder}/");

if( ! isset($name) )
$name = basename( explode('?', $url)[0] );

$file = $this->dataDir . "\\cache\\{$folder}\\" . $name;
$file = $this->dataDir . "/cache/{$folder}/" . $name;

try {
if( ! file_exists( $file ) )
Expand Down Expand Up @@ -1373,16 +1373,16 @@ public function defaultDirectory(): String {

public function checkDirs(){

$this->dataDir = $this->defaultDirectory() . "\\FlowerVK";
$this->dataDir = $this->defaultDirectory() . "/FlowerVK";

if( ! is_dir($this->dataDir) )
mkdir($this->dataDir);

if( ! is_dir( $this->dataDir . "\\cache") )
mkdir($this->dataDir . "\\cache" );
if( ! is_dir( $this->dataDir . "/cache") )
mkdir($this->dataDir . "/cache" );

if( ! is_dir( $this->dataDir . "\\update") )
mkdir($this->dataDir . "\\update" );
if( ! is_dir( $this->dataDir . "/update") )
mkdir($this->dataDir . "/update" );
}

public function checkDir($dir){
Expand Down

0 comments on commit b5bcc81

Please sign in to comment.