version 2.0.2

Author: jonasN5

README.md

@@ -13,7 +13,7 @@ Simply download and execute the setup.exe file
 
         sudo apt-get install python3-pip python3-tk unrar
         sudo pip3 install django==1.8.5 irc requests cherrypy pytz miniupnpc
-        sudo dpkg -i IRCapp_2.0.deb
+        sudo dpkg -i IRCapp_2.0.2.deb
 *   In case you choose to clone the source code, for instance if you implement a server, you should run :
 
         sudo apt-get install python3-pip python3-tk unrar       
@@ -42,4 +42,9 @@ A few major things still need to be done:
 *   Change: the download directory is now selected via a menu
 *   A few other things probably too...
 
+###Changelog 2.0.2 (since 2.0) :
+*   Fix: clicking on the file name in the download now properly opens the file location
+*   Fix: displays an error when trying to change the download directory while downloading
+*   Fix: added a download_directory to the config.ini, to be used in case the GUI doesn't work properly (couldn't yet find why)
+
 

config.ini

@@ -1,4 +1,5 @@
 ip_address = 127.0.0.1 #this is the ip address used by the WSGI server
 port = 8020 #this is the port used by the WSGI server
-port_forwarding = #use this if automatic UPnP port forwarding doesn't work -> open port manually on your router
+port_forwarding = #use this if automatic UPnP port forwarding doesnt work -> open port manually on your router
 timezone = Europe/Paris #check : https://en.wikipedia.org/wiki/List_of_tz_database_time_zones for all valid timezones
+download_directory = /home/mrj/Documents/family #add full path if GUI doesnt work

core/logs.py

@@ -2,13 +2,21 @@
 from django.utils.translation import ugettext as _
 import os, sys
 from core.models import Download_Path
+import settings
 
 def directory():
     if Download_Path.objects.all().count() == 0:
         #temporary solution to get download path for english, german and french speaking users to avoid third party dependancy
         default = os.path.join(os.path.expanduser('~'), _('Downloads'))
         if not os.path.exists(default):
-            default = os.path.join(os.path.expanduser('~'), _('Téléchargements'))
+            default = os.path.join(os.path.expanduser('~'), 'Téléchargements')  
+        #config.ini file has priority
+        with open(os.path.join(settings.BASE_DIR, "config.ini"), "r") as cfg:
+            content = cfg.readlines()
+            path = content[4][1+content[4].index("="):content[4].index("#")].strip(" ")
+            cfg.close()
+        if path:
+            default = path
         if os.path.exists(default):
             Download_Path(download_path=default).save()
             return Download_Path.objects.latest('id').download_path

setup.py

@@ -2,7 +2,7 @@
 
 
 setup(name='ircapp',
-      version='2.0',
+      version='2.0.2',
       author='MrJ',
       description='Simple IRC Client',
       license='MIT',

setupcx.py

@@ -26,7 +26,7 @@
 
 setup(
     name = 'IRCapp',
-    version = '2.0',
+    version = '2.0.2',
     description = 'Simple IRC app based on irclib',
     author = 'MrJ',
     options = {'build_exe': {'include_files':includefiles, 'packages':packages, "excludes": ['pytz', 'core'], "include_msvcr" : include_msvcr}}, 

templates/search.html

@@ -77,7 +77,7 @@
   <!-- </div> -->
   <div style="text-align:center;padding-top:60px" class="mdl-card__supporting-text">
     <img style="margin-right:8px;margin-bottom:8px" src="{{STATIC_URL}}ic_ircapp_logo_bluegray.svg" height="32px"><br>
-    v<strong>2.0</strong> &middot; <a style="text-decoration:underline;cursor:pointer;" target="_blank" href="/log/">Log file</a><br><br>
+    v<strong>2.0.1</strong> &middot; <a style="text-decoration:underline;cursor:pointer;" target="_blank" href="/log/">Log file</a><br><br>
     <strong>Code by MrJ &middot; Art by Schickele</strong><br>
     Inspired by the search king’s dev site<br>
     &copy; 2015–2016 &middot; <a target="_blank" href="{{STATIC_URL}}ircapp_gua.txt">License (MIT)</a><br><br>
@@ -203,6 +203,7 @@
       Download directory: <a id="base_folder" title="Double click to change">{{directory}}</a>
     {% endif %}
     <div style="display: none;" id="nospacediv">Insufficient harddrive space to download the file, please make some and click "home" afterwards</div>
+    <div style="display: none;" id="path_msg"></div>
     <span id="free_sp">{{free_space}} GB free <img style="display: none;" id='space_warning' src='{{STATIC_URL}}ic_warning_red.svg' heitgh="18px"></span>
     <br>
     <div id="downbox_options">
@@ -553,6 +554,7 @@
         Getspace(false);
       } else {
         $("#path_msg").html(data.error);
+        $("#path_msg").show();
       }
     },
     error: function( jqXHR, textStatus ) {
@@ -643,14 +645,9 @@
 });
 
 $('#down').on('click', '#opendir', function(event) {
-  var self   = $(this).parent();
-  myclass = $(this).attr('class');
-  if ( myclass === "history" ){
-    var pk  = self.attr('id');
-    $.get( "/opendir/", { pk : pk }  );
-  } else {
-    $.get( "/opendir/", { pk : 0 }  );
-  }
+  var self   = $(this).parent(),
+      myclass = self.parent().parent().parent().attr('id');
+  $.get( "/opendir/", { pk : self.attr('id'), myclass : myclass }  );  
 });
 $('#close_download_box').click(function(event) {
   $("#down").hide();
@@ -982,7 +979,7 @@
                                 var new_tr = [];
                                 new_tr.push(
                                     "<tr class='mainrow'>" + 
-                                    "<td><td><td><td rowspan='2'><img id='delete_pic' src='{{STATIC_URL}}ic_cancel_red.svg'></td>" + 
+                                    "<td id='opendir'><td><td><td rowspan='2'><img id='delete_pic' src='{{STATIC_URL}}ic_cancel_red.svg'></td>" + 
                                     "</tr>" +
                                     "<tr><td><td><td>"+
                                     "<div class='progressbox' style='display: none;'>"+

views.py

@@ -551,16 +551,16 @@ def splitext(path):
     return os.path.splitext(path)
 
 def opendir(request):
-    pk = int(request.GET['pk'])
-    try:
-        basefolder = Download_Path.objects.latest('id').download_path
+    pk, myclass = int(request.GET['pk']), request.GET['myclass']
+    if directory():
+        basefolder = directory()
         foldername = basefolder
-        if pk != 0:
+        if myclass == "history":
             fileobject = Download_History.objects.get(pk=pk)
             if "extracted" in fileobject.status and ".tar" in splitext(fileobject.filename)[1]:
-                foldername = os.path.join(basefolder, splitext(fileobject.filename)[0])
+                foldername = os.path.join(basefolder, splitext(fileobject.filename)[0])           
         else:
-            fileobject = Download_Ongoing.objects.latest('id')
+            fileobject = Download_Ongoing.objects.get(pk=pk)
             if "Extracting" in fileobject.status and ".tar" in splitext(fileobject.filename)[1]:
                 foldername = os.path.join(basefolder, '_UNPACK_' + splitext(fileobject.filename)[0])
             elif "extracted" in fileobject.status and ".tar" in splitext(fileobject.filename)[1]:
@@ -570,9 +570,10 @@ def opendir(request):
         else:
             opener ="open" if sys.platform == "darwin" else "xdg-open"
             subprocess.call([opener, foldername])
-        return HttpResponse("")
-    except Exception as e:
-        return HttpResponse("Error: %s" % e)    
+        return HttpResponse("succefully opened directory")
+    else:
+        return HttpResponse("No directory set to open dir") 
+
 
 def read_log(request):
     log_file = open(log().my_log)